[Boost-commit] svn:boost r51430 - in sandbox/SCons: . tools/scons

Subject: [Boost-commit] svn:boost r51430 - in sandbox/SCons: . tools/scons
From: loonycyborg_at_[hidden]
Date: 2009-02-24 08:54:28

Author: loonycyborg
Date: 2009-02-24 08:54:28 EST (Tue, 24 Feb 2009)
New Revision: 51430
URL: http://svn.boost.org/trac/boost/changeset/51430

Log:
Added support for system and versioned layout.

Text files modified: 
   sandbox/SCons/SConstruct                          |     5 ++++-                                   
   sandbox/SCons/tools/scons/boost-build-variants.py |     8 ++++++++                                
   2 files changed, 12 insertions(+), 1 deletions(-)

Modified: sandbox/SCons/SConstruct
==============================================================================
--- sandbox/SCons/SConstruct	(original)
+++ sandbox/SCons/SConstruct	2009-02-24 08:54:28 EST (Tue, 24 Feb 2009)
@@ -5,7 +5,8 @@
 vars.AddVariables(
     ListVariable("variant", "Build configuration", "release", ["release", "debug", "profile"]),
     ListVariable("link", "Library linking", "all", ["static", "dynamic"]),
-    ListVariable("threading", "Multi-threading support", "multi", ["single", "multi"])
+    ListVariable("threading", "Multi-threading support", "multi", ["single", "multi"]),
+    EnumVariable("layout", "Layout of library names and header locations", "versioned", ["versioned", "system"])
 )
 env = Environment(toolpath = ["tools/scons"], tools = ["default", "boost-libs", "boost-build-variants", "boost-configure"], variables = vars, config_log = "$BOOST_BUILD_DIR/config.log")
 vars.Save("build-config.py", env)
@@ -22,6 +23,8 @@
 if(GetOption("help")):
     Return()
 
+env["BOOST_VERSION"] = "1.38"
+
 SConsignFile(File(env.subst("$BOOST_BUILD_DIR/sconsign.dblite")).path)
 
 SConscript("libs/SConscript")

Modified: sandbox/SCons/tools/scons/boost-build-variants.py
==============================================================================
--- sandbox/SCons/tools/scons/boost-build-variants.py	(original)
+++ sandbox/SCons/tools/scons/boost-build-variants.py	2009-02-24 08:54:28 EST (Tue, 24 Feb 2009)
@@ -48,11 +48,19 @@
 
 def boost_suffix(env):
     suffix = str()
+
+    if env["layout"] == "versioned":
+        if "gcc" in env["TOOLS"]:
+            suffix += "-gcc" + "".join(env["CCVERSION"].split(".")[0:2])
+
     if env["THREADING"] == "multi":
         suffix += "-mt"
     if env["DEBUG"]:
         suffix += "-d"
 
+    if env["layout"] == "versioned":
+        suffix += "-" + "_".join(env["BOOST_VERSION"].split("."))
+
     return suffix
 
 def exists():