Add simpler language tag dialog (#1931).

[dcpomatic.git] / platform / windows / wscript

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 752706011040fc8a893a56a080c99f3c7d033a25..930fbfa0d3448de0d0ca61d3d5d422245b53d7e0 100644 (file)
--- 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'),
@@ -174,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"
@@ -307,34 +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-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"
 
 SectionEnd
     """, file=f)
@@ -471,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)