X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=platform%2Fwindows%2Fwscript;h=752706011040fc8a893a56a080c99f3c7d033a25;hp=faa8bf14d264b0592b0f28e093566716abf40ce9;hb=ba7684b62d762345c337b67be48cd18e2cdc5dc5;hpb=234ce9c96476a90122cbad885eed595a8551b116 diff --git a/platform/windows/wscript b/platform/windows/wscript index faa8bf14d..752706011 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -1,16 +1,29 @@ from __future__ import print_function import os -def write_installer(bits, windows_version, dcpomatic_version, debug): +def write_installer(bits, dcpomatic_version, debug, variant, disk): + + tools = [ + ('batch', 'Batch Converter'), + ('kdm', 'KDM Creator'), + ('kdm_cli', 'KDM Creator CLI'), + ('player', 'Player'), + ('cli', 'CLI'), + ('create', 'Creator'), + ('playlist', 'Playlist Editor'), + ('combiner', 'Combiner'), + ] + + if disk: + tools.append(('disk', 'Disk Writer')) + + # It would be nice to use exist_ok here but it requires quite a new python try: os.makedirs('build/platform/windows') except: pass - filename = 'build/platform/windows/installer.' - if windows_version is not None: - filename += 'xp.' - filename += '%d.nsi' % bits + filename = 'build/platform/windows/installer.%d.nsi' % bits f = open(filename, 'w') print('!include "MUI2.nsh"', file=f) @@ -27,10 +40,7 @@ def write_installer(bits, windows_version, dcpomatic_version, debug): 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' + outfile += '%s %d-bit Installer.exe' % (dcpomatic_version, bits) print('outFile "%s"' % outfile, file=f) @@ -75,11 +85,10 @@ File "%static_deps%/bin/libintl-8.dll" File "%static_deps%/bin/libboost_chrono-mt.dll" File "%static_deps%/bin/libboost_filesystem-mt.dll" File "%static_deps%/bin/libboost_system-mt.dll" -File "%static_deps%/bin/libboost_thread_win32-mt.dll" +File "%static_deps%/bin/libboost_thread-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=f) if bits == 32: @@ -93,9 +102,6 @@ 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-9.dll" -File "%static_deps%/bin/libGraphicsMagick-3.dll" -File "%static_deps%/bin/libGraphicsMagickWand-2.dll" -File "%static_deps%/bin/libGraphicsMagick++-11.dll" File "%static_deps%/bin/libpng16-16.dll" File "%static_deps%/bin/libsigc-2.0-0.dll" File "%static_deps%/bin/libsndfile-1.dll" @@ -108,6 +114,8 @@ File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll" File "%static_deps%/bin/wxmsw30u_richtext_gcc_custom.dll" File "%static_deps%/bin/wxmsw30u_html_gcc_custom.dll" +File "%static_deps%/bin/wxmsw30u_gl_gcc_custom.dll" +File "%static_deps%/bin/wxmsw30u_propgrid_gcc_custom.dll" File "%static_deps%/bin/wxbase30u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" @@ -131,15 +139,14 @@ File "%static_deps%/bin/libxslt-1.dll" 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-4.dll" +File "%static_deps%/bin/libzip.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/libnettle-7.dll" +File "%static_deps%/bin/icuuc65.dll" +File "%static_deps%/bin/icudt65.dll" +File "%static_deps%/bin/icuin65.dll" File "%static_deps%/bin/liblzma-5.dll" File "%static_deps%/bin/libpcre-1.dll" File "%static_deps%/bin/libharfbuzz-0.dll" @@ -148,24 +155,38 @@ 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/libhogweed-5.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) +File "%static_deps%/bin/libgpg-error-0.dll" +File "%static_deps%/bin/libpangoft2-1.0-0.dll" +File "%static_deps%/bin/libx264-155.dll" +File "%static_deps%/bin/libwebp-7.dll" + """, file=f) if bits == 32: - print('File "%static_deps%/bin/libgpg-error-0.dll"', file=f) + print('File "%static_deps%/bin/libcrypto-1_1.dll"', file=f) else: - print('File "%static_deps%/bin/libgpg-error6-0.dll"', file=f) + print('File "%static_deps%/bin/libcrypto-1_1-x64.dll"', file=f) print(""" -File "%static_deps%/bin/libpangoft2-1.0-0.dll" -File "%static_deps%/bin/libx264-152.dll" +File "%static_deps%/bin/libltdl-7.dll" +File "%static_deps%/bin/libdl.dll" +File "%cdist_deps%/bin/leqm_nrt.dll" +File "%cdist_deps%/bin/asdcp-carl.dll" +File "%cdist_deps%/bin/kumu-carl.dll" + """, file=f) + + if disk: + print(""" +File "%static_deps%/bin/libnanomsg.dll" +File "%cdist_deps%/lib/libblockdev.dll" +File "%cdist_deps%/lib/liblwext4.dll" + """, file=f) -File "%cdist_deps%/bin/asdcp-cth.dll" -File "%cdist_deps%/bin/kumu-cth.dll" + print(""" File "%cdist_deps%/bin/avcodec-58.dll" File "%cdist_deps%/bin/avfilter-7.dll" File "%cdist_deps%/bin/avformat-58.dll" @@ -173,26 +194,21 @@ 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/dcp-1.0.dll" File "%cdist_deps%/bin/swscale-5.dll" +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 "%cdist_deps%/src/openssl/apps/openssl.exe" +File "%cdist_deps%/bin/libopenjp2.dll" """, file=f) - if windows_version == 'xp': - print('File "%cdist_deps%/bin/libopenjpeg-1.dll"', file=f) - else: - print('File "%cdist_deps%/bin/libopenjp2.dll"', file=f) - 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%/gdb.exe"', file=f) - print('File "%mingw%/addr2line.exe"', file=f) + print('File "%mingw%/bin/gdb.exe"', file=f) + for s, l in tools: + print('File "%%resources%%/dcpomatic2_%s_debug.bat"' % s, file=f) else: print('File "%binaries%/src/wx/dcpomatic2-wx.dll"', file=f) print('File "%binaries%/src/lib/dcpomatic2.dll"', file=f) @@ -270,15 +286,55 @@ 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" 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" +File "%graphics%/link.png" +SetOutPath "$INSTDIR\\xsd" +File "%cdist_deps%/share/libdcp/xsd/SMPTE-335-2012.xsd" +File "%cdist_deps%/share/libdcp/xsd/SMPTE-395-2014-13-1-aaf.xsd" +File "%cdist_deps%/share/libdcp/xsd/SMPTE-429-7-2006-CPL.xsd" +File "%cdist_deps%/share/libdcp/xsd/SMPTE-429-8-2006-PKL.xsd" +File "%cdist_deps%/share/libdcp/xsd/SMPTE-429-9-2007-AM.xsd" +File "%cdist_deps%/share/libdcp/xsd/SMPTE-429-10-2008.xsd" +File "%cdist_deps%/share/libdcp/xsd/SMPTE-429-12-2008.xsd" +File "%cdist_deps%/share/libdcp/xsd/SMPTE-429-16.xsd" +File "%cdist_deps%/share/libdcp/xsd/xmldsig-core-schema.xsd" +File "%cdist_deps%/share/libdcp/xsd/XMLSchema.dtd" +File "%cdist_deps%/share/libdcp/xsd/XMLSchema.xsd" +File "%cdist_deps%/share/libdcp/xsd/xml.xsd" +File "%cdist_deps%/share/libdcp/xsd/xlink.xsd" +File "%cdist_deps%/share/libdcp/xsd/DCDMSubtitle-2010.xsd" +File "%cdist_deps%/share/libdcp/xsd/DCSubtitle.v1.mattsson.xsd" +File "%cdist_deps%/share/libdcp/xsd/Main-Stereo-Picture-CPL.xsd" +File "%cdist_deps%/share/libdcp/xsd/PROTO-ASDCP-AM-20040311.xsd" +File "%cdist_deps%/share/libdcp/xsd/PROTO-ASDCP-CC-CPL-20070926.xsd" +File "%cdist_deps%/share/libdcp/xsd/PROTO-ASDCP-CPL-20040511.xsd" +File "%cdist_deps%/share/libdcp/xsd/PROTO-ASDCP-PKL-20040311.xsd" +File "%cdist_deps%/share/libdcp/xsd/Dolby-2012-AD.xsd" +File "%cdist_deps%/share/libdcp/xsd/isdcf-mca.xsd" +SetOutPath "$INSTDIR\\tags" +File "%cdist_deps%/share/libdcp/tags/extlang" +File "%cdist_deps%/share/libdcp/tags/language" +File "%cdist_deps%/share/libdcp/tags/region" +File "%cdist_deps%/share/libdcp/tags/script" +File "%cdist_deps%/share/libdcp/tags/variant" SectionEnd """, file=f) @@ -295,28 +351,27 @@ SectionEnd else: print('CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2"', file=f) - 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_player.exe" + print('File "%binaries%/src/tools/dcpomatic2.exe"', file=f) + for s, l in tools: + print('File "%%binaries%%/src/tools/dcpomatic2_%s.exe"' % s, file=f) + + if disk: + print(""" +File "%binaries%/src/tools/dcpomatic2_disk_writer.exe" +File "%resources%/dcpomatic2_disk_writer.exe.manifest" """, file=f) if debug: 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\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f) + for s, l in tools: + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 %s debug.lnk" "$INSTDIR\\bin\\dcpomatic2_%s_debug.bat" ""' % (l, s), file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\Uninstall DCP-o-matic 2 debug.lnk" "$INSTDIR\\Uninstall.exe"', 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: 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\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f) + for s, l in tools: + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 %s.lnk" "$INSTDIR\\bin\\dcpomatic2_%s.exe"' % (l, s), file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.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) @@ -326,33 +381,27 @@ File "%binaries%/src/tools/dcpomatic2_player.exe" if debug: print('Section "DCP-o-matic 2 debug desktop shortcuts" SEC_MASTER_DESKTOP', file=f) 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) - print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f) + for s, l in tools: + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 %s debug.lnk" "$INSTDIR\\bin\\dcpomatic2_%s_debug.bat" ""' % (l, s), file=f) else: print('Section "DCP-o-matic 2 desktop shortcuts" SEC_MASTER_DESKTOP', file=f) 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('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f) + for s, l in tools: + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 %s.lnk" "$INSTDIR\\bin\\dcpomatic2_%s.exe"' % (l, s), file=f) print("SectionEnd", file=f) - if not debug: - print(""" + print(""" Section "Encode server" SEC_SERVER SetOutPath "$INSTDIR\\bin" 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\\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" "" +CreateShortCut "$DESKTOP\\DCP-o-matic 2 Encode Server.lnk" "$INSTDIR\\bin\\dcpomatic2_server.exe" "" SectionEnd """, file=f) @@ -362,15 +411,15 @@ SectionEnd 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('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_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 @@ -389,8 +438,12 @@ Section "Uninstall" RMDir /r "$INSTDIR\\*.*" RMDir "$INSTDIR" 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" + """, file=f) + + for s, l in tools: + print('Delete "$DESKTOP\\DCP-o-matic 2 %s debug.lnk"' % l, file=f) + + print(""" Delete "$SMPROGRAMS\\DCP-o-matic 2 debug\\*.*" RmDir "$SMPROGRAMS\\DCP-o-matic 2 debug" DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic 2 debug" @@ -403,9 +456,12 @@ 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" + """, file=f) + + for s, l in tools: + print('Delete "$DESKTOP\\DCP-o-matic 2 %s.lnk"' % l) + + print(""" Delete "$SMPROGRAMS\\DCP-o-matic 2\\*.*" RmDir "$SMPROGRAMS\\DCP-o-matic 2" DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic 2" @@ -415,7 +471,5 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U def build(bld): - write_installer(32, None, bld.env.VERSION, bld.env.DEBUG) - write_installer(64, None, bld.env.VERSION, bld.env.DEBUG) - write_installer(32, 'xp', bld.env.VERSION, bld.env.DEBUG) - write_installer(64, 'xp', bld.env.VERSION, bld.env.DEBUG) + write_installer(32, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK) + write_installer(64, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK)