[java-identity-provider] 01/02: IDP-1607 Remove residual x86 support
Rod Widdowson
rdw at steadingsoftware.com
Thu Feb 4 11:27:02 UTC 2021
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=cfc2b6728981c91c639045615c0ce13e42c6cdd9
commit cfc2b6728981c91c639045615c0ce13e42c6cdd9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Feb 3 17:05:01 2021 +0000
IDP-1607 Remove residual x86 support
https://issues.shibboleth.net/jira/browse/IDP-1607
---
idp-installer/src/main/wix/IdP.bat | 2 +-
idp-installer/src/main/wix/Jetty.bat | 2 +-
idp-installer/src/main/wix/MergeModule.wxs | 2 +-
idp-installer/src/main/wix/ShibbolethIdP-main.wxs | 12 +++---------
idp-installer/src/main/wix/ShibbolethIdP-registry.wxs | 7 +------
idp-installer/src/main/wix/procrun.wxs | 6 ------
6 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/idp-installer/src/main/wix/IdP.bat b/idp-installer/src/main/wix/IdP.bat
index ac6fa1e0f..a4061d41a 100644
--- a/idp-installer/src/main/wix/IdP.bat
+++ b/idp-installer/src/main/wix/IdP.bat
@@ -178,7 +178,7 @@ if ERRORLEVEL 1 goto done
"%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/CANDLE" -nologo -arch x64 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs ShibbolethIdP-delete.wxs -dmsitype=x64 -ext WixUtilExtension
+"%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
diff --git a/idp-installer/src/main/wix/Jetty.bat b/idp-installer/src/main/wix/Jetty.bat
index 695c5926e..4498f4ca8 100644
--- a/idp-installer/src/main/wix/Jetty.bat
+++ b/idp-installer/src/main/wix/Jetty.bat
@@ -134,7 +134,7 @@ del *.wixobj *.wixpdb
REM compile Jetty and procrun contents as well as the merge module for x64
-"%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=x64 -ext WixFirewallExtension
+"%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 -ext WixFirewallExtension
if ERRORLEVEL 1 goto done
REM link for x64
diff --git a/idp-installer/src/main/wix/MergeModule.wxs b/idp-installer/src/main/wix/MergeModule.wxs
index ea616fe09..3b1b674ca 100644
--- a/idp-installer/src/main/wix/MergeModule.wxs
+++ b/idp-installer/src/main/wix/MergeModule.wxs
@@ -17,7 +17,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="Jetty" Language="1033" Version="3.1.0.0">
- <Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="The Shibboleth Consortium" InstallerVersion="310" Description="Merge Module for Jetty" Comments="This module is built by the Shibboleth Consortium. Includes Jetty (from Eclipse) and Procrun (from Apache)" Platform="$(var.msitype)" />
+ <Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="The Shibboleth Consortium" InstallerVersion="310" Description="Merge Module for Jetty" Comments="This module is built by the Shibboleth Consortium. Includes Jetty (from Eclipse) and Procrun (from Apache)" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="JETTYROOT" Name="Jetty" />
<Directory Id="PROCRUNROOT" Name="ProcRun" />
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index 0a413f652..acf764948 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -20,15 +20,13 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="Shibboleth IdP V4" Language="1033" Version="4.1.0.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
- <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP V4.1.0" Manufacturer="The Shibboleth Consortium" />
+ <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="x64" Description="Shibboleth IdP V4.1.0" Manufacturer="The Shibboleth Consortium" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />
<MediaTemplate EmbedCab="yes" />
<Condition Message="Shibboleth requires a Windows NT-based operating system.">NOT Version9X</Condition>
- <?if $(var.msitype) = "x86" ?>
- <Condition Message="Do not install the 32 bit installer on a 64 bit machine.">NOT VersionNT64</Condition>
- <?endif ?>
+ <Condition
<!-- Information for the properties page of the msi -->
@@ -53,7 +51,7 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="SHIBBOLETHDIR" Name="Shibboleth">
- <Merge Id="jetty" Language="1033" SourceFile="$(var.ProjectDir)\jetty-$(var.msitype).msm" DiskId="1" />
+ <Merge Id="jetty" Language="1033" SourceFile="$(var.ProjectDir)\jetty-x64.msm" DiskId="1" />
<Directory Id="INSTALLDIR" Name="IdP">
<Directory Id="CredsFolder" Name="credentials" />
<Directory Id="ConfFolder" Name="conf" />
@@ -127,11 +125,7 @@
<CustomAction Id="RunJettyAnt" Directory="INSTALLDIR" ExeCommand="[QtJettyAnt]" Execute="deferred" Impersonate="no" />
<CustomAction Id="QtJettyAnt" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <?if $(var.msitype) = "x86" ?>
- <CustomAction Id="SetJavaJvmMx" Property="JAVA_JVMMX" Value="#1500" />
- <?else ?>
<CustomAction Id="SetJavaJvmMx" Property="JAVA_JVMMX" Value="#2048" />
- <?endif ?>
<InstallUISequence>
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
index 00e1d8cd5..3adad3237 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
@@ -20,11 +20,6 @@
<!-- to do with the IdP Registry -->
- <?if $(var.msitype) != "x86" ?>
- <?define isWin64="yes" ?>
- <?else ?>
- <?define isWin64="no" ?>
- <?endif ?>
<?define ServiceName="shibd_idp"?>
<Fragment>
<ComponentGroup Id="SaveRegistry">
@@ -33,7 +28,7 @@
<RegistryValue Id="targetRegJetty" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallJetty" Value="[INSTALL_JETTY]" Type="string" />
</Component>
<!-- pretty icon for the "install programs" page -->
- <Component Id="shib.ico" Guid="{7F4CE60B-A27B-4E07-8DD9-19F16B008C56}" Directory="TARGETDIR" Win64="$(var.isWin64)">
+ <Component Id="shib.ico" Guid="{7F4CE60B-A27B-4E07-8DD9-19F16B008C56}" Directory="TARGETDIR" Win64="yes">
<File KeyPath="yes" Source="$(var.ProjectDir)\shib.ico" />
<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[#shib.ico],0" Type="string" />
</Component>
diff --git a/idp-installer/src/main/wix/procrun.wxs b/idp-installer/src/main/wix/procrun.wxs
index a2f502436..3a218e658 100644
--- a/idp-installer/src/main/wix/procrun.wxs
+++ b/idp-installer/src/main/wix/procrun.wxs
@@ -49,9 +49,6 @@
-->
<Component Id="procrun_32_service" Directory="PROCRUNROOT" Guid="{544A5D33-CF99-4384-A74D-79FB29DE904D}">
<File Id="file_procrun_32_service" KeyPath="yes" Source="$(var.ProcrunSrc)\prunsrv.exe" Name="$(var.ServiceName).exe" />
- <?if $(var.msitype) = "x86" ?>
- <ServiceInstall Id="Service32" Name="$(var.ServiceName)" DisplayName="Shibboleth IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="ignore" />
- <?endif ?>
</Component>
<Component Id="procrun_32_Firewall" Directory="PROCRUNROOT" Guid="{F93B8D9F-7BBA-4D79-995D-4AC20FF158E4}" KeyPath="yes">
<Condition>Not NO_FIREWALL</Condition>
@@ -61,9 +58,6 @@
<Component Id="procrun_AMD64_service" Directory="dir64" Guid="{2673BCBE-3659-4AC6-B39C-DF1EEDF72C0E}">
<Condition>VersionNT64 And Not Intel64</Condition>
<File Id="file_procrun_AMD64_service" KeyPath="yes" Source="$(var.ProcrunSrc)\amd64\prunsrv.exe" Name="$(var.ServiceName).exe" />
- <?if $(var.msitype) != "x86" ?>
- <ServiceInstall Id="ServiceX64" Name="$(var.ServiceName)" DisplayName="Shibboleth IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="ignore" />
- <?endif ?>
</Component>
<Component Id="procrun_AMD64_Firewall" Directory="dir64" Guid="{BC605FF4-0233-4332-BC90-0C2E5FEC37D2}" KeyPath="yes">
<Condition>NOT NO_FIREWALL And VersionNT64 And Not Intel64</Condition>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list