[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: IdP.bat IdP.wxs

[noreply at shibboleth.net]

Author: rdw
Date: Fri Aug 22 11:57:08 2014
New Revision: 6459

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6459&view=rev
Log:
IDP-469 Install Tomcat below Shibboleth, not IdP.  This means that the user selects that directory, not IDP

Modified:
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/IdP.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=6459&r1=6458&r2=6459&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Fri Aug 22 11:57:08 2014
@@ -85,7 +85,7 @@
 cd ..
 
 for /D %%X in (idp-extract/*) do set idpex=%%X
-"%WIX%/BIN/HEAT" dir idp-extract\%idpex% -platform -gg -dr IDPROOT -var var.idpSrc -cg IdPGroup -out idp_contents.wxs
+"%WIX%/BIN/HEAT" dir idp-extract\%idpex% -platform -gg -dr IdPFolder -var var.idpSrc -cg IdPGroup -out idp_contents.wxs -srd
 if ERRORLEVEL 1 goto done
 
 

Modified: trunk/idp-installer/src/main/wix/IdP.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.wxs?rev=6459&r1=6458&r2=6459&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.wxs (original)
+++ trunk/idp-installer/src/main/wix/IdP.wxs Fri Aug 22 11:57:08 2014
@@ -14,11 +14,8 @@
 	<Directory Id='TARGETDIR' Name='SourceDir' >
 	    <Directory Id='ProgramFilesFolder' >
 		<Directory Id='ShibFolder' Name='Shibboleth' >
-		    <Directory Id='IdPFolder' Name='IdP'>
-			<Directory Id='IDPROOT' >
-			    <Merge Id="procrun" Language='1033' SourceFile='$(var.ProjectDir)\jetty.msm' DiskId='1'/>
-			</Directory>
-		    </Directory>
+		    <Merge Id="procrun" Language='1033' SourceFile='$(var.ProjectDir)\jetty.msm' DiskId='1'/>
+		    <Directory Id='IdPFolder' Name='IdP'/>
 		</Directory>
 	    </Directory>
 	</Directory>
@@ -28,7 +25,7 @@
 	<WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)\Dialog.bmp" />
 	<WixVariable Id="WixUICostingPopupOptOut" Value="1" />
 	
-	<Property Id="WIXUI_INSTALLDIR" Value="IDPROOT" />
+	<Property Id="WIXUI_INSTALLDIR" Value="ShibFolder" />
 	<UIRef Id='WixUI_InstallDir'/>
     </Product>