backout overeager commit of three files into R3682

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 16e3de6..d54e803 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -19,7 +19,7 @@
 <?include Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Product Id='{0F65D86B-3F47-41DC-9CEC-E20538849A6C}' Language='1033' \r
+  <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' \r
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'\r
@@ -152,7 +152,6 @@
       <ComponentRef Id='mod_shib_2464.so'/>\r
       <ComponentRef Id='odbc_store64.so'/>\r
       <ComponentRef Id='plugins64.so'/>\r
-      <ComponentRef Id='plugins_lite64.so'/>\r
       <ComponentRef Id='shibauthorizer64.exe'/>\r
       <ComponentRef Id='shibresponder64.exe'/>\r
 \r
@@ -163,7 +162,6 @@
       <ComponentRef Id='mod_shib_2464.so_debug'/>\r
       <ComponentRef Id='odbc_store64.so_debug'/>\r
       <ComponentRef Id='plugins64.so_debug'/>\r
-      <ComponentRef Id='plugins_lite64.so_debug'/>\r
       <ComponentRef Id='shibauthorizer64.exe_debug'/>\r
       <ComponentRef Id='shibresponder64.exe_debug'/>\r
 \r

diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 0148b82..d3fe0cc 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -19,7 +19,7 @@
 <?include Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Product Id='{DB1B7660-87DA-4B83-AF31-0449113298BD}' Language='1033' \r
+  <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
     <Package Description='Installer for Shibboleth SP (32-bit only)' Compressed='yes'\r

diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index 6fa2b09..238d9ba 100644 (file)
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -17,11 +17,11 @@
    permissions and limitations under the License.  -->\r
 \r
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <?define BuildDirectory='g:\downloads\shib\' ?>\r
-  <?define SPBuildDirectory='g:\downloads\shib\cvs\2.0\' ?>\r
+  <?define BuildDirectory='C:\Users\scantor\Shibboleth\' ?>\r
+  <?define SPBuildDirectory='C:\Users\scantor\Shibboleth\git\' ?>\r
   \r
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
-  <?define ShibbolethVersion='2.5.1'?>\r
+  <?define ShibbolethVersion='2.5.0'?>\r
   <!-- DO NOT CHANGE UpgradeCode -->\r
   <?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>\r
 \r
@@ -33,7 +33,7 @@
 \r
   <?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->\r
 \r
-  <?define OpenSAMLVersion='2.5.1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+  <?define OpenSAMLVersion='2.5.0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
   <?define OpenSAMLFileVersion='2_5' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->\r
 \r
   <?define OpenSSLVersion='1.0.0.9' ?><!-- 1.0.0i -->\r
@@ -47,10 +47,10 @@
   <?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->\r
   <?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
 \r
-  <?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
+  <?define XmlSecVersion='1.6.1' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
   <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
 \r
-  <?define XmlToolingVersion='1.5.1' ?>\r
+  <?define XmlToolingVersion='1.5.0' ?>\r
   <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
 \r
   <?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->\r