summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-03-30 08:08:28 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-03-30 08:08:28 (GMT)
commitc87a58a698ecaca2e6c4577e1e645b38a2c32e67 (patch)
tree074664c0f43b137d189c12ea3d62360d68fbcd64 /BuildTools
parente1691fa514c04694da6525afb1b9ef4362356525 (diff)
downloadswift-contrib-c87a58a698ecaca2e6c4577e1e645b38a2c32e67.zip
swift-contrib-c87a58a698ecaca2e6c4577e1e645b38a2c32e67.tar.bz2
Fix 'scons dist=1'.
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConstruct6
1 files changed, 2 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 15fed66..494ee1e 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -37,8 +37,6 @@ env = Environment(CPPPATH = "#", ENV = {'PATH' : os.environ['PATH']}, variables
Help(vars.GenerateHelpText(env))
-env.Alias("dist", ["."])
-
# Default custom tools
env.Tool("Test", toolpath = ["#/BuildTools/SCons/Tools"])
env.Tool("WriteVal", toolpath = ["#/BuildTools/SCons/Tools"])
@@ -116,14 +114,14 @@ if env["PLATFORM"] == "darwin" :
# Testing
env["TEST_TYPE"] = env["test"]
-env.Alias("check", ".")
-if "check" in ARGUMENTS or "check" in COMMAND_LINE_TARGETS :
+if "check" in ARGUMENTS :
env["TEST_TYPE"] = "unit"
env["TEST"] = (env["TEST_TYPE"] != "none") or env.GetOption("clean")
if env.get("valgrind", 0) :
env["TEST_RUNNER"] = "valgrind --suppressions=QA/valgrind.supp -q --leak-check=full --track-origins=yes "
# Packaging
+env["DIST"] = "dist" in ARGUMENTS or env.GetOption("clean")
if ARGUMENTS.get("SWIFT_INSTALLDIR", "") :
env["SWIFT_INSTALLDIR"] = Dir(ARGUMENTS["SWIFT_INSTALLDIR"]).abspath