diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-16 21:05:39 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-09-19 03:19:38 +0000 |
| commit | 9143862cd0ae2ca9365a189e47fba7364699f35f (patch) | |
| tree | 9c4d1ca4dddd9fa22e07ea45dd4c0e48a59e8745 /packaging | |
| parent | d7fe514fc05e95e3a99fd211768de5abdc3f6486 (diff) | |
WiX: add SSHdump, Ciscodump and UDPdump to installer
Change-Id: Iae2a222db8e9359fd8440b59f43ec90c3b7f8243
Reviewed-on: https://code.wireshark.org/review/17747
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 47 | ||||
| -rw-r--r-- | packaging/wix/Features.wxi | 10 |
2 files changed, 50 insertions, 7 deletions
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index db057e2efc..ce690e9e40 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -419,7 +419,7 @@ </ComponentGroup> </Fragment> - <!-- Andrioddump --> + <!-- Androiddump --> <Fragment> <DirectoryRef Id="dirExtcap"> <Component Id="cmpAndroiddump_exe" Guid="*"> @@ -459,7 +459,7 @@ </ComponentGroup> </Fragment> - <!-- Sshdump - WIP: uncomment this section when sshdump on windows will be ready to go + <!-- Sshdump --> <Fragment> <DirectoryRef Id="dirExtcap"> <Component Id="cmpSshdump_exe" Guid="*"> @@ -473,12 +473,51 @@ </DirectoryRef> </Fragment> <Fragment> - <ComponentGroup Id="CG.Tools.Randpktdump"> + <ComponentGroup Id="CG.Tools.Sshdump"> <ComponentRef Id="cmpSshdump_exe" /> <ComponentRef Id="cmpSshdump_html" /> </ComponentGroup> </Fragment> - --> + + <!-- Ciscodump --> + <Fragment> + <DirectoryRef Id="dirExtcap"> + <Component Id="cmpCiscodump_exe" Guid="*"> + <File Id="filCiscodump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\Ciscodump.exe" /> + </Component> + </DirectoryRef> + <DirectoryRef Id="INSTALLFOLDER"> + <Component Id="cmpCiscodump_html" Guid="*"> + <File Id="filCiscodump_html" KeyPath="yes" Source="$(var.Staging.Dir)\Ciscodump.html" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Tools.Ciscodump"> + <ComponentRef Id="cmpCiscodump_exe" /> + <ComponentRef Id="cmpCiscodump_html" /> + </ComponentGroup> + </Fragment> + + <!-- Udpdump --> + <Fragment> + <DirectoryRef Id="dirExtcap"> + <Component Id="cmpUdpdump_exe" Guid="*"> + <File Id="filUdpdump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\Udpdump.exe" /> + </Component> + </DirectoryRef> + <DirectoryRef Id="INSTALLFOLDER"> + <Component Id="cmpUdpdump_html" Guid="*"> + <File Id="filUdpdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\Udpdump.html" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Tools.Udpdump"> + <ComponentRef Id="cmpUdpdump_exe" /> + <ComponentRef Id="cmpUdpdump_html" /> + </ComponentGroup> + </Fragment> <?ifdef USER_GUIDE_DIR?> <!-- User Guide --> diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi index ba9f0e4765..559d73361e 100644 --- a/packaging/wix/Features.wxi +++ b/packaging/wix/Features.wxi @@ -84,11 +84,15 @@ <Feature Id="Fe.Tools.Randpktdump" Title="Randpktdump" Level="2" AllowAdvertise="yes" Display="expand" Description="Provide random packet generator."> <ComponentGroupRef Id="CG.Tools.Randpktdump" /> </Feature> - <!-- WIP: uncomment this section when sshdump on windows will be ready to go - <Feature Id="Fe.Tools.Sshdump" Title="Sshdump" Level="1" AllowAdvertise="no" Display="expand" Description="Provide remote capture through SSH."> + <Feature Id="Fe.Tools.Sshdump" Title="Sshdump" Level="1" AllowAdvertise="yes" Display="expand" Description="Provide remote capture through SSH."> <ComponentGroupRef Id="CG.Tools.Sshdump" /> </Feature> - --> + <Feature Id="Fe.Tools.Ciscodump" Title="Ciscodump" Level="1" AllowAdvertise="yes" Display="expand" Description="Provide capture interface from a remote Cisco router through SSH."> + <ComponentGroupRef Id="CG.Tools.Ciscodump" /> + </Feature> + <Feature Id="Fe.Tools.Udpdump" Title="Udpdump" Level="1" AllowAdvertise="yes" Display="expand" Description="Provide capture interface that gets UDP packets from network devices."> + <ComponentGroupRef Id="CG.Tools.Udpdump" /> + </Feature> </Feature> <?ifdef USER_GUIDE_DIR?> <Feature Id="Fe.UserGuide" Title="User's Guide" Level="1" AllowAdvertise="yes" Display="expand" Description="Install an offline copy of the User's Guide."> |