Try to fix up 32/64 bit windows builds.
authorCarl Hetherington <cth@carlh.net>
Fri, 26 Oct 2012 15:35:14 +0000 (16:35 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 26 Oct 2012 15:35:14 +0000 (16:35 +0100)
builds/windows-32
builds/windows-64
release
windows/installer.nsi.32.in [new file with mode: 0644]
windows/installer.nsi.64.in [new file with mode: 0644]
windows/wscript

index cddeeeed3e9de0ad2327a1338d487714f9cc1865..036ccc685cfe211f674e6a4635a6ec9ffedb649c 100755 (executable)
@@ -26,11 +26,11 @@ fi
 
 d=`pwd`
 
-cp build/windows/installer.nsi build/windows/installer2.nsi
+cp build/windows/installer.32.nsi build/windows/installer2.32.nsi
 
-sed -i "s~%resources%~$d/windows~g" build/windows/installer2.nsi
-sed -i "s~%deps%~$WINDOWS_PREFIX~g" build/windows/installer2.nsi
-sed -i "s~%binaries%~$d/build~g" build/windows/installer2.nsi
-sed -i "s~%bits%~32~g" build/windows/installer2.nsi
+sed -i "s~%resources%~$d/windows~g" build/windows/installer2.32.nsi
+sed -i "s~%deps%~$WINDOWS_PREFIX~g" build/windows/installer2.32.nsi
+sed -i "s~%binaries%~$d/build~g" build/windows/installer2.32.nsi
+sed -i "s~%bits%~32~g" build/windows/installer2.32.nsi
 
-makensis build/windows/installer2.nsi
+makensis build/windows/installer2.32.nsi
index f203370a11a91c9f817ff0b48e4d279a033a05c6..3675b117305b04656b01531bbc64969539ab95d1 100755 (executable)
@@ -27,11 +27,11 @@ fi
 
 d=`pwd`
 
-cp build/windows/installer.nsi build/windows/installer2.nsi
+cp build/windows/installer.64.nsi build/windows/installer2.64.nsi
 
-sed -i "s~%resources%~$d/windows~g" build/windows/installer2.nsi
-sed -i "s~%deps%~$WINDOWS_PREFIX~g" build/windows/installer2.nsi
-sed -i "s~%binaries%~$d/build~g" build/windows/installer2.nsi
-sed -i "s~%bits%~64~g" build/windows/installer2.nsi
+sed -i "s~%resources%~$d/windows~g" build/windows/installer2.64.nsi
+sed -i "s~%deps%~$WINDOWS_PREFIX~g" build/windows/installer2.64.nsi
+sed -i "s~%binaries%~$d/build~g" build/windows/installer2.64.nsi
+sed -i "s~%bits%~64~g" build/windows/installer2.64.nsi
 
-makensis build/windows/installer2.nsi
+makensis build/windows/installer2.64.nsi
diff --git a/release b/release
index 9f9850792108fd8f34034b4cb79deea600af2e11..29da203c128a4d32d73bab96177ebc84f5409c7b 100755 (executable)
--- a/release
+++ b/release
@@ -67,8 +67,10 @@ command("./waf clean")
 command("./waf")
 command("./waf configure")
 command("./waf dist")
-command("./builds/windows")
-shutil.copy(os.path.join('build', 'windows', 'DVD-o-matic %s Installer.exe' % release_version_string), '.')
+command("./builds/windows-32")
+shutil.copy(os.path.join('build', 'windows', 'DVD-o-matic %s 32-bit Installer.exe' % release_version_string), '.')
+command("./builds/windows-64")
+shutil.copy(os.path.join('build', 'windows', 'DVD-o-matic %s 64-bit Installer.exe' % release_version_string), '.')
 
 rewrite_wscript(new_pre_version)
 
diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in
new file mode 100644 (file)
index 0000000..b85b526
--- /dev/null
@@ -0,0 +1,119 @@
+!include "MUI2.nsh"
+Name "DVD-o-matic"
+
+RequestExecutionLevel admin
+
+outFile "DVD-o-matic @version@ 32-bit Installer.exe"
+!define MUI_ICON "%resources%/dvdomatic.ico"
+!define MUI_UNICON "%resources%/dvdomatic.ico"
+!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp"
+
+InstallDir "$PROGRAMFILES\DVD-o-matic"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "../../COPYING"
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+!insertmacro MUI_LANGUAGE "English"
+
+Section "install" "Installation info"
+SetOutPath "$INSTDIR\bin"
+
+File "%deps%/bin/asdcp-libdcp.dll"
+File "%deps%/bin/avcodec-54.dll"
+File "%deps%/bin/avfilter-3.dll"
+File "%deps%/bin/avformat-54.dll"
+File "%deps%/bin/avutil-51.dll"
+File "%deps%/bin/dcp.dll"
+File "%deps%/bin/libintl.dll"
+File "%deps%/bin/kumu-libdcp.dll"
+File "%deps%/bin/libboost_chrono-mt.dll"
+File "%deps%/bin/libboost_filesystem-mt.dll"
+File "%deps%/bin/libboost_system-mt.dll"
+File "%deps%/bin/libboost_thread_win32-mt.dll"
+File "%deps%/bin/libboost_date_time-mt.dll"
+File "%deps%/bin/libeay32.dll"
+File "%deps%/bin/libgcc_s_sjlj-1.dll"
+File "%deps%/bin/libgio-2.0-0.dll"
+File "%deps%/bin/libglib-2.0-0.dll"
+File "%deps%/bin/libgobject-2.0-0.dll"
+File "%deps%/bin/libjpeg-7.dll"
+File "%deps%/bin/libMagick++-5.dll"
+File "%deps%/bin/libMagickCore-5.dll"
+File "%deps%/bin/libMagickWand-5.dll"
+File "%deps%/bin/libopenjpeg-1.dll"
+File "%deps%/bin/libpng14-14.dll"
+File "%deps%/bin/libsigc-2.0-0.dll"
+File "%deps%/bin/libsndfile-1.dll"
+File "%deps%/bin/libssh.dll"
+File "%deps%/bin/libstdc++-6.dll"
+File "%deps%/bin/postproc-52.dll"
+File "%deps%/bin/swresample-0.dll"
+File "%deps%/bin/swscale-2.dll"
+File "%deps%/bin/zlib1.dll"
+File "%deps%/bin/libjpeg-8.dll"
+File "%deps%/bin/wxbase28_gcc_custom.dll"
+File "%deps%/bin/wxmsw28_core_gcc_custom.dll"
+File "%deps%/bin/wxmsw28_adv_gcc_custom.dll"
+File "%deps%/bin/libcairo-2.dll"
+File "%deps%/bin/libfontconfig-1.dll"
+File "%deps%/bin/libexpat-1.dll"
+File "%deps%/bin/freetype6.dll"
+File "%deps%/bin/libgthread-2.0-0.dll"
+File "%deps%/bin/libpango-1.0-0.dll"
+File "%deps%/bin/libgmodule-2.0-0.dll"
+File "%deps%/bin/libpangocairo-1.0-0.dll"
+File "%deps%/bin/libpangoft2-1.0-0.dll"
+File "%deps%/bin/libpangowin32-1.0-0.dll"
+File "%deps%/bin/libtiff3.dll"
+File "%deps%/bin/jpeg62.dll"
+File "%deps%/bin/libglibmm-2.4-1.dll"
+File "%deps%/bin/libxml++-2.6-2.dll"
+File "%deps%/bin/libxml2-2.dll"
+
+File "%binaries%/src/wx/dvdomatic-wx.dll"
+File "%binaries%/src/lib/dvdomatic.dll"
+File "%binaries%/src/tools/dvdomatic.exe"
+File "%binaries%/src/tools/servomatic_cli.exe"
+File "%binaries%/src/tools/servomatic_gui.exe"
+
+SetOutPath "$PROFILE\.magick"
+
+File "%deps%/etc/ImageMagick/delegates.xml"
+
+CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
+CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
+CreateDirectory "$SMPROGRAMS\DVD-o-matic"
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe"
+WriteUninstaller "$INSTDIR\Uninstall.exe"
+SectionEnd
+Section "Uninstall"
+RMDir /r "$INSTDIR\*.*"    
+RMDir "$INSTDIR"
+Delete "$DESKTOP\DVD-o-matic.lnk"
+Delete "$DESKTOP\DVD-o-matic encode server.lnk"
+Delete "$SMPROGRAMS\DVD-o-matic\*.*"
+RmDir  "$SMPROGRAMS\DVD-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic"
+SectionEnd
diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
new file mode 100644 (file)
index 0000000..fe02bc7
--- /dev/null
@@ -0,0 +1,118 @@
+!include "MUI2.nsh"
+Name "DVD-o-matic"
+
+RequestExecutionLevel admin
+
+outFile "DVD-o-matic @version@ 64-bit Installer.exe"
+!define MUI_ICON "%resources%/dvdomatic.ico"
+!define MUI_UNICON "%resources%/dvdomatic.ico"
+!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp"
+
+InstallDir "$PROGRAMFILES\DVD-o-matic"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "../../COPYING"
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+!insertmacro MUI_LANGUAGE "English"
+
+Section "install" "Installation info"
+SetOutPath "$INSTDIR\bin"
+
+File "%deps%/bin/asdcp-libdcp.dll"
+File "%deps%/bin/avcodec-54.dll"
+File "%deps%/bin/avfilter-3.dll"
+File "%deps%/bin/avformat-54.dll"
+File "%deps%/bin/avutil-51.dll"
+File "%deps%/bin/dcp.dll"
+File "%deps%/bin/libintl-8.dll"
+File "%deps%/bin/kumu-libdcp.dll"
+File "%deps%/bin/libboost_chrono-mt.dll"
+File "%deps%/bin/libboost_filesystem-mt.dll"
+File "%deps%/bin/libboost_system-mt.dll"
+File "%deps%/bin/libboost_thread_win32-mt.dll"
+File "%deps%/bin/libboost_date_time-mt.dll"
+File "%deps%/bin/libeay32.dll"
+File "%deps%/bin/libgcc_s_sjlj-1.dll"
+File "%deps%/bin/libgio-2.0-0.dll"
+File "%deps%/bin/libglib-2.0-0.dll"
+File "%deps%/bin/libgobject-2.0-0.dll"
+File "%deps%/bin/libMagick++-5.dll"
+File "%deps%/bin/libMagickCore-5.dll"
+File "%deps%/bin/libMagickWand-5.dll"
+File "%deps%/bin/libopenjpeg-1.dll"
+File "%deps%/bin/libpng14-14.dll"
+File "%deps%/bin/libsigc-2.0-0.dll"
+File "%deps%/bin/libsndfile-1.dll"
+File "%deps%/bin/libssh.dll"
+File "%deps%/bin/libstdc++-6.dll"
+File "%deps%/bin/postproc-52.dll"
+File "%deps%/bin/swresample-0.dll"
+File "%deps%/bin/swscale-2.dll"
+File "%deps%/bin/zlib1.dll"
+File "%deps%/bin/libjpeg-8.dll"
+File "%deps%/bin/wxbase28_gcc_custom.dll"
+File "%deps%/bin/wxmsw28_core_gcc_custom.dll"
+File "%deps%/bin/wxmsw28_adv_gcc_custom.dll"
+File "%deps%/bin/libcairo-2.dll"
+File "%deps%/bin/libfontconfig-1.dll"
+File "%deps%/bin/libexpat-1.dll"
+File "%deps%/bin/libfreetype-6.dll"
+File "%deps%/bin/libgthread-2.0-0.dll"
+File "%deps%/bin/libpango-1.0-0.dll"
+File "%deps%/bin/libgmodule-2.0-0.dll"
+File "%deps%/bin/libpangocairo-1.0-0.dll"
+File "%deps%/bin/libpangoft2-1.0-0.dll"
+File "%deps%/bin/libpangowin32-1.0-0.dll"
+File "%deps%/bin/libtiff-5.dll"
+File "%deps%/bin/libjpeg-8.dll"
+File "%deps%/bin/libglibmm-2.4-1.dll"
+File "%deps%/bin/libxml++-2.6-2.dll"
+File "%deps%/bin/libxml2-2.dll"
+
+File "%binaries%/src/wx/dvdomatic-wx.dll"
+File "%binaries%/src/lib/dvdomatic.dll"
+File "%binaries%/src/tools/dvdomatic.exe"
+File "%binaries%/src/tools/servomatic_cli.exe"
+File "%binaries%/src/tools/servomatic_gui.exe"
+
+SetOutPath "$PROFILE\.magick"
+
+File "%deps%/etc/ImageMagick/delegates.xml"
+
+CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
+CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
+CreateDirectory "$SMPROGRAMS\DVD-o-matic"
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe"
+WriteUninstaller "$INSTDIR\Uninstall.exe"
+SectionEnd
+Section "Uninstall"
+RMDir /r "$INSTDIR\*.*"    
+RMDir "$INSTDIR"
+Delete "$DESKTOP\DVD-o-matic.lnk"
+Delete "$DESKTOP\DVD-o-matic encode server.lnk"
+Delete "$SMPROGRAMS\DVD-o-matic\*.*"
+RmDir  "$SMPROGRAMS\DVD-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic"
+SectionEnd
index b9d1f3c9e80e973098666c361feb7c106a0c36ee..585cebef1d8efa9225cb8caff13ef38d3c5fc1c4 100644 (file)
@@ -1,3 +1,4 @@
 def build(bld):
-    bld.new_task_gen(features = 'subst', source = 'installer.nsi.in', target = 'installer.nsi', version = bld.env.VERSION)
+    bld.new_task_gen(features = 'subst', source = 'installer.nsi.32.in', target = 'installer.32.nsi', version = bld.env.VERSION)
+    bld.new_task_gen(features = 'subst', source = 'installer.nsi.64.in', target = 'installer.64.nsi', version = bld.env.VERSION)