From 630b64613567c268b2b08966707c81d3ec8661a5 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 13 Sep 2016 17:07:15 -0700 Subject: WiX: Add NSIS installer checks. Look for an existing NSIS installation and cancel the installation if we find one. Add a note about making this process more friendly. Change-Id: Id6ea4d511bc813a38fa834931f5e677d3d6a4319 Reviewed-on: https://code.wireshark.org/review/17702 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gilbert Ramirez --- packaging/wix/Prerequisites.wxi | 72 +++++++++++++++++++++++++++++++++++++++++ packaging/wix/Wireshark.wxs | 3 +- 2 files changed, 73 insertions(+), 2 deletions(-) (limited to 'packaging/wix') diff --git a/packaging/wix/Prerequisites.wxi b/packaging/wix/Prerequisites.wxi index 820d167b87..49de0c53f3 100644 --- a/packaging/wix/Prerequisites.wxi +++ b/packaging/wix/Prerequisites.wxi @@ -26,5 +26,77 @@ = 600)]]> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/wix/Wireshark.wxs b/packaging/wix/Wireshark.wxs index 24154b1595..a2fbcd37db 100644 --- a/packaging/wix/Wireshark.wxs +++ b/packaging/wix/Wireshark.wxs @@ -13,7 +13,6 @@ .ico file instead of pointing to wireshark.exe. --> - @@ -26,7 +25,7 @@ - + -- cgit v1.2.3