[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: IdP.bat ShibbolethIdP-update-dlg.wxs procrun.wx...
noreply at shibboleth.net
noreply at shibboleth.net
Wed Oct 8 07:11:56 EDT 2014
Author: rdw
Date: Wed Oct 8 07:11:56 2014
New Revision: 6653
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6653&view=rev
Log:
More Windows installer bugfixes: Better tidy up after build. Generate unique passwords for each keystore, better display of upgrade values and give the correct password to ant
Modified:
trunk/idp-installer/src/main/wix/IdP.bat
trunk/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
trunk/idp-installer/src/main/wix/procrun.wxs
trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
Modified: trunk/idp-installer/src/main/wix/IdP.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.bat?rev=6653&r1=6652&r2=6653&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Wed Oct 8 07:11:56 2014
@@ -153,6 +153,6 @@
REM Tidy up in the Sucessful exit case
del *.wixobj *.wixpdb
rd /s /q idp-extract
- del idp-contents.wxs
+ del idp_contents.wxs
:done
Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs?rev=6653&r1=6652&r2=6653&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs Wed Oct 8 07:11:56 2014
@@ -31,15 +31,13 @@
<Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
<!-- Where we are installing -->
- <Control Id="DescriptionLine1" Type="Text" X="25" Y="51" Height="12" Width="320"
+ <Control Id="DescriptionLine1" Type="Text" X="25" Y="51" Height="24" Width="320"
Text="The updated files for [ProductName] will be installed to [INSTALLDIR]"/>
<!-- Jetty? -->
- <Control Id="UpdateJetty" Type="CheckBox" X="265" Y="146" Height="17" Width="80"
+ <Control Id="UpdateJetty" Type="CheckBox" X="25" Y="80" Height="17" Width="80"
CheckBoxPropertyRef="INSTALL_JETTY" CheckBoxValue="TRUE"
Text="Install Jetty">
- <Publish Event="AddLocal" Value="InstallJetty">INSTALL_JETTY = "TRUE"</Publish>
- <Publish Event="Remove" Value="InstallJetty">INSTALL_JETTY <> "TRUE"</Publish>
</Control>
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
@@ -49,7 +47,9 @@
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="NewDialog" Value="VerifyReadyDlg"/>
+ <Publish Event="AddLocal" Value="InstallJetty">INSTALL_JETTY</Publish>
+ <Publish Event="Remove" Value="InstallJetty">Not INSTALL_JETTY</Publish>
+ <Publish Event="NewDialog" Value="VerifyReadyDlg"/>
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
Modified: trunk/idp-installer/src/main/wix/procrun.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/procrun.wxs?rev=6653&r1=6652&r2=6653&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/procrun.wxs (original)
+++ trunk/idp-installer/src/main/wix/procrun.wxs Wed Oct 8 07:11:56 2014
@@ -37,7 +37,7 @@
<File Id="file_procrun_notice" KeyPath="yes" Source="$(var.ProcrunSrc)\NOTICE.txt" />
</Component>
<Component Id="procrun_mgr" Directory="PROCRUNROOT" Guid="{E24E17EE-684F-42E0-B481-1CBBC084A861}">
- <File Id="file_procrun_mgr" KeyPath="yes" Source="$(var.ProcrunSrc)\prunmgr.exe" />
+ <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="{F0B94ECE-2029-43E6-B9AE-11A6C782D7D5}">
<File Id="procrun_relnotes" KeyPath="yes" Source="$(var.ProcrunSrc)\RELEASE-NOTES.txt" />
Modified: trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs?rev=6653&r1=6652&r2=6653&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs (original)
+++ trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs Wed Oct 8 07:11:56 2014
@@ -43,7 +43,7 @@
AntFile.WriteLine "idp.host.name=" & IdpHostName
AntFile.WriteLine "idp.uri.subject.alt.name=https://" & IdpHostName & "/shibboleth/idp"
AntFile.WriteLine "idp.keystore.password=" & KeyStorePassword
[... 6 lines stripped ...]
More information about the commits
mailing list