[msitools: 10/13] wxi: add libpsl
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools: 10/13] wxi: add libpsl
- Date: Tue, 12 Nov 2019 16:19:04 +0000 (UTC)
commit 89f45c3a876b380f75d0d67797b0f234e6ff88f5
Author: Marc-André Lureau <marcandre lureau redhat com>
Date: Tue Nov 12 18:54:05 2019 +0400
wxi: add libpsl
Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>
data/Makefile.am | 1 +
data/wixl/libpsl.wxi | 27 +++++++++++++++++++++++++++
data/wixl/libsoup.wxi | 2 ++
3 files changed, 30 insertions(+)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 4655921..6780b2f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -55,6 +55,7 @@ dist_wxi_DATA = \
wixl/libjpeg-turbo.wxi \
wixl/libogg.wxi \
wixl/libpng.wxi \
+ wixl/libpsl.wxi \
wixl/libtheora.wxi \
wixl/libsoup.wxi \
wixl/libssh2.wxi \
diff --git a/data/wixl/libpsl.wxi b/data/wixl/libpsl.wxi
new file mode 100644
index 0000000..3856af9
--- /dev/null
+++ b/data/wixl/libpsl.wxi
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <DirectoryRef Id="INSTALLDIR">
+ <Directory Id="dir2D3098FFD34FC5EF4517BBB41996F5BA" Name="bin">
+ <Component Win64="$(var.Win64)" Id="cmp623D47B2027F21474F47C1C4704368D4" Guid="*">
+ <File Id="fil8042056BEA1D99C64675288045616E47" KeyPath="yes"
Source="$(var.SourceDir)/bin/libpsl-5.dll"/>
+ </Component>
+ <Component Win64="$(var.Win64)" Id="cmp9D2AA8985E0A8850F26F59982EBA3778" Guid="*">
+ <File Id="fil4FF7104C50C8ADD542487D78E33ACE77" KeyPath="yes"
Source="$(var.SourceDir)/bin/psl-make-dafsa"/>
+ </Component>
+ <Component Win64="$(var.Win64)" Id="cmpADBFD4F1CA5279BDCC1E889FA67D7A9D" Guid="*">
+ <File Id="fil9E9A7A96731B296133D0CB3C634687C8" KeyPath="yes"
Source="$(var.SourceDir)/bin/psl.exe"/>
+ </Component>
+ </Directory>
+ </DirectoryRef>
+ </Fragment>
+ <Fragment>
+ <ComponentGroup Id="CG.libpsl">
+ <ComponentRef Id="cmp623D47B2027F21474F47C1C4704368D4"/>
+ <ComponentRef Id="cmp9D2AA8985E0A8850F26F59982EBA3778"/>
+ <ComponentRef Id="cmpADBFD4F1CA5279BDCC1E889FA67D7A9D"/>
+ </ComponentGroup>
+ </Fragment>
+</Include>
+<!-- generated with msitools 0.99 -->
+<!-- wixl-heat -var var.SourceDir -p /usr/i686-w64-mingw32/sys-root/mingw/ -component-group CG.libpsl
-directory-ref INSTALLDIR -win64 -->
diff --git a/data/wixl/libsoup.wxi b/data/wixl/libsoup.wxi
index 5bd37f8..0ebea8f 100644
--- a/data/wixl/libsoup.wxi
+++ b/data/wixl/libsoup.wxi
@@ -4,6 +4,7 @@
<?require sqlite.wxi?>
<?require libxml2.wxi?>
<?require brotli.wxi?>
+<?require libpsl.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -392,6 +393,7 @@
<ComponentGroupRef Id="CG.sqlite"/>
<ComponentGroupRef Id="CG.libxml2"/>
<ComponentGroupRef Id="CG.brotli"/>
+ <ComponentGroupRef Id="CG.libpsl"/>
<ComponentRef Id="cmpE0095401FA3CB98EFD660E75EDDFE4A1"/>
<ComponentRef Id="cmp8C10D6766D440291BEE1790C27EF3688"/>
<ComponentRef Id="cmpCA3786BF3ADEC21C1C3A237A948F2236"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]