[msitools: 12/13] wxi: add libunistring
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools: 12/13] wxi: add libunistring
- Date: Tue, 12 Nov 2019 16:19:14 +0000 (UTC)
commit 06764ac01966eae0bcc03d5022941e9082fef870
Author: Marc-André Lureau <marcandre lureau redhat com>
Date: Tue Nov 12 19:11:03 2019 +0400
wxi: add libunistring
Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>
data/Makefile.am | 1 +
data/wixl/libpsl.wxi | 6 ++++++
data/wixl/libunistring.wxi | 23 +++++++++++++++++++++++
3 files changed, 30 insertions(+)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 6780b2f..7935163 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -61,6 +61,7 @@ dist_wxi_DATA = \
wixl/libssh2.wxi \
wixl/libtasn1.wxi \
wixl/libtiff.wxi \
+ wixl/libunistring.wxi \
wixl/libusbx.wxi \
wixl/libvirt.wxi \
wixl/libvirt-glib.wxi \
diff --git a/data/wixl/libpsl.wxi b/data/wixl/libpsl.wxi
index 3856af9..3c334ba 100644
--- a/data/wixl/libpsl.wxi
+++ b/data/wixl/libpsl.wxi
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require win-iconv.wxi?>
+<?require libidn2.wxi?>
+<?require libunistring.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -17,6 +20,9 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.libpsl">
+ <ComponentGroupRef Id="CG.win-iconv"/>
+ <ComponentGroupRef Id="CG.libidn2"/>
+ <ComponentGroupRef Id="CG.libunistring"/>
<ComponentRef Id="cmp623D47B2027F21474F47C1C4704368D4"/>
<ComponentRef Id="cmp9D2AA8985E0A8850F26F59982EBA3778"/>
<ComponentRef Id="cmpADBFD4F1CA5279BDCC1E889FA67D7A9D"/>
diff --git a/data/wixl/libunistring.wxi b/data/wixl/libunistring.wxi
new file mode 100644
index 0000000..6c17da7
--- /dev/null
+++ b/data/wixl/libunistring.wxi
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?require winpthreads.wxi?>
+<?require gcc.wxi?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <DirectoryRef Id="INSTALLDIR">
+ <Directory Id="dir43E2AE7773EAC4DAD184C275A1DB79F6" Name="bin">
+ <Component Win64="$(var.Win64)" Id="cmpEB991A29316681A5B1442B24AE868212" Guid="*">
+ <File Id="filAB6EF5A1645BFD3FFD1098831DE792F7" KeyPath="yes"
Source="$(var.SourceDir)/bin/libunistring-2.dll"/>
+ </Component>
+ </Directory>
+ </DirectoryRef>
+ </Fragment>
+ <Fragment>
+ <ComponentGroup Id="CG.libunistring">
+ <ComponentGroupRef Id="CG.winpthreads"/>
+ <ComponentGroupRef Id="CG.gcc"/>
+ <ComponentRef Id="cmpEB991A29316681A5B1442B24AE868212"/>
+ </ComponentGroup>
+ </Fragment>
+</Include>
+<!-- generated with msitools 0.99 -->
+<!-- wixl-heat -var var.SourceDir -p /usr/i686-w64-mingw32/sys-root/mingw/ -directory-ref INSTALLDIR -win64
-component-group CG.libunistring -->
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]