diff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-11-05 22:27:52 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-11-05 22:49:42 (GMT) |
| commit | 184909e229c3e7b702099d69c0192c500d750e68 (patch) | |
| tree | 8e98e8b45830ed1713f3339a91307659fba1e916 /Swift | |
| parent | 0b56244a3efbd20fa28c63bffad32165283a42df (diff) | |
| download | swift-contrib-184909e229c3e7b702099d69c0192c500d750e68.zip swift-contrib-184909e229c3e7b702099d69c0192c500d750e68.tar.bz2 | |
Assume Windows packaging doesn't include openssl
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/Packaging/nsis/swift.nsi | 8 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Swift/Packaging/nsis/swift.nsi b/Swift/Packaging/nsis/swift.nsi index a5cc71a..92c65c4 100644 --- a/Swift/Packaging/nsis/swift.nsi +++ b/Swift/Packaging/nsis/swift.nsi @@ -26,72 +26,72 @@ SetCompressor lzma !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Swift" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES !macro checkNotRunning FindProcDLL::FindProc "Swift.exe" IntCmp $R0 1 0 notRunning MessageBox MB_OK|MB_ICONEXCLAMATION "Swift is running. Please close it first" /SD IDOK Abort notRunning: !macroend Function .onInit !insertmacro checkNotRunning FunctionEnd Function un.onInit !insertmacro checkNotRunning FunctionEnd # default section start section "Main install" # define output path setOutPath $INSTDIR # Specify files to go in output path. # If you update this list, update the uninstall list too. File "..\..\QtUI\Swift\Swift.exe" -File "..\..\QtUI\Swift\ssleay32.dll" -File "..\..\QtUI\Swift\libeay32.dll" +#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" File "..\..\QtUI\Swift\QtXMLPatterns4.dll" SetOutPath $INSTDIR\imageformats File "..\..\QtUI\Swift\imageformats\qgif4.dll" File "..\..\QtUI\Swift\imageformats\qico4.dll" File "..\..\QtUI\Swift\imageformats\qjpeg4.dll" File "..\..\QtUI\Swift\imageformats\qmng4.dll" File "..\..\QtUI\Swift\imageformats\qsvg4.dll" File "..\..\QtUI\Swift\imageformats\qtiff4.dll" SetOutPath $INSTDIR\sounds File "..\..\QtUI\Swift\sounds\message-received.wav" SetOutPath $INSTDIR\images File "..\..\QtUI\Swift\images\logo-icon-32.png" SetOutPath $INSTDIR\translations !include translations-install.nsh # create start menu item !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Swift.lnk" "$INSTDIR\Swift.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall Swift.lnk" "$INSTDIR\uninstaller.exe" !insertmacro MUI_STARTMENU_WRITE_END # Add the information to Add/Remove WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Swift" "DisplayName" "Swift" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Swift" "UninstallString" "$\"$INSTDIR\uninstaller.exe$\"" @@ -107,72 +107,72 @@ sectionEnd Section -Prerequisites # http://nsis.sourceforge.net/Embedding_other_installers FindFirst $R1 $R0 "$WINDIR\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.*" ${If} $R0 != "" #Skip vc runtime, already installed ${Else} SetOutPath $INSTDIR\Prerequisites MessageBox MB_YESNO "Install C++ Runtime?" /SD IDYES IDNO endRuntime File ${msvccRedistributableDir}\${msvccRedistributableExe} ExecWait "$INSTDIR\Prerequisites\${msvccRedistributableExe}" Delete $INSTDIR\Prerequisites\${msvccRedistributableExe} RmDir $INSTDIR\Prerequisites ${EndIf} Goto endRuntime endRuntime: SectionEnd section "autostart" MessageBox MB_YESNO "Would you like Swift to run at startup?" /SD IDYES IDNO endAutostart WriteRegStr HKEY_CURRENT_USER "Software\Microsoft\Windows\CurrentVersion\Run" "Swift" "$INSTDIR\Swift.exe" Goto endAutostart endAutostart: sectionEnd # create a section to define what the uninstaller does. # the section will always be named "Uninstall" section "Uninstall" # Always delete uninstaller first delete $INSTDIR\uninstaller.exe # now delete installed files delete $INSTDIR\Swift.exe - delete $INSTDIR\ssleay32.dll - delete $INSTDIR\libeay32.dll + #delete $INSTDIR\ssleay32.dll + #delete $INSTDIR\libeay32.dll delete $INSTDIR\phonon4.dll delete $INSTDIR\QtCore4.dll delete $INSTDIR\QtGui4.dll delete $INSTDIR\QtWebKit4.dll delete $INSTDIR\QtNetwork4.dll delete $INSTDIR\QtXMLPatterns4.dll delete $INSTDIR\imageformats\qgif4.dll delete $INSTDIR\imageformats\qico4.dll delete $INSTDIR\imageformats\qjpeg4.dll delete $INSTDIR\imageformats\qmng4.dll delete $INSTDIR\imageformats\qsvg4.dll delete $INSTDIR\imageformats\qtiff4.dll delete $INSTDIR\sounds\message-received.wav delete $INSTDIR\images\logo-icon-32.png" !include translations-uninstall.nsh RmDir $INSTDIR\translations RmDir $INSTDIR\Prerequisites RmDir $INSTDIR\imageformats RmDir $INSTDIR\images RmDir $INSTDIR\sounds RmDir $INSTDIR !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder Delete "$SMPROGRAMS\$StartMenuFolder\Swift.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall Swift.lnk" RmDir "$SMPROGRAMS\$StartMenuFolder" DeleteRegKey HKEY_CURRENT_USER "Software\Swift\Start Menu Folder" DeleteRegKey /ifempty HKEY_CURRENT_USER "Software\Swift" DeleteRegKey HKEY_CURRENT_USER "Software\Microsoft\Windows\CurrentVersion\Run\Swift" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Swift" Goto endUninstall endUninstall: sectionEnd diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 932a1fa..a62e14c 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -222,49 +222,49 @@ if env["PLATFORM"] == "win32" : for lang in translation_languages : nsis_translation_install_script += "File \"..\\..\\QtUI\\Swift\\translations\\swift_" + lang + ".qm\"\n" nsis_translation_uninstall_script += "delete $INSTDIR\\translations\\swift_" + lang + ".qm\n" myenv.WriteVal("../Packaging/nsis/translations-install.nsh", myenv.Value(nsis_translation_install_script)) myenv.WriteVal("../Packaging/nsis/translations-uninstall.nsh", myenv.Value(nsis_translation_uninstall_script)) ################################################################################ if env["PLATFORM"] == "darwin" : frameworks = [] if env["HAVE_SPARKLE"] : frameworks.append(env["SPARKLE_FRAMEWORK"]) if env["HAVE_GROWL"] : frameworks.append(env["GROWL_FRAMEWORK"]) commonResources[""] = commonResources.get("", []) + ["#/Swift/resources/MacOSX/Swift.icns"] app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = commonResources, frameworks = frameworks, handlesXMPPURIs = True) if env["DIST"] : myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], ["Swift/Packaging/MacOSX/package.sh " + app.path + " Swift/Packaging/MacOSX/Swift.dmg.gz $TARGET $QTDIR"]) if env.get("SWIFT_INSTALLDIR", "") : env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram + openURIProgram) env.InstallAs(os.path.join(env["SWIFT_INSTALLDIR"], "share", "pixmaps", "swift.xpm"), "#/Swift/resources/logo/logo-icon-32.xpm") icons_path = os.path.join(env["SWIFT_INSTALLDIR"], "share", "icons", "hicolor") env.InstallAs(os.path.join(icons_path, "32x32", "apps", "swift.xpm"), "#/Swift/resources/logo/logo-icon-32.xpm") env.InstallAs(os.path.join(icons_path, "scalable", "apps", "swift.svg"), "#/Swift/resources/logo/logo-icon.svg") for i in ["16", "22", "24", "64", "128"] : env.InstallAs(os.path.join(icons_path, i + "x" + i, "apps", "swift.png"), "#/Swift/resources/logo/logo-icon-" + i + ".png") env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "applications"), "#/Swift/resources/swift.desktop") for dir, resource in commonResources.items() : env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "swift", dir), resource) if env["PLATFORM"] == "win32" : if env["DIST"] : commonResources[""] = commonResources.get("", []) + [ - os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"), - os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"), + #os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"), + #os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"), "#/Swift/resources/images", ] myenv.WindowsBundle("Swift", resources = commonResources, qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"], qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "QtXMLPatterns4", "phonon4"]) myenv.Append(NSIS_OPTIONS = [ "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", "/DbuildVersion=" + myenv["SWIFT_VERSION"] ]) myenv.Nsis("../Packaging/nsis/swift.nsi") |
Swift