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 /Swift/QtUI
parente1691fa514c04694da6525afb1b9ef4362356525 (diff)
downloadswift-contrib-c87a58a698ecaca2e6c4577e1e645b38a2c32e67.zip
swift-contrib-c87a58a698ecaca2e6c4577e1e645b38a2c32e67.tar.bz2
Fix 'scons dist=1'.
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/.gitignore2
-rw-r--r--Swift/QtUI/SConscript4
2 files changed, 3 insertions, 3 deletions
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"),