[java-identity-provider] 04/04: IDP-2140 Move forward Windows Installer to V5

[Rod Widdowson]

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

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

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

commit 8a9f936486889fd4f2e59931a164360608e47780
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 11 16:48:57 2023 +0100

    IDP-2140 Move forward Windows Installer to V5
    
    https://shibboleth.atlassian.net/browse/IDP-2140
    
    Change the install of jetty base for the installer
---
 idp-installer/src/main/wix/IdP.bat                | 29 +++++++++--------------
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs |  3 ++-
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/idp-installer/src/main/wix/IdP.bat b/idp-installer/src/main/wix/IdP.bat
index 59c337d41..59124265c 100644
--- a/idp-installer/src/main/wix/IdP.bat
+++ b/idp-installer/src/main/wix/IdP.bat
@@ -121,7 +121,7 @@ if ERRORLEVEL 1 (
   goto done;
 )
 for /D %%X in (*) do set jettyBaseEx=%%X
-rename %jettyBaseEx% JettyBase
+rename %jettyBaseEx% jetty-base
 
 cd ..\idp-extract
 for /D %%X in (*) do set idpex=%%X
@@ -138,29 +138,22 @@ if exist %idpex%\embedded (
    rd /q /s %idpex%\embedded
 )
 
-copy the appropriate jetty base
-
-move ..\idp-jetty-base-extract\JettyBase %idpex%\jetty-base
-if ERRORLEVEL 1 (
-  cd ..
-  echo jetty-base directory not found?
-  goto done;
-)
-
-rem We want to call jetty-base/start.d jetty-base/start.d.dist
-
-rename  %idpex%\jetty-base\start.d start.d.dist
+cd ..\idp-jetty-base-extract\jetty-base
+rename start.d start.d.dist
 if ERRORLEVEL 1 (
   cd ..
   echo jetty-base/start.d directory not found?
   goto done;
 )
-
 rem IDP-1149 make doubley sure that we have a jetty-base\tmp dir
-mkdir %idpex%\jetty-base\tmp\
-echo "keeper" > %idpex%\jetty-base\tmp\.keep
+mkdir tmp
+echo "keeper" > tmp\.keep
 
-cd ..
+cd ..\..
+"%WIX%/BIN/HEAT" dir idp-jetty-base-extract\jetty-base -platform -gg -dr INSTALLDIR -var var.jettyBaseRoot -cg JettyBaseGroup -out jetty_base_contents.wxs -src
+if ERRORLEVEL 1 goto done
+"%WIX%/BIN/CANDLE" -nologo -arch x86 -djettyBaseRoot=idp-jetty-base-extract\jetty-base jetty_base_contents.wxs
+if ERRORLEVEL 1 goto done
 
 "%WIX%/BIN/HEAT" dir idp-extract\%idpex% -platform -gg -dr IDPDISTDIR -var var.idpSrc -cg IdPGroup -out idp_contents.wxs -srd
 if ERRORLEVEL 1 goto done
@@ -175,7 +168,7 @@ if ERRORLEVEL 1 goto done
 "%WIX%/BIN/CANDLE" -nologo -arch x64 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs ShibbolethIdP-delete.wxs -ext WixUtilExtension
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/LIGHT" -nologo -out idp-x64.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj ShibbolethIdP-warndir-dlg.wixobj ShibbolethIdP-delete.wixobj -ext WixUtilExtension -sice:ICE61
+"%WIX%/BIN/LIGHT" -nologo -out idp-x64.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj jetty_base_contents.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj ShibbolethIdP-warndir-dlg.wixobj ShibbolethIdP-delete.wixobj -ext WixUtilExtension -sice:ICE61
 if ERRORLEVEL 1 goto done
 
 
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index d3320243f..d04747546 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -40,6 +40,7 @@
                 <MergeRef Id="jetty" />
                 <ComponentRef Id="JettyPermissions" />
                 <ComponentRef Id="Shibd_idpw" />
+		<ComponentGroupRef Id="JettyBaseGroup" />
             </Feature>
             <ComponentGroupRef Id="DeleteFiles" />
             <ComponentGroupRef Id="IdPGroup" />
@@ -162,7 +163,7 @@
         <CustomAction Id="RunIdpInstall" Directory="ProgramFilesFolder" ExeCommand="[QtIdpInstall]" Execute="deferred" Impersonate="no" />
         <CustomAction Id="QtIdpInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 
-        <CustomAction Id="SetFinalizeJetty" Property="QtFinalizeJetty" Value=""[JAVA_EXECUTABLE]" -cp "[IDPDISTDIR]\bin\lib\*;[IDPDISTDIR]\dist\webapp\WEB-INF\lib\*" -Didp.home=[INSTALLDIR] net.shibboleth.idp.installer.impl.FinalizeJettyBase" />
+        <CustomAction Id="SetFinalizeJetty" Property="QtFinalizeJetty" Value=""[JAVA_EXECUTABLE]" -cp "[IDPDISTDIR]\bin\lib\*;[IDPDISTDIR]\webapp\WEB-INF\lib\*" -Didp.home="[JAVA_IDP_HOME]" net.shibboleth.idp.installer.impl.FinalizeJettyBase" />
         <CustomAction Id="RunFinalizeJetty" Directory="INSTALLDIR" ExeCommand="[QtFinalizeJetty]" Execute="deferred" Impersonate="no" />
         <CustomAction Id="QtFinalizeJetty" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 

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