[java-idp-jetty-base] 01/01: IDP-2147 Investigate Wix V4
Rod Widdowson
rdw at steadingsoftware.com
Mon Nov 20 11:16:40 UTC 2023
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=29f8ed9994e64e51b56ad551900a598cb33e9b98
commit 29f8ed9994e64e51b56ad551900a598cb33e9b98
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Nov 19 15:12:10 2023 +0000
IDP-2147 Investigate Wix V4
https://shibboleth.atlassian.net/browse/IDP-2147
Fix a miriad of quite horrendous bitness issues (which all start many
years ago when we had a 32 bit installer).
Make sure that we populate the .gitkeep files into the target (so that
the installer actually creates the files we want).
---
pom.xml | 3 ---
src/main/wix/Jetty-Main.wxs | 9 ++++++---
src/main/wix/Jetty-Procrun.wxs | 27 +++++++++++++++------------
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 594d9e2..fb45d09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,9 +84,6 @@
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
- <excludes>
- <exclude>**/.gitkeep</exclude>
- </excludes>
<filtering>false</filtering>
</resource>
</resources>
diff --git a/src/main/wix/Jetty-Main.wxs b/src/main/wix/Jetty-Main.wxs
index 5d37a32..ad06f49 100644
--- a/src/main/wix/Jetty-Main.wxs
+++ b/src/main/wix/Jetty-Main.wxs
@@ -40,8 +40,6 @@
<ComponentRef Id="Icon" />
</Feature>
-
-
<Component Id="Icon" Guid="{C866B1EC-63E2-4379-BAA3-4D3936AE1BEC}" Directory="IDP_INSTALLDIR" Bitness="always64">
<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[IDP_INSTALLDIR]\shib.ico,0" Type="string" />
</Component>
@@ -95,7 +93,12 @@
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="SHIBBOLETHDIR" Name="Shibboleth">
<Directory Id="JETTYROOT" Name="Jetty" />
- <Directory Id="PROCRUNROOT" Name="ProcRun" />
+ <Directory Id="PROCRUNROOT64" Name="ProcRun" />
+ </Directory>
+ </StandardDirectory>
+ <StandardDirectory Id="ProgramFilesFolder">
+ <Directory Id="SHIBBOLETHDIR32" Name="Shibboleth">
+ <Directory Id="PROCRUNROOT32" Name="ProcRun" />
</Directory>
</StandardDirectory>
<Directory Id="IDP_INSTALLDIR">
diff --git a/src/main/wix/Jetty-Procrun.wxs b/src/main/wix/Jetty-Procrun.wxs
index 7cb5282..f4bd18f 100644
--- a/src/main/wix/Jetty-Procrun.wxs
+++ b/src/main/wix/Jetty-Procrun.wxs
@@ -14,32 +14,35 @@
<?define ServiceStart="auto"?>
<?define ServiceName="shibd_idp"?>
<Fragment>
- <DirectoryRef Id="PROCRUNROOT">
+ <DirectoryRef Id="PROCRUNROOT64">
<Directory Id="dir64" Name="amd64" />
<Directory Id="procrunLogFolder" Name="log" />
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="ProcrunGroup">
- <Component Id="procrun_license" Directory="PROCRUNROOT" Guid="{03024B30-C81A-47D1-B52C-488A8786D5BF}">
+ <Component Id="procrun_license" Directory="PROCRUNROOT64" Guid="{03024B30-C81A-47D1-B52C-488A8786D5BF}">
<File Id="file_procrun_license" KeyPath="yes" Source="$(var.ProcrunSrc)\LICENSE.txt" />
</Component>
- <Component Id="procrun_notice" Directory="PROCRUNROOT" Guid="{6F141D2D-4138-40DD-85A0-FEFBF7BBE54F}">
+ <Component Id="procrun_notice" Directory="PROCRUNROOT64" Guid="{6F141D2D-4138-40DD-85A0-FEFBF7BBE54F}">
<File Id="file_procrun_notice" KeyPath="yes" Source="$(var.ProcrunSrc)\NOTICE.txt" />
</Component>
- <Component Id="procrun_mgr" Directory="PROCRUNROOT" Guid="{68387254-C37C-4F6B-A4A6-8174BA1FE9FC}">
+ <Component Id="procrun_mgr" Directory="PROCRUNROOT64" Guid="{68387254-C37C-4F6B-A4A6-8174BA1FE9FC}">
<File Id="file_procrun_mgr" KeyPath="yes" Source="$(var.ProcrunSrc)\prunmgr.exe" Name="$(var.ServiceName)w.exe" />
</Component>
- <Component Id="procrun_relnotes" Directory="PROCRUNROOT" Guid="{DBDBFF9F-D7D0-42B1-A992-87565473A1C7}">
+ <Component Id="procrun_relnotes" Directory="PROCRUNROOT64" Guid="{DBDBFF9F-D7D0-42B1-A992-87565473A1C7}">
<File Id="procrun_relnotes" KeyPath="yes" Source="$(var.ProcrunSrc)\RELEASE-NOTES.txt" />
</Component>
- <Component Id="procrun_permissions" Directory="PROCRUNROOT" Guid="{47F3846B-42DE-4B80-9F24-4F2831CF3AA9}">
- <RegistryValue Id="ProcrunPermissions" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="ProcrunPermissions" Value="TRUE" Type="string" KeyPath="yes" />
+ <Component Id="procrun_permissions32" Directory="PROCRUNROOT32" Guid="{47F3846B-42DE-4B84-9F24-4F2831CF3AA9}" Bitness="always32">
+ <RegistryValue Id="ProcrunPermissions32" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="ProcrunPermissions32" Value="TRUE" Type="string" KeyPath="yes" />
<RegistryKey ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)" Root="HKLM">
<Permission User="Administrators" GenericAll="yes" />
<Permission User="SYSTEM" GenericAll="yes" />
<Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
</RegistryKey>
+ </Component>
+ <Component Id="procrun_permissions64" Directory="PROCRUNROOT64" Guid="{47F3846B-42DE-4B81-9F24-4F2831CF3AA9}" Bitness="always64">
+ <RegistryValue Id="ProcrunPermissions64" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="ProcrunPermissions64" Value="TRUE" Type="string" KeyPath="yes" />
<CreateFolder Directory="procrunLogFolder">
<Permission User="Administrators" GenericAll="yes" />
<Permission User="SYSTEM" GenericAll="yes" />
@@ -63,7 +66,7 @@
<!-- Configure the service -->
- <Component Id="ServiceParameters" Directory="PROCRUNROOT" Guid="{EBC566D8-0B22-4625-98E8-C8506A6892B5}" KeyPath="yes" Condition="NOT Installed">
+ <Component Id="ServiceParameters" Directory="PROCRUNROOT32" Guid="{EBC566D8-0B22-4625-98E8-C8506A6892B5}" KeyPath="yes" Condition="NOT Installed" Bitness="always32">
<!-- Start component here - that way if the start fails the user will be prompted and things will continue with the service declared. -->
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SYSTEM\CurrentControlSet\services\$(var.ServiceName)\Parameters" Root="HKLM">
@@ -74,7 +77,7 @@
<ServiceControl Id="controlService" Name="$(var.ServiceName)" Stop="install" Start="install" Wait="no" />
<ServiceControl Id="controlServiceUninstall" Name="$(var.ServiceName)" Stop="uninstall" Remove="uninstall" Wait="yes" />
</Component>
- <Component Id="StartParameters" Directory="PROCRUNROOT" Guid="{E9C5155E-F44D-4A10-9CEB-5CC2D683CD8A}" KeyPath="yes">
+ <Component Id="StartParameters" Directory="PROCRUNROOT32" Guid="{E9C5155E-F44D-4A10-9CEB-5CC2D683CD8A}" KeyPath="yes" Bitness="always32">
<!-- ForceDeleteOnUninstall stops us accumulating Stop keys -->
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Start" Root="HKLM">
<RegistryValue Name="Class" Value="org.eclipse.jetty.start.Main" Type="string" />
@@ -91,7 +94,7 @@
<Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
</RegistryKey>
</Component>
- <Component Id="StopParameters" Directory="PROCRUNROOT" Guid="{F436CF79-B29E-45D7-B0D0-7181949CB9B3}" KeyPath="yes">
+ <Component Id="StopParameters" Directory="PROCRUNROOT32" Guid="{F436CF79-B29E-45D7-B0D0-7181949CB9B3}" KeyPath="yes" Bitness="always32">
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Stop" Root="HKLM">
<RegistryValue Name="Class" Value="org.eclipse.jetty.start.Main" Type="string" />
<RegistryValue Name="Mode" Value="jvm" Type="string" />
@@ -108,7 +111,7 @@
<Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
</RegistryKey>
</Component>
- <Component Id="LogParameters" Directory="PROCRUNROOT" Guid="{4D3AD97F-9646-4399-B071-93AB48A4E4C1}" KeyPath="yes">
+ <Component Id="LogParameters" Directory="PROCRUNROOT32" Guid="{4D3AD97F-9646-4399-B071-93AB48A4E4C1}" KeyPath="yes" Bitness="always32">
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Log" Root="HKLM">
<RegistryValue Name="Path" Value="[PROCRUNROOT]\log" Type="string" />
<RegistryValue Name="StdError" Value="auto" Type="string" />
@@ -118,7 +121,7 @@
<Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
</RegistryKey>
</Component>
- <Component Id="JavaParameters" Directory="PROCRUNROOT" Guid="{E7BF22CE-465C-4A77-B518-E13EEFF0A0BC}" KeyPath="yes">
+ <Component Id="JavaParameters" Directory="PROCRUNROOT32" Guid="{E7BF22CE-465C-4A77-B518-E13EEFF0A0BC}" KeyPath="yes" Bitness="always32">
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Java" Root="HKLM">
<RegistryValue Name="JavaHome" Value="[%JAVA_HOME]" Type="string" />
<RegistryValue Name="Jvm" Value="auto" Type="string" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list