aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/wix
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-03-06 15:29:34 -0800
committerGerald Combs <gerald@wireshark.org>2018-03-07 00:16:54 +0000
commite3c263c01236e7c31ec23f6c3d8750d7e92fb5a3 (patch)
tree54fcc9a118fc5ecb29984bd213837902fcfb8e0c /packaging/wix
parentf0fb6ee50c953ac07eb76d47036a761a57f35491 (diff)
NSIS, WiX: Handle the presence or absence of mmdbresolve.
Only install mmdbresolve if MAXMINDDB_FOUND is true. Fixup the Qt about box and WiX GTK defines while we're here. Change-Id: I7ac3c21ddb4aebc1dae1c3d8cfd2bcafc4139d2e Reviewed-on: https://code.wireshark.org/review/26299 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/wix')
-rw-r--r--packaging/wix/CMakeLists.txt13
-rw-r--r--packaging/wix/ComponentGroups.wxi4
-rw-r--r--packaging/wix/Features.wxi2
-rw-r--r--packaging/wix/WiresharkOptionsDlg.wxs2
4 files changed, 16 insertions, 5 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index 352e53f854..881f8610c4 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -300,11 +300,15 @@ endif()
file(APPEND "${_gtk_dll_manifest_wix}" "\n</Wix>\n")
if(BUILD_wireshark_gtk AND GTK_FOUND)
- set(use_gtk "-dGTK_DIR")
+ set(d_gtk_dir "-dGTK_DIR")
endif()
if(SMI_DIR)
- set(use_smi "-dSMI_DIR")
+ set(d_smi_dir "-dSMI_DIR")
+endif()
+
+if (MAXMINDDB_FOUND)
+ set(d_mmdbresolve_exe "-dMMDBRESOLVE_EXE")
endif()
set(WIX_CANDLE_DEFINES
@@ -323,8 +327,9 @@ set(WIX_CANDLE_DEFINES
-dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/snmp/mibs
-dVCRedistVersion=${MSVC_CRT_VERSION}
-dVCRedistDir=${MERGE_MODULE_DIR}
- ${use_gtk}
- ${use_smi}
+ ${d_gtk_dir}
+ ${d_smi_dir}
+ ${d_mmdbresolve_exe}
-arch ${TARGET_MACHINE}
-ext WixUIExtension
-I${CMAKE_SOURCE_DIR}/packaging/wix
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 8631c805d2..f6c70433c2 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -434,13 +434,14 @@
</Fragment>
<!-- MMDBResolve -->
+ <?ifdef MMDBRESOLVE_EXE?>
<Fragment>
<DirectoryRef Id="INSTALLFOLDER">
<Component Id="cmpMmdbresolve_exe" Guid="*">
<File Id="filMmdbresolve_exe" KeyPath="yes" Source="$(var.Staging.Dir)\mmdbresolve.exe" />
</Component>
<Component Id="cmpMmdbresolve_html" Guid="*">
- <File Id="filMmdbresolve_html" KeyPath="yes" Source="$(var.Staging.Dir)\rawshark.html" />
+ <File Id="filMmdbresolve_html" KeyPath="yes" Source="$(var.Staging.Dir)\mmdbresolve.html" />
</Component>
</DirectoryRef>
</Fragment>
@@ -450,6 +451,7 @@
<ComponentRef Id="cmpMmdbresolve_html" />
</ComponentGroup>
</Fragment>
+ <?endif?>
<!-- Androiddump -->
<Fragment>
diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi
index 277a713a14..918da3bb66 100644
--- a/packaging/wix/Features.wxi
+++ b/packaging/wix/Features.wxi
@@ -81,9 +81,11 @@
<Feature Id="Fe.Tools.Rawshark" Title="Rawshark" Level="1" AllowAdvertise="yes" Display="expand" Description="Raw packet filter.">
<ComponentGroupRef Id="CG.Tools.Rawshark" />
</Feature>
+ <?ifdef MMDBRESOLVE_EXE?>
<Feature Id="Fe.Tools.MMDBResolve" Title="MMDBResolve" Level="1" AllowAdvertise="yes" Display="expand" Description="IP geolocation database resolution.">
<ComponentGroupRef Id="CG.Tools.MMDBResolve" />
</Feature>
+ <?endif?>
<Feature Id="Fe.Tools.Androiddump" Title="Androiddump" Level="2" AllowAdvertise="yes" Display="expand" Description="Provide capture interfaces from Android devices.">
<ComponentGroupRef Id="CG.Tools.Androiddump" />
</Feature>
diff --git a/packaging/wix/WiresharkOptionsDlg.wxs b/packaging/wix/WiresharkOptionsDlg.wxs
index d37f74c32b..9b1cd3aacb 100644
--- a/packaging/wix/WiresharkOptionsDlg.wxs
+++ b/packaging/wix/WiresharkOptionsDlg.wxs
@@ -22,6 +22,7 @@
<Condition Action="disable"><![CDATA[&Fe.Wireshark <> 3]]></Condition>
</Control>
+ <?ifdef GTK_DIR?>
<Control Id="WiresharkLegacyStartMenuCB" Type="CheckBox" X="20" Y="117" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_LEGACY_START_MENU" Text="Wireshark Legacy Start Menu Item">
<Condition Action="enable"><![CDATA[&Fe.WiresharkGTK = 3]]></Condition>
<Condition Action="disable"><![CDATA[&Fe.WiresharkGTK <> 3]]></Condition>
@@ -34,6 +35,7 @@
<Condition Action="enable"><![CDATA[&Fe.WiresharkGTK = 3]]></Condition>
<Condition Action="disable"><![CDATA[&Fe.WiresharkGTK <> 3]]></Condition>
</Control>
+ <?endif?>
<Control Id="FileExtensions" Type="GroupBox" X="15" Y="180" Width="250" Height="100" Text="File Extensions"/>
<Control Id="FileExtensionsRadio" Type="RadioButtonGroup" X="20" Y="190" Width="235" Height="50" Property="WIRESHARK_FILE_EXTENSIONS">