X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fwindows%2Fwscript;h=b130acf2c2f219eba647ebc2178a21de299ae15c;hb=183b5597f73b85c0d6d29db8f6ed519386d07aa9;hp=24b6ed099a057ddcddd04a09d4870cd372b94de2;hpb=5103f0c13a854beaf7bcf252621bee0b2890771d;p=dcpomatic.git diff --git a/platform/windows/wscript b/platform/windows/wscript index 24b6ed099..b130acf2c 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -1,29 +1,57 @@ from __future__ import print_function import os -def write_installer(bits, version): +def write_installer(bits, windows_version, dcpomatic_version, debug, variant): try: os.makedirs('build/platform/windows') except: pass - f = open('build/platform/windows/installer.%d.nsi' % bits, 'w') + filename = 'build/platform/windows/installer.' + if windows_version is not None: + filename += 'xp.' + filename += '%d.nsi' % bits + + f = open(filename, 'w') print('!include "MUI2.nsh"', file=f) if bits == 64: print('!include "x64.nsh"', file=f) - print('Name "DCP-o-matic"', file=f) + if debug: + print('Name "DCP-o-matic debug"', file=f) + else: + print('Name "DCP-o-matic"', file=f) + print('RequestExecutionLevel admin', file=f) - print('outFile "DCP-o-matic %s %d-bit Installer.exe"' % (version, bits), file=f) + outfile = 'DCP-o-matic ' + if debug: + outfile += 'Debug ' + outfile += '%s %d-bit ' % (dcpomatic_version, bits) + if windows_version is 'xp': + outfile += 'XP ' + outfile += 'Installer.exe' + + print('outFile "%s"' % outfile, file=f) + print(""" -!define MUI_ICON "%resources%/dcpomatic.ico" -!define MUI_UNICON "%resources%/dcpomatic.ico" -!define MUI_SPECIALBITMAP "%resources%/dcpomatic.bmp" +!define MUI_ICON "%graphics%/windows/dcpomatic2.ico" +!define MUI_UNICON "%graphics%/windows/dcpomatic2.ico" +!define MUI_SPECIALBITMAP "%graphics%/windows/dcpomatic.bmp" !include "Sections.nsh" + """, file=f) + + if bits == 64: + program_files = "$PROGRAMFILES64" + else: + program_files = "$PROGRAMFILES" -InstallDir "$PROGRAMFILES\\DCP-o-matic" + if debug: + print('InstallDir "%s\\DCP-o-matic 2 debug"' % program_files, file=f) + else: + print('InstallDir "%s\\DCP-o-matic 2"' % program_files, file=f) + print(""" !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "../../../COPYING" !insertmacro MUI_PAGE_DIRECTORY @@ -35,18 +63,13 @@ SectionIn RO if bits == 64: print(""" -${If} ${RunningX64} - DetailPrint "Installer running on 64-bit host" - ; disable registry redirection (enable access to 64-bit portion of registry) - SetRegView 64 - ; change install dir - StrCpy $INSTDIR "$PROGRAMFILES64\DCP-o-matic" -${EndIf} +; disable registry redirection (enable access to 64-bit portion of registry) +SetRegView 64 """, file=f) print(""" SetOutPath "$INSTDIR\\bin" -WriteUninstaller "$INSTDIR\Uninstall.exe" +WriteUninstaller "$INSTDIR\\Uninstall.exe" File "%static_deps%/bin/libintl-8.dll" File "%static_deps%/bin/libboost_chrono-mt.dll" @@ -55,23 +78,28 @@ File "%static_deps%/bin/libboost_system-mt.dll" File "%static_deps%/bin/libboost_thread_win32-mt.dll" File "%static_deps%/bin/libboost_date_time-mt.dll" File "%static_deps%/bin/libboost_locale-mt.dll" +File "%static_deps%/bin/libboost_regex-mt.dll" File "%static_deps%/bin/libeay32.dll" -File "%static_deps%/bin/libgcc_s_sjlj-1.dll" +""", file=f) + + if bits == 32: + print('File "%static_deps%/bin/libgcc_s_sjlj-1.dll"', file=f) + else: + print('File "%static_deps%/bin/libgcc_s_seh-1.dll"', file=f) + + print(""" File "%static_deps%/bin/libgio-2.0-0.dll" File "%static_deps%/bin/libglib-2.0-0.dll" File "%static_deps%/bin/libgobject-2.0-0.dll" File "%static_deps%/bin/libiconv-2.dll" -File "%static_deps%/bin/libjpeg-8.dll" -File "%static_deps%/bin/libMagick++-6.Q16-3.dll" -File "%static_deps%/bin/libMagickCore-6.Q16-1.dll" -File "%static_deps%/bin/libMagickWand-6.Q16-1.dll" -File "%static_deps%/bin/libpng15-15.dll" +File "%static_deps%/bin/libjpeg-9.dll" +File "%static_deps%/bin/libpng16-16.dll" File "%static_deps%/bin/libsigc-2.0-0.dll" File "%static_deps%/bin/libsndfile-1.dll" File "%static_deps%/bin/libssh.dll" File "%static_deps%/bin/libstdc++-6.dll" File "%static_deps%/bin/zlib1.dll" -File "%static_deps%/bin/libjpeg-8.dll" +File "%static_deps%/bin/libjpeg-9.dll" File "%static_deps%/bin/wxbase30u_gcc_custom.dll" File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll" @@ -101,102 +129,284 @@ File "%static_deps%/bin/libffi-6.dll" File "%static_deps%/bin/openssl.exe" File "%static_deps%/bin/libcurl-4.dll" File "%static_deps%/bin/ssleay32.dll" -File "%static_deps%/bin/libzip-2.dll" - -File "%cdist_deps%/bin/asdcp-libdcp.dll" -File "%cdist_deps%/bin/kumu-libdcp.dll" -File "%cdist_deps%/bin/avcodec-56.dll" -File "%cdist_deps%/bin/avfilter-5.dll" -File "%cdist_deps%/bin/avformat-56.dll" -File "%cdist_deps%/bin/avutil-54.dll" -File "%cdist_deps%/bin/avdevice-56.dll" -File "%cdist_deps%/bin/postproc-53.dll" -File "%cdist_deps%/bin/dcp.dll" -File "%cdist_deps%/bin/libopenjpeg-1.dll" -File "%cdist_deps%/bin/swresample-1.dll" -File "%cdist_deps%/bin/swscale-3.dll" +File "%static_deps%/bin/libzip-4.dll" +File "%static_deps%/bin/libcairomm-1.0-1.dll" +File "%static_deps%/bin/libpangomm-1.4-1.dll" +File "%static_deps%/bin/libsamplerate-0.dll" +File "%static_deps%/bin/libnettle-6.dll" +File "%static_deps%/bin/icuuc56.dll" +File "%static_deps%/bin/icudt56.dll" +File "%static_deps%/bin/icuin56.dll" +File "%static_deps%/bin/liblzma-5.dll" +File "%static_deps%/bin/libpcre-1.dll" +File "%static_deps%/bin/libharfbuzz-0.dll" +File "%static_deps%/bin/libjasper.dll" +File "%static_deps%/bin/liblcms2-2.dll" +File "%static_deps%/bin/libwinpthread-1.dll" +File "%static_deps%/bin/libgnutls-30.dll" +File "%static_deps%/bin/libgmp-10.dll" +File "%static_deps%/bin/libhogweed-4.dll" +File "%static_deps%/bin/libidn2-0.dll" +File "%static_deps%/bin/libunistring-2.dll" +File "%static_deps%/bin/libssh2-1.dll" +File "%static_deps%/bin/libgcrypt-20.dll" +""", file=f) + + if bits == 32: + print('File "%static_deps%/bin/libgpg-error-0.dll"', file=f) + else: + print('File "%static_deps%/bin/libgpg-error6-0.dll"', file=f) + + print(""" +File "%static_deps%/bin/libpangoft2-1.0-0.dll" +File "%static_deps%/bin/libx264-152.dll" + +File "%cdist_deps%/bin/asdcp-cth.dll" +File "%cdist_deps%/bin/kumu-cth.dll" + """, file=f) + + if windows_version == 'xp': + print(""" +File "%cdist_deps%/bin/avcodec-57.dll" +File "%cdist_deps%/bin/avfilter-6.dll" +File "%cdist_deps%/bin/avformat-57.dll" +File "%cdist_deps%/bin/avutil-55.dll" +File "%cdist_deps%/bin/avdevice-57.dll" +File "%cdist_deps%/bin/postproc-54.dll" +File "%cdist_deps%/bin/swresample-2.dll" +File "%cdist_deps%/bin/swscale-4.dll" + """, file=f) + else: + print(""" +File "%cdist_deps%/bin/avcodec-58.dll" +File "%cdist_deps%/bin/avfilter-7.dll" +File "%cdist_deps%/bin/avformat-58.dll" +File "%cdist_deps%/bin/avutil-56.dll" +File "%cdist_deps%/bin/avdevice-58.dll" +File "%cdist_deps%/bin/postproc-55.dll" +File "%cdist_deps%/bin/swresample-3.dll" +File "%cdist_deps%/bin/swscale-5.dll" + """, file=f) + + print(""" +File "%cdist_deps%/bin/dcp-1.0.dll" File "%cdist_deps%/bin/cxml-0.dll" +File "%cdist_deps%/bin/sub-1.0.dll" File "%cdist_deps%/bin/ffprobe.exe" + """, file=f) -File "%binaries%/src/wx/dcpomatic-wx.dll" -File "%binaries%/src/lib/dcpomatic.dll" + if windows_version == 'xp': + print('File "%cdist_deps%/bin/libopenjpeg-1.dll"', file=f) + else: + print('File "%cdist_deps%/bin/libopenjp2.dll"', file=f) -# I don't know why, but sometimes it seems that -# delegates.xml must be in with the binaries, and -# sometimes in the $PROFILE. Meh. -File "%static_deps%/etc/ImageMagick-6/delegates.xml" -SetOutPath "$PROFILE\\.magick" -File "%static_deps%/etc/ImageMagick-6/delegates.xml" + if debug: + print('File "%resources%/gdb_script"', file=f) + print('File "%resources%/dcpomatic2_debug.bat"', file=f) + print('File "%resources%/dcpomatic2_batch_debug.bat"', file=f) + print('File "%resources%/dcpomatic2_kdm_debug.bat"', file=f) + print('File "%resources%/dcpomatic2_player_debug.bat"', file=f) + print('File "%mingw%/bin/gdb.exe"', file=f) + else: + print('File "%binaries%/src/wx/dcpomatic2-wx.dll"', file=f) + print('File "%binaries%/src/lib/dcpomatic2.dll"', file=f) + + print(""" +SetOutPath "$INSTDIR\\bin" SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES" -File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo" -File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo" +File "%binaries%/src/lib/mo/fr_FR/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/fr_FR/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/fr_FR/dcpomatic2.mo" File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\it\\LC_MESSAGES" -File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo" -File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo" +File "%binaries%/src/lib/mo/it_IT/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/it_IT/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/it_IT/dcpomatic2.mo" File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\es\\LC_MESSAGES" -File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo" -File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo" +File "%binaries%/src/lib/mo/es_ES/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/es_ES/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/es_ES/dcpomatic2.mo" File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\sv\\LC_MESSAGES" -File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo" -File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo" +File "%binaries%/src/lib/mo/sv_SE/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/sv_SE/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/sv_SE/dcpomatic2.mo" File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\de\\LC_MESSAGES" -File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo" -File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo" +File "%binaries%/src/lib/mo/de_DE/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/de_DE/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/de_DE/dcpomatic2.mo" File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd.mo" SetOutPath "$INSTDIR\\locale\\nl\\LC_MESSAGES" -File "%binaries%/src/lib/mo/nl_NL/libdcpomatic.mo" -File "%binaries%/src/wx/mo/nl_NL/libdcpomatic-wx.mo" -File "%binaries%/src/tools/mo/nl_NL/dcpomatic.mo" +File "%binaries%/src/lib/mo/nl_NL/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/nl_NL/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/nl_NL/dcpomatic2.mo" File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd.mo" +SetOutPath "$INSTDIR\\locale\\ru\\LC_MESSAGES" +File "%binaries%/src/lib/mo/ru_RU/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/ru_RU/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/ru_RU/dcpomatic2.mo" +File "%static_deps%/share/locale/ru/LC_MESSAGES/wxstd.mo" +SetOutPath "$INSTDIR\\locale\\pl\\LC_MESSAGES" +File "%binaries%/src/lib/mo/pl_PL/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/pl_PL/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/pl_PL/dcpomatic2.mo" +File "%static_deps%/share/locale/pl/LC_MESSAGES/wxstd.mo" +SetOutPath "$INSTDIR\\locale\\da\\LC_MESSAGES" +File "%binaries%/src/lib/mo/da_DK/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/da_DK/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/da_DK/dcpomatic2.mo" +File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd.mo" +SetOutPath "$INSTDIR\\locale\\pt_PT\\LC_MESSAGES" +File "%binaries%/src/lib/mo/pt_PT/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/pt_PT/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/pt_PT/dcpomatic2.mo" +SetOutPath "$INSTDIR\\locale\\pt_BR\\LC_MESSAGES" +File "%binaries%/src/lib/mo/pt_BR/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/pt_BR/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/pt_BR/dcpomatic2.mo" +SetOutPath "$INSTDIR\\locale\\sk\\LC_MESSAGES" +File "%binaries%/src/lib/mo/sk_SK/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/sk_SK/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/sk_SK/dcpomatic2.mo" +SetOutPath "$INSTDIR\\locale\\cs\\LC_MESSAGES" +File "%binaries%/src/lib/mo/cs_CZ/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/cs_CZ/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/cs_CZ/dcpomatic2.mo" +File "%static_deps%/share/locale/cs/LC_MESSAGES/wxstd.mo" +SetOutPath "$INSTDIR\\locale\\uk\\LC_MESSAGES" +File "%binaries%/src/lib/mo/uk_UA/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/uk_UA/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/uk_UA/dcpomatic2.mo" +SetOutPath "$INSTDIR\\locale\\zh_cn\\LC_MESSAGES" +File "%binaries%/src/lib/mo/zh_CN/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/zh_CN/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/zh_CN/dcpomatic2.mo" +SetOutPath "$INSTDIR\\locale\\tr_tr\\LC_MESSAGES" +File "%binaries%/src/lib/mo/tr_TR/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/tr_TR/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/tr_TR/dcpomatic2.mo" -WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)" -WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "UninstallString" "$INSTDIR\\Uninstall.exe" -WriteUninstaller "$INSTDIR\\Uninstall.exe" +SetOutPath "$INSTDIR" +File "%resources%/../../fonts/LiberationSans-Regular.ttf" +File "%resources%/../../fonts/LiberationSans-Italic.ttf" +File "%resources%/../../fonts/LiberationSans-Bold.ttf" +File /oname=fonts.conf "%resources%/../../fonts/fonts.conf.windows" +File "%graphics%/splash.png" +File "%graphics%/zoom.png" +File "%graphics%/zoom_all.png" +File "%graphics%/select.png" +File "%graphics%/snap.png" +File "%graphics%/sequence.png" +File "%graphics%/me.jpg" +File "%graphics%/tick.png" +File "%graphics%/no_tick.png" SectionEnd + """, file=f) -Section "DCP-o-matic" SEC_MASTER -SetOutPath "$INSTDIR\\bin" -CreateDirectory "$SMPROGRAMS\\DCP-o-matic" -File "%binaries%/src/tools/dcpomatic.exe" -File "%binaries%/src/tools/dcpomatic_batch.exe" -File "%binaries%/src/tools/dcpomatic_cli.exe" -CreateShortCut "$DESKTOP\\DCP-o-matic.lnk" "$INSTDIR\\bin\\dcpomatic.exe" "" -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic.lnk" "$INSTDIR\\bin\\dcpomatic.exe" "" "$INSTDIR\\bin\\dcpomatic.exe" 0 -CreateShortCut "$DESKTOP\\DCP-o-matic batch converter.lnk" "$INSTDIR\\bin\\dcpomatic_batch.exe" "" -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic batch converter.lnk" "$INSTDIR\\bin\\dcpomatic.exe" "" "$INSTDIR\\bin\\dcpomatic_batch.exe" 0 -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\Uninstall DCP-o-matic.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0 -WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)" -WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "UninstallString" "$INSTDIR\\Uninstall.exe" -WriteUninstaller "$INSTDIR\\Uninstall.exe" -SectionEnd + if debug: + print('Section "DCP-o-matic 2 debug" SEC_MASTER', file=f) + else: + print('Section "DCP-o-matic 2" SEC_MASTER', file=f) + + print('SetOutPath "$INSTDIR\\bin"', file=f) + + if debug: + print('CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2 debug"', file=f) + else: + print('CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2"', file=f) + + if variant != 'swaroop': + print(""" +File "%binaries%/src/tools/dcpomatic2.exe" +File "%binaries%/src/tools/dcpomatic2_batch.exe" +File "%binaries%/src/tools/dcpomatic2_cli.exe" +File "%binaries%/src/tools/dcpomatic2_create.exe" +File "%binaries%/src/tools/dcpomatic2_kdm.exe" +File "%binaries%/src/tools/dcpomatic2_kdm_cli.exe" + """, file=f) + + print(""" +File "%binaries%/src/tools/dcpomatic2_player.exe" +File "%binaries%/src/tools/dcpomatic2_playlist.exe" + """, file=f) + + if debug: + if variant != "swaroop": + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat"', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\Uninstall DCP-o-matic 2 debug.lnk" "$INSTDIR\\Uninstall.exe"', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f) + print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "DisplayName" "DCP-o-matic 2 debug (remove only)"', file=f) + print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f) + else: + if variant != "swaroop": + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe"', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 KDM creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe"', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 Playlist Editor.lnk" "$INSTDIR\\bin\\dcpomatic2_playlist.exe"', file=f) + print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "DisplayName" "DCP-o-matic 2 (remove only)"', file=f) + print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f) + + print("SectionEnd", file=f) + + if debug: + print('Section "DCP-o-matic 2 debug desktop shortcuts" SEC_MASTER_DESKTOP', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f) + if variant != "swaroop": + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat" ""', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f) + else: + print('Section "DCP-o-matic 2 desktop shortcuts" SEC_MASTER_DESKTOP', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f) + if variant != "swaroop": + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" ""', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f) + + print("SectionEnd", file=f) + if not debug and variant != "swaroop": + print(""" Section "Encode server" SEC_SERVER SetOutPath "$INSTDIR\\bin" -CreateDirectory "$SMPROGRAMS\\DCP-o-matic" -File "%binaries%/src/tools/dcpomatic_server_cli.exe" -File "%binaries%/src/tools/dcpomatic_server.exe" -CreateShortCut "$DESKTOP\\DCP-o-matic encode server.lnk" "$INSTDIR\\bin\\dcpomatic_server.exe" "" -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic encode server.lnk" "$INSTDIR\\bin\\dcpomatic_server.exe" "" "$INSTDIR\\bin\\dcpomatic_server.exe" 0 -CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\Uninstall DCP-o-matic.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0 +CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2" +File "%binaries%/src/tools/dcpomatic2_server_cli.exe" +File "%binaries%/src/tools/dcpomatic2_server.exe" +CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic2_server.exe" "" "$INSTDIR\\bin\\dcpomatic2_server.exe" 0 +CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0 +SectionEnd + """, file=f) + + print(""" +Section "Encode server desktop shortcuts" SEC_SERVER_DESKTOP +CreateShortCut "$DESKTOP\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic2_server.exe" "" SectionEnd + """, file=f) -LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic" -LangString DESC_SEC_SERVER ${LANG_ENGLISH} "DCP-o-matic encode server" + if variant != "swaroop": + if debug: + print('LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic 2 debug"', file=f) + print('LangString DESC_SEC_MASTER_DESKTOP ${LANG_ENGLISH} "DCP-o-matic 2 debug desktop shortcuts"', file=f) + else: + print('LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic 2"', file=f) + print('LangString DESC_SEC_MASTER_DESKTOP ${LANG_ENGLISH} "DCP-o-matic 2 desktop shortcuts"', file=f) + print('LangString DESC_SEC_SERVER ${LANG_ENGLISH} "DCP-o-matic 2 encode server"', file=f) + print('LangString DESC_SEC_SERVER_DESKTOP ${LANG_ENGLISH} "DCP-o-matic 2 encode server desktop shortcuts"', file=f) + print(""" !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MASTER} $(DESC_SEC_MASTER) + !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MASTER_DESKTOP} $(DESC_SEC_MASTER_DESKTOP) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_SERVER} $(DESC_SEC_SERVER) + !insertmacro MUI_DESCRIPTION_TEXT ${SEC_SERVER_DESKTOP} $(DESC_SEC_SERVER_DESKTOP) !insertmacro MUI_FUNCTION_DESCRIPTION_END !insertmacro MUI_PAGE_INSTFILES @@ -207,21 +417,41 @@ LangString DESC_SEC_SERVER ${LANG_ENGLISH} "DCP-o-matic encode server" !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH !insertmacro MUI_LANGUAGE "English" + """, file=f) + if debug: + print(""" Section "Uninstall" -RMDir /r "$INSTDIR\\*.*" +RMDir /r "$INSTDIR\\*.*" RMDir "$INSTDIR" -Delete "$DESKTOP\\DCP-o-matic.lnk" -Delete "$DESKTOP\\DCP-o-matic batch converter.lnk" -Delete "$DESKTOP\\DCP-o-matic encode server.lnk" -Delete "$SMPROGRAMS\\DCP-o-matic\\*.*" -RmDir "$SMPROGRAMS\\DCP-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" +Delete "$DESKTOP\\DCP-o-matic 2 debug.lnk" +Delete "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk" +Delete "$DESKTOP\\DCP-o-matic 2 KDM creator debug.lnk" +Delete "$SMPROGRAMS\\DCP-o-matic 2 debug\\*.*" +RmDir "$SMPROGRAMS\\DCP-o-matic 2 debug" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic 2 debug" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" + SectionEnd + """, file=f) + else: + print(""" +Section "Uninstall" +RMDir /r "$INSTDIR\\*.*" +RMDir "$INSTDIR" +Delete "$DESKTOP\\DCP-o-matic 2.lnk" +Delete "$DESKTOP\\DCP-o-matic 2 batch converter.lnk" +Delete "$DESKTOP\\DCP-o-matic 2 encode server.lnk" +Delete "$DESKTOP\\DCP-o-matic 2 KDM creator.lnk" +Delete "$SMPROGRAMS\\DCP-o-matic 2\\*.*" +RmDir "$SMPROGRAMS\\DCP-o-matic 2" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic 2" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2" SectionEnd """, file=f) - + def build(bld): - write_installer(32, bld.env.VERSION) - write_installer(64, bld.env.VERSION) + write_installer(32, None, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT) + write_installer(64, None, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT) + write_installer(32, 'xp', bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT) + write_installer(64, 'xp', bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT)