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'),
('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')
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"
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"
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)
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)