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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Dec 10 06:06:26 2014
New Revision: 7057

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7057&view=rev
Log:
Clean up 32/64 bit handling.  Remove Beta identification and rev the subsubversion.

Modified:
    trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs?rev=7057&r1=7056&r2=7057&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs Wed Dec 10 06:06:26 2014
@@ -121,7 +121,7 @@
         Installed AND NOT PATCH
       </Publish>
 
-      <ProgressText Action="QtIdpAnt">Performing Installation tasks (this may take some time on initial installs)</ProgressText>
+      <ProgressText Action="QtIdpAnt">Performing IdP Installation tasks; this may take some time.</ProgressText>
       <ProgressText Action="QtJettyAnt">Configuring Jetty</ProgressText>
     </UI>
   </Fragment>

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=7057&r1=7056&r2=7057&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Wed Dec 10 06:06:26 2014
@@ -19,7 +19,7 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Shibboleth IdP V3 BETA" Language="1033" Version="3.0.0.5" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+  <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.0.0.6" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
     <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP V3.0" Manufacturer="The Shibboleth Consortium"/>
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes"
@@ -27,6 +27,9 @@
     <MediaTemplate EmbedCab="yes"/>
 
     <Condition Message="Shibboleth requires a Windows NT-based operating system.">NOT Version9X</Condition>
+<?if $(var.msitype) = "x86" ?>
+    <Condition Message="Do not install the 32 bit installer on a 64 bit machine.">NOT VersionNT64</Condition>
+<?endif?>
 
     <!-- Information for the properties page of the msi -->
 
@@ -82,7 +85,7 @@
       </DirectorySearch>
     </Property>
 
-    <CustomAction Id="NoJavaBin" Error="Could not locate Java.exe please check the value for JAVA_HOME"/>
+    <CustomAction Id="NoJavaBin" Error="Could not locate Java.exe.  Please check the value for JAVA_HOME."/>
 
     <!-- Inherit the setup, if they were. -->
     <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />