Modify the Versions property sheet so that the merge modules can be compiled from...

Some existing (location) macros are defined in terms of some new (version) macros.

git-svn-id: https://svn.shibboleth.net/cpp-xmltooling/branches/REL_1@1003 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/msbuild/Versions.props b/msbuild/Versions.props
index 6ecac6b..a612f56 100644 (file)
--- a/msbuild/Versions.props
+++ b/msbuild/Versions.props
@@ -2,15 +2,97 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup Label="VersionMacros">\r
     <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>\r
-    <ApacheRoot>C:\</ApacheRoot>\r
-    <openssl>openssl-1.0.1c</openssl>\r
-    <curl>curl-7.26.0</curl>\r
-    <xerces Condition="'$(Platform)'=='x64'">xerces-c-3.1.1-x86_64-windows-vc-10.0</xerces>\r
-    <xerces Condition="'$(Platform)'=='win32'">xerces-c-3.1.1-x86-windows-vc-10.0</xerces>\r
-    <xmlsec>xml-security-c-1.7.0</xmlsec>\r
+    <ApacheRoot>E:\</ApacheRoot>\r
+\r
+    <CurlVersion>7.26.0</CurlVersion>\r
+    <curl>curl-$(CurlVersion)</curl>\r
+\r
     <boost>boost_1_50_0</boost>\r
-    <log4shib>log4shib-1.0.5</log4shib>\r
-    <zlib>zlib-1.2.7</zlib>\r
-    <fcgi>fcgi-2.4.0-VC10</fcgi>\r
+    <Log4ShibVersion>1.0.5</Log4ShibVersion>\r
+    <Log4ShibFileVersion>1_0</Log4ShibFileVersion>\r
+    <!-- Change the 4 components below if the Log4ShibFileVersion name changes -->\r
+    <Log4ShibComponent32>{2FDE8ED0-774A-4F44-88D5-C7089350D895}</Log4ShibComponent32>\r
+    <Log4ShibComponent32d>{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}</Log4ShibComponent32d>\r
+    <Log4ShibComponent64>{DA7E5213-363E-4E13-B05D-90905BE9FB94}</Log4ShibComponent64>\r
+    <Log4ShibComponent64d>{792E6762-70FE-418A-9336-39DDF1A6BAE7}</Log4ShibComponent64d>\r
+    <log4shib>log4shib-$(LogForShibVersion)</log4shib>\r
+\r
+    <OpenSAMLVersion>2.5.0</OpenSAMLVersion>\r
+    <OpenSAMLFileVersion>2_5</OpenSAMLFileVersion>\r
+    <!-- Change the 4 components below if the OpenSAMLFileVersion name changes -->\r
+    <SamlComponent32>{B52F8C71-2042-4CDF-A250-BD773985A2AB}</SamlComponent32>\r
+    <SamlComponent32d>{7B934257-5F7F-428E-930E-A793A11573D7}</SamlComponent32d>\r
+    <SamlComponent64>{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}</SamlComponent64>\r
+    <SamlComponent64d>{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}</SamlComponent64d>\r
+\r
+    <XmlToolingVersion>1.5.1</XmlToolingVersion>\r
+    <XmlToolingFileVersion>1_5</XmlToolingFileVersion>\r
+    <!-- Change the 8 components below if the OpenSAMLFileVersion name changes -->\r
+    <XMLToolingComponent32>{53533A59-A563-439D-B13D-A4D7090C42D3}</XMLToolingComponent32>\r
+    <XMLToolingLiteComponent32>{5045A722-D6D6-4E55-9196-CB7C50B4446F}</XMLToolingLiteComponent32>\r
+    <XMLToolingComponent32d>{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}</XMLToolingComponent32d>\r
+    <XMLToolingLiteComponent32d>{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}</XMLToolingLiteComponent32d>\r
+    <XMLToolingComponent64>{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}</XMLToolingComponent64>\r
+    <XMLToolingLiteComponent64>{060F61B9-36E9-4F33-9B5B-C59A43709052}</XMLToolingLiteComponent64>\r
+    <XMLToolingComponent64d>{C380627F-9D45-4626-A249-3831FC7C83FC}</XMLToolingComponent64d>\r
+    <XMLToolingLiteComponent64d>{2786A98E-763C-41A1-A6D5-363DB22F17E9}</XMLToolingLiteComponent64d>\r
+\r
+    <OpenSSLVersion>1.0.1.3</OpenSSLVersion>\r
+    <OpenSSLDirVersion>1.0.1c</OpenSSLDirVersion>\r
+    <openssl>openssl-$(OpenSSLDirVersion)</openssl>\r
+    <OpenSSLFileVersion>1_0</OpenSSLFileVersion>\r
+    <!-- Change the 8 components below if OpenSSLFileVersion changes -->\r
+    <LibEay32Component>='{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}</LibEay32Component>\r
+    <SSlEay32Component>='{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}</SSlEay32Component>\r
+    <LibEay32Componentd>='{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}</LibEay32Componentd>\r
+    <SSlEay32Componentd>='{A9583DF6-F075-4F43-991C-3611B31036DF}</SSlEay32Componentd>\r
+    <LibEay64Component>{DCB83813-11B4-469D-BD26-5DBF9815AC36}</LibEay64Component>\r
+    <SSlEay64Component>{EAC28C6F-C98E-454F-BFE7-076D7C0A5CF1}</SSlEay64Component>\r
+    <LibEay64Componentd>{D6E409C6-2F1C-42BA-8759-CF898C62C9A9}</LibEay64Componentd>\r
+    <SSlEay64Componentd>{8FBB6D41-0044-4969-AA27-813EF2606C7A}</SSlEay64Componentd>\r
+\r
+    <ShibbolethDllVersion>1.5.1</ShibbolethDllVersion>\r
+    <ShibbolethDllFileVersion>1_5</ShibbolethDllFileVersion>\r
+    <!-- Change the 8 components below if ShibbolethDllFileVersion changes -->\r
+    <ShibDll32Component>{9DE384BF-C286-4A72-AED9-AA34384005C0}</ShibDll32Component>\r
+    <ShibDllLite32Component>{10475E33-434D-4805-B983-195092549BED}</ShibDllLite32Component>\r
+    <ShibDll32Componentd>{4196D799-1162-4D62-9F7A-1F59E90F19F1}</ShibDll32Componentd>\r
+    <ShibDllLite32Componentd>{8E070220-2992-4D45-BF98-459022CD268F}</ShibDllLite32Componentd>\r
+    <ShibDll64Component>{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}</ShibDll64Component>\r
+    <ShibDllLite64Component>{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}</ShibDllLite64Component>\r
+    <ShibDll64Componentd>{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}</ShibDll64Componentd>\r
+    <ShibDllLite64Componentd>{5EF6FF17-0510-484B-9F24-523B29EB416C}</ShibDllLite64Componentd>\r
+\r
+    <XercesVersion>3.1.1</XercesVersion>\r
+    <xerces Condition="'$(Platform)'=='x64'">xerces-c-$(XercesVersion)-x86_64-windows-vc-10.0</xerces>\r
+    <xerces Condition="'$(Platform)'=='win32'">xerces-c-$(XercesVersion)-x86-windows-vc-10.0</xerces>\r
+    <XercesFileVersion>3_1</XercesFileVersion>\r
+    <!-- Change the 4 components below if XercesFileVersion changes -->\r
+    <Xerces32Component>{64C16FA9-685C-4612-B9C2-0B56C84A69E1}</Xerces32Component>\r
+    <Xerces32Componentd>{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}</Xerces32Componentd>\r
+    <Xerces64Component>{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}</Xerces64Component>\r
+    <Xerces64Componentd>{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}</Xerces64Componentd>\r
+\r
+\r
+    <XmlSecVersion>1.7.0</XmlSecVersion>\r
+    <xmlsec>xml-security-c-$(XmlSecVersion)</xmlsec>\r
+    <XmlSecFileVersion>1_7</XmlSecFileVersion>\r
+    <!-- Change the 4 components below if XmlSecFileVersion changes -->\r
+    <XmlSec32Component>{761CE697-2701-4149-ACD5-A693EBB45B33}</XmlSec32Component>\r
+    <XmlSec32Componentd>{34D437A1-3008-433F-A86F-F69E4852069F}</XmlSec32Componentd>\r
+    <XmlSec64Component>{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}</XmlSec64Component>\r
+    <XmlSec64Componentd>{D97E1B5C-B020-4621-94CE-F10FCFF765C5}</XmlSec64Componentd>\r
+\r
+    <ZlibVersion>1.2.7</ZlibVersion>\r
+    <zlib>zlib-$(ZlibVersion)</zlib>\r
+    <ZlibFileVersion>1</ZlibFileVersion>\r
+    <Zlib32Component>{059557A8-7311-47BB-8A5F-CC85F72AE495}</Zlib32Component>\r
+    <Zlib32Componentd>{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}</Zlib32Componentd>\r
+    <Zlib64Component>{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}</Zlib64Component>\r
+    <Zlib64Componentd>{74D67C6F-655E-4E4D-A147-39F32DB6E796}</Zlib64Componentd>\r
+\r
+    <FastCGIVersion>2.4.0</FastCGIVersion>\r
+    <fcgi>fcgi-$(FastCGIVersion)-VC10</fcgi>\r
+\r
   </PropertyGroup>\r
 </Project>\r