summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-13 16:16:20 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-13 16:16:20 (GMT)
commit108e9ddf2887dd154fd6ef530edffb452b58d73a (patch)
treef60adffdaddd59147e9b53a5b859672ce1ac0b85
parent9913a17ce5c3e62f9a907000590e9df4734580a0 (diff)
downloadswift-contrib-108e9ddf2887dd154fd6ef530edffb452b58d73a.zip
swift-contrib-108e9ddf2887dd154fd6ef530edffb452b58d73a.tar.bz2
Fix NSIS script to work with SCons scanner.
-rw-r--r--Swift/Packaging/nsis/swift.nsi18
-rw-r--r--Swift/QtUI/SConscript12
2 files changed, 14 insertions, 16 deletions
diff --git a/Swift/Packaging/nsis/swift.nsi b/Swift/Packaging/nsis/swift.nsi
index 5492648..49bb934 100644
--- a/Swift/Packaging/nsis/swift.nsi
+++ b/Swift/Packaging/nsis/swift.nsi
@@ -1,8 +1,6 @@
# set dependencies
-!define swiftBuildDir "..\..\QtUI\Swift"
!define msvccRedistributableExe "vcredist_x86.exe"
-
# define installer name
outFile "Swift-installer-win32-${buildDate}.exe"
@@ -19,14 +17,14 @@ setOutPath $INSTDIR
# Specify files to go in output path.
# If you update this list, update the uninstall list too.
-file ${swiftBuildDir}\Swift.exe
-file ${swiftBuildDir}\ssleay32.dll
-file ${swiftBuildDir}\libeay32.dll
-file ${swiftBuildDir}\phonon4.dll
-file ${swiftBuildDir}\QtCore4.dll
-file ${swiftBuildDir}\QtGui4.dll
-file ${swiftBuildDir}\QtWebKit4.dll
-file ${swiftBuildDir}\QtNetwork4.dll
+File "..\..\QtUI\Swift\Swift.exe"
+File "..\..\QtUI\Swift\ssleay32.dll"
+File "..\..\QtUI\Swift\libeay32.dll"
+File "..\..\QtUI\Swift\phonon4.dll"
+File "..\..\QtUI\Swift\QtCore4.dll"
+File "..\..\QtUI\Swift\QtGui4.dll"
+File "..\..\QtUI\Swift\QtWebKit4.dll"
+File "..\..\QtUI\Swift\QtNetwork4.dll"
# create start menu item
createShortCut "$SMPROGRAMS\Swift\Swift.lnk" "$INSTDIR\Swift.exe"
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 72b9d6d..9b672b0 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -90,13 +90,13 @@ if env["PLATFORM"] == "darwin" :
])
if env["PLATFORM"] == "win32" :
- myenv.WindowsBundle("Swift", resources = [
- os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),
- os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),
- [os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + "4.dll") for codec in ["gif", "ico", "jpeg", "mng", "svg", "tiff"]]
- ], qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "phonon4"])
-
if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
+ myenv.WindowsBundle("Swift", resources = [
+ os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),
+ os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),
+ [os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + "4.dll") for codec in ["gif", "ico", "jpeg", "mng", "svg", "tiff"]]
+ ], qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "phonon4"])
+
myenv.Append(NSIS_OPTIONS = [
"/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"",
"/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")