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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Oct 13 07:25:08 2014
New Revision: 6680

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6680&view=rev
Log:
IDP-469 More bugfixing.  Set idp.home to *exactly* the correct string.  Put the icon in place for 64 bit installs.  Cleanup the Apache stop port.  Also tested to upgrade from 3.0.0.0 to3.0.0.1

Added:
    trunk/idp-installer/src/main/wix/scripts/shib_set_java_idp_home.vbs
Modified:
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/IdP.sln
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
    trunk/idp-installer/src/main/wix/procrun.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=6680&r1=6679&r2=6680&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Mon Oct 13 07:25:08 2014
@@ -132,16 +132,17 @@
 "%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-main.wxs -dmsitype=x86
+"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-registry.wxs ShibbolethIdP-main.wxs -dmsitype=x86
 
-"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-registry.wxs ShibbolethIdP-gui.wxs ShibbolethIdP-install-dlg.wxs ShibbolethIdP-update-dlg.wxs
+"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-gui.wxs ShibbolethIdP-install-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-update-dlg.wixobj -ext WixUtilExtension.dll -sice:ICE61
 if ERRORLEVEL 1 goto done
 
-del  ShibbolethIdP-main.wixobj
-"%WIX%/BIN/CANDLE" -nologo -arch x64 -dProjectDir=. ShibbolethIdP-main.wxs -dmsitype=x64
+del ShibbolethIdP-main.wixobj
+del ShibbolethIdP-registry.wixobj
+"%WIX%/BIN/CANDLE" -nologo -arch x64 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs -dmsitype=x64
 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-update-dlg.wixobj -ext WixUtilExtension.dll -sice:ICE61

Modified: trunk/idp-installer/src/main/wix/IdP.sln
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.sln?rev=6680&r1=6679&r2=6680&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.sln (original)
+++ trunk/idp-installer/src/main/wix/IdP.sln Mon Oct 13 07:25:08 2014
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "IdP", "IdP.wixproj", "{160BBB2F-0656-4132-9428-8FE5DC417E08}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -13,6 +13,7 @@
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{604AB912-549C-4613-A987-E0146AE7BB68}"
 	ProjectSection(SolutionItems) = preProject
 		scripts\shib_random.vbs = scripts\shib_random.vbs
+		scripts\shib_set_java_idp_home.vbs = scripts\shib_set_java_idp_home.vbs
 		scripts\shib_write_configs.vbs = scripts\shib_write_configs.vbs
 	EndProjectSection
 EndProject

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs?rev=6680&r1=6679&r2=6680&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Mon Oct 13 07:25:08 2014
@@ -19,7 +19,7 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Shibboleth IdP" Language="1033" Version="3.0.0.1" Manufacturer="Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+  <Product Id="*" Name="Shibboleth IdP" Language="1033" Version="3.0.0.0" Manufacturer="Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
     <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP" Manufacturer="Shibboleth Consortium"/>
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes"
@@ -48,25 +48,25 @@

[... 234 lines stripped ...]