[java-identity-provider] 06/07: IDP-1499 Installer: Minimal Wix change to install using new stuff

[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=349bf6333eb1260d7e5736aeeb8853fa4d136d49

commit 349bf6333eb1260d7e5736aeeb8853fa4d136d49
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Oct 18 16:46:41 2019 +0100

    IDP-1499 Installer: Minimal Wix change to install using new stuff
    
    https://issues.shibboleth.net/jira/browse/IDP-1499
---
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index d445b51..b8c3507 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -117,7 +117,7 @@
         <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]" org.apache.tools.ant.Main -e -f "[INSTALLDIR]\bin\build.xml" -Didp.property.file=idp.install.properties install-nocopy" />
+        <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" />
         <CustomAction Id="RunIdpAnt" Directory="ProgramFilesFolder" ExeCommand="[QtIdpAnt]" Execute="deferred" Impersonate="no" />
         <CustomAction Id="QtIdpAnt" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 

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