svn commit: r757694 - in /apr/apr/trunk: SConscript SConstruct

[pq...@apache.org]

Author: pquerna
Date: Tue Mar 24 09:39:18 2009
New Revision: 757694

URL: http://svn.apache.org/viewvc?rev=757694&view=rev
Log:
SCons: ability to build in a variant build directory

Added:
    apr/apr/trunk/SConscript
Modified:
    apr/apr/trunk/SConstruct

Added: apr/apr/trunk/SConscript
URL: http://svn.apache.org/viewvc/apr/apr/trunk/SConscript?rev=757694&view=auto
==============================================================================
--- apr/apr/trunk/SConscript (added)
+++ apr/apr/trunk/SConscript Tue Mar 24 09:39:18 2009
@@ -0,0 +1,12 @@
+
+Import("env")
+
+files = env.core_lib_files()
+
+(major, minor, patch) = env.APRVersion()
+
+libapr = env.SharedLibrary('apr-%d' % (major), files)
+
+targets = [libapr]
+
+Return("targets")
\ No newline at end of file

Modified: apr/apr/trunk/SConstruct
URL: http://svn.apache.org/viewvc/apr/apr/trunk/SConstruct?rev=757694&r1=757693&r2=757694&view=diff
==============================================================================
--- apr/apr/trunk/SConstruct (original)
+++ apr/apr/trunk/SConstruct Tue Mar 24 09:39:18 2009
@@ -17,6 +17,7 @@
 
 env = APREnv(args=ARGUMENTS, variables=vars)
 
+
 Help(vars.GenerateHelpText(env))
 
 env.APRHints()
@@ -40,12 +41,9 @@
             'all': 31}
   env.AppendUnique(CPPFLAGS = "-DAPR_POOL_DEBUG=%d" % flags[env['pool_debug']])
 
-files = env.core_lib_files()
-
-(major, minor, patch) = env.APRVersion()
-
-libapr = env.SharedLibrary('apr-%d' % (major), files)
+Export("env")
 
-targets = [libapr]
+# TODO: Support debug/release builds
+targets = SConscript("SConscript", variant_dir='builds/default', duplicate=0)
 
 env.Default(targets)