diff options
Diffstat (limited to 'packaging/wix/ComponentGroups.wxi')
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 48 |
1 files changed, 29 insertions, 19 deletions
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 8a649732..0c2156af 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Include> <!-- Wireshark --> @@ -30,15 +30,9 @@ <Component Id="cmpCOPYING_txt" Guid="*"> <File Id="filCOPYING_txt" KeyPath="yes" Source="$(var.Staging.Dir)\COPYING.txt" /> </Component> - <Component Id="cmpNEWS_txt" Guid="*"> - <File Id="filNEWS_txt" KeyPath="yes" Source="$(var.Staging.Dir)\NEWS.txt" /> - </Component> <Component Id="cmpREADME_txt" Guid="*"> <File Id="filREADME_txt" KeyPath="yes" Source="$(var.Staging.Dir)\README.txt" /> </Component> - <Component Id="cmpREADME_windows_txt" Guid="*"> - <File Id="filREADME_windows_txt" KeyPath="yes" Source="$(var.Staging.Dir)\README.windows.txt" /> - </Component> <Component Id="cmpWka" Guid="*"> <File Id="filWka" KeyPath="yes" Source="$(var.Staging.Dir)\wka" /> </Component> @@ -67,7 +61,7 @@ <File Id="filIpmap_html" KeyPath="yes" Source="$(var.Staging.Dir)\ipmap.html" /> </Component> <Component Id="cmpReleaseNotes_html" Guid="*"> - <File Id="filReleaseNotes_html" KeyPath="yes" Source="$(var.Staging.Dir)\release-notes.html" /> + <File Id="filReleaseNotes_html" KeyPath="yes" Source="$(var.Staging.Dir)\release-notes.html" Name="Release Notes.html" /> </Component> </DirectoryRef> </Fragment> @@ -77,9 +71,7 @@ <ComponentRef Id="cmpLibwireshark_dll" /> <ComponentRef Id="cmpLibwsutil_dll" /> <ComponentRef Id="cmpCOPYING_txt" /> - <ComponentRef Id="cmpNEWS_txt" /> <ComponentRef Id="cmpREADME_txt" /> - <ComponentRef Id="cmpREADME_windows_txt" /> <ComponentRef Id="cmpWka" /> <ComponentRef Id="cmpPdml2html_xsl" /> <ComponentRef Id="cmpWs_css" /> @@ -461,7 +453,7 @@ <!-- Androiddump --> <Fragment> - <DirectoryRef Id="dirExtcap"> + <DirectoryRef Id="dirExtcapWireshark"> <Component Id="cmpAndroiddump_exe" Guid="*"> <File Id="filAndroiddump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\androiddump.exe" /> </Component> @@ -481,7 +473,7 @@ <!-- Randpktdump --> <Fragment> - <DirectoryRef Id="dirExtcap"> + <DirectoryRef Id="dirExtcapWireshark"> <Component Id="cmpRandpktdump_exe" Guid="*"> <File Id="filRandpktdump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\randpktdump.exe" /> </Component> @@ -501,7 +493,7 @@ <!-- Etwdump --> <Fragment> - <DirectoryRef Id="dirExtcap"> + <DirectoryRef Id="dirExtcapWireshark"> <Component Id="cmpEtwdump_exe" Guid="*"> <File Id="filEtwdump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\etwdump.exe" /> </Component> @@ -521,7 +513,7 @@ <!-- Sshdump --> <Fragment> - <DirectoryRef Id="dirExtcap"> + <DirectoryRef Id="dirExtcapWireshark"> <Component Id="cmpSshdump_exe" Guid="*"> <File Id="filSshdump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\sshdump.exe" /> </Component> @@ -541,7 +533,7 @@ <!-- Ciscodump --> <Fragment> - <DirectoryRef Id="dirExtcap"> + <DirectoryRef Id="dirExtcapWireshark"> <Component Id="cmpCiscodump_exe" Guid="*"> <File Id="filCiscodump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\Ciscodump.exe" /> </Component> @@ -561,7 +553,7 @@ <!-- Wifidump --> <Fragment> - <DirectoryRef Id="dirExtcap"> + <DirectoryRef Id="dirExtcapWireshark"> <Component Id="cmpWifidump_exe" Guid="*"> <File Id="filWifidump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\wifidump.exe" /> </Component> @@ -581,7 +573,7 @@ <!-- Udpdump --> <Fragment> - <DirectoryRef Id="dirExtcap"> + <DirectoryRef Id="dirExtcapWireshark"> <Component Id="cmpUdpdump_exe" Guid="*"> <File Id="filUdpdump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\Udpdump.exe" /> </Component> @@ -599,13 +591,13 @@ </ComponentGroup> </Fragment> - <?ifdef DOCBOOK_DIR?> + <?ifdef DOC_DIR?> <!-- User Guide is created by heat --> <!-- FAQ --> <Fragment> <DirectoryRef Id="INSTALLFOLDER"> <Component Id="cmpFAQ_html" Guid="*"> - <File Id="filFAQ_html" KeyPath="yes" Source="$(var.DOCBOOK_DIR)\faq.html" /> + <File Id="filFAQ_html" KeyPath="yes" Source="$(var.DOC_DIR)\faq.html" /> </Component> </DirectoryRef> </Fragment> @@ -702,6 +694,15 @@ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="cap" Type="integer" Value="1" KeyPath="yes"/> <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> </Component> + <Component Id="cmpFAems"> + <ProgId Id="$(var.WiresharkFileAssociation)" Description="ems"> + <Extension Id="ems"> + <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument=""%1""/> + </Extension> + </ProgId> + <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="ems" Type="integer" Value="1" KeyPath="yes"/> + <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> + </Component> <Component Id="cmpFAenc"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="enc"> <Extension Id="enc"> @@ -819,6 +820,15 @@ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="rf5" Type="integer" Value="1" KeyPath="yes"/> <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> </Component> + <Component Id="cmpFAscap"> + <ProgId Id="$(var.WiresharkFileAssociation)" Description="scap"> + <Extension Id="scap"> + <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument=""%1""/> + </Extension> + </ProgId> + <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="scap" Type="integer" Value="1" KeyPath="yes"/> + <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> + </Component> <Component Id="cmpFAsnoop"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="snoop"> <Extension Id="snoop"> |