From d0ec474417bfbbcd05a3f106f25e742534170f09 Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Sat, 11 Jan 2014 15:56:23 +0100
Subject: [PATCH] Fix directory reference for prov-params in MSI

---
 resources/install/build.xml                   | 17 +++++++++++++++-
 ...wxi => DefaultOverridesProps.wxi.template} | 20 +++++++++----------
 .../windows/heat-component-libsearch.xsl      | 12 +++++++++++
 3 files changed, 38 insertions(+), 11 deletions(-)
 rename resources/install/windows/{DefaultOverridesProps.wxi => DefaultOverridesProps.wxi.template} (89%)
 create mode 100644 resources/install/windows/heat-component-libsearch.xsl

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 24cfaae1a..a6e31960f 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -561,6 +561,22 @@
                 in="${windows.app.dir}/tmp/heat.wxs"
                 out="${windows.app.dir}/tmp/component-refs.wxi"
                 style="${inst.resrc}/windows/heat-component-refs.xsl" />
+        <xslt
+                in="${windows.app.dir}/tmp/heat.wxs"
+                out="${windows.app.dir}/tmp/lib-dir-id.properties"
+                style="${inst.resrc}/windows/heat-component-libsearch.xsl" />
+
+        <property file="${windows.app.dir}/tmp/lib-dir-id.properties"/>
+        <copy
+            file="${inst.resrc}/windows/DefaultOverridesProps.wxi.template"
+            tofile="${windows.app.dir}/tmp/DefaultOverridesProps.wxi">
+            <globmapper from="*.wxi.template" to="*.wxi" />
+            <filterchain>
+                <tokenfilter>
+                    <replacestring from="@@lib" to="${wix.heat.jitsi.lib.dir}" />
+                </tokenfilter>
+            </filterchain>
+        </copy>
 
         <condition property="windows.is.64" value="yes" else="no">
             <equals arg1="${windows.arch}" arg2="64" />
@@ -694,7 +710,6 @@
                 <include name="*.wxl" />
                 <include name="installer-windows.wxs" />
                 <include name="SCRegistrySpec.wxi" />
-                <include name="DefaultOverridesProps.wxi" />
                 <include name="windows_shortcut_specification.wxi" />
             </fileset>
         </copy>
diff --git a/resources/install/windows/DefaultOverridesProps.wxi b/resources/install/windows/DefaultOverridesProps.wxi.template
similarity index 89%
rename from resources/install/windows/DefaultOverridesProps.wxi
rename to resources/install/windows/DefaultOverridesProps.wxi.template
index e5461f170..222bd64b0 100644
--- a/resources/install/windows/DefaultOverridesProps.wxi
+++ b/resources/install/windows/DefaultOverridesProps.wxi.template
@@ -10,14 +10,14 @@
 		<ComponentGroup Id="ComponentGroup_DefaultOverrides">
 			<Component
 				Id="ComponentGroup_DefaultOverrides_Provisioning_Method"
-				Directory="lib"
+				Directory="@@lib"
 				Guid="A1D53A23-11C6-4886-BB34-E70B68CF8CF4"
 				Win64="$(var.Win64)">
 				<Condition><![CDATA[PROV_METHOD]]></Condition>
 				<IniFile
 					Id="DefaultOverrides_ProvisioningMethodOnly"
 					Action="addLine"
-					Directory="lib"
+					Directory="@@lib"
 					Name="jitsi-default-overrides.properties"
 					Section="#dummy"
 					Key="net.java.sip.communicator.plugin.provisioning.METHOD"
@@ -27,14 +27,14 @@
 			</Component>
 			<Component
 				Id="ComponentGroup_DefaultOverrides_Provisioning_URL"
-				Directory="lib"
+				Directory="@@lib"
 				Guid="36516208-617E-4901-B52C-E35D25FDC2C8"
 				Win64="$(var.Win64)">
 				<Condition><![CDATA[PROV_URL]]></Condition>
 				<IniFile
 					Id="DefaultOverrides_ProvisioningManualMethodForUrl"
 					Action="addLine"
-					Directory="lib"
+					Directory="@@lib"
 					Name="jitsi-default-overrides.properties"
 					Section="#dummy"
 					Key="net.java.sip.communicator.plugin.provisioning.METHOD"
@@ -43,7 +43,7 @@
 				<IniFile
 					Id="DefaultOverrides_ProvisioningUrl"
 					Action="addLine"
-					Directory="lib"
+					Directory="@@lib"
 					Name="jitsi-default-overrides.properties"
 					Section="#dummy"
 					Key="net.java.sip.communicator.plugin.provisioning.URL"
@@ -53,14 +53,14 @@
 			</Component>
 			<Component
 				Id="ComponentGroup_DefaultOverrides_MandatoryProvisioning_Method"
-				Directory="lib"
+				Directory="@@lib"
 				Guid="BCE0A574-8852-45FA-90AD-07D5CDC1ED2C"
 				Win64="$(var.Win64)">
 				<Condition><![CDATA[MPROV_METHOD]]></Condition>
 				<IniFile
 					Id="DefaultOverrides_MandatoryProvisioningMethodOnly"
 					Action="addLine"
-					Directory="lib"
+					Directory="@@lib"
 					Name="jitsi-default-overrides.properties"
 					Section="#dummy"
 					Key="*net.java.sip.communicator.plugin.provisioning.METHOD"
@@ -70,14 +70,14 @@
 			</Component>
 			<Component
 				Id="ComponentGroup_DefaultOverrides_MandatoryProvisioning_URL"
-				Directory="lib"
+				Directory="@@lib"
 				Guid="57FD10F7-324B-42B9-A3A3-F2ED97A518FC"
 				Win64="$(var.Win64)">
 				<Condition><![CDATA[MPROV_URL]]></Condition>
 				<IniFile
 					Id="DefaultOverrides_MandatoryProvisioningManualMethodForUrl"
 					Action="addLine"
-					Directory="lib"
+					Directory="@@lib"
 					Name="jitsi-default-overrides.properties"
 					Section="#dummy"
 					Key="*net.java.sip.communicator.plugin.provisioning.METHOD"
@@ -86,7 +86,7 @@
 				<IniFile
 					Id="DefaultOverrides_MandatoryProvisioningUrl"
 					Action="addLine"
-					Directory="lib"
+					Directory="@@lib"
 					Name="jitsi-default-overrides.properties"
 					Section="#dummy"
 					Key="*net.java.sip.communicator.plugin.provisioning.URL"
diff --git a/resources/install/windows/heat-component-libsearch.xsl b/resources/install/windows/heat-component-libsearch.xsl
new file mode 100644
index 000000000..a5fa0d4a9
--- /dev/null
+++ b/resources/install/windows/heat-component-libsearch.xsl
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet
+    version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns="http://schemas.microsoft.com/wix/2006/wi"
+>
+    <xsl:output method="text" version="1.0" />
+    <xsl:strip-space elements="*"/>
+    <xsl:template match="*//*[local-name()='Component' and @Id='jitsi_defaults.properties']">
+        <xsl:text>wix.heat.jitsi.lib.dir=</xsl:text><xsl:value-of select="../@Id"/>
+    </xsl:template>
+</xsl:stylesheet>