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

[noreply at shibboleth.net]

Author: rdw
Date: Tue May 29 08:34:17 2012
New Revision: 3683

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3683&view=rev
Log:
backout overeager commit of three files into R3682

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

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=3683&r1=3682&r2=3683&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Tue May 29 08:34:17 2012
@@ -19,7 +19,7 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Id='{0F65D86B-3F47-41DC-9CEC-E20538849A6C}' Language='1033' 
+  <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
@@ -152,7 +152,6 @@
       <ComponentRef Id='mod_shib_2464.so'/>
       <ComponentRef Id='odbc_store64.so'/>
       <ComponentRef Id='plugins64.so'/>
-      <ComponentRef Id='plugins_lite64.so'/>
       <ComponentRef Id='shibauthorizer64.exe'/>
       <ComponentRef Id='shibresponder64.exe'/>
 
@@ -163,7 +162,6 @@
       <ComponentRef Id='mod_shib_2464.so_debug'/>
       <ComponentRef Id='odbc_store64.so_debug'/>
       <ComponentRef Id='plugins64.so_debug'/>
-      <ComponentRef Id='plugins_lite64.so_debug'/>
       <ComponentRef Id='shibauthorizer64.exe_debug'/>
       <ComponentRef Id='shibresponder64.exe_debug'/>
 

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=3683&r1=3682&r2=3683&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs Tue May 29 08:34:17 2012
@@ -19,7 +19,7 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Id='{DB1B7660-87DA-4B83-AF31-0449113298BD}' Language='1033' 
+  <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (32-bit only)' Compressed='yes'

Modified: branches/REL_2/msi/WiX/Versions.wxi
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Versions.wxi?rev=3683&r1=3682&r2=3683&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Versions.wxi (original)
+++ branches/REL_2/msi/WiX/Versions.wxi Tue May 29 08:34:17 2012
@@ -17,11 +17,11 @@
    permissions and limitations under the License.  -->
 
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <?define BuildDirectory='g:\downloads\shib\' ?>
-  <?define SPBuildDirectory='g:\downloads\shib\cvs\2.0\' ?>
+  <?define BuildDirectory='C:\Users\scantor\Shibboleth\' ?>
+  <?define SPBuildDirectory='C:\Users\scantor\Shibboleth\git\' ?>
   
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
-  <?define ShibbolethVersion='2.5.1'?>
+  <?define ShibbolethVersion='2.5.0'?>
   <!-- DO NOT CHANGE UpgradeCode -->
   <?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>
 
@@ -33,7 +33,7 @@
 
   <?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->
 
-  <?define OpenSAMLVersion='2.5.1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
+  <?define OpenSAMLVersion='2.5.0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
   <?define OpenSAMLFileVersion='2_5' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->
 
   <?define OpenSSLVersion='1.0.0.9' ?><!-- 1.0.0i -->
@@ -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' -->
   <?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
-  <?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
+  <?define XmlSecVersion='1.6.1' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
   <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
-  <?define XmlToolingVersion='1.5.1' ?>
+  <?define XmlToolingVersion='1.5.0' ?>

[... 4 lines stripped ...]