From e65ec76e6f1982765008abfe5e18b986be1cfe38 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Mon, 31 Aug 2020 12:36:40 -0400
Subject: [PATCH] installer: update xslt filter to avoid harvesting vc redist
executable
In vc redist folder, there are two vc redist executables that can be
deployed by qt windows deploy. Update the filter so that both can be
avoided to be deployed.
Gitlab: #49
Change-Id: Ia79923dd2a7487833884812e2f5c7536cc30b24e
---
JamiInstaller/HarvestFilter.xslt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/JamiInstaller/HarvestFilter.xslt b/JamiInstaller/HarvestFilter.xslt
index b9179f476..4b78b7c76 100644
--- a/JamiInstaller/HarvestFilter.xslt
+++ b/JamiInstaller/HarvestFilter.xslt
@@ -12,7 +12,7 @@ xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
</xsl:template>
<xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, 'Jami.exe')]" use="@Id" />
- <xsl:key name="vc-service-search" match="wix:Component[contains(wix:File/@Source, 'vcredist_x64.exe')]" use="@Id" />
+ <xsl:key name="vc-service-search" match="wix:Component[contains(wix:File/@Source, 'redist') and contains(wix:File/@Source, 'vc')]" use="@Id" />
<xsl:key name="pdb-search" match="wix:Component[contains(wix:File/@Source, '.pdb')]" use="@Id" />
<xsl:key name="lib-search" match="wix:Component[contains(wix:File/@Source, 'Jami.lib')]" use="@Id" />
<xsl:key name="exp-search" match="wix:Component[contains(wix:File/@Source, 'Jami.exp')]" use="@Id" />
--
GitLab