[msitools: 15/18] wixl: fix many missing dependencies
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools: 15/18] wixl: fix many missing dependencies
- Date: Wed, 13 Feb 2019 17:08:28 +0000 (UTC)
commit ab5a6aaa32250305f379dfbe1fd2a3d60b8539bb
Author: Daniel P. Berrangé <berrange redhat com>
Date: Wed Feb 13 12:52:49 2019 +0000
wixl: fix many missing dependencies
Many of the dll/exe files in the wxi files had dependencies
on dlls from other wxi files that were not listed as
component references. This would cause those dll/exe to
fail to load at runtime.
Signed-off-by: Daniel P. Berrangé <berrange redhat com>
data/wixl/SDL.wxi | 2 ++
data/wixl/curl.wxi | 2 ++
data/wixl/freetype.wxi | 2 ++
data/wixl/gettext.wxi | 2 ++
data/wixl/glib-networking.wxi | 4 ++++
data/wixl/gstreamer-plugins-bad-free.wxi | 2 ++
data/wixl/gstreamer-plugins-base.wxi | 2 ++
data/wixl/gstreamer.wxi | 2 ++
data/wixl/gstreamer1-plugins-bad-free.wxi | 16 ++++++++++++++++
data/wixl/gstreamer1-plugins-base.wxi | 14 ++++++++++++++
data/wixl/gstreamer1-plugins-good.wxi | 10 ++++++++++
data/wixl/jasper.wxi | 2 ++
data/wixl/json-glib.wxi | 2 ++
data/wixl/libidn2.wxi | 1 +
data/wixl/libpng.wxi | 2 ++
data/wixl/libssh2.wxi | 2 ++
data/wixl/libtasn1.wxi | 2 ++
data/wixl/libtiff.wxi | 6 ++++++
data/wixl/libusbx.wxi | 2 ++
data/wixl/libvirt-glib.wxi | 4 ++++
data/wixl/libvirt.wxi | 3 +++
data/wixl/libvorbis.wxi | 2 ++
data/wixl/nspr.wxi | 2 ++
data/wixl/opus.wxi | 2 ++
data/wixl/orc.wxi | 4 ++++
data/wixl/p11-kit.wxi | 2 ++
data/wixl/pango.wxi | 4 ++++
data/wixl/pcre.wxi | 2 ++
data/wixl/pixman.wxi | 2 ++
data/wixl/readline.wxi | 2 ++
data/wixl/sqlite.wxi | 2 ++
31 files changed, 108 insertions(+)
---
diff --git a/data/wixl/SDL.wxi b/data/wixl/SDL.wxi
index 21dc367..72c1f3c 100644
--- a/data/wixl/SDL.wxi
+++ b/data/wixl/SDL.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<?require win-iconv.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
@@ -12,6 +13,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.SDL">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentGroupRef Id="CG.win-iconv"/>
<ComponentRef Id="cmpE62B6BBD3A238B97A2947D35EA1404D3"/>
</ComponentGroup>
diff --git a/data/wixl/curl.wxi b/data/wixl/curl.wxi
index f67eb2a..7a896a1 100644
--- a/data/wixl/curl.wxi
+++ b/data/wixl/curl.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<?require libssh2.wxi?>
<?require libidn2.wxi?>
<?require zlib.wxi?>
@@ -15,6 +16,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.curl">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentGroupRef Id="CG.libssh2"/>
<ComponentGroupRef Id="CG.libidn2"/>
<ComponentGroupRef Id="CG.zlib"/>
diff --git a/data/wixl/freetype.wxi b/data/wixl/freetype.wxi
index 57860b5..b4045fb 100644
--- a/data/wixl/freetype.wxi
+++ b/data/wixl/freetype.wxi
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?require zlib.wxi?>
<?require bzip2.wxi?>
+<?require libpng.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -25,6 +26,7 @@
<ComponentGroup Id="CG.freetype">
<ComponentGroupRef Id="CG.zlib"/>
<ComponentGroupRef Id="CG.bzip2"/>
+ <ComponentGroupRef Id="CG.libpng"/>
<ComponentRef Id="cmp7DA3DC54BBE4B60593CD317C4279F7F9"/>
<ComponentRef Id="cmpF7131FB60E792D02C7BC8C64E5B69F31"/>
<ComponentRef Id="cmp8A37F66595F5F762AB4F86BE3F6A1171"/>
diff --git a/data/wixl/gettext.wxi b/data/wixl/gettext.wxi
index 371a20a..88eeacc 100644
--- a/data/wixl/gettext.wxi
+++ b/data/wixl/gettext.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<?require win-iconv.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
@@ -12,6 +13,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.gettext">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentGroupRef Id="CG.win-iconv"/>
<ComponentRef Id="cmpAB304E617DA059E0A52EC5BF43346A01"/>
</ComponentGroup>
diff --git a/data/wixl/glib-networking.wxi b/data/wixl/glib-networking.wxi
index d1874ec..6f6f904 100644
--- a/data/wixl/glib-networking.wxi
+++ b/data/wixl/glib-networking.wxi
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require glib2.wxi?>
+<?require gnutls.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -453,6 +455,8 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.glib-networking">
+ <ComponentGroupRef Id="CG.glib2"/>
+ <ComponentGroupRef Id="CG.gnutls"/>
<ComponentRef Id="cmpCD94B8BC5279DED6AA0535512CF9F77F"/>
<ComponentRef Id="cmpC43485D6DED6223ACAE9A1A77620DDEE"/>
<ComponentRef Id="cmpA4755E383A415852D4327CE43C266424"/>
diff --git a/data/wixl/gstreamer-plugins-bad-free.wxi b/data/wixl/gstreamer-plugins-bad-free.wxi
index 332a70b..73849d1 100644
--- a/data/wixl/gstreamer-plugins-bad-free.wxi
+++ b/data/wixl/gstreamer-plugins-bad-free.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gstreamer-plugins-base.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -307,6 +308,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.gstreamer-plugins-bad-free">
+ <ComponentGroupRef Id="CG.gstreamer-plugins-base"/>
<ComponentRef Id="cmp1D8B9D7E1D18E1EA7E966168D927E773"/>
<ComponentRef Id="cmpAF77634CCAF99FC3E9C83FD43FC1B33A"/>
<ComponentRef Id="cmpF725BDD5EB70C20F9ECEB165E73DB26D"/>
diff --git a/data/wixl/gstreamer-plugins-base.wxi b/data/wixl/gstreamer-plugins-base.wxi
index a73027b..e6c4575 100644
--- a/data/wixl/gstreamer-plugins-base.wxi
+++ b/data/wixl/gstreamer-plugins-base.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gstreamer.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -318,6 +319,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.gstreamer-plugins-base">
+ <ComponentGroupRef Id="CG.gstreamer"/>
<ComponentRef Id="cmp36A33AA1FB543AB9420BBD9874513FB0"/>
<ComponentRef Id="cmp4A56F2FEAA3A575F3561BD6E960B6B47"/>
<ComponentRef Id="cmp18ED35739242986000DC9D69D40BC8BC"/>
diff --git a/data/wixl/gstreamer.wxi b/data/wixl/gstreamer.wxi
index 4319a82..1b15a3d 100644
--- a/data/wixl/gstreamer.wxi
+++ b/data/wixl/gstreamer.wxi
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?require gcc.wxi?>
<?require glib2.wxi?>
+<?require libxml2.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -333,6 +334,7 @@
<ComponentGroup Id="CG.gstreamer">
<ComponentGroupRef Id="CG.gcc"/>
<ComponentGroupRef Id="CG.glib2"/>
+ <ComponentGroupRef Id="CG.libxml2"/>
<ComponentRef Id="cmpFADD48213C312FDF38DBDAC806C1C602"/>
<ComponentRef Id="cmp057BDD3A0F4E1D0B34E9B1552D91E4A7"/>
<ComponentRef Id="cmpA22A0BE92B2CD1202E3678C160441460"/>
diff --git a/data/wixl/gstreamer1-plugins-bad-free.wxi b/data/wixl/gstreamer1-plugins-bad-free.wxi
index bf355e5..bc4104c 100644
--- a/data/wixl/gstreamer1-plugins-bad-free.wxi
+++ b/data/wixl/gstreamer1-plugins-bad-free.wxi
@@ -1,4 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gstreamer1-plugins-base.wxi?>
+<?require OpenEXR.wxi?>
+<?require gcc-c++.wxi?>
+<?require libxml2.wxi?>
+<?require nettle.wxi?>
+<?require openssl.wxi?>
+<?require opus.wxi?>
+<?require gsm.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -561,6 +569,14 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.gstreamer1-plugins-bad-free">
+ <ComponentGroupRef Id="CG.gstreamer1-plugins-base"/>
+ <ComponentGroupRef Id="CG.OpenEXR"/>
+ <ComponentGroupRef Id="CG.gcc-c++"/>
+ <ComponentGroupRef Id="CG.libxml2"/>
+ <ComponentGroupRef Id="CG.nettle"/>
+ <ComponentGroupRef Id="CG.openssl"/>
+ <ComponentGroupRef Id="CG.opus"/>
+ <ComponentGroupRef Id="CG.gsm"/>
<ComponentRef Id="cmpE39DF1299C0BDC69E6FF0EDB21C2B44C"/>
<ComponentRef Id="cmp705F0A830103CB63E5311A0F5D856051"/>
<ComponentRef Id="cmpCF0950505CA3AAD329BD2CE5D1B4608A"/>
diff --git a/data/wixl/gstreamer1-plugins-base.wxi b/data/wixl/gstreamer1-plugins-base.wxi
index a39ffa2..99b0a98 100644
--- a/data/wixl/gstreamer1-plugins-base.wxi
+++ b/data/wixl/gstreamer1-plugins-base.wxi
@@ -1,4 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gstreamer1.wxi?>
+<?require cairo.wxi?>
+<?require orc.wxi?>
+<?require pango.wxi?>
+<?require libjpeg-turbo.wxi?>
+<?require libtheora.wxi?>
+<?require libvorbis.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -425,6 +432,13 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.gstreamer1-plugins-base">
+ <ComponentGroupRef Id="CG.gstreamer1"/>
+ <ComponentGroupRef Id="CG.cairo"/>
+ <ComponentGroupRef Id="CG.orc"/>
+ <ComponentGroupRef Id="CG.pango"/>
+ <ComponentGroupRef Id="CG.libtheora"/>
+ <ComponentGroupRef Id="CG.libjpeg-turbo"/>
+ <ComponentGroupRef Id="CG.libvorbis"/>
<ComponentRef Id="cmpB1B82A568DAEDDF49DEB42572093B712"/>
<ComponentRef Id="cmp5312431B22ECEBFEB23D2F1A773AA137"/>
<ComponentRef Id="cmp41BC989F8EA49BB2E49028C69193B3BB"/>
diff --git a/data/wixl/gstreamer1-plugins-good.wxi b/data/wixl/gstreamer1-plugins-good.wxi
index a68c830..b4de0cb 100644
--- a/data/wixl/gstreamer1-plugins-good.wxi
+++ b/data/wixl/gstreamer1-plugins-good.wxi
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gstreamer1-plugins-base.wxi?>
+<?require gdk-pixbuf.wxi?>
+<?require libsoup.wxi?>
+<?require speex.wxi?>
+<?require wavpack.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -470,6 +475,11 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.gstreamer1-plugins-good">
+ <ComponentGroupRef Id="CG.gstreamer1-plugins-base"/>
+ <ComponentGroupRef Id="CG.gdk-pixbuf"/>
+ <ComponentGroupRef Id="CG.libsoup"/>
+ <ComponentGroupRef Id="CG.speex"/>
+ <ComponentGroupRef Id="CG.wavpack"/>
<ComponentRef Id="cmpF8FE67B25637640E5CB8BE6D46D1C224"/>
<ComponentRef Id="cmp7D8CE0D5E00E81505331851485CA580D"/>
<ComponentRef Id="cmp6FBA8AA198BE210C228261A01654551B"/>
diff --git a/data/wixl/jasper.wxi b/data/wixl/jasper.wxi
index 2c9c391..1457183 100644
--- a/data/wixl/jasper.wxi
+++ b/data/wixl/jasper.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<?require libjpeg-turbo.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
@@ -12,6 +13,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.jasper">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentGroupRef Id="CG.libjpeg-turbo"/>
<ComponentRef Id="cmpE90E07EE9910949948EAE5A96FD6427E"/>
</ComponentGroup>
diff --git a/data/wixl/json-glib.wxi b/data/wixl/json-glib.wxi
index 065fcf7..84f6e10 100644
--- a/data/wixl/json-glib.wxi
+++ b/data/wixl/json-glib.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require glib2.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -438,6 +439,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.json-glib">
+ <ComponentGroupRef Id="CG.glib2"/>
<ComponentRef Id="cmpB22C65EB18C45EE7EEC15BB62ABF151F"/>
<ComponentRef Id="cmp7B62E6909CFDAB61D81B735937C94082"/>
<ComponentRef Id="cmp139CB05C6FB19C67B172A8BFABC18233"/>
diff --git a/data/wixl/libidn2.wxi b/data/wixl/libidn2.wxi
index c73587f..e211de6 100644
--- a/data/wixl/libidn2.wxi
+++ b/data/wixl/libidn2.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gettext.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
diff --git a/data/wixl/libpng.wxi b/data/wixl/libpng.wxi
index c014c60..4e9b9dd 100644
--- a/data/wixl/libpng.wxi
+++ b/data/wixl/libpng.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<?require zlib.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
@@ -12,6 +13,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.libpng">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentGroupRef Id="CG.zlib"/>
<ComponentRef Id="cmp71CA8B05415501F69863A36302EE1D4F"/>
</ComponentGroup>
diff --git a/data/wixl/libssh2.wxi b/data/wixl/libssh2.wxi
index efb42a7..0376151 100644
--- a/data/wixl/libssh2.wxi
+++ b/data/wixl/libssh2.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<?require openssl.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
@@ -12,6 +13,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.libssh2">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentGroupRef Id="CG.openssl"/>
<ComponentRef Id="cmpEE42CB652174B969C39CF95DFE7C4795"/>
</ComponentGroup>
diff --git a/data/wixl/libtasn1.wxi b/data/wixl/libtasn1.wxi
index 63fb26f..c019cbc 100644
--- a/data/wixl/libtasn1.wxi
+++ b/data/wixl/libtasn1.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.libtasn1">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmpA0ECA72D4779635FA3B2FDA40876FCC3"/>
</ComponentGroup>
</Fragment>
diff --git a/data/wixl/libtiff.wxi b/data/wixl/libtiff.wxi
index dcf61ba..7cad23f 100644
--- a/data/wixl/libtiff.wxi
+++ b/data/wixl/libtiff.wxi
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc-c++.wxi?>
+<?require libjpeg-turbo.wxi?>
+<?require zlib.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -14,6 +17,9 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.libtiff">
+ <ComponentGroupRef Id="CG.gcc-c++"/>
+ <ComponentGroupRef Id="CG.libjpeg-turbo"/>
+ <ComponentGroupRef Id="CG.zlib"/>
<ComponentRef Id="cmp8D382588B7F7DD3EF2B6D88927913BA5"/>
<ComponentRef Id="cmp1E73886068B760FB1A37062110040830"/>
</ComponentGroup>
diff --git a/data/wixl/libusbx.wxi b/data/wixl/libusbx.wxi
index e2f5897..ec8f4bd 100644
--- a/data/wixl/libusbx.wxi
+++ b/data/wixl/libusbx.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.libusbx">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmp599803EA845A59EB223BCE67450D325A"/>
</ComponentGroup>
</Fragment>
diff --git a/data/wixl/libvirt-glib.wxi b/data/wixl/libvirt-glib.wxi
index a8e3fa0..6398f80 100644
--- a/data/wixl/libvirt-glib.wxi
+++ b/data/wixl/libvirt-glib.wxi
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require glib2.wxi?>
+<?require libvirt.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -610,6 +612,8 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.libvirt-glib">
+ <ComponentGroupRef Id="CG.glib2"/>
+ <ComponentGroupRef Id="CG.libvirt"/>
<ComponentRef Id="cmp5FCB8F3AE3F20A298819F67E64FBF317"/>
<ComponentRef Id="cmp5C5B70DD5533CEFA333B56F9C014CB62"/>
<ComponentRef Id="cmp13CF7D74B2B78A2F705C91302D938335"/>
diff --git a/data/wixl/libvirt.wxi b/data/wixl/libvirt.wxi
index c78257e..abb3586 100644
--- a/data/wixl/libvirt.wxi
+++ b/data/wixl/libvirt.wxi
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?require gcc.wxi?>
<?require curl.wxi?>
+<?require dlfcn.wxi?>
<?require gnutls.wxi?>
<?require gettext.wxi?>
<?require portablexdr.wxi?>
@@ -559,7 +560,9 @@
<ComponentGroup Id="CG.libvirt">
<ComponentGroupRef Id="CG.gcc"/>
<ComponentGroupRef Id="CG.curl"/>
+ <ComponentGroupRef Id="CG.dlfcn"/>
<ComponentGroupRef Id="CG.gettext"/>
+ <ComponentGroupRef Id="CG.gnutls"/>
<ComponentGroupRef Id="CG.portablexdr"/>
<ComponentGroupRef Id="CG.readline"/>
<ComponentGroupRef Id="CG.libxml2"/>
diff --git a/data/wixl/libvorbis.wxi b/data/wixl/libvorbis.wxi
index f1360ac..5a595f4 100644
--- a/data/wixl/libvorbis.wxi
+++ b/data/wixl/libvorbis.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require libogg.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -17,6 +18,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.libvorbis">
+ <ComponentGroupRef Id="CG.libogg"/>
<ComponentRef Id="cmp79A4376EB016D4E6DCF0F0A3ECCB227C"/>
<ComponentRef Id="cmpDE9F467369F0967388B374FBB7855227"/>
<ComponentRef Id="cmp5AE62240861BF88A419E10060A0A41FB"/>
diff --git a/data/wixl/nspr.wxi b/data/wixl/nspr.wxi
index 3ad0757..aa5f636 100644
--- a/data/wixl/nspr.wxi
+++ b/data/wixl/nspr.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.nspr">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmp22A2DEFE509A234A8BFAF3D0B8ABD7D2"/>
<ComponentRef Id="cmp49B31C531B672BB004CB42B27F61AB03"/>
<ComponentRef Id="cmp22BFC894EE0607BA5D7505D052149CC4"/>
diff --git a/data/wixl/opus.wxi b/data/wixl/opus.wxi
index 4d113e1..ddb7a8c 100644
--- a/data/wixl/opus.wxi
+++ b/data/wixl/opus.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.opus">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmp84E64C7B172B991C514AAFD74A64D747"/>
</ComponentGroup>
</Fragment>
diff --git a/data/wixl/orc.wxi b/data/wixl/orc.wxi
index 542c7ba..d0bc1b6 100644
--- a/data/wixl/orc.wxi
+++ b/data/wixl/orc.wxi
@@ -6,6 +6,9 @@
<Component Win64="$(var.Win64)" Id="cmpD74B99A7894F2D6E2B1F93E5D403C0BB" Guid="*">
<File Id="fil3152DFC6CBD8BB05A5A806FE595675D1" KeyPath="yes"
Source="$(var.SourceDir)/bin/liborc-0.4-0.dll"/>
</Component>
+ <Component Win64="$(var.Win64)" Id="cmp612780F96E22289C46DEF09D778D1CF4" Guid="*">
+ <File Id="filC89FFEC2D5B8DD05CC54D5456D608C7B" KeyPath="yes"
Source="$(var.SourceDir)/bin/liborc-test-0.4-0.dll"/>
+ </Component>
<Component Win64="$(var.Win64)" Id="cmp462AA8AF641AC020455E07D6D3EE94AC" Guid="*">
<File Id="fil2534E81F2EE42A0A493B4169233E9CE3" KeyPath="yes"
Source="$(var.SourceDir)/bin/orc-bugreport.exe"/>
</Component>
@@ -15,6 +18,7 @@
<Fragment>
<ComponentGroup Id="CG.orc">
<ComponentRef Id="cmpD74B99A7894F2D6E2B1F93E5D403C0BB"/>
+ <ComponentRef Id="cmp612780F96E22289C46DEF09D778D1CF4"/>
<ComponentRef Id="cmp462AA8AF641AC020455E07D6D3EE94AC"/>
</ComponentGroup>
</Fragment>
diff --git a/data/wixl/p11-kit.wxi b/data/wixl/p11-kit.wxi
index 77d3d44..f2fe7ff 100644
--- a/data/wixl/p11-kit.wxi
+++ b/data/wixl/p11-kit.wxi
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?require gettext.wxi?>
+<?require libffi.wxi?>
<?require openssl.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
@@ -24,6 +25,7 @@
<Fragment>
<ComponentGroup Id="CG.p11-kit">
<ComponentGroupRef Id="CG.gettext"/>
+ <ComponentGroupRef Id="CG.libffi"/>
<ComponentGroupRef Id="CG.openssl"/>
<ComponentRef Id="cmp307E48A1EF0D19A304DE093AD0643335"/>
<ComponentRef Id="cmp6F4A6C742079260754A22831F49D9280"/>
diff --git a/data/wixl/pango.wxi b/data/wixl/pango.wxi
index 9527320..25b55cf 100644
--- a/data/wixl/pango.wxi
+++ b/data/wixl/pango.wxi
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require cairo.wxi?>
<?require freetype.wxi?>
<?require fontconfig.wxi?>
+<?require harfbuzz.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -25,8 +27,10 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.pango">
+ <ComponentGroupRef Id="CG.cairo"/>
<ComponentGroupRef Id="CG.freetype"/>
<ComponentGroupRef Id="CG.fontconfig"/>
+ <ComponentGroupRef Id="CG.harfbuzz"/>
<ComponentRef Id="cmp1FE5988884F4A6E5F9B935E26F7CA89E"/>
<ComponentRef Id="cmpB85AF8036B232EAA090D687374559306"/>
<ComponentRef Id="cmp79E5CAC364D0F87C611C24DBEC44D777"/>
diff --git a/data/wixl/pcre.wxi b/data/wixl/pcre.wxi
index 26ae70d..86a2015 100644
--- a/data/wixl/pcre.wxi
+++ b/data/wixl/pcre.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc-c++.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -26,6 +27,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.pcre">
+ <ComponentGroupRef Id="CG.gcc-c++"/>
<ComponentRef Id="cmp668040CFC18C80B20F14D55591D45E09"/>
<ComponentRef Id="cmp72BE68106F35943B29E99A283AD288F6"/>
<ComponentRef Id="cmp36BA2F946E5595ED0FFF72D90FF8FAD3"/>
diff --git a/data/wixl/pixman.wxi b/data/wixl/pixman.wxi
index a5954f4..574f81d 100644
--- a/data/wixl/pixman.wxi
+++ b/data/wixl/pixman.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.pixman">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmp2E74A346D62E4FE48906B9C60A265509"/>
</ComponentGroup>
</Fragment>
diff --git a/data/wixl/readline.wxi b/data/wixl/readline.wxi
index 16cd447..446af62 100644
--- a/data/wixl/readline.wxi
+++ b/data/wixl/readline.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require termcap.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -14,6 +15,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.readline">
+ <ComponentGroupRef Id="CG.termcap"/>
<ComponentRef Id="cmp7C7539F2ACE2AF31823E3A1B78156443"/>
<ComponentRef Id="cmpEF32E14B9685643E27AF514A96E080EB"/>
</ComponentGroup>
diff --git a/data/wixl/sqlite.wxi b/data/wixl/sqlite.wxi
index c40458a..93b3ede 100644
--- a/data/wixl/sqlite.wxi
+++ b/data/wixl/sqlite.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.sqlite">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmpB490C74629FA32C393722CA47DF0D3CB"/>
<ComponentRef Id="cmpDA4901A9813F7735DA9C843EE2352043"/>
</ComponentGroup>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
