From f1285fcf061669702ca1accd7b2c50ebc8198993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Fri, 27 Sep 2019 23:03:13 +0100
Subject: CMake: Don't install HTML manuals twice
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

HTML docs are installed to both $docdir and $pkgdatadir. Fix that
to install to $docdir only.

Change-Id: I115158585b6df9170d9a01249adbc8548df91f14
Reviewed-on: https://code.wireshark.org/review/34640
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
---
 packaging/wix/ComponentGroups.wxi | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'packaging/wix')

diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 5468978bfd..70e87b32fb 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)\wireshark.html" />
+          <File Id="filWireshark_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\wireshark.html" />
         </Component>
         <Component Id="cmpWireshark_filter_html" Guid="*">
-          <File Id="filWireshark_filter_html" KeyPath="yes" Source="$(var.Staging.Dir)\wireshark-filter.html" />
+          <File Id="filWireshark_filter_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\dumpcap.html" />
+          <File Id="filDumpcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\dumpcap.html" />
         </Component>
         <Component Id="cmpExtcap_html" Guid="*">
-          <File Id="filExtcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\extcap.html" />
+          <File Id="filExtcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\tshark.html" />
+                <File Id="filTShark_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\editcap.html" />
+              <File Id="filEditcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\text2pcap.html" />
+        <File Id="filText2pcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\mergecap.html" />
+        <File Id="filMergecap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\reordercap.html" />
+        <File Id="filReordercap_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\dftest.html" />
+        <File Id="filDFTest_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\capinfos.html" />
+        <File Id="filCapinfos_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\rawshark.html" />
+        <File Id="filRawshark_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\randpkt.html" />
+        <File Id="filRandpkt_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\mmdbresolve.html" />
+        <File Id="filMmdbresolve_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\androiddump.html" />
+        <File Id="filAndroiddump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\randpktdump.html" />
+        <File Id="filRandpktdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\sshdump.html" />
+        <File Id="filSshdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\Ciscodump.html" />
+        <File Id="filCiscodump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\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)\Udpdump.html" />
+        <File Id="filUdpdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\doc\Udpdump.html" />
       </Component>
     </DirectoryRef>
   </Fragment>
-- 
cgit v1.2.3