Swiftdiff options
| -rw-r--r-- | BuildTools/SCons/SConstruct | 6 | ||||
| -rw-r--r-- | Swift/QtUI/.gitignore | 2 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 4 |
3 files changed, 5 insertions, 7 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 diff --git a/Swift/QtUI/.gitignore b/Swift/QtUI/.gitignore index 379d4f5..f539e86 100644 --- a/Swift/QtUI/.gitignore +++ b/Swift/QtUI/.gitignore @@ -1,3 +1,3 @@ Swift BuildVersion.h -Swift-*.dmg +*.dmg diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index e0e41bc..9883040 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -117,7 +117,7 @@ if env["PLATFORM"] == "darwin" : if env["HAVE_SPARKLE"] : frameworks.append(env["SPARKLE_FRAMEWORK"]) app = myenv.AppBundle("Swift", version = env["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"], frameworks = frameworks) - if "dist" in COMMAND_LINE_TARGETS : + if env["DIST"] : myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], [ "$QTDIR/bin/macdeployqt $SOURCE -dmg", Move("$TARGET", "$SOURCE.dir/Swift.dmg") @@ -127,7 +127,7 @@ if env.get("SWIFT_INSTALLDIR", "") : env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram) if env["PLATFORM"] == "win32" : - if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") : + if env["DIST"] : myenv.WindowsBundle("Swift", resources = [ os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"), os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"), |