aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2017-09-22 14:50:38 +0200
committerJörg Mayer <jmayer@loplof.de>2017-09-23 20:15:11 +0000
commitc5403b6c1ec1c905ea0add21a25e617cd2e76a6e (patch)
tree907f057bc41caca844b0477dcdac93677550a188
parentfd4dc6f115868f18e787f4bffaf8f8c5ceccff82 (diff)
Add lcap file extension to nsis and wix installers.
Also add ntar file extention to wix installer to match nsis Change-Id: Idb6f660fda27c6ad3c3cd70acd482eafa2c14307 Reviewed-on: https://code.wireshark.org/review/23656 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-rw-r--r--packaging/nsis/AdditionalTasksPage.ini2
-rwxr-xr-xpackaging/nsis/common.nsh1
-rw-r--r--packaging/wix/ComponentGroups.wxi36
-rw-r--r--packaging/wix/WiresharkOptionsDlg.wxs4
4 files changed, 40 insertions, 3 deletions
diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini
index 9e53bb6..5f187bd 100644
--- a/packaging/nsis/AdditionalTasksPage.ini
+++ b/packaging/nsis/AdditionalTasksPage.ini
@@ -113,7 +113,7 @@ Left=10
Right=280
Top=120
Bottom=128
-Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, mplog, out, pcap,
+Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, out, pcap,
[Field 13]
Type=Label
diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh
index a08b4fb..1c09eec 100755
--- a/packaging/nsis/common.nsh
+++ b/packaging/nsis/common.nsh
@@ -111,6 +111,7 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
Push ".out"
Push ".ntar"
Push ".mplog"
+ Push ".lcap"
Push ".ipfix"
Push ".fdc"
Push ".erf"
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 3220eb3..15c8759 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -706,6 +706,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="ipfix" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
</Component>
+ <Component Id="cmpFAlcap">
+ <ProgId Id="$(var.WiresharkFileAssociation)" Description="lcap">
+ <Extension Id="lcap">
+ <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+ </Extension>
+ </ProgId>
+ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="lcap" Type="integer" Value="1" KeyPath="yes"/>
+ <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+ </Component>
<Component Id="cmpFAmplog">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog">
<Extension Id="mplog">
@@ -715,6 +724,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="mplog" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
</Component>
+ <Component Id="cmpFAntar">
+ <ProgId Id="$(var.WiresharkFileAssociation)" Description="ntar">
+ <Extension Id="ntar">
+ <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
+ </Extension>
+ </ProgId>
+ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="ntar" Type="integer" Value="1" KeyPath="yes"/>
+ <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
+ </Component>
<Component Id="cmpFAout">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="out">
<Extension Id="out">
@@ -947,6 +965,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="ipfix" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
</Component>
+ <Component Id="cmpFAlcapLegacy" Guid="64C1C689-CDAF-491D-AB39-8FA62AE565D3">
+ <ProgId Id="$(var.WiresharkFileAssociation)" Description="lcap">
+ <Extension Id="lcap">
+ <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+ </Extension>
+ </ProgId>
+ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="lcap" Type="integer" Value="1" KeyPath="yes"/>
+ <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+ </Component>
<Component Id="cmpFAmplogLegacy" Guid="7AA152AB-1225-466E-8C33-2DF9E6C1CBCE">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog">
<Extension Id="mplog">
@@ -956,6 +983,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="mplog" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
</Component>
+ <Component Id="cmpFAntarLegacy" Guid="4D7AD891-359B-4E74-A0C7-63300F9DC232">
+ <ProgId Id="$(var.WiresharkFileAssociation)" Description="ntar">
+ <Extension Id="ntar">
+ <Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
+ </Extension>
+ </ProgId>
+ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="ntar" Type="integer" Value="1" KeyPath="yes"/>
+ <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
+ </Component>
<Component Id="cmpFAoutLegacy" Guid="75E60C7A-758F-45C9-A9CF-6B87F3609229">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="out">
<Extension Id="out">
diff --git a/packaging/wix/WiresharkOptionsDlg.wxs b/packaging/wix/WiresharkOptionsDlg.wxs
index 7d17baf..d37f74c 100644
--- a/packaging/wix/WiresharkOptionsDlg.wxs
+++ b/packaging/wix/WiresharkOptionsDlg.wxs
@@ -47,8 +47,8 @@
<RadioButton Value="2" X="5" Y="35" Height="15" Width="235" Text="None" />
</RadioButtonGroup>
</Control>
- <Control Id="FileExtensionsText1" Type="Text" X="20" Y="250" Width="235" Height="15" Transparent="yes" NoPrefix="yes" Text="Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, mplog, out, pcap," />
- <Control Id="FileExtensionsText2" Type="Text" X="20" Y="265" Width="235" Height="15" Transparent="yes" NoPrefix="yes" Text="pcapng, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz" />
+ <Control Id="FileExtensionsText1" Type="Text" X="20" Y="250" Width="235" Height="15" Transparent="yes" NoPrefix="yes" Text="Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, lcap, mplog, ntar, out," />
+ <Control Id="FileExtensionsText2" Type="Text" X="20" Y="265" Width="235" Height="15" Transparent="yes" NoPrefix="yes" Text="pcap, pcapng, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz" />
<Control Id="BottomLine" Type="Line" X="0" Y="284" Width="370" Height="0" />
<Control Id="Back" Type="PushButton" X="180" Y="293" Width="56" Height="17" Text="!(loc.WixUIBack)" />