X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fwindows%2Fwscript;h=46974ed0f553c4dba607597a88f22b069255088d;hb=2034cf8a82be21d4d07de81ae40c8255da1ed21e;hp=2e7ccb279380f24dcc5ce335fe992453cd5f6bf8;hpb=cde60b33c3b63b09705475154281bf236f1ef018;p=dcpomatic.git diff --git a/platform/windows/wscript b/platform/windows/wscript index 2e7ccb279..46974ed0f 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -1,7 +1,7 @@ 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'), @@ -82,15 +82,11 @@ SetOutPath "$INSTDIR\\bin" WriteUninstaller "$INSTDIR\\Uninstall.exe" 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-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=f) + for lib in ['chrono', 'filesystem', 'system', 'thread', 'date_time', 'locale', 'regex']: + print('File "%%static_deps%%/bin/libboost_%s-mt-x%d.dll"' % (lib, bits), file=f) + if bits == 32: print('File "%static_deps%/bin/libgcc_s_sjlj-1.dll"', file=f) else: @@ -109,14 +105,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" @@ -143,19 +139,17 @@ 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-7.dll" -File "%static_deps%/bin/icuuc65.dll" -File "%static_deps%/bin/icudt65.dll" -File "%static_deps%/bin/icuin65.dll" +File "%static_deps%/bin/libnettle-8.dll" +File "%static_deps%/bin/icuuc66.dll" +File "%static_deps%/bin/icudt66.dll" +File "%static_deps%/bin/icuin66.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-5.dll" +File "%static_deps%/bin/libhogweed-6.dll" File "%static_deps%/bin/libidn2-0.dll" File "%static_deps%/bin/libunistring-2.dll" File "%static_deps%/bin/libssh2-1.dll" @@ -164,16 +158,19 @@ 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 "%static_deps%/bin/GLEW.dll" +File "%static_deps%/bin/libdav1d.dll" """, file=f) if bits == 32: - print('File "%static_deps%/bin/libcrypto-1_1.dll"', file=f) + print('File "%static_deps%/bin/libcrypto-3.dll"', file=f) else: - print('File "%static_deps%/bin/libcrypto-1_1-x64.dll"', file=f) + print('File "%static_deps%/bin/libcrypto-3-x64.dll"', file=f) 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" @@ -207,6 +204,9 @@ File "%cdist_deps%/bin/libopenjp2.dll" print('File "%resources%/gdb_script"', file=f) print('File "%resources%/dcpomatic2_debug.bat"', file=f) print('File "%mingw%/bin/gdb.exe"', file=f) + print('File "%static_deps%/bin/libtermcap.dll"', file=f) + print('File "%static_deps%/bin/libreadline8.dll"', file=f) + print('File "%static_deps%/bin/libmman.dll"', file=f) for s, l in tools: print('File "%%resources%%/dcpomatic2_%s_debug.bat"' % s, file=f) else: @@ -307,28 +307,37 @@ 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-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/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/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" +File "%cdist_deps%/share/libdcp/tags/dcnc" +SetOutPath "$INSTDIR" +File "%cdist_deps%/share/libdcp/ratings" SectionEnd """, file=f) @@ -465,5 +474,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)