projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac0b8be
)
Always build the disk writer on Windows.
author
Carl Hetherington
<cth@carlh.net>
Mon, 15 May 2023 23:13:00 +0000
(
01:13
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 16 May 2023 21:29:21 +0000
(23:29 +0200)
platform/windows/wscript
patch
|
blob
|
history
diff --git
a/platform/windows/wscript
b/platform/windows/wscript
index e544554270a6868848a91445291da25615db6de8..450e4f60cc459144f6af32a8d489fe8b12383c6c 100644
(file)
--- a/
platform/windows/wscript
+++ b/
platform/windows/wscript
@@
-1,7
+1,7
@@
from __future__ import print_function
import os
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'),
tools = [
('batch', 'Batch Converter'),
@@
-14,11
+14,9
@@
def write_installer(bits, dcpomatic_version, debug, disk):
('combiner', 'Combiner'),
('editor', 'Editor'),
('map', 'Map'),
('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')
# It would be nice to use exist_ok here but it requires quite a new python
try:
os.makedirs('build/platform/windows')
@@
-177,16
+175,9
@@
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 "%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 "%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 "%cdist_deps%/bin/avcodec-58.dll"
File "%cdist_deps%/bin/avfilter-7.dll"
File "%cdist_deps%/bin/avformat-58.dll"
@@
-379,11
+370,8
@@
SectionEnd
for s, l in tools:
print('File "%%binaries%%/src/tools/dcpomatic2_%s.exe"' % s, 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)
+ 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)
if debug:
print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat"', file=f)
@@
-495,5
+483,5
@@
DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U
def build(bld):
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)