summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swift/Packaging/nsis/swift.nsi1
-rw-r--r--Swift/QtUI/SConscript8
2 files changed, 7 insertions, 2 deletions
diff --git a/Swift/Packaging/nsis/swift.nsi b/Swift/Packaging/nsis/swift.nsi
index 862dca5..5492648 100644
--- a/Swift/Packaging/nsis/swift.nsi
+++ b/Swift/Packaging/nsis/swift.nsi
@@ -1,5 +1,4 @@
# set dependencies
-!define buildDate "20090811"
!define swiftBuildDir "..\..\QtUI\Swift"
!define msvccRedistributableExe "vcredist_x86.exe"
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 0c458a1..16ad48d 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -1,4 +1,4 @@
-import os, shutil
+import os, shutil, datetime
def generateDefaultTheme(env, target, source) :
sourceDir = source[0].abspath
@@ -47,6 +47,7 @@ myenv.MergeFlags(env["ZLIB_FLAGS"])
myenv.MergeFlags(env["OPENSSL_FLAGS"])
myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
+myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
myenv.EnableQt4Modules(['QtCore', 'QtGui', 'QtWebKit'], debug = False)
myenv.Append(CPPPATH = ["/usr/include/phonon"])
@@ -109,3 +110,8 @@ if env["PLATFORM"] == "win32" :
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.Nsis("../Packaging/nsis/swift.nsi")