[msitools] wxi: add a bunch of missing CG.gcc

From: Marc-André Lureau <malureau src gnome org>
To: commits-list gnome org
Cc:
Subject: [msitools] wxi: add a bunch of missing CG.gcc
Date: Tue, 4 Aug 2020 19:10:03 +0000 (UTC)
commit f0c443e115960b5aee679234c76676be1ecdf073
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Tue Aug 4 22:58:56 2020 +0400

    wxi: add a bunch of missing CG.gcc

 data/wixl/brotli.wxi        | 2 ++
 data/wixl/dlfcn.wxi         | 2 ++
 data/wixl/fribidi.wxi       | 2 ++
 data/wixl/libgcrypt.wxi     | 2 ++
 data/wixl/libgpg-error.wxi  | 2 ++
 data/wixl/libjpeg-turbo.wxi | 2 ++
 data/wixl/orc.wxi           | 2 ++
 data/wixl/readline.wxi      | 2 ++
 data/wixl/win-iconv.wxi     | 2 ++
 9 files changed, 18 insertions(+)
---
diff --git a/data/wixl/brotli.wxi b/data/wixl/brotli.wxi
index ac73167..4685e9d 100644
--- a/data/wixl/brotli.wxi
+++ b/data/wixl/brotli.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
@@ -20,6 +21,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.brotli">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentRef Id="cmpB336AC899DE387A813412D5D2C2C6CB8"/>
       <ComponentRef Id="cmpE91C930EC548A1F8EFBA853B5875B9DD"/>
       <ComponentRef Id="cmp283C38D965F9EF7F304458A8495E3B4E"/>
diff --git a/data/wixl/dlfcn.wxi b/data/wixl/dlfcn.wxi
index ef5a54a..9fcfb1c 100644
--- a/data/wixl/dlfcn.wxi
+++ b/data/wixl/dlfcn.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
@@ -11,6 +12,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.dlfcn">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentRef Id="cmp06F32930767F7281F055402428C3F667"/>
     </ComponentGroup>
   </Fragment>
diff --git a/data/wixl/fribidi.wxi b/data/wixl/fribidi.wxi
index 18c057a..2c52e71 100644
--- a/data/wixl/fribidi.wxi
+++ b/data/wixl/fribidi.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
@@ -14,6 +15,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.fribidi">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentRef Id="cmpE3E9300ACC4CD8F7782E3FDD49BFE7AE"/>
       <ComponentRef Id="cmp5E61DB4379F999150CF8476802B9F2B6"/>
     </ComponentGroup>
diff --git a/data/wixl/libgcrypt.wxi b/data/wixl/libgcrypt.wxi
index bb8ceaa..d3255b2 100644
--- a/data/wixl/libgcrypt.wxi
+++ b/data/wixl/libgcrypt.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <?require libgpg-error.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
@@ -12,6 +13,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.libgcrypt">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentGroupRef Id="CG.libgpg-error"/>
       <ComponentRef Id="cmp62E6A98D1545A50FDD03A0868E255359"/>
     </ComponentGroup>
diff --git a/data/wixl/libgpg-error.wxi b/data/wixl/libgpg-error.wxi
index e1ca3d8..a37e314 100644
--- a/data/wixl/libgpg-error.wxi
+++ b/data/wixl/libgpg-error.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
@@ -85,6 +86,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.libgpg-error">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentRef Id="cmpDDAF30DD250EE6A297D2F9D2B1E5DA64"/>
       <ComponentRef Id="cmp2FF0AD4FC85CBFCF23A83045A6303C42"/>
       <ComponentRef Id="cmp515E3EA54C3696051B4011090130326E"/>
diff --git a/data/wixl/libjpeg-turbo.wxi b/data/wixl/libjpeg-turbo.wxi
index 1751ad6..2b2b9ee 100644
--- a/data/wixl/libjpeg-turbo.wxi
+++ b/data/wixl/libjpeg-turbo.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
@@ -14,6 +15,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.libjpeg-turbo">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentRef Id="cmpE626C1C6102BF568BDCB9DFDD7870ABD"/>
       <ComponentRef Id="cmp99A30A0157840A35C882406BD3246229"/>
     </ComponentGroup>
diff --git a/data/wixl/orc.wxi b/data/wixl/orc.wxi
index d0bc1b6..2005276 100644
--- a/data/wixl/orc.wxi
+++ b/data/wixl/orc.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
@@ -17,6 +18,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.orc">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentRef Id="cmpD74B99A7894F2D6E2B1F93E5D403C0BB"/>
       <ComponentRef Id="cmp612780F96E22289C46DEF09D778D1CF4"/>
       <ComponentRef Id="cmp462AA8AF641AC020455E07D6D3EE94AC"/>
diff --git a/data/wixl/readline.wxi b/data/wixl/readline.wxi
index b13aa13..c793506 100644
--- a/data/wixl/readline.wxi
+++ b/data/wixl/readline.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <?require termcap.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
@@ -15,6 +16,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.readline">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentGroupRef Id="CG.termcap"/>
       <ComponentRef Id="cmpDAF77C127888108A58D3975FEE05AB54"/>
       <ComponentRef Id="cmpE5CE7E9C7DB9DC58E77E82DF9EA14BB0"/>
diff --git a/data/wixl/win-iconv.wxi b/data/wixl/win-iconv.wxi
index bb3dce0..83085b2 100644
--- a/data/wixl/win-iconv.wxi
+++ b/data/wixl/win-iconv.wxi
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
@@ -11,6 +12,7 @@
   </Fragment>
   <Fragment>
     <ComponentGroup Id="CG.win-iconv">
+      <ComponentGroupRef Id="CG.gcc"/>
       <ComponentRef Id="cmp3807A1C7915A2A7EFF8C88382DB67C3C"/>
     </ComponentGroup>
   </Fragment>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]