summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-12 06:42:46 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-12 06:42:46 (GMT)
commit92596a6d13f89f5ac15c21a4c100a148df8386ce (patch)
tree9cc3bc49657c69770fc0adc83f140602761ecc75
parent208d7df20352927e1663ff81304310f3849aa87f (diff)
downloadswift-contrib-92596a6d13f89f5ac15c21a4c100a148df8386ce.zip
swift-contrib-92596a6d13f89f5ac15c21a4c100a148df8386ce.tar.bz2
Remove commented code.
-rw-r--r--Swift/QtUI/SConscript29
1 files changed, 16 insertions, 13 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 16ad48d..7be53dc 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -35,6 +35,7 @@ Import("env")
myenv = env.Clone()
myenv["BUILDERS"]["WindowsBundle"] = Builder(action = Action(buildWindowsBundle, cmdstr = "$BUNDLECOMSTR"))
+myenv["BUILDERS"]["AppBundle"] = Builder(action = Action(buildAppBundle, cmdstr = "$BUNDLECOMSTR"))
myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_FLAGS"])
@@ -100,18 +101,20 @@ if env["PLATFORM"] == "darwin" :
myenv.Command("Swift.app", "Swift", createAppBundle)
if env["PLATFORM"] == "win32" :
- myenv.WindowsBundle(Dir("Swift"), [
- swiftProgram[0],
- File(os.path.join(env["QTDIR"], "bin", "QtCore4.dll")),
- File(os.path.join(env["QTDIR"], "bin", "QtGui4.dll")),
- File(os.path.join(env["QTDIR"], "bin", "QtNetwork4.dll")),
- File(os.path.join(env["QTDIR"], "bin", "QtWebKit4.dll")),
- File(os.path.join(env["QTDIR"], "bin", "phonon4.dll")),
- File(os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll")),
- File(os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll")),
- ])
-
if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
- #myenv.Append(NSIS_OPTIONS = ["/DmsvccRedistributableDir=\"" + env["vcredist"] + "\""])
- myenv.Append(NSIS_OPTIONS = ["/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", "/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")])
+ myenv.WindowsBundle(Dir("Swift"), [
+ swiftProgram[0],
+ File(os.path.join(env["QTDIR"], "bin", "QtCore4.dll")),
+ File(os.path.join(env["QTDIR"], "bin", "QtGui4.dll")),
+ File(os.path.join(env["QTDIR"], "bin", "QtNetwork4.dll")),
+ File(os.path.join(env["QTDIR"], "bin", "QtWebKit4.dll")),
+ File(os.path.join(env["QTDIR"], "bin", "phonon4.dll")),
+ File(os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll")),
+ File(os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll")),
+ ])
+
+ myenv.Append(NSIS_OPTIONS = [
+ "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"",
+ "/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")
+ ])
myenv.Nsis("../Packaging/nsis/swift.nsi")