[cpp-sp COMMIT] in /branches/REL_2: .gitignore msi/WiX/ShibbolethSP-main-x64.wxs msi/WiX/ShibbolethSP-main-x86.wxs

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jun 20 15:13:21 2012
New Revision: 3713

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3713&view=rev
Log:
Name and description change to installers

Modified:
    branches/REL_2/.gitignore
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs

Modified: branches/REL_2/.gitignore
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/.gitignore?rev=3713&r1=3712&r2=3713&view=diff
==============================================================================
--- branches/REL_2/.gitignore (original)
+++ branches/REL_2/.gitignore Wed Jun 20 15:13:21 2012
@@ -145,6 +145,7 @@
 /nsapi_shib/*.plg
 /nsapi_shib/Release
 /nsapi_shib/Debug
+/nsapi_shib/x64
 /nsapi_shib/*.dep
 /nsapi_shib/*.mak
 /nsapi_shib/*.aps

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs?rev=3713&r1=3712&r2=3713&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Wed Jun 20 15:13:21 2012
@@ -20,9 +20,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' 
-           Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
+           Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
-    <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
+    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Beta 1' Compressed='yes'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." 

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs?rev=3713&r1=3712&r2=3713&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs Wed Jun 20 15:13:21 2012
@@ -20,9 +20,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' 
-           Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
+           Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
-    <Package Description='Installer for Shibboleth SP (32-bit only)' Compressed='yes'
+    <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion) Beta 1' Compressed='yes'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
 
     <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."