[java-identity-provider] branch master updated: Stop building the 32 bit installer

[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=fd2fd6623acd0b61a4fb0642919110355b4609c4

The following commit(s) were added to refs/heads/master by this push:
       new  fd2fd66   Stop building the 32 bit installer
fd2fd66 is described below

commit fd2fd6623acd0b61a4fb0642919110355b4609c4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Feb 5 15:42:57 2020 +0000

    Stop building the 32 bit installer
---
 idp-installer/src/main/wix/IdP.bat   | 12 ------------
 idp-installer/src/main/wix/Jetty.bat | 10 ----------
 2 files changed, 22 deletions(-)

diff --git a/idp-installer/src/main/wix/IdP.bat b/idp-installer/src/main/wix/IdP.bat
index 57797cd..ac6fa1e 100644
--- a/idp-installer/src/main/wix/IdP.bat
+++ b/idp-installer/src/main/wix/IdP.bat
@@ -19,11 +19,6 @@ if not exist jetty-x64.msm (
    goto done
 )
 
-if not exist jetty-x86.msm (
-   echo RUN JETTY.BAT FIRST
-   goto done
-)
-
 REM Clear up detritus from last time
 
 if exist idp_contents.wxs (
@@ -180,16 +175,9 @@ REM Build
 "%WIX%/BIN/CANDLE" -nologo -arch x86 -didpSrc=idp-extract\%idpex% idp_contents.wxs
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-registry.wxs ShibbolethIdP-main.wxs ShibbolethIdP-delete.wxs -dmsitype=x86 -ext WixUtilExtension
-
 "%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-gui.wxs ShibbolethIdP-install-dlg.wxs ShibbolethIdP-warndir-dlg.wxs ShibbolethIdP-adconfig-dlg.wxs ShibbolethIdP-update-dlg.wxs
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/LIGHT" -nologo -out idp-x86.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
-if ERRORLEVEL 1 goto done
-
-del ShibbolethIdP-main.wixobj
-del ShibbolethIdP-registry.wixobj
 "%WIX%/BIN/CANDLE" -nologo -arch x64 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs ShibbolethIdP-delete.wxs -dmsitype=x64 -ext WixUtilExtension
 if ERRORLEVEL 1 goto done
 
diff --git a/idp-installer/src/main/wix/Jetty.bat b/idp-installer/src/main/wix/Jetty.bat
index 2ce2f54..695c592 100644
--- a/idp-installer/src/main/wix/Jetty.bat
+++ b/idp-installer/src/main/wix/Jetty.bat
@@ -129,16 +129,6 @@ if ERRORLEVEL 1 goto done
 REM TODO extract the Main-Class (via Properties) from start.jar 
 set JETTY_CLASS=org.eclipse.jetty.start.Main
 
-REM compile Jetty and procrun contents as well as the merge module for x86
-
-"%WIX%/BIN/CANDLE" -nologo -dJettySrc=jetty-extract\%Jex% -dJettyClass=%JETTY_CLASS% -dProcrunSrc=procrun-extract -dPlatform=x86 -arch x86 jetty_contents.wxs MergeModule.wxs procrun.wxs -dmsitype=x86 -ext WixFirewallExtension
-if ERRORLEVEL 1 goto done
-
-REM link for x86
-
-"%WIX%/BIN/LIGHT" -nologo -out Jetty-x86.msm jetty_contents.wixobj procrun.wixobj mergemodule.wixobj -ext WixFirewallExtension  -sw1072
-if ERRORLEVEL 1 goto done
-
 Rem tidy
 del *.wixobj *.wixpdb
 

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