X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fwindows%2Fwscript;h=4ae96bb0abbf7f452425c97c2a6681a4271d9495;hb=38d7879904d10ff0b527374ee14bfe0217991d8f;hp=f958aa21827074f73660451351da6ca5b147cfe3;hpb=f43ccfa90dd77a8b2b89539e174ad8947191b6ed;p=dcpomatic.git diff --git a/platform/windows/wscript b/platform/windows/wscript index f958aa218..4ae96bb0a 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -1,7 +1,23 @@ from __future__ import print_function import os -def write_installer(bits, dcpomatic_version, debug, variant, disk): +def write_installer(bits, dcpomatic_version, debug, 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: @@ -93,14 +109,14 @@ File "%static_deps%/bin/libssh.dll" File "%static_deps%/bin/libstdc++-6.dll" File "%static_deps%/bin/zlib1.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" -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/wxbase314u_gcc_custom.dll" +File "%static_deps%/bin/wxmsw314u_core_gcc_custom.dll" +File "%static_deps%/bin/wxmsw314u_adv_gcc_custom.dll" +File "%static_deps%/bin/wxmsw314u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxmsw314u_html_gcc_custom.dll" +File "%static_deps%/bin/wxmsw314u_gl_gcc_custom.dll" +File "%static_deps%/bin/wxmsw314u_propgrid_gcc_custom.dll" +File "%static_deps%/bin/wxbase314u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" @@ -158,6 +174,7 @@ File "%static_deps%/bin/libwebp-7.dll" print(""" File "%static_deps%/bin/libltdl-7.dll" File "%static_deps%/bin/libdl.dll" +File /oname=dcpomatic2_verify.exe "%cdist_deps%/bin/dcpverify.exe" File "%cdist_deps%/bin/leqm_nrt.dll" File "%cdist_deps%/bin/asdcp-carl.dll" File "%cdist_deps%/bin/kumu-carl.dll" @@ -190,12 +207,9 @@ File "%cdist_deps%/bin/libopenjp2.dll" 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) - if disk: - print('File "%resources%/dcpomatic2_disk_debug.bat"', 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) @@ -294,19 +308,35 @@ File "%graphics%/tick.png" File "%graphics%/no_tick.png" File "%graphics%/link.png" SetOutPath "$INSTDIR\\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/Dolby-2012-AD.xsd" +File "%cdist_deps%/share/libdcp/xsd/isdcf-mca.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/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-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/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/xlink.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/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-CPL-20040511.xsd" -File "%cdist_deps%/share/libdcp/xsd/PROTO-ASDCP-PKL-20040311.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" +File "%cdist_deps%/share/libdcp/tags/dcnc" SectionEnd """, file=f) @@ -323,46 +353,28 @@ 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_kdm_cli.exe" - """, file=f) + 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.exe" File "%binaries%/src/tools/dcpomatic2_disk_writer.exe" File "%resources%/dcpomatic2_disk_writer.exe.manifest" """, file=f) - print(""" -File "%binaries%/src/tools/dcpomatic2_player.exe" -File "%binaries%/src/tools/dcpomatic2_playlist.exe" - """, 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) - if disk: - print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 Disk Writer debug.lnk" "$INSTDIR\\bin\\dcpomatic2_disk_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('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: 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) - if disk: - print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 Disk Writer.lnk" "$INSTDIR\\bin\\dcpomatic2_disk.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('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) @@ -370,20 +382,14 @@ File "%binaries%/src/tools/dcpomatic2_playlist.exe" 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) 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) - if disk: - print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Disk Writer debug.lnk" "$INSTDIR\\bin\\dcpomatic2_disk_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 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', 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) - if disk: - print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Disk Writer.lnk" "$INSTDIR\\bin\\dcpomatic2_disk.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) @@ -434,9 +440,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" -Delete "$DESKTOP\\DCP-o-matic 2 Disk Writer 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" @@ -449,10 +458,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" -Delete "$DESKTOP\\DCP-o-matic 2 Disk Writer.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" @@ -462,5 +473,5 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U def build(bld): - 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) + write_installer(32, bld.env.VERSION, bld.env.DEBUG, bld.env.ENABLE_DISK) + write_installer(64, bld.env.VERSION, bld.env.DEBUG, bld.env.ENABLE_DISK)