diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-09-09 09:30:54 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-09-13 21:23:51 +0000 |
| commit | ec5f5780a11ca1e2019f3d5b7bf6a9a64aa0b144 (patch) | |
| tree | 58b0e09a1c6f18e4bc30959de62bdf8448492757 /packaging/nsis/config.nsh.in | |
| parent | aa44e3b75da316bb9ee3237c401042afa36db7d8 (diff) | |
NSIS: Look for an installed WiX package.
Dig through the registry and look for a WiX / Windows Installer package.
Offer to uninstall it if we find one.
Change-Id: I513ce4184880571c484461483a3d25e6d90a85e0
Reviewed-on: https://code.wireshark.org/review/17613
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis/config.nsh.in')
| -rw-r--r-- | packaging/nsis/config.nsh.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in index c119d04fd4..69212541e6 100644 --- a/packaging/nsis/config.nsh.in +++ b/packaging/nsis/config.nsh.in @@ -4,6 +4,7 @@ # Do not prefix comments with ";". They will be removed by CMake. +# MUST match "<Product ... Name=" in wix/Wireshark.wxs. !define PROGRAM_NAME "@PROGRAM_NAME@" !define TOP_SRC_DIR "@TOP_SRC_DIR@" !define STAGING_DIR "@STAGING_DIR@" |