[java-identity-provider] 02/07: IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun

[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=0dfb77a59d2a25d0475c01832ddeb0ffbf714a7f

commit 0dfb77a59d2a25d0475c01832ddeb0ffbf714a7f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 20 10:30:21 2023 +0100

    IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
    
    https://shibboleth.atlassian.net/browse/IDP-2136
    
    Finalize Jetty and rename procrun.wxs to jetty-procrun.wxs
---
 .../src/main/wix/{procrun.wxs => Jetty-Procrun.wxs}       |  0
 idp-installer/src/main/wix/Jetty-main.wxs                 | 15 +++++++++++++++
 idp-installer/src/main/wix/JettyNew.bat                   |  8 ++++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/idp-installer/src/main/wix/procrun.wxs b/idp-installer/src/main/wix/Jetty-Procrun.wxs
similarity index 100%
rename from idp-installer/src/main/wix/procrun.wxs
rename to idp-installer/src/main/wix/Jetty-Procrun.wxs
diff --git a/idp-installer/src/main/wix/Jetty-main.wxs b/idp-installer/src/main/wix/Jetty-main.wxs
index ba687fb7c..c11e67425 100644
--- a/idp-installer/src/main/wix/Jetty-main.wxs
+++ b/idp-installer/src/main/wix/Jetty-main.wxs
@@ -48,6 +48,11 @@
 	</Feature>
 
 	<Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="CommonAppDataFolder">
+                <Directory Id="ProgramDataShib" Name="Shibboleth">
+                    <Directory Id="IDPDISTDIR" Name="IdP"/>
+                </Directory>
+            </Directory>
             <Directory Id="ProgramFilesFolder">
                 <Directory Id="SHIBBOLETHDIR" Name="Shibboleth" >
 		    <Directory Id="JETTYROOT" Name="Jetty" />
@@ -63,6 +68,16 @@
             </Directory>
         </Directory>
 
+        <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="SHIBBOLETHDIR" ExeCommand="[QtFinalizeJetty]" Execute="deferred" Impersonate="no" />
+        <CustomAction Id="QtFinalizeJetty" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+
+	<InstallExecuteSequence>
+            <Custom Action="SetFinalizeJetty" After="InstallFiles">(NOT Installed)</Custom>
+            <Custom Action="RunFinalizeJetty" After="SetFinalizeJetty">(NOT Installed) AND DEBUG_INSTALL</Custom>
+            <Custom Action="QtFinalizeJetty" After="SetFinalizeJetty">(NOT Installed)  AND (NOT DEBUG_INSTALL)</Custom>
+	</InstallExecuteSequence>
+
 	<!-- Parameters -->
 	<Property Id="ALWAYS_START_SERVICE" Value="TRUE" Secure="yes" />
 	<Property Id="JAVA_JVMMX" Secure="yes">
diff --git a/idp-installer/src/main/wix/JettyNew.bat b/idp-installer/src/main/wix/JettyNew.bat
index f288efdf4..f646f4cbd 100644
--- a/idp-installer/src/main/wix/JettyNew.bat
+++ b/idp-installer/src/main/wix/JettyNew.bat
@@ -1,4 +1,4 @@
-REM @Echo off
+ at Echo off
 REM Generate msm
 setlocal
 
@@ -185,7 +185,7 @@ del *.wixobj *.wixpdb
 :recompile
 REM compile Jetty and procrun contents as well as the main command line
 
-"%WIX%/BIN/CANDLE" -nologo -dJettySrc=jetty-extract\%Jex% -dProcrunSrc=procrun-extract -dPlatform=x86 -arch x86 jetty_contents.wxs Jetty-main.wxs procrun.wxs -ext WixFirewallExtension -ext WixUtilExtension
+"%WIX%/BIN/CANDLE" -nologo -dJettySrc=jetty-extract\%Jex% -dProcrunSrc=procrun-extract -dPlatform=x86 -arch x86 jetty_contents.wxs Jetty-main.wxs Jetty-Procrun.wxs -ext WixFirewallExtension -ext WixUtilExtension
 if ERRORLEVEL 1 goto done
 
 "%WIX%/BIN/CANDLE" -nologo -arch x86 -djettyBaseRoot=idp-jetty-base-extract\jetty-base jetty_base_contents.wxs jetty-delete.wxs -ext WixUtilExtension
@@ -194,15 +194,15 @@ if ERRORLEVEL 1 goto done
 
 REM link for x64
 
-"%WIX%/BIN/LIGHT" -nologo -out Jetty-x64.msi jetty_base_contents.wixobj jetty_contents.wixobj procrun.wixobj Jetty-main.wixobj jetty-delete.wixobj -ext WixFirewallExtension -sw1072 -ext WixUtilExtension -sice:ICE61
+"%WIX%/BIN/LIGHT" -nologo -out Jetty-x64.msi jetty_base_contents.wixobj jetty_contents.wixobj Jetty-Procrun.wixobj Jetty-main.wixobj jetty-delete.wixobj -ext WixFirewallExtension -sw1072 -ext WixUtilExtension -sice:ICE61
 if ERRORLEVEL 1 goto done
 
-goto done
 dir Jetty-*.msi
 
 REM Tidy up in the Sucessful exit case
    rd /q /s procrun-extract
    rd /q /s jetty-extract
+   rd /q /s idp-jetty-base-extract
    del *.wixobj *.wixpdb
    del jetty_contents.wxs
    del jetty_base_contents.wxs

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