Name and description change to installers

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3713 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/.gitignore b/.gitignore
index 34dfc67..ff8534a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 08b3f58..aaa9f12 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -20,9 +20,9 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' \r
-           Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
+           Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' \r
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
-    <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'\r
+    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Beta 1' Compressed='yes'\r
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
 \r
     <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." \r

diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index d3fe0cc..ba4b893 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -20,9 +20,9 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
-           Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
+           Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' \r
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
-    <Package Description='Installer for Shibboleth SP (32-bit only)' Compressed='yes'\r
+    <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion) Beta 1' Compressed='yes'\r
              Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
 \r
     <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." \r