summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BuildTools/SCons/Tools/nsis.py2
-rw-r--r--SConstruct3
-rw-r--r--Swift/Packaging/nsis/swift.nsi19
3 files changed, 11 insertions, 13 deletions
diff --git a/BuildTools/SCons/Tools/nsis.py b/BuildTools/SCons/Tools/nsis.py
index 76f19fc..07ef045 100644
--- a/BuildTools/SCons/Tools/nsis.py
+++ b/BuildTools/SCons/Tools/nsis.py
@@ -10,8 +10,6 @@ TODO:
def generate(env) :
"""Add Builders and construction variables for qt to an Environment."""
- print "Loading nsis tool..."
-
Builder = SCons.Builder.Builder
env['NSIS_MAKENSIS'] = 'makensis'
diff --git a/SConstruct b/SConstruct
index fb940ab..a6b64cf 100644
--- a/SConstruct
+++ b/SConstruct
@@ -13,6 +13,8 @@ if os.name != "nt" :
vars.Add(BoolVariable("coverage", "Compile with coverage information", "no"))
if os.name == "mac" :
vars.Add(BoolVariable("universal", "Create universal binaries", "no"))
+if os.name == "nt" :
+ vars.Add(PathVariable("vcredist", "MSVC redistributable dir", "", PathVariable.PathAccept))
vars.Add(PackageVariable("openssl", "OpenSSL location", "yes"))
vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))
@@ -22,6 +24,7 @@ vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))
env = Environment(CPPPATH = "#", ENV = {'PATH' : os.environ['PATH']}, variables = vars)
Help(vars.GenerateHelpText(env))
+env.Alias("dist", ["."])
# Default compiler flags
if env["optimize"] :
diff --git a/Swift/Packaging/nsis/swift.nsi b/Swift/Packaging/nsis/swift.nsi
index f62450b..862dca5 100644
--- a/Swift/Packaging/nsis/swift.nsi
+++ b/Swift/Packaging/nsis/swift.nsi
@@ -1,10 +1,7 @@
# set dependencies
!define buildDate "20090811"
-!define swiftBuildDir "..\..\QtUI\"
-!define openSSLDir "G:\usr\openssl-0.9.8a.win32\bin"
-!define msvccRedistributableDir "G:\devel\vcredist"
+!define swiftBuildDir "..\..\QtUI\Swift"
!define msvccRedistributableExe "vcredist_x86.exe"
-!define qtDLLDir "G:\Qt\4.5.2-lgpl-vs2008\bin"
# define installer name
@@ -24,13 +21,13 @@ setOutPath $INSTDIR
# Specify files to go in output path.
# If you update this list, update the uninstall list too.
file ${swiftBuildDir}\Swift.exe
-file ${openSSLDir}\ssleay32.dll
-file ${openSSLDir}\libeay32.dll
-file ${qtDLLDir}\phonon4.dll
-file ${qtDLLDir}\QtCore4.dll
-file ${qtDLLDir}\QtGui4.dll
-file ${qtDLLDir}\QtWebKit4.dll
-file ${qtDLLDir}\QtNetwork4.dll
+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
# create start menu item
createShortCut "$SMPROGRAMS\Swift\Swift.lnk" "$INSTDIR\Swift.exe"