Import Apache build roots

diff --git a/msbuild/Includes.props b/msbuild/Includes.props
index a6bbd30..41f2b2e 100644 (file)
--- a/msbuild/Includes.props
+++ b/msbuild/Includes.props
@@ -16,8 +16,23 @@
     <BuildMacro Include="CxxTestRoot">\r
       <Value>$(CxxTestRoot)</Value>\r
     </BuildMacro>\r
-    <BuildMacro Include="ApacheRoot">\r
-      <Value>$(ApacheRoot)</Value>\r
+    <BuildMacro Include="Apache13Root">\r
+      <Value>$(Apache13Root)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="Apache20Root">\r
+      <Value>$(Apache20Root)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="Apache22Root">\r
+      <Value>$(Apache22Root)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="Apache24Root">\r
+      <Value>$(Apache24Root)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="Apache22Root64">\r
+      <Value>$(Apache22Root64)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="Apache24Root64">\r
+      <Value>$(Apache24Root64)</Value>\r
     </BuildMacro>\r
     <BuildMacro Include="openssl">\r
       <Value>$(openssl)</Value>\r

diff --git a/msbuild/Versions.props b/msbuild/Versions.props
index f91a998..18fd51e 100644 (file)
--- a/msbuild/Versions.props
+++ b/msbuild/Versions.props
@@ -2,7 +2,6 @@
 <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>E:\</ApacheRoot>\r
 \r
     <ShibbolethVersion>2.5.0</ShibbolethVersion>\r
 \r
@@ -15,7 +14,8 @@
     <CurlVersion>7.26.0</CurlVersion>\r
     <curl>curl-$(CurlVersion)</curl>\r
 \r
-    <boost>boost_1_50_0</boost>\r
+    <boost>boost_1_51_0</boost>\r
+    \r
     <Log4ShibVersion>1.0.5</Log4ShibVersion>\r
     <Log4ShibFileVersion>1_0</Log4ShibFileVersion>\r
     <!-- Change the 4 components below if the Log4ShibFileVersion name changes -->\r
@@ -33,9 +33,9 @@
     <SamlComponent64>{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}</SamlComponent64>\r
     <SamlComponent64d>{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}</SamlComponent64d>\r
 \r
-    <XmlToolingVersion>1.5.1</XmlToolingVersion>\r
+    <XmlToolingVersion>1.5.2</XmlToolingVersion>\r
     <XmlToolingFileVersion>1_5</XmlToolingFileVersion>\r
-    <!-- Change the 8 components below if the OpenSAMLFileVersion name changes -->\r
+    <!-- Change the 8 components below if the XmlToolingFileVersion 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