From: Carl Hetherington <cth@carlh.net>
Date: Tue, 25 Aug 2015 15:35:17 +0000 (+0100)
Subject: Hopefully fix duplicate uninstallers (#672).
X-Git-Tag: v2.1.46~9
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=fb5167c9bf8b0063c9ee49b52ecd8d8118d3c27b

Hopefully fix duplicate uninstallers (#672).
---

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 5f11977b4..4a0de2f47 100644
--- 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"
@@ -211,17 +211,6 @@ File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR"
 File "%resources%/../../LiberationSans-Regular.ttf"
 File "%graphics%/splash.png"
-    """, 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)
-
-    print("""
-WriteUninstaller "$INSTDIR\\Uninstall.exe"
 
 CreateDirectory "$INSTDIR\etc\pango"
 ReadEnvStr $0 COMSPEC
@@ -266,7 +255,6 @@ File "%binaries%/src/tools/dcpomatic2_create.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)