X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=platform%2Fwindows%2Fwscript;h=450e4f60cc459144f6af32a8d489fe8b12383c6c;hb=aff3c1deba92d7178b2461f6fae7ccaa9a8fcf8b;hp=ed5f5d4f2e0ba10324b6a1372f779fe54e829836;hpb=952084c4221c5708e02c783284cf0f7239c6b4c4;p=dcpomatic.git diff --git a/platform/windows/wscript b/platform/windows/wscript index ed5f5d4f2..450e4f60c 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, disk): +def write_installer(bits, dcpomatic_version, debug): tools = [ ('batch', 'Batch Converter'), @@ -12,11 +12,11 @@ def write_installer(bits, dcpomatic_version, debug, disk): ('create', 'Creator'), ('playlist', 'Playlist Editor'), ('combiner', 'Combiner'), + ('editor', 'Editor'), + ('map', 'Map'), + ('disk', 'Disk Writer') ] - 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') @@ -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: @@ -150,8 +146,6 @@ 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" @@ -165,30 +159,25 @@ 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 /oname=dcpomatic2_kdm_inspect.exe "%cdist_deps%/bin/dcpkdm.exe" 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) - - print(""" File "%cdist_deps%/bin/avcodec-58.dll" File "%cdist_deps%/bin/avfilter-7.dll" File "%cdist_deps%/bin/avformat-58.dll" @@ -209,6 +198,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: @@ -292,6 +284,14 @@ 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\\locale\\sl_si\\LC_MESSAGES" +File "%binaries%/src/lib/mo/sl_SI/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/sl_SI/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/sl_SI/dcpomatic2.mo" +SetOutPath "$INSTDIR\\locale\\hu_hu\\LC_MESSAGES" +File "%binaries%/src/lib/mo/hu_HU/libdcpomatic2.mo" +File "%binaries%/src/wx/mo/hu_HU/libdcpomatic2-wx.mo" +File "%binaries%/src/tools/mo/hu_HU/dcpomatic2.mo" SetOutPath "$INSTDIR" File "%resources%/../../fonts/LiberationSans-Regular.ttf" @@ -299,17 +299,27 @@ 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%/zoom_white.png" +File "%graphics%/zoom_black.png" +File "%graphics%/zoom_all_white.png" +File "%graphics%/zoom_all_black.png" +File "%graphics%/select_white.png" +File "%graphics%/select_black.png" +File "%graphics%/snap_white.png" +File "%graphics%/snap_black.png" +File "%graphics%/sequence_white.png" +File "%graphics%/sequence_black.png" File "%graphics%/me.jpg" File "%graphics%/tick.png" File "%graphics%/no_tick.png" File "%graphics%/link.png" +File "%graphics%/add_black.png" +File "%graphics%/add_white.png" +File "%graphics%/pause_black.png" +File "%graphics%/pause_white.png" SetOutPath "$INSTDIR\\xsd" File "%cdist_deps%/share/libdcp/xsd/DCDMSubtitle-2010.xsd" +File "%cdist_deps%/share/libdcp/xsd/DCDMSubtitle-2014.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" @@ -338,6 +348,8 @@ 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) @@ -358,11 +370,8 @@ SectionEnd 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) + print("File \"%binaries%/src/tools/dcpomatic2_disk_writer.exe\"", file=f) + print("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) @@ -474,5 +483,5 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U def build(bld): - 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) + write_installer(32, bld.env.VERSION, bld.env.DEBUG) + write_installer(64, bld.env.VERSION, bld.env.DEBUG)