Hey Ingo,
seems there is a problem when building windows 32 builds with this
one. The error is:
21:57:44 [exec]
....\jitsi\release\windows\tmp\DefaultOverridesProps.wxi(11) : error
LGHT0204 : ICE80: This 32BitComponent
ComponentGroup_DefaultOverrides_Provisioning_Method uses
64BitDirectory lib
21:57:44 [exec]
....\jitsi\release\windows\tmp\DefaultOverridesProps.wxi(27) : error
LGHT0204 : ICE80: This 32BitComponent
ComponentGroup_DefaultOverrides_Provisioning_URL uses 64BitDirectory
lib
21:57:44 [exec]
....\jitsi\release\windows\tmp\DefaultOverridesProps.wxi(52) : error
LGHT0204 : ICE80: This 32BitComponent
ComponentGroup_DefaultOverrides_MandatoryProvisioning_Method uses
64BitDirectory lib
21:57:45 [exec]
....\jitsi\release\windows\tmp\DefaultOverridesProps.wxi(68) : error
LGHT0204 : ICE80: This 32BitComponent
ComponentGroup_DefaultOverrides_MandatoryProvisioning_URL uses
64BitDirectory lib
Regards
damencho
···
On Sun, Dec 8, 2013 at 9:54 PM, <ingo@jitsi.org> wrote:
Repository : ssh://lists.jitsi.org/jitsi
On branch : master
Link : https://github.com/jitsi/jitsi/compare/77afb677645651af0f4e57f48d824baa474f8f19...62b6d94bc4a7270857ef2178d72a4ff4766296c8---------------------------------------------------------------
commit 62b6d94bc4a7270857ef2178d72a4ff4766296c8
Author: Ingo Bauersachs <ingo@jitsi.org>
Date: Sun Dec 8 20:53:19 2013 +0100MSI props [M]PROV_URL and [M]PROV_METHOD to set provisioning via params
---------------------------------------------------------------
62b6d94bc4a7270857ef2178d72a4ff4766296c8
resources/install/build.xml | 1 +
.../install/windows/DefaultOverridesProps.wxi | 95 ++++++++++++++++++++
resources/install/windows/installer-windows.wxs | 2 +
3 files changed, 98 insertions(+)diff --git a/resources/install/build.xml b/resources/install/build.xml
index 9594117..7083b42 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -690,6 +690,7 @@
<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
new file mode 100644
index 0000000..500f743
--- /dev/null
+++ b/resources/install/windows/DefaultOverridesProps.wxi
@@ -0,0 +1,95 @@
+<?xml version="1.0" ?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<!--
+ Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
+ <Fragment>
+ <ComponentGroup Id="ComponentGroup_DefaultOverrides">
+ <Component
+ Id="ComponentGroup_DefaultOverrides_Provisioning_Method"
+ Directory="lib"
+ Guid="A1D53A23-11C6-4886-BB34-E70B68CF8CF4">
+ <Condition><![CDATA[PROV_METHOD]]></Condition>
+ <IniFile
+ Id="DefaultOverrides_ProvisioningMethodOnly"
+ Action="addLine"
+ Directory="lib"
+ Name="jitsi-default-overrides.properties"
+ Section="#dummy"
+ Key="net.java.sip.communicator.plugin.provisioning.METHOD"
+ Value="[PROV_METHOD]"
+ />
+ <CreateFolder/>
+ </Component>
+ <Component
+ Id="ComponentGroup_DefaultOverrides_Provisioning_URL"
+ Directory="lib"
+ Guid="36516208-617E-4901-B52C-E35D25FDC2C8">
+ <Condition><![CDATA[PROV_URL]]></Condition>
+ <IniFile
+ Id="DefaultOverrides_ProvisioningManualMethodForUrl"
+ Action="addLine"
+ Directory="lib"
+ Name="jitsi-default-overrides.properties"
+ Section="#dummy"
+ Key="net.java.sip.communicator.plugin.provisioning.METHOD"
+ Value="Manual"
+ />
+ <IniFile
+ Id="DefaultOverrides_ProvisioningUrl"
+ Action="addLine"
+ Directory="lib"
+ Name="jitsi-default-overrides.properties"
+ Section="#dummy"
+ Key="net.java.sip.communicator.plugin.provisioning.URL"
+ Value="[PROV_URL]"
+ />
+ <CreateFolder/>
+ </Component>
+ <Component
+ Id="ComponentGroup_DefaultOverrides_MandatoryProvisioning_Method"
+ Directory="lib"
+ Guid="A1D53A23-11C6-4886-BB34-E70B68CF8CF4">
+ <Condition><![CDATA[MPROV_METHOD]]></Condition>
+ <IniFile
+ Id="DefaultOverrides_MandatoryProvisioningMethodOnly"
+ Action="addLine"
+ Directory="lib"
+ Name="jitsi-default-overrides.properties"
+ Section="#dummy"
+ Key="*net.java.sip.communicator.plugin.provisioning.METHOD"
+ Value="[MPROV_METHOD]"
+ />
+ <CreateFolder/>
+ </Component>
+ <Component
+ Id="ComponentGroup_DefaultOverrides_MandatoryProvisioning_URL"
+ Directory="lib"
+ Guid="36516208-617E-4901-B52C-E35D25FDC2C8">
+ <Condition><![CDATA[MPROV_URL]]></Condition>
+ <IniFile
+ Id="DefaultOverrides_MandatoryProvisioningManualMethodForUrl"
+ Action="addLine"
+ Directory="lib"
+ Name="jitsi-default-overrides.properties"
+ Section="#dummy"
+ Key="*net.java.sip.communicator.plugin.provisioning.METHOD"
+ Value="Manual"
+ />
+ <IniFile
+ Id="DefaultOverrides_MandatoryProvisioningUrl"
+ Action="addLine"
+ Directory="lib"
+ Name="jitsi-default-overrides.properties"
+ Section="#dummy"
+ Key="*net.java.sip.communicator.plugin.provisioning.URL"
+ Value="[MPROV_URL]"
+ />
+ <CreateFolder/>
+ </Component>
+ </ComponentGroup>
+ </Fragment>
+</Include>
diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index 95c1082..c70623d 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -132,6 +132,7 @@
<ComponentRef Id="Component_StartupShortcut" /><ComponentGroupRef Id="ComponentGroup_RegistryEntries" />
+ <ComponentGroupRef Id="ComponentGroup_DefaultOverrides" />
</Feature><!--
@@ -671,5 +672,6 @@
</Fragment><?include SCRegistrySpec.wxi ?>
+<?include DefaultOverridesProps.wxi ?></Wix>
_______________________________________________
commits mailing list
commits@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/commits
