diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-08-25 16:35:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-08-25 16:35:17 +0100 |
| commit | fb5167c9bf8b0063c9ee49b52ecd8d8118d3c27b (patch) | |
| tree | d93103e30528a533b6da397d446df6807b18d68e /platform/windows/wscript | |
| parent | a4096456865eb1d1e45bc2828b6e45a61d9c7201 (diff) | |
Hopefully fix duplicate uninstallers (#672).
Diffstat (limited to 'platform/windows/wscript')
| -rw-r--r-- | platform/windows/wscript | 14 |
1 files changed, 1 insertions, 13 deletions
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) |