diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-09-07 14:53:10 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-09-11 04:35:20 +0000 |
| commit | b82695d9976ebed00f34bfc45f0358db095e0670 (patch) | |
| tree | ae183073d2b0ac6bb513ba5ba492e4b23efb4aa4 /packaging/wix | |
| parent | 2fb9cbd9adae558276ff68d4d819566246f4e3f5 (diff) | |
WiX: Add a warning and increase compression.
Note that you should probably uninstall the NSIS package first if it's
installed. Set the compression level to "high".
Change-Id: I10de8df580f8410fd13cdf414db1b1812a9fcf02
Reviewed-on: https://code.wireshark.org/review/17566
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: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'packaging/wix')
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | packaging/wix/Makefile.am | 1 | ||||
| -rw-r--r-- | packaging/wix/StringOverrides.wxl | 4 | ||||
| -rw-r--r-- | packaging/wix/Wireshark.wxs | 9 |
4 files changed, 12 insertions, 3 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 16489f0741..2f0c848583 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -314,6 +314,7 @@ set(WIX_LIGHT_DEFINES -out ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${WIRESHARK_TARGET_PLATFORM}-${PROJECT_VERSION}.msi -sw1076 -ext WixUIExtension + -loc ${CMAKE_CURRENT_SOURCE_DIR}/StringOverrides.wxl PARENT_SCOPE ) diff --git a/packaging/wix/Makefile.am b/packaging/wix/Makefile.am index deda36c965..ce663a213c 100644 --- a/packaging/wix/Makefile.am +++ b/packaging/wix/Makefile.am @@ -11,6 +11,7 @@ EXTRA_DIST = \ Plugins.wxi \ Prerequisites.wxi \ README \ + StringOverrides.wxl \ UserInterface.wxi \ Wireshark.wxs \ WiresharkOptionsDlg.wxs \ diff --git a/packaging/wix/StringOverrides.wxl b/packaging/wix/StringOverrides.wxl new file mode 100644 index 0000000000..d0930c844e --- /dev/null +++ b/packaging/wix/StringOverrides.wxl @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<WixLocalization Culture="en-US" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization"> + <String Id="WelcomeDlgDescription" Overridable="yes">This will install [ProductName] [ProductVersion] on your computer. If you installed [ProductName] using the .exe installer please uninstall it first.</String> +</WixLocalization> diff --git a/packaging/wix/Wireshark.wxs b/packaging/wix/Wireshark.wxs index f875ba837f..24154b1595 100644 --- a/packaging/wix/Wireshark.wxs +++ b/packaging/wix/Wireshark.wxs @@ -8,10 +8,13 @@ <!-- Windows 8 and later supports PNG. Until then we use cave paintings^W^W BMP. --> <?define BannerImagePath="$(var.AssetDir)\banner.bmp"?> <?define DialogImagePath="$(var.AssetDir)\dialog.bmp"?> - <!-- Use the application icon in "Programs and Features" --> + <!-- Use the application icon in "Programs and Features" + This is apparently stored uncompressed, i.e. we should use a dedicated + .ico file instead of pointing to wireshark.exe. + --> <?define ProgramsFeaturesIconPath="$(var.IconDir)\wireshark.ico"?> - <Product Id="*" Name="$(var.WiresharkName) $(var.WiresharkVersion)" Language="1033" Version="$(var.WiresharkVersion)" Manufacturer="The Wireshark developer community, http://www.wireshark.org/" UpgradeCode="0d67aace-269a-4264-81a3-da8055c1c79c"> + <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 --> <Property Id="WIRESHARK_START_MENU" Value="1" Secure="yes"/> @@ -23,7 +26,7 @@ <Property Id="WIRESHARK_FILE_EXTENSIONS" Value="0"/> <MajorUpgrade DowngradeErrorMessage="A newer version of $(var.WiresharkName) is already installed." /> - <MediaTemplate EmbedCab="yes" /> + <MediaTemplate EmbedCab="yes" CompressionLevel="high" /> <!-- Include the prerequisites, by referencing the placeholder property --> <PropertyRef Id="IncludePrerequisites" /> |