From ec5f5780a11ca1e2019f3d5b7bf6a9a64aa0b144 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 9 Sep 2016 09:30:54 -0700 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- packaging/nsis/config.nsh.in | 1 + packaging/nsis/wireshark.nsi | 66 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 4 deletions(-) (limited to 'packaging/nsis') 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 "