Separate Versions and Includes properties sheets for building

diff --git a/cpp-xmltooling.sln b/cpp-xmltooling.sln
index 7b85cf3..6124a93 100644 (file)
--- a/cpp-xmltooling.sln
+++ b/cpp-xmltooling.sln
@@ -1,6 +1,6 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 2012\r
+# Visual Studio 2010\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{61BF324D-2532-49C9-93CE-DF0E89529D4F}"\r
        ProjectSection(SolutionItems) = preProject\r
                m4\acinclude.m4 = m4\acinclude.m4\r

diff --git a/msbuild/Includes.props b/msbuild/Includes.props
new file mode 100644 (file)
index 0000000..a6bbd30
--- /dev/null
+++ b/msbuild/Includes.props
@@ -0,0 +1,53 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup Label="Wibble">\r
+    <ExecutablePath>$(ExecutablePath)</ExecutablePath>\r
+    <IncludePath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>\r
+    <ReferencePath>$(ReferencePath)</ReferencePath>\r
+    <LibraryPath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\msvc10\Debug;$(BuildRoot)\$(log4shib)\msvc10\Release;$(BuildRoot)\$(xerces)\lib;$(BuildRoot)\$(xmlsec)\Build\Win32\VC10\Debug No Xalan;$(BuildRoot)\$(xmlsec)\Build\Win32\VC10\Release No Xalan;$(BuildRoot)\nsapi\lib;$(BuildRoot)\$(fcgi)\Win32\Debug;$(BuildRoot)\$(fcgi)\Win32\Release;$(BuildRoot)\$(zlib)\Debug;$(BuildRoot)\$(zlib)\Release;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\msvc10\x64\Debug;$(BuildRoot)\$(log4shib)\msvc10\x64\Release;$(BuildRoot)\$(xerces)\lib;$(BuildRoot)\$(xmlsec)\Build\x64\VC10\Debug No Xalan;$(BuildRoot)\$(xmlsec)\Build\x64\VC10\Release No Xalan;$(BuildRoot)\$(fcgi)\Win32\x64\Debug;$(BuildRoot)\$(fcgi)\Win32\x64\Release;$(BuildRoot)\$(zlib)\x64\Debug;$(BuildRoot)\$(zlib)\x64\Release;$(LibraryPath)</LibraryPath>\r
+    <SourcePath>$(SourcePath)</SourcePath>\r
+    <ExcludePath>$(ExcludePath)</ExcludePath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <BuildMacro Include="BuildRoot">\r
+      <Value>$(BuildRoot)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="CxxTestRoot">\r
+      <Value>$(CxxTestRoot)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="ApacheRoot">\r
+      <Value>$(ApacheRoot)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="openssl">\r
+      <Value>$(openssl)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="curl">\r
+      <Value>$(curl)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="xerces">\r
+      <Value>$(xerces)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="xmlsec">\r
+      <Value>$(xmlsec)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="boost">\r
+      <Value>$(boost)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="log4shib">\r
+      <Value>$(log4shib)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="zlib">\r
+      <Value>$(zlib)</Value>\r
+    </BuildMacro>\r
+    <BuildMacro Include="fcgi">\r
+      <Value>$(fcgi)</Value>\r
+    </BuildMacro>\r
+  </ItemGroup>\r
+  <ItemDefinitionGroup>\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+</Project>\r

diff --git a/msbuild/Versions.props b/msbuild/Versions.props
new file mode 100644 (file)
index 0000000..0422357
--- /dev/null
+++ b/msbuild/Versions.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<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
+    <boost>boost_1_49_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
+\r
+  </PropertyGroup>\r
+</Project>\r