[java-identity-provider] 01/02: IDP-1512 Fix and ICE03 warning in the windows installer build.

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b4cce32ec269575fbe846ec3b6fdb29075197b0f

commit b4cce32ec269575fbe846ec3b6fdb29075197b0f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Oct 25 13:57:24 2019 +0100

    IDP-1512 Fix and ICE03 warning in the windows installer build.
    
    https://issues.shibboleth.net/jira/browse/IDP-1512
---
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index b8c3507..7ffed0c 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -116,8 +116,10 @@
 
         <CustomAction Id="SetDefaultInstallDir" Property="DefaultInstallDir" Value="[WindowsVolume]opt\shibboleth-idp\" />
 
-        <!-- Ant actions -->
-        <CustomAction Id="SetIdpAnt" Property="QtIdpAnt" Value=""[JAVA_EXECUTABLE]" -cp "[INSTALLDIR]\bin\lib\*;[INSTALLDIR]\dist\webapp\WEB-INF\lib\*" -Didp.home="[JAVA_IDP_HOME]" -Didp.property.file=idp.install.properties -Dant.home="[JAVA_IDP_HOME]\bin" org.apache.tools.ant.Main -e -f "[INSTALLDIR]\bin\build.xml" install-nocopy" />
+        <!-- Ant actions set the command line in two parts because of ICE03 -->
+        <CustomAction Id="SetIdpAnt1" Property="QtIdpAnt1" Value=""[JAVA_EXECUTABLE]" -cp "[INSTALLDIR]\bin\lib\*;[INSTALLDIR]\dist\webapp\WEB-INF\lib\*" -Didp.home="[JAVA_IDP_HOME]""/>
+        <CustomAction Id="SetIdpAnt2" Property="QtIdpAnt2" Value="-Didp.property.file=idp.install.properties -Dant.home="[JAVA_IDP_HOME]\bin" org.apache.tools.ant.Main -e -f "[INSTALLDIR]\bin\build.xml" install-nocopy" />
+        <CustomAction Id="SetIdpAnt3" Property="QtIdpAnt" Value="[QtIdpAnt1] [QtIdpAnt2]" />
         <CustomAction Id="RunIdpAnt" Directory="ProgramFilesFolder" ExeCommand="[QtIdpAnt]" Execute="deferred" Impersonate="no" />
         <CustomAction Id="QtIdpAnt" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 
@@ -169,7 +171,7 @@
 
             <!-- Setup JAVA_IDP_HOME before we use it -->
 
-            <Custom Action="SetJavaIdpHome" Before="SetIdpAnt" />
+            <Custom Action="SetJavaIdpHome" Before="SetIdpAnt1" />
 
             <!-- Could we find JAVA.EXE ?-->
             <Custom Action="NoJavaBin" After="AppSearch">NOT JAVA_EXECUTABLE</Custom>
@@ -180,9 +182,11 @@
 
             <Custom Action="SetWriteConfigFiles" After="CostFinalize">NOT Installed</Custom>
             <Custom Action="WriteConfigFiles" After="InstallFiles">NOT Installed</Custom>
-            <Custom Action="SetIdpAnt" After="WriteConfigFiles">NOT Installed</Custom>
-            <Custom Action="RunIdpAnt" After="SetIdpAnt">(NOT Installed) AND DEBUG_INSTALL</Custom>
-            <Custom Action="QtIdpAnt" After="SetIdpAnt">(NOT Installed) AND (NOT DEBUG_INSTALL)</Custom>
+            <Custom Action="SetIdpAnt1" After="WriteConfigFiles">NOT Installed</Custom>
+            <Custom Action="SetIdpAnt2" After="SetIdpAnt1">NOT Installed</Custom>
+            <Custom Action="SetIdpAnt3" After="SetIdpAnt2">NOT Installed</Custom>
+            <Custom Action="RunIdpAnt" After="SetIdpAnt3">(NOT Installed) AND DEBUG_INSTALL</Custom>
+            <Custom Action="QtIdpAnt" After="SetIdpAnt3">(NOT Installed) AND (NOT DEBUG_INSTALL)</Custom>
             <Custom Action="SetJettyAnt" After="RunIdpAnt">(NOT Installed) AND INSTALL_JETTY</Custom>
             <Custom Action="RunJettyAnt" After="SetJettyAnt">(NOT Installed) AND INSTALL_JETTY AND DEBUG_INSTALL</Custom>
             <Custom Action="QtJettyAnt" After="SetJettyAnt">(NOT Installed) AND INSTALL_JETTY AND (NOT DEBUG_INSTALL)</Custom>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.