summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-07-10 18:26:40 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-07-13 18:12:34 (GMT)
commita0f902844e7d83006a45c40158aa7d8256c87260 (patch)
tree58034bcb1d7ace395912aaa64ea0953c13bd77d5 /BuildTools/SCons
parentac6840211564d59c106cf4ab2cf0206e26996440 (diff)
downloadswift-contrib-a0f902844e7d83006a45c40158aa7d8256c87260.zip
swift-contrib-a0f902844e7d83006a45c40158aa7d8256c87260.tar.bz2
Added scons2ninja script.
This script allows you to use ninja to drive your build, but using SCons in the back to generate the ninja files. Change-Id: I410d80d91f3c2ca6f369169d9b004b531625022f
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConscript.boot1
-rw-r--r--BuildTools/SCons/SConstruct8
2 files changed, 8 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 9f624da..9ac3cca 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -73,6 +73,7 @@ vars.Add(BoolVariable("set_iterator_debug_level", "Set _ITERATOR_DEBUG_LEVEL=0",
# Set up default build & configure environment
################################################################################
+
env_ENV = {
'PATH' : os.environ['PATH'],
'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index ada291e..75baf21 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -33,7 +33,7 @@ def colorize(command, target, color) :
suffix = "\033[0m"
return " " + prefix + command + suffix + " " + target
-if int(ARGUMENTS.get("V", 0)) == 0:
+if int(ARGUMENTS.get("V", 0)) == 0 and not ARGUMENTS.get("dump_trace", False) :
env["CCCOMSTR"] = colorize("CC", "$TARGET", "green")
env["SHCCCOMSTR"] = colorize("CC", "$TARGET", "green")
env["CXXCOMSTR"] = colorize("CXX", "$TARGET", "green")
@@ -559,6 +559,12 @@ else :
# Project files
################################################################################
+if ARGUMENTS.get("dump_trace", False) :
+ env.SetOption("no_exec", True)
+ env["TEST"] = True
+ env.Decider(lambda x, y, z : True)
+ SCons.Node.Python.Value.changed_since_last_build = (lambda x, y, z: True)
+
# Modules
modules = []
if os.path.isdir(Dir("#/3rdParty").abspath) :