diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-09-13 17:07:15 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-09-19 02:49:53 +0000 |
| commit | 630b64613567c268b2b08966707c81d3ec8661a5 (patch) | |
| tree | f11766803b401b172d1439041b8ccac30b6d0a27 /packaging/wix/Wireshark.wxs | |
| parent | df2f01a60bed267117c8c46dea4259dc7e2e995c (diff) | |
| download | wireshark-630b64613567c268b2b08966707c81d3ec8661a5.tar.gz | |
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 <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu>
Diffstat (limited to 'packaging/wix/Wireshark.wxs')
| -rw-r--r-- | packaging/wix/Wireshark.wxs | 3 |
1 files changed, 1 insertions, 2 deletions
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. --> <?define ProgramsFeaturesIconPath="$(var.IconDir)\wireshark.ico"?> - <Product Id="*" Name="$(var.WiresharkName)" Language="1033" Version="$(var.WiresharkVersion)" Manufacturer="The Wireshark developer community, http://www.wireshark.org/" UpgradeCode="0d67aace-269a-4264-81a3-da8055c1c79c"> <Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine" /> <!-- Values for Additional Tasks --> @@ -26,7 +25,7 @@ <Property Id="WIRESHARK_FILE_EXTENSIONS" Value="0"/> <MajorUpgrade DowngradeErrorMessage="A newer version of $(var.WiresharkName) is already installed." /> - <MediaTemplate EmbedCab="yes" CompressionLevel="high" /> + <MediaTemplate EmbedCab="yes" CompressionLevel="high" /> <!-- Include the prerequisites, by referencing the placeholder property --> <PropertyRef Id="IncludePrerequisites" /> |