[java-identity-provider] 03/03: IDP-2107 Misc V5 Installer tasks
Rod Widdowson
rdw at steadingsoftware.com
Tue Aug 1 15:12:11 UTC 2023
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=989f271c547bf80bfaf86b85fc73b88f314e1b34
commit 989f271c547bf80bfaf86b85fc73b88f314e1b34
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 1 16:03:13 2023 +0100
IDP-2107 Misc V5 Installer tasks
https://shibboleth.atlassian.net/browse/IDP-2107
Windows Installer:
Change specific location warning into a generic one about
setting up ACLs on the installation location
---
idp-installer/src/main/wix/IdP.bat | 4 ++--
idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs | 6 +-----
idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs | 7 ++-----
...olethIdP-warndir-dlg.wxs => ShibbolethIdP-warn-dlg.wxs} | 14 +++++++-------
4 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/idp-installer/src/main/wix/IdP.bat b/idp-installer/src/main/wix/IdP.bat
index 61b453201..a904c66cc 100644
--- a/idp-installer/src/main/wix/IdP.bat
+++ b/idp-installer/src/main/wix/IdP.bat
@@ -94,13 +94,13 @@ 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-gui.wxs ShibbolethIdP-install-dlg.wxs ShibbolethIdP-warndir-dlg.wxs ShibbolethIdP-adconfig-dlg.wxs ShibbolethIdP-update-dlg.wxs
+"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-gui.wxs ShibbolethIdP-install-dlg.wxs ShibbolethIdP-warn-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 -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
+"%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-warn-dlg.wixobj ShibbolethIdP-delete.wixobj -ext WixUtilExtension -sice:ICE61
if ERRORLEVEL 1 goto done
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
index c8f89a642..529f903a8 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
@@ -53,9 +53,6 @@
<Control Id="ADDescriptionLine5" Type="Text" X="25" Y="151" Height="18" Width="150" Text="Password" />
<Control Id="ADPASS" Type="Edit" X="185" Y="151" Height="18" Width="150" Password="yes" Sunken="no" Property="AD_PASS" Text="[AD_PASS]" />
-
-
-
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
@@ -63,8 +60,7 @@
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="NewDialog" Value="WarnDirDlgShib">NOT (INSTALL_JETTY OR (INSTALLDIR=DefaultInstallDir))</Publish>
- <Publish Event="NewDialog" Value="VerifyReadyDlg">INSTALL_JETTY OR (INSTALLDIR=DefaultInstallDir)</Publish>
+ <Publish Event="NewDialog" Value="WarnDlgShib">1</Publish>
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
index 7b568160f..77253aa3a 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
@@ -61,11 +61,8 @@
<Publish Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]">1</Publish>
<Publish Event="DoAction" Value="WixUIValidatePath">NOT WIXUI_DONTVALIDATEPATH</Publish>
<Publish Event="SpawnDialog" Value="InvalidDirDlg">NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"</Publish>
- <Publish Event="NewDialog" Value="VerifyReadyDlg">
- (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE" AND (INSTALLDIR=DefaultInstallDir)
- </Publish>
- <Publish Event="NewDialog" Value="WarnDirDlgShib">
- (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE" AND NOT (INSTALLDIR=DefaultInstallDir)
+ <Publish Event="NewDialog" Value="WarnDlgShib">
+ (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE"
</Publish>
<Publish Event="NewDialog" Value="ConfigADDlg">
(WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD="TRUE"
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-warndir-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-warn-dlg.wxs
similarity index 75%
rename from idp-installer/src/main/wix/ShibbolethIdP-warndir-dlg.wxs
rename to idp-installer/src/main/wix/ShibbolethIdP-warn-dlg.wxs
index 62848eac0..444dc55be 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-warndir-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-warn-dlg.wxs
@@ -16,17 +16,19 @@
<Fragment>
<UI>
- <Dialog Id="WarnDirDlgShib" Width="370" Height="270" Title="[ProductName] Update">
+ <Dialog Id="WarnDlgShib" Width="370" Height="270" Title="[ProductName] Installation">
<!-- Stuff at the top: picture, some text, a line -->
<Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
- <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Update Shibboleth" Transparent="yes" />
- <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="Update to [ProductName]" Transparent="yes" />
+ <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Install Shibboleth" Transparent="yes" />
+ <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="Dont forget to set file permissions" Transparent="yes" />
<Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
<!-- Where we are installing -->
<Control Id="Warn" Type="Bitmap" X="25" Y="51" Height="32" Width="32" Text="WixUI_Ico_Exclam" />
- <Control Id="Warn2" Type="Text" X="73" Y="51" Height="12" Width="270" Text="Installation not to standard location ([DefaultInstallDir])" />
- <Control Id="Warn3" Type="Text" X="73" Y="67" Height="12" Width="270" Text="Set the property 'idp.home' in your container to be [INSTALLDIR]" />
+ <Control Id="Warn2" Type="Text" X="73" Y="51" Height="12" Width="270" Text="NOTE That unless you will be installing Jetty with the" />
+ <Control Id="Warn3" Type="Text" X="73" Y="64" Height="12" Width="270" Text="Shibboleth project installer you should set appropriate permissions." />
+ <Control Id="Warn4" Type="Text" X="73" Y="90" Height="12" Width="270" Text="See the Documentation for details." />
+ <Control Id="Warn5" Type="Text" X="73" Y="106" Height="12" Width="270" Text="The 'setacl' batch file provides an example." />
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
@@ -36,8 +38,6 @@
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="AddLocal" Value="InstallJetty">INSTALL_JETTY</Publish>
- <Publish Event="Remove" Value="InstallJetty">Not INSTALL_JETTY</Publish>
<Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
</Control>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list