diff options
author | João Valverde <j@v6e.pt> | 2019-10-10 15:34:46 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2019-10-10 15:58:41 +0000 |
commit | 97cb389a3531269b3c86555156a2bba62ccfd8a5 (patch) | |
tree | 16a7b35a0e1a1411fcf11ff3e05af31b2e2c57ae /packaging | |
parent | 51fbc7198ef3ebd49c3c491e4a5b3ed72eec278d (diff) |
Revert "CMake: Don't install HTML manuals twice"
This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993.
NSIS package is broken with this commit.
Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6
Reviewed-on: https://code.wireshark.org/review/34758
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/nsis/wireshark.nsi | 38 | ||||
-rw-r--r-- | packaging/wix/ComponentGroups.wxi | 38 |
2 files changed, 38 insertions, 38 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 1646adf52b..1c92387735 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -497,11 +497,11 @@ File "${STAGING_DIR}\wka" File "${STAGING_DIR}\services" File "${STAGING_DIR}\pdml2html.xsl" File "${STAGING_DIR}\ws.css" -File "${STAGING_DIR}\doc\wireshark.html" -File "${STAGING_DIR}\doc\wireshark-filter.html" +File "${STAGING_DIR}\wireshark.html" +File "${STAGING_DIR}\wireshark-filter.html" File "${STAGING_DIR}\dumpcap.exe" -File "${STAGING_DIR}\doc\dumpcap.html" -File "${STAGING_DIR}\doc\extcap.html" +File "${STAGING_DIR}\dumpcap.html" +File "${STAGING_DIR}\extcap.html" File "${STAGING_DIR}\ipmap.html" ; C-runtime redistributable @@ -974,7 +974,7 @@ Section "TShark" SecTShark ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\tshark.exe" -File "${STAGING_DIR}\doc\tshark.html" +File "${STAGING_DIR}\tshark.html" SectionEnd SectionGroup "Plugins & Extensions" SecPluginsGroup @@ -1064,63 +1064,63 @@ Section "Editcap" SecEditcap ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\editcap.exe" -File "${STAGING_DIR}\doc\editcap.html" +File "${STAGING_DIR}\editcap.html" SectionEnd Section "Text2Pcap" SecText2Pcap ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\text2pcap.exe" -File "${STAGING_DIR}\doc\text2pcap.html" +File "${STAGING_DIR}\text2pcap.html" SectionEnd Section "Mergecap" SecMergecap ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\mergecap.exe" -File "${STAGING_DIR}\doc\mergecap.html" +File "${STAGING_DIR}\mergecap.html" SectionEnd Section "Reordercap" SecReordercap ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\reordercap.exe" -File "${STAGING_DIR}\doc\reordercap.html" +File "${STAGING_DIR}\reordercap.html" SectionEnd Section "DFTest" SecDFTest ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\dftest.exe" -File "${STAGING_DIR}\doc\dftest.html" +File "${STAGING_DIR}\dftest.html" SectionEnd Section "Capinfos" SecCapinfos ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\capinfos.exe" -File "${STAGING_DIR}\doc\capinfos.html" +File "${STAGING_DIR}\capinfos.html" SectionEnd Section "Rawshark" SecRawshark ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\rawshark.exe" -File "${STAGING_DIR}\doc\rawshark.html" +File "${STAGING_DIR}\rawshark.html" SectionEnd Section /o "Randpkt" SecRandpkt ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\randpkt.exe" -File "${STAGING_DIR}\doc\randpkt.html" +File "${STAGING_DIR}\randpkt.html" SectionEnd !ifdef MMDBRESOLVE_EXE Section "MMDBResolve" SecMMDBResolve ;------------------------------------------- SetOutPath $INSTDIR -File "${STAGING_DIR}\doc\mmdbresolve.html" +File "${STAGING_DIR}\mmdbresolve.html" SetOutPath $INSTDIR File "${STAGING_DIR}\mmdbresolve.exe" SectionEnd @@ -1129,7 +1129,7 @@ SectionEnd Section /o "Androiddump" SecAndroiddumpinfos ;------------------------------------------- SetOutPath $INSTDIR -File "${STAGING_DIR}\doc\androiddump.html" +File "${STAGING_DIR}\androiddump.html" SetOutPath $INSTDIR\extcap File "${STAGING_DIR}\extcap\androiddump.exe" SectionEnd @@ -1137,8 +1137,8 @@ SectionEnd Section /o "SSHdump" SecSSHdumpinfos ;------------------------------------------- SetOutPath $INSTDIR -File "${STAGING_DIR}\doc\sshdump.html" -File "${STAGING_DIR}\doc\ciscodump.html" +File "${STAGING_DIR}\sshdump.html" +File "${STAGING_DIR}\ciscodump.html" SetOutPath $INSTDIR\extcap File "${STAGING_DIR}\extcap\sshdump.exe" File "${STAGING_DIR}\extcap\ciscodump.exe" @@ -1147,7 +1147,7 @@ SectionEnd Section /o "UDPdump" SecUDPdumpinfos ;------------------------------------------- SetOutPath $INSTDIR -File "${STAGING_DIR}\doc\udpdump.html" +File "${STAGING_DIR}\udpdump.html" SetOutPath $INSTDIR\extcap File "${STAGING_DIR}\extcap\udpdump.exe" SectionEnd @@ -1155,7 +1155,7 @@ SectionEnd Section /o "Randpktdump" SecRandpktdumpinfos ;------------------------------------------- SetOutPath $INSTDIR -File "${STAGING_DIR}\doc\randpktdump.html" +File "${STAGING_DIR}\randpktdump.html" SetOutPath $INSTDIR\extcap File "${STAGING_DIR}\extcap\randpktdump.exe" SectionEnd diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 70e87b32fb..5468978bfd 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -58,19 +58,19 @@ <File Id="filWs_css" KeyPath="yes" Source="$(var.Staging.Dir)\ws.css" /> </Component> <Component Id="cmpWireshark_html" Guid="*"> - <File Id="filWireshark_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\wireshark.html" /> + <File Id="filWireshark_html" KeyPath="yes" Source="$(var.Staging.Dir)\wireshark.html" /> </Component> <Component Id="cmpWireshark_filter_html" Guid="*"> - <File Id="filWireshark_filter_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\wireshark-filter.html" /> + <File Id="filWireshark_filter_html" KeyPath="yes" Source="$(var.Staging.Dir)\wireshark-filter.html" /> </Component> <Component Id="cmpDumpcap_exe" Guid="*"> <File Id="filDumpcap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\dumpcap.exe" /> </Component> <Component Id="cmpDumpcap_html" Guid="*"> - <File Id="filDumpcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\dumpcap.html" /> + <File Id="filDumpcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\dumpcap.html" /> </Component> <Component Id="cmpExtcap_html" Guid="*"> - <File Id="filExtcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\extcap.html" /> + <File Id="filExtcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\extcap.html" /> </Component> <Component Id="cmpIpmap_html" Guid="*"> <File Id="filIpmap_html" KeyPath="yes" Source="$(var.Staging.Dir)\ipmap.html" /> @@ -228,7 +228,7 @@ <File Id="filTShark_exe" KeyPath="yes" Source="$(var.Staging.Dir)\tshark.exe" /> </Component> <Component Id="cmpTShark_html" Guid="*"> - <File Id="filTShark_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\tshark.html" /> + <File Id="filTShark_html" KeyPath="yes" Source="$(var.Staging.Dir)\tshark.html" /> </Component> </DirectoryRef> </Fragment> @@ -274,7 +274,7 @@ <File Id="filEditcap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\editcap.exe" /> </Component> <Component Id="cmpEditcap_html" Guid="*"> - <File Id="filEditcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\editcap.html" /> + <File Id="filEditcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\editcap.html" /> </Component> </DirectoryRef> </Fragment> @@ -292,7 +292,7 @@ <File Id="filText2pcap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\text2pcap.exe" /> </Component> <Component Id="cmpText2pcap_html" Guid="*"> - <File Id="filText2pcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\text2pcap.html" /> + <File Id="filText2pcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\text2pcap.html" /> </Component> </DirectoryRef> </Fragment> @@ -310,7 +310,7 @@ <File Id="filMergecap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\mergecap.exe" /> </Component> <Component Id="cmpMergecap_html" Guid="*"> - <File Id="filMergecap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\mergecap.html" /> + <File Id="filMergecap_html" KeyPath="yes" Source="$(var.Staging.Dir)\mergecap.html" /> </Component> </DirectoryRef> </Fragment> @@ -328,7 +328,7 @@ <File Id="filReordercap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\reordercap.exe" /> </Component> <Component Id="cmpReordercap_html" Guid="*"> - <File Id="filReordercap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\reordercap.html" /> + <File Id="filReordercap_html" KeyPath="yes" Source="$(var.Staging.Dir)\reordercap.html" /> </Component> </DirectoryRef> </Fragment> @@ -346,7 +346,7 @@ <File Id="filDFTest_exe" KeyPath="yes" Source="$(var.Staging.Dir)\dftest.exe" /> </Component> <Component Id="cmpDFTest_html" Guid="*"> - <File Id="filDFTest_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\dftest.html" /> + <File Id="filDFTest_html" KeyPath="yes" Source="$(var.Staging.Dir)\dftest.html" /> </Component> </DirectoryRef> </Fragment> @@ -364,7 +364,7 @@ <File Id="filCapinfos_exe" KeyPath="yes" Source="$(var.Staging.Dir)\capinfos.exe" /> </Component> <Component Id="cmpCapinfos_html" Guid="*"> - <File Id="filCapinfos_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\capinfos.html" /> + <File Id="filCapinfos_html" KeyPath="yes" Source="$(var.Staging.Dir)\capinfos.html" /> </Component> </DirectoryRef> </Fragment> @@ -382,7 +382,7 @@ <File Id="filRawshark_exe" KeyPath="yes" Source="$(var.Staging.Dir)\rawshark.exe" /> </Component> <Component Id="cmpRawshark_html" Guid="*"> - <File Id="filRawshark_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\rawshark.html" /> + <File Id="filRawshark_html" KeyPath="yes" Source="$(var.Staging.Dir)\rawshark.html" /> </Component> </DirectoryRef> </Fragment> @@ -400,7 +400,7 @@ <File Id="filRandpkt_exe" KeyPath="yes" Source="$(var.Staging.Dir)\randpkt.exe" /> </Component> <Component Id="cmpRandpkt_html" Guid="*"> - <File Id="filRandpkt_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\randpkt.html" /> + <File Id="filRandpkt_html" KeyPath="yes" Source="$(var.Staging.Dir)\randpkt.html" /> </Component> </DirectoryRef> </Fragment> @@ -419,7 +419,7 @@ <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)\doc\mmdbresolve.html" /> + <File Id="filMmdbresolve_html" KeyPath="yes" Source="$(var.Staging.Dir)\mmdbresolve.html" /> </Component> </DirectoryRef> </Fragment> @@ -440,7 +440,7 @@ </DirectoryRef> <DirectoryRef Id="INSTALLFOLDER"> <Component Id="cmpAndroiddump_html" Guid="*"> - <File Id="filAndroiddump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\androiddump.html" /> + <File Id="filAndroiddump_html" KeyPath="yes" Source="$(var.Staging.Dir)\androiddump.html" /> </Component> </DirectoryRef> </Fragment> @@ -460,7 +460,7 @@ </DirectoryRef> <DirectoryRef Id="INSTALLFOLDER"> <Component Id="cmpRandpktdump_html" Guid="*"> - <File Id="filRandpktdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\randpktdump.html" /> + <File Id="filRandpktdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\randpktdump.html" /> </Component> </DirectoryRef> </Fragment> @@ -480,7 +480,7 @@ </DirectoryRef> <DirectoryRef Id="INSTALLFOLDER"> <Component Id="cmpSshdump_html" Guid="*"> - <File Id="filSshdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\sshdump.html" /> + <File Id="filSshdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\sshdump.html" /> </Component> </DirectoryRef> </Fragment> @@ -500,7 +500,7 @@ </DirectoryRef> <DirectoryRef Id="INSTALLFOLDER"> <Component Id="cmpCiscodump_html" Guid="*"> - <File Id="filCiscodump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\Ciscodump.html" /> + <File Id="filCiscodump_html" KeyPath="yes" Source="$(var.Staging.Dir)\Ciscodump.html" /> </Component> </DirectoryRef> </Fragment> @@ -520,7 +520,7 @@ </DirectoryRef> <DirectoryRef Id="INSTALLFOLDER"> <Component Id="cmpUdpdump_html" Guid="*"> - <File Id="filUdpdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\Udpdump.html" /> + <File Id="filUdpdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\Udpdump.html" /> </Component> </DirectoryRef> </Fragment> |