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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Oct  8 06:37:03 2014
New Revision: 6652

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6652&view=rev
Log:
Checkpoint some Windows Installer bugfixes

Modified:
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/Jetty.bat
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    trunk/idp-installer/src/main/wix/procrun.wxs
    trunk/idp-installer/src/main/wix/scripts/shib_random.vbs
    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=6652&r1=6651&r2=6652&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Wed Oct  8 06:37:03 2014
@@ -137,14 +137,14 @@
 "%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-registry.wxs 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
+"%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
 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
+"%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
 if ERRORLEVEL 1 goto done
 
 
@@ -153,6 +153,6 @@
 REM Tidy up in the Sucessful exit case
    del *.wixobj *.wixpdb
    rd /s /q idp-extract
-
+   del idp-contents.wxs
 :done
 

Modified: trunk/idp-installer/src/main/wix/Jetty.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/Jetty.bat?rev=6652&r1=6651&r2=6652&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/Jetty.bat (original)
+++ trunk/idp-installer/src/main/wix/Jetty.bat Wed Oct  8 06:37:03 2014
@@ -156,6 +156,7 @@
    rd /q /s procrun-extract
    rd /q /s jetty-extract
    del *.wixobj *.wixpdb
+   del jetty_contents.wxs
 
 :done
 

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=6652&r1=6651&r2=6652&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Wed Oct  8 06:37:03 2014
@@ -19,10 +19,11 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Shibboleth IdP" Language="1033" Version="0.0.3.0" Manufacturer="Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+  <Product Id="*" Name="Shibboleth IdP" Language="1033" Version="3.0.0.1" 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." Schedule="afterInstallInitialize"/>
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes"
+                  Schedule="afterInstallInitialize" />
     <MediaTemplate EmbedCab="yes"/>
 
     <Condition Message="Shibboleth requires a Windows NT-based operating system.">NOT Version9X</Condition>
@@ -74,8 +75,8 @@
       <DirectorySearch Id="QiSearch" Depth="1" Path="C:\Program Files\Internet2\ShibIdP"/>
     </Property>
 
-    <Property Id="IS_V2" Secure="yes">TOSET</Property>
-    <Property Id="JETTY_PASS" Secure="yes">TOSET</Property>
+<!--    <Property Id="IS_V2" Secure="yes">TOSET</Property>
+    <Property Id="JETTY_PASS" Secure="yes">TOSET</Property> -->
 
     <Property Id="QI_INSTALLDIR64" Secure="yes">
       <DirectorySearch Id="QiSearch" Depth="1" Path="C:\Program Files (x86)\Internet2\ShibIdP"/>

[... 95 lines stripped ...]