[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: IdP.bat IdP.wixproj ShibbolethIdP-adconfig-dlg....

[noreply at shibboleth.net]

Author: rdw
Date: Mon Aug 10 12:14:38 2015
New Revision: 7669

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7669&view=rev
Log:
IDP-664 Provide assistance for Container installs

https://issues.shibboleth.net/jira/browse/IDP-664

If the installer does not select install Jetty but doesn't chose
/opt/shibboleth-idp as installation location throw up an
extra dialog with a warning telling them to setup idp.home
correctly.


Added:
    trunk/idp-installer/src/main/wix/ShibbolethIdP-warndir-dlg.wxs
Modified:
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/IdP.wixproj
    trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs

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=7669&r1=7668&r2=7669&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat	(original)
+++ trunk/idp-installer/src/main/wix/IdP.bat	Mon Aug 10 12:14:38 2015
@@ -1,4 +1,4 @@
- at Echo off
+ at echo off
 REM Generate msi
 setlocal
 
@@ -149,10 +149,10 @@
 
 "%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-adconfig-dlg.wxs ShibbolethIdP-update-dlg.wxs
+"%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-delete.wixobj -ext WixUtilExtension -sice:ICE61
+"%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
@@ -160,7 +160,7 @@
 "%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
 
-"%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-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-warndir-dlg.wixobj ShibbolethIdP-delete.wixobj -ext WixUtilExtension -sice:ICE61
 if ERRORLEVEL 1 goto done
 
 

Modified: trunk/idp-installer/src/main/wix/IdP.wixproj
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.wixproj?rev=7669&r1=7668&r2=7669&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.wixproj	(original)
+++ trunk/idp-installer/src/main/wix/IdP.wixproj	Mon Aug 10 12:14:38 2015
@@ -32,6 +32,7 @@
     <Compile Include="ShibbolethIdP-main.wxs" />
     <Compile Include="ShibbolethIdP-registry.wxs" />
     <Compile Include="ShibbolethIdP-update-dlg.wxs" />
+    <Compile Include="ShibbolethIdP-warndir-dlg.wxs" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs?rev=7669&r1=7668&r2=7669&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs	(original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs	Mon Aug 10 12:14:38 2015
@@ -67,7 +67,8 @@
                 </Control>
 
                 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
-                    <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>

[... 222 lines stripped ...]