Basics of OpenGL viewer.
[dcpomatic.git] / platform / windows / wscript
index 996d8acd09fbce41e9a81afd3e15c5d4fd0c4540..176e3840e39773fa042073e99f905a6c47e00515 100644 (file)
@@ -1,7 +1,7 @@
 from __future__ import print_function
 import os
 
-def write_installer(bits, windows_version, dcpomatic_version, debug):
+def write_installer(bits, windows_version, dcpomatic_version, debug, variant):
     try:
         os.makedirs('build/platform/windows')
     except:
@@ -35,9 +35,9 @@ def write_installer(bits, windows_version, dcpomatic_version, debug):
     print('outFile "%s"' % outfile, file=f)
 
     print("""
-!define MUI_ICON "%graphics%/dcpomatic2.ico"
-!define MUI_UNICON "%graphics%/dcpomatic2.ico"
-!define MUI_SPECIALBITMAP "%graphics%/dcpomatic.bmp"
+!define MUI_ICON "%graphics%/windows/dcpomatic2.ico"
+!define MUI_UNICON "%graphics%/windows/dcpomatic2.ico"
+!define MUI_SPECIALBITMAP "%graphics%/windows/dcpomatic.bmp"
 !include "Sections.nsh"
     """, file=f)
 
@@ -75,32 +75,37 @@ 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_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=f)
+
+    if bits == 32:
+        print('File "%static_deps%/bin/libgcc_s_sjlj-1.dll"', file=f)
+    else:
+        print('File "%static_deps%/bin/libgcc_s_seh-1.dll"', file=f)
+
+    print("""
 File "%static_deps%/bin/libgio-2.0-0.dll"
 File "%static_deps%/bin/libglib-2.0-0.dll"
 File "%static_deps%/bin/libgobject-2.0-0.dll"
 File "%static_deps%/bin/libiconv-2.dll"
-File "%static_deps%/bin/libjpeg-8.dll"
-File "%static_deps%/bin/libMagick++-6.Q16-3.dll"
-File "%static_deps%/bin/libMagickCore-6.Q16-1.dll"
-File "%static_deps%/bin/libMagickWand-6.Q16-1.dll"
-File "%static_deps%/bin/libpng15-15.dll"
+File "%static_deps%/bin/libjpeg-9.dll"
+File "%static_deps%/bin/libpng16-16.dll"
 File "%static_deps%/bin/libsigc-2.0-0.dll"
 File "%static_deps%/bin/libsndfile-1.dll"
 File "%static_deps%/bin/libssh.dll"
 File "%static_deps%/bin/libstdc++-6.dll"
 File "%static_deps%/bin/zlib1.dll"
-File "%static_deps%/bin/libjpeg-8.dll"
+File "%static_deps%/bin/libjpeg-9.dll"
 File "%static_deps%/bin/wxbase30u_gcc_custom.dll"
 File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll"
 File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll"
 File "%static_deps%/bin/wxmsw30u_richtext_gcc_custom.dll"
 File "%static_deps%/bin/wxmsw30u_html_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_gl_gcc_custom.dll"
 File "%static_deps%/bin/wxbase30u_xml_gcc_custom.dll"
 File "%static_deps%/bin/libcairo-2.dll"
 File "%static_deps%/bin/libfreetype-6.dll"
@@ -125,17 +130,44 @@ File "%static_deps%/bin/libffi-6.dll"
 File "%static_deps%/bin/openssl.exe"
 File "%static_deps%/bin/libcurl-4.dll"
 File "%static_deps%/bin/ssleay32.dll"
-File "%static_deps%/bin/libzip-2.dll"
+File "%static_deps%/bin/libzip-4.dll"
 File "%static_deps%/bin/libcairomm-1.0-1.dll"
 File "%static_deps%/bin/libpangomm-1.4-1.dll"
 File "%static_deps%/bin/libsamplerate-0.dll"
-File "%static_deps%/bin/libnettle-6-2.dll"
-File "%static_deps%/lib/icuuc52.dll"
-File "%static_deps%/lib/icudt52.dll"
-File "%static_deps%/lib/icuin52.dll"
+File "%static_deps%/bin/libnettle-6.dll"
+File "%static_deps%/bin/icuuc56.dll"
+File "%static_deps%/bin/icudt56.dll"
+File "%static_deps%/bin/icuin56.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"
+File "%static_deps%/bin/libhogweed-4.dll"
+File "%static_deps%/bin/libidn2-0.dll"
+File "%static_deps%/bin/libunistring-2.dll"
+File "%static_deps%/bin/libssh2-1.dll"
+File "%static_deps%/bin/libgcrypt-20.dll"
+""", file=f)
+
+    if bits == 32:
+        print('File "%static_deps%/bin/libgpg-error-0.dll"', file=f)
+    else:
+        print('File "%static_deps%/bin/libgpg-error6-0.dll"', file=f)
+
+    print("""
+File "%static_deps%/bin/libpangoft2-1.0-0.dll"
+File "%static_deps%/bin/libx264-152.dll"
 
 File "%cdist_deps%/bin/asdcp-cth.dll"
 File "%cdist_deps%/bin/kumu-cth.dll"
+    """, file=f)
+
+    if windows_version == 'xp':
+        print("""
 File "%cdist_deps%/bin/avcodec-57.dll"
 File "%cdist_deps%/bin/avfilter-6.dll"
 File "%cdist_deps%/bin/avformat-57.dll"
@@ -143,8 +175,22 @@ File "%cdist_deps%/bin/avutil-55.dll"
 File "%cdist_deps%/bin/avdevice-57.dll"
 File "%cdist_deps%/bin/postproc-54.dll"
 File "%cdist_deps%/bin/swresample-2.dll"
-File "%cdist_deps%/bin/dcp-1.0.dll"
 File "%cdist_deps%/bin/swscale-4.dll"
+        """, file=f)
+    else:
+        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/avutil-56.dll"
+File "%cdist_deps%/bin/avdevice-58.dll"
+File "%cdist_deps%/bin/postproc-55.dll"
+File "%cdist_deps%/bin/swresample-3.dll"
+File "%cdist_deps%/bin/swscale-5.dll"
+        """, file=f)
+
+    print("""
+File "%cdist_deps%/bin/dcp-1.0.dll"
 File "%cdist_deps%/bin/cxml-0.dll"
 File "%cdist_deps%/bin/sub-1.0.dll"
 File "%cdist_deps%/bin/ffprobe.exe"
@@ -160,20 +206,14 @@ File "%cdist_deps%/bin/ffprobe.exe"
         print('File "%resources%/dcpomatic2_debug.bat"', file=f)
         print('File "%resources%/dcpomatic2_batch_debug.bat"', file=f)
         print('File "%resources%/dcpomatic2_kdm_debug.bat"', file=f)
-        print('File "%mingw%/gdb.exe"', file=f)
-        print('File "%mingw%/addr2line.exe"', file=f)
+        print('File "%resources%/dcpomatic2_player_debug.bat"', file=f)
+        print('File "%mingw%/bin/gdb.exe"', file=f)
     else:
         print('File "%binaries%/src/wx/dcpomatic2-wx.dll"', file=f)
         print('File "%binaries%/src/lib/dcpomatic2.dll"', file=f)
 
     print("""
 SetOutPath "$INSTDIR\\bin"
-# 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"
-SetOutPath "$PROFILE\\.magick"
-File "%static_deps%/etc/ImageMagick-6/delegates.xml"
 
 SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/fr_FR/libdcpomatic2.mo"
@@ -245,12 +285,25 @@ SetOutPath "$INSTDIR\\locale\\zh_cn\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/zh_CN/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/zh_CN/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/zh_CN/dcpomatic2.mo"
+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"
 File "%resources%/../../fonts/LiberationSans-Regular.ttf"
 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%/me.jpg"
+File "%graphics%/tick.png"
+File "%graphics%/no_tick.png"
 
 SectionEnd
     """, file=f)
@@ -267,26 +320,38 @@ SectionEnd
     else:
         print('CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2"', file=f)
 
-    print("""
+    if variant != 'swaroop':
+        print("""
 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 "%binaries%/src/tools/dcpomatic2_kdm.exe"
+File "%binaries%/src/tools/dcpomatic2_kdm_cli.exe"
+    """, file=f)
+
+    print("""
+File "%binaries%/src/tools/dcpomatic2_player.exe"
+File "%binaries%/src/tools/dcpomatic2_playlist.exe"
     """, 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)
-        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f)
-        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f)
-        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\Uninstall DCP-o-matic 2 debug.lnk" "$INSTDIR\\Uninstall.exe"', file=f)
+        if variant != "swaroop":
+            print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat"', file=f)
+            print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 Batch Converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f)
+            print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 KDM Creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f)
+            print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\Uninstall DCP-o-matic 2 debug.lnk" "$INSTDIR\\Uninstall.exe"', file=f)
+        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f)
         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('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe"', file=f)
-        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f)
-        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 KDM creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f)
-        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe"', file=f)
+        if variant != "swaroop":
+            print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe"', file=f)
+            print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 Batch Converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f)
+            print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 KDM Creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f)
+            print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe"', file=f)
+        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f)
+        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 Playlist Editor.lnk" "$INSTDIR\\bin\\dcpomatic2_playlist.exe"', file=f)
         print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "DisplayName" "DCP-o-matic 2 (remove only)"', file=f)
         print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f)
 
@@ -294,25 +359,29 @@ File "%binaries%/src/tools/dcpomatic2_kdm.exe"
 
     if debug:
         print('Section "DCP-o-matic 2 debug desktop shortcuts" SEC_MASTER_DESKTOP', file=f)
-        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat" ""', file=f)
-        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f)
-        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f)
+        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f)
+        if variant != "swaroop":
+            print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat" ""', file=f)
+            print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Batch Converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f)
+            print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM Creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f)
     else:
         print('Section "DCP-o-matic 2 desktop shortcuts" SEC_MASTER_DESKTOP', file=f)
-        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" ""', file=f)
-        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f)
-        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f)
+        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f)
+        if variant != "swaroop":
+            print('CreateShortCut "$DESKTOP\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" ""', file=f)
+            print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Batch Converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f)
+            print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM Creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f)
 
     print("SectionEnd", file=f)
 
-    if not debug:
+    if not debug and variant != "swaroop":
         print("""
 Section "Encode server" SEC_SERVER
 SetOutPath "$INSTDIR\\bin"
 CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2"
 File "%binaries%/src/tools/dcpomatic2_server_cli.exe"
 File "%binaries%/src/tools/dcpomatic2_server.exe"
-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\\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)
@@ -323,14 +392,15 @@ CreateShortCut "$DESKTOP\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpom
 SectionEnd
     """, file=f)
 
-    if debug:
-        print('LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic 2 debug"', file=f)
-        print('LangString DESC_SEC_MASTER_DESKTOP ${LANG_ENGLISH} "DCP-o-matic 2 debug desktop shortcuts"', file=f)
-    else:
-        print('LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic 2"', file=f)
-        print('LangString DESC_SEC_MASTER_DESKTOP ${LANG_ENGLISH} "DCP-o-matic 2 desktop shortcuts"', file=f)
-        print('LangString DESC_SEC_SERVER ${LANG_ENGLISH} "DCP-o-matic 2 encode server"', file=f)
-        print('LangString DESC_SEC_SERVER_DESKTOP ${LANG_ENGLISH} "DCP-o-matic 2 encode server desktop shortcuts"', file=f)
+    if variant != "swaroop":
+        if debug:
+            print('LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic 2 debug"', file=f)
+            print('LangString DESC_SEC_MASTER_DESKTOP ${LANG_ENGLISH} "DCP-o-matic 2 debug desktop shortcuts"', file=f)
+        else:
+            print('LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic 2"', file=f)
+            print('LangString DESC_SEC_MASTER_DESKTOP ${LANG_ENGLISH} "DCP-o-matic 2 desktop shortcuts"', file=f)
+            print('LangString DESC_SEC_SERVER ${LANG_ENGLISH} "DCP-o-matic 2 encode server"', file=f)
+            print('LangString DESC_SEC_SERVER_DESKTOP ${LANG_ENGLISH} "DCP-o-matic 2 encode server desktop shortcuts"', file=f)
 
     print("""
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -356,8 +426,8 @@ Section "Uninstall"
 RMDir /r "$INSTDIR\\*.*"
 RMDir "$INSTDIR"
 Delete "$DESKTOP\\DCP-o-matic 2 debug.lnk"
-Delete "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk"
-Delete "$DESKTOP\\DCP-o-matic 2 KDM creator debug.lnk"
+Delete "$DESKTOP\\DCP-o-matic 2 Batch Converter debug.lnk"
+Delete "$DESKTOP\\DCP-o-matic 2 KDM Creator debug.lnk"
 Delete "$SMPROGRAMS\\DCP-o-matic 2 debug\\*.*"
 RmDir  "$SMPROGRAMS\\DCP-o-matic 2 debug"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic 2 debug"
@@ -370,8 +440,8 @@ Section "Uninstall"
 RMDir /r "$INSTDIR\\*.*"
 RMDir "$INSTDIR"
 Delete "$DESKTOP\\DCP-o-matic 2.lnk"
-Delete "$DESKTOP\\DCP-o-matic 2 batch converter.lnk"
-Delete "$DESKTOP\\DCP-o-matic 2 encode server.lnk"
+Delete "$DESKTOP\\DCP-o-matic 2 Batch Converter.lnk"
+Delete "$DESKTOP\\DCP-o-matic 2 Encode Server.lnk"
 Delete "$DESKTOP\\DCP-o-matic 2 KDM creator.lnk"
 Delete "$SMPROGRAMS\\DCP-o-matic 2\\*.*"
 RmDir  "$SMPROGRAMS\\DCP-o-matic 2"
@@ -382,7 +452,7 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U
 
 
 def build(bld):
-    write_installer(32, None, bld.env.VERSION, bld.env.DEBUG)
-    write_installer(64, None, bld.env.VERSION, bld.env.DEBUG)
-    write_installer(32, 'xp', bld.env.VERSION, bld.env.DEBUG)
-    write_installer(64, 'xp', bld.env.VERSION, bld.env.DEBUG)
+    write_installer(32, None, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT)
+    write_installer(64, None, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT)
+    write_installer(32, 'xp', bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT)
+    write_installer(64, 'xp', bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT)