[java-idp-jetty-base] branch dev/IDP-2147 updated: IDP-2147 Investigate Wix V4

[Rod Widdowson]

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

rdw pushed a commit to branch dev/IDP-2147
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=4be9d57afadc770bb64ed9d88269c3b5dc490459

The following commit(s) were added to refs/heads/dev/IDP-2147 by this push:
     new 4be9d57  IDP-2147 Investigate Wix V4
4be9d57 is described below

commit 4be9d57afadc770bb64ed9d88269c3b5dc490459
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Sep 18 13:19:20 2023 +0100

    IDP-2147 Investigate Wix V4
    
        https://shibboleth.atlassian.net/browse/IDP-2147
    
    Batch file to build the installer
---
 src/main/wix/{Jetty.bat => JettyW4.bat} | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/wix/Jetty.bat b/src/main/wix/JettyW4.bat
similarity index 76%
rename from src/main/wix/Jetty.bat
rename to src/main/wix/JettyW4.bat
index 20d64b0..93baebd 100644
--- a/src/main/wix/Jetty.bat
+++ b/src/main/wix/JettyW4.bat
@@ -1,4 +1,4 @@
- at Echo off
+rem @Echo off
 REM Generate msm
 setlocal
 
@@ -156,7 +156,8 @@ mkdir logs
 echo "keeper" > logs\.keep
 
 cd ..\..
-"%WIX%/BIN/HEAT" dir idp-jetty-base-extract\jetty-base -platform -gg -dr IDP_INSTALLDIR -var var.jettyBaseRoot -cg JettyBaseGroup -out jetty_base_contents.wxs -src
+H:\Downloads\Shib\Wix4\heat.exe dir idp-jetty-base-extract\jetty-base -platform -gg -dr IDP_INSTALLDIR -var var.jettyBaseRoot -cg JettyBaseGroup -out jetty_base_contents.wxs -src
+echo %ERRORLEVEL%
 if ERRORLEVEL 1 goto done
 
 mkdir jetty-extract
@@ -178,28 +179,17 @@ rd /s /q jetty-extract\%jex%\demo-base
 
 REM Extract Jetty
 echo %jex% 1> jetty-extract/%jex%/JETTY_VERSION.TXT
-"%WIX%/BIN/HEAT"  dir jetty-extract\%Jex% -platform -gg -dr JETTYROOT -var var.JettySrc -cg JettyGroup -out jetty_contents.wxs -nologo -srd
+H:\Downloads\Shib\Wix4\heat.exe dir jetty-extract\%Jex% -platform -gg -dr JETTYROOT -var var.JettySrc -cg JettyGroup -out jetty_contents.wxs -nologo -srd
+echo %ERRORLEVEL%
 if ERRORLEVEL 1 goto done
 
 Rem tidy
 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 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 -dProjectDir=. jetty_base_contents.wxs Jetty-User.wxs jetty-delete.wxs Jetty-Gui.wxs Jetty-InstallDlg.wxs -ext WixUtilExtension
-if ERRORLEVEL 1 goto done
-
-
-REM link for x64
-
-"%WIX%/BIN/LIGHT" -nologo -out Jetty-x64.msi jetty_base_contents.wixobj jetty_contents.wixobj Jetty-Procrun.wixobj Jetty-main.wixobj jetty-delete.wixobj Jetty-User.wixobj Jetty-Gui.wixobj Jetty-InstallDlg.wixobj -ext WixFirewallExtension -sw1072 -ext WixUtilExtension -sice:ICE61 -ext WixUIExtension
-if ERRORLEVEL 1 goto done
+wix build -d JettySrc=jetty-extract\%Jex% -d ProcrunSrc=procrun-extract -d Platform=x86 -arch x86 jetty_contents.wxs Jetty-main.wxs Jetty-Procrun.wxs -o a -ext WixToolset.Firewall.wixext -ext WixToolset.Util.wixext -ext WixToolset.UI.wixext  -d jettyBaseRoot=idp-jetty-base-extract\jetty-base -d ProjectDir=. jetty_base_contents.wxs Jetty-User.wxs jetty-delete.wxs Jetty-Gui.wxs Jetty-InstallDlg.wxs -arch x64 -o jetty.msi
 
-dir Jetty-*.msi
 
 REM Tidy up in the Sucessful exit case
    rd /q /s procrun-extract

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