diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-07-29 11:01:38 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-29 20:19:22 +0000 |
| commit | 2df5bf3ec89d672ba927c98062e5aad3403d09cf (patch) | |
| tree | ce12844104ad8eeffef3877503353f3098bf8275 /packaging/wix | |
| parent | 4d4a7a6c848fb48713221c2513da286c2de6fe72 (diff) | |
| download | wireshark-2df5bf3ec89d672ba927c98062e5aad3403d09cf.tar.gz | |
WiX: Set the "Programs and Features" icon.
Use our normal application icon in "Programs and Features".
Change-Id: I480fcd16b9de1b58852ee8fb5226062da8ed7419
Reviewed-on: https://code.wireshark.org/review/16768
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 | 9 | ||||
| -rw-r--r-- | packaging/wix/UserInterface.wxi | 3 | ||||
| -rw-r--r-- | packaging/wix/Wireshark.wxs | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 822023d9a5..357152ab37 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -292,12 +292,13 @@ set(WIX_CANDLE_DEFINES -dWiresharkVersion=${PRODUCT_VERSION} -dAssetDir=${CMAKE_SOURCE_DIR}/packaging/wix -dBuildOutputDir=${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE} - -dVCRedistVersion=${MSVC_CRT_VERSION} - -dVCRedistDir=${MSVC_REDIST_DIR} - -dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/snmp/mibs - -dRadiusDictDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/radius -dDiameterDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/diameter + -dIconDir=${CMAKE_SOURCE_DIR}/image -dQtTranslationDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/translations + -dRadiusDictDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/radius + -dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/snmp/mibs + -dVCRedistVersion=${MSVC_CRT_VERSION} + -dVCRedistDir=${MSVC_REDIST_DIR} ${use_gtk} ${use_smi} ${ENABLE_LIBWIRESHARK} diff --git a/packaging/wix/UserInterface.wxi b/packaging/wix/UserInterface.wxi index 114efb68f8..e572666417 100644 --- a/packaging/wix/UserInterface.wxi +++ b/packaging/wix/UserInterface.wxi @@ -5,7 +5,8 @@ <WixVariable Id="WixUILicenseRtf" Value="$(var.EulaPath)" /> <WixVariable Id="WixUIBannerBmp" Value="$(var.BannerImagePath)" /> <WixVariable Id="WixUIDialogBmp" Value="$(var.DialogImagePath)" /> - <Property Id="ARPPRODUCTICON" Value="ProductIcon" /> + <Icon Id="ProgramsFeaturesIcon" SourceFile="$(var.ProgramsFeaturesIconPath)"/> + <Property Id="ARPPRODUCTICON" Value="ProgramsFeaturesIcon" /> <!-- This UI identifier will be used in the product definition--> <UI Id="UI.Wireshark"> diff --git a/packaging/wix/Wireshark.wxs b/packaging/wix/Wireshark.wxs index fc9027a414..f875ba837f 100644 --- a/packaging/wix/Wireshark.wxs +++ b/packaging/wix/Wireshark.wxs @@ -8,6 +8,8 @@ <!-- 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" --> + <?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"> <Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine" /> @@ -40,4 +42,4 @@ <?include Plugins.wxi ?> <?include Features.wxi ?> <?include UserInterface.wxi ?> -</Wix>
\ No newline at end of file +</Wix> |