Various dist dep fixes.

[dcpomatic.git] / platform / windows / wscript

diff --git a/platform/windows/wscript b/platform/windows/wscript
index cdfc249318379dd15775c5c161b61c0eb8f7a7db..02d132ba164b33ffc0e2a58d3918b4f0833e3444 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -59,7 +59,7 @@ ${EndIf}
 
     print("""
 SetOutPath "$INSTDIR\\bin"
-WriteUninstaller "$INSTDIR\Uninstall.exe"
+WriteUninstaller "$INSTDIR\\Uninstall.exe"
 
 File "%static_deps%/bin/libintl-8.dll"
 File "%static_deps%/bin/libboost_chrono-mt.dll"
@@ -68,6 +68,7 @@ File "%static_deps%/bin/libboost_system-mt.dll"
 File "%static_deps%/bin/libboost_thread_win32-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 "%static_deps%/bin/libeay32.dll"
 File "%static_deps%/bin/libgcc_s_sjlj-1.dll"
 File "%static_deps%/bin/libgio-2.0-0.dll"
@@ -118,6 +119,9 @@ File "%static_deps%/bin/libzip-2.dll"
 File "%static_deps%/bin/libcairomm-1.0-1.dll"
 File "%static_deps%/bin/libpangomm-1.4-1.dll"
 File "%static_deps%/bin/pango-querymodules.exe"
+File "%static_deps%/bin/libsamplerate-0.dll"
+File "%static_deps%/lib/icuuc52.dll"
+File "%static_deps%/lib/icudt52.dll"
 
 File "%cdist_deps%/bin/asdcp-libdcp-1.0.dll"
 File "%cdist_deps%/bin/kumu-libdcp-1.0.dll"
@@ -132,7 +136,9 @@ File "%cdist_deps%/bin/libopenjpeg-1.dll"
 File "%cdist_deps%/bin/swresample-1.dll"
 File "%cdist_deps%/bin/swscale-3.dll"
 File "%cdist_deps%/bin/cxml-0.dll"
-File "%cdist_deps%/bin/sub.dll"
+File "%cdist_deps%/bin/sub-1.0.dll"
+File "%cdist_deps%/bin/asdcp-libsub-1.0.dll"
+File "%cdist_deps%/bin/kumu-libsub-1.0.dll"
 File "%cdist_deps%/bin/ffprobe.exe"
     """, file=f)
 
@@ -152,7 +158,7 @@ File "%static_deps%/lib/pango/1.8.0/modules/pango-basic-win32.dll"
 File "%static_deps%/lib/pango/1.8.0/modules/pango-indic-lang.dll"
 
 SetOutPath "$INSTDIR\\bin"
-# I don't know why, but sometimes it seems that 
+# I don't know why, but sometimes it seems that
 # delegates.xml must be in with the binaries, and
 # sometimes in the $PROFILE.  Meh.
 File "%static_deps%/etc/ImageMagick-6/delegates.xml"
@@ -189,17 +195,25 @@ File "%binaries%/src/lib/mo/nl_NL/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/nl_NL/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/nl_NL/dcpomatic2.mo"
 File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd.mo"
-    """, file=f)
-
-    if debug:
-        print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 Debug" "DisplayName" "DCP-o-matic 2 Debug (remove only)"', file=f)
-        print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 Debug" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f)
-    else:
-        print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2" "DisplayName" "DCP-o-matic 2 (remove only)"', file=f)
-        print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f)
+SetOutPath "$INSTDIR\\locale\\ru\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/ru_RU/libdcpomatic2.mo"
+File "%binaries%/src/wx/mo/ru_RU/libdcpomatic2-wx.mo"
+File "%binaries%/src/tools/mo/ru_RU/dcpomatic2.mo"
+File "%static_deps%/share/locale/ru/LC_MESSAGES/wxstd.mo"
+SetOutPath "$INSTDIR\\locale\\pl\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/pl_PL/libdcpomatic2.mo"
+File "%binaries%/src/wx/mo/pl_PL/libdcpomatic2-wx.mo"
+File "%binaries%/src/tools/mo/pl_PL/dcpomatic2.mo"
+File "%static_deps%/share/locale/pl/LC_MESSAGES/wxstd.mo"
+SetOutPath "$INSTDIR\\locale\\da\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/da_DK/libdcpomatic2.mo"
+File "%binaries%/src/wx/mo/da_DK/libdcpomatic2-wx.mo"
+File "%binaries%/src/tools/mo/da_DK/dcpomatic2.mo"
+File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd.mo"
 
-    print("""
-WriteUninstaller "$INSTDIR\\Uninstall.exe"
+SetOutPath "$INSTDIR"
+File "%resources%/../../LiberationSans-Regular.ttf"
+File "%graphics%/splash.png"
 
 CreateDirectory "$INSTDIR\etc\pango"
 ReadEnvStr $0 COMSPEC
@@ -213,7 +227,7 @@ SectionEnd
         print('Section "DCP-o-matic 2 Debug" SEC_MASTER', file=f)
     else:
         print('Section "DCP-o-matic 2" SEC_MASTER', file=f)
-    
+
     print('SetOutPath "$INSTDIR\\bin"', file=f)
 
     if debug:
@@ -225,6 +239,7 @@ SectionEnd
 File "%binaries%/src/tools/dcpomatic2.exe"
 File "%binaries%/src/tools/dcpomatic2_batch.exe"
 File "%binaries%/src/tools/dcpomatic2_cli.exe"
+File "%binaries%/src/tools/dcpomatic2_create.exe"
     """, file=f)
 
     if debug:
@@ -243,7 +258,6 @@ File "%binaries%/src/tools/dcpomatic2_cli.exe"
         print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f)
 
     print("""
-WriteUninstaller "$INSTDIR\\Uninstall.exe"
 SectionEnd
     """, file=f)
 
@@ -255,7 +269,7 @@ CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2"
 File "%binaries%/src/tools/dcpomatic2_server_cli.exe"
 File "%binaries%/src/tools/dcpomatic2_server.exe"
 CreateShortCut "$DESKTOP\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic2_server.exe" ""
-CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic_server.exe" "" "$INSTDIR\\bin\\dcpomatic2_server.exe" 0
+CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic2_server.exe" "" "$INSTDIR\\bin\\dcpomatic2_server.exe" 0
 CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0
 SectionEnd
     """, file=f)
@@ -266,7 +280,7 @@ SectionEnd
         print('LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic 2"', file=f)
         print('LangString DESC_SEC_SERVER ${LANG_ENGLISH} "DCP-o-matic 2 encode server"', file=f)
 
-    printf("""
+    print("""
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MASTER} $(DESC_SEC_MASTER)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_SERVER} $(DESC_SEC_SERVER)
@@ -285,7 +299,7 @@ SectionEnd
     if debug:
         print("""
 Section "Uninstall"
-RMDir /r "$INSTDIR\\*.*"    
+RMDir /r "$INSTDIR\\*.*"
 RMDir "$INSTDIR"
 Delete "$DESKTOP\\DCP-o-matic 2 Debug.lnk"
 Delete "$SMPROGRAMS\\DCP-o-matic 2 Debug\\*.*"
@@ -297,7 +311,7 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U
     else:
         print("""
 Section "Uninstall"
-RMDir /r "$INSTDIR\\*.*"    
+RMDir /r "$INSTDIR\\*.*"
 RMDir "$INSTDIR"
 Delete "$DESKTOP\\DCP-o-matic 2.lnk"
 Delete "$DESKTOP\\DCP-o-matic 2 batch converter.lnk"
@@ -308,7 +322,7 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic 2"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2"
  SectionEnd
     """, file=f)
-    
+
 
 def build(bld):
     write_installer(32, bld.env.VERSION, bld.env.DEBUG)