[cpp-xmltooling COMMIT] /branches/REL_1/msbuild/Versions.props

noreply at shibboleth.net noreply at shibboleth.net
Mon Oct 22 11:49:54 EDT 2012


Author: rdw
Date: Mon Oct 22 11:49:54 2012
New Revision: 1003

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=1003&view=rev
Log:
Modify the Versions property sheet so that the merge modules can be compiled from the IDE.  This mostly conists of adding fileName and components macros.  These still have to be changed in lockstep, but can now be done in one place.

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

Modified:
    branches/REL_1/msbuild/Versions.props

Modified: branches/REL_1/msbuild/Versions.props
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/msbuild/Versions.props?rev=1003&r1=1002&r2=1003&view=diff
==============================================================================
--- branches/REL_1/msbuild/Versions.props (original)
+++ branches/REL_1/msbuild/Versions.props Mon Oct 22 11:49:54 2012
@@ -2,15 +2,97 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="VersionMacros">
     <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
-    <ApacheRoot>C:\</ApacheRoot>
-    <openssl>openssl-1.0.1c</openssl>
-    <curl>curl-7.26.0</curl>
-    <xerces Condition="'$(Platform)'=='x64'">xerces-c-3.1.1-x86_64-windows-vc-10.0</xerces>
-    <xerces Condition="'$(Platform)'=='win32'">xerces-c-3.1.1-x86-windows-vc-10.0</xerces>
-    <xmlsec>xml-security-c-1.7.0</xmlsec>
+    <ApacheRoot>E:\</ApacheRoot>
+
+    <CurlVersion>7.26.0</CurlVersion>
+    <curl>curl-$(CurlVersion)</curl>
+
     <boost>boost_1_50_0</boost>
-    <log4shib>log4shib-1.0.5</log4shib>
-    <zlib>zlib-1.2.7</zlib>
-    <fcgi>fcgi-2.4.0-VC10</fcgi>
+    <Log4ShibVersion>1.0.5</Log4ShibVersion>
+    <Log4ShibFileVersion>1_0</Log4ShibFileVersion>
+    <!-- Change the 4 components below if the Log4ShibFileVersion name changes -->
+    <Log4ShibComponent32>{2FDE8ED0-774A-4F44-88D5-C7089350D895}</Log4ShibComponent32>
+    <Log4ShibComponent32d>{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}</Log4ShibComponent32d>
+    <Log4ShibComponent64>{DA7E5213-363E-4E13-B05D-90905BE9FB94}</Log4ShibComponent64>
+    <Log4ShibComponent64d>{792E6762-70FE-418A-9336-39DDF1A6BAE7}</Log4ShibComponent64d>
+    <log4shib>log4shib-$(LogForShibVersion)</log4shib>
+
+    <OpenSAMLVersion>2.5.0</OpenSAMLVersion>
+    <OpenSAMLFileVersion>2_5</OpenSAMLFileVersion>
+    <!-- Change the 4 components below if the OpenSAMLFileVersion name changes -->
+    <SamlComponent32>{B52F8C71-2042-4CDF-A250-BD773985A2AB}</SamlComponent32>
+    <SamlComponent32d>{7B934257-5F7F-428E-930E-A793A11573D7}</SamlComponent32d>
+    <SamlComponent64>{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}</SamlComponent64>
+    <SamlComponent64d>{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}</SamlComponent64d>
+
+    <XmlToolingVersion>1.5.1</XmlToolingVersion>
+    <XmlToolingFileVersion>1_5</XmlToolingFileVersion>
+    <!-- Change the 8 components below if the OpenSAMLFileVersion name changes -->
+    <XMLToolingComponent32>{53533A59-A563-439D-B13D-A4D7090C42D3}</XMLToolingComponent32>
+    <XMLToolingLiteComponent32>{5045A722-D6D6-4E55-9196-CB7C50B4446F}</XMLToolingLiteComponent32>
+    <XMLToolingComponent32d>{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}</XMLToolingComponent32d>
+    <XMLToolingLiteComponent32d>{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}</XMLToolingLiteComponent32d>
+    <XMLToolingComponent64>{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}</XMLToolingComponent64>
+    <XMLToolingLiteComponent64>{060F61B9-36E9-4F33-9B5B-C59A43709052}</XMLToolingLiteComponent64>
+    <XMLToolingComponent64d>{C380627F-9D45-4626-A249-3831FC7C83FC}</XMLToolingComponent64d>
+    <XMLToolingLiteComponent64d>{2786A98E-763C-41A1-A6D5-363DB22F17E9}</XMLToolingLiteComponent64d>
+
+    <OpenSSLVersion>1.0.1.3</OpenSSLVersion>
+    <OpenSSLDirVersion>1.0.1c</OpenSSLDirVersion>
+    <openssl>openssl-$(OpenSSLDirVersion)</openssl>
+    <OpenSSLFileVersion>1_0</OpenSSLFileVersion>
+    <!-- Change the 8 components below if OpenSSLFileVersion changes -->
+    <LibEay32Component>='{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}</LibEay32Component>
+    <SSlEay32Component>='{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}</SSlEay32Component>
+    <LibEay32Componentd>='{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}</LibEay32Componentd>
+    <SSlEay32Componentd>='{A9583DF6-F075-4F43-991C-3611B31036DF}</SSlEay32Componentd>
+    <LibEay64Component>{DCB83813-11B4-469D-BD26-5DBF9815AC36}</LibEay64Component>
+    <SSlEay64Component>{EAC28C6F-C98E-454F-BFE7-076D7C0A5CF1}</SSlEay64Component>
+    <LibEay64Componentd>{D6E409C6-2F1C-42BA-8759-CF898C62C9A9}</LibEay64Componentd>
+    <SSlEay64Componentd>{8FBB6D41-0044-4969-AA27-813EF2606C7A}</SSlEay64Componentd>
+
+    <ShibbolethDllVersion>1.5.1</ShibbolethDllVersion>
+    <ShibbolethDllFileVersion>1_5</ShibbolethDllFileVersion>
+    <!-- Change the 8 components below if ShibbolethDllFileVersion changes -->
+    <ShibDll32Component>{9DE384BF-C286-4A72-AED9-AA34384005C0}</ShibDll32Component>

[... 42 lines stripped ...]


More information about the commits mailing list