osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2016-07-29 11:01:38 -07:00 committed by Michael Mann
parent 4d4a7a6c84
commit 2df5bf3ec8
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packaging/wix/CMakeLists.txt
View File

@ -292,12 +292,13 @@ set(WIX_CANDLE_DEFINES
-dWiresharkVersion=${PRODUCT_VERSION}
-dAssetDir=${CMAKE_SOURCE_DIR}/packaging/wix
-dBuildOutputDir=${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}
-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}
-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
-dQtTranslationDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/translations
${use_gtk}
${use_smi}
${ENABLE_LIBWIRESHARK}

3
packaging/wix/UserInterface.wxi
View File

@ -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">

4
packaging/wix/Wireshark.wxs
View File

@ -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>
</Wix>