From da027e52587f9ccc312be5ea8ecf21b45af8ab79 Mon Sep 17 00:00:00 2001 From: Rod Widdowson Date: Sun, 24 Apr 2016 14:37:57 +0100 Subject: [PATCH] CPPXT-106 Move projects to VC14 https://issues.shibboleth.net/jira/browse/CPPXT-106 First stage. Move the build things down into a projects/VC10 directory. --- .gitignore | 6 +- projects/vc10/.gitignore | 13 + .../vc10/cpp-xmltooling.sln | 84 ++--- projects/vc10/xmltooling/.gitignore | 15 + .../vc10/xmltooling}/xmltooling-lite.vcxproj | 178 +++++------ .../xmltooling}/xmltooling-lite.vcxproj.filters | 166 +++++----- projects/vc10/xmltooling/xmltooling.vcxproj | 347 +++++++++++++++++++++ .../vc10/xmltooling}/xmltooling.vcxproj.filters | 296 +++++++++--------- .../vc10/xmltoolingtest}/xmltoolingtest.vcxproj | 54 ++-- .../xmltoolingtest}/xmltoolingtest.vcxproj.filters | 42 +-- xmltooling/xmltooling.vcxproj | 346 -------------------- 11 files changed, 790 insertions(+), 757 deletions(-) create mode 100644 projects/vc10/.gitignore rename cpp-xmltooling.sln => projects/vc10/cpp-xmltooling.sln (65%) create mode 100644 projects/vc10/xmltooling/.gitignore rename {xmltooling => projects/vc10/xmltooling}/xmltooling-lite.vcxproj (62%) rename {xmltooling => projects/vc10/xmltooling}/xmltooling-lite.vcxproj.filters (54%) create mode 100644 projects/vc10/xmltooling/xmltooling.vcxproj rename {xmltooling => projects/vc10/xmltooling}/xmltooling.vcxproj.filters (53%) rename {xmltoolingtest => projects/vc10/xmltoolingtest}/xmltoolingtest.vcxproj (92%) rename {xmltoolingtest => projects/vc10/xmltoolingtest}/xmltoolingtest.vcxproj.filters (68%) delete mode 100644 xmltooling/xmltooling.vcxproj diff --git a/.gitignore b/.gitignore index 1f2cf28..aa24900 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ # The contents of the svn:ignore property on the branch root. /Debug /*.ncb -/*.suo +*.suo /Release /aclocal.m4 /autom4te.cache @@ -49,8 +49,8 @@ /x64 /Portfile /*.gz -/*.opensdf -/*.sdf +*.opensdf +*.sdf /ipch /build-aux /build diff --git a/projects/vc10/.gitignore b/projects/vc10/.gitignore new file mode 100644 index 0000000..5cc0182 --- /dev/null +++ b/projects/vc10/.gitignore @@ -0,0 +1,13 @@ +/Debug +/*.lo +/*.la +/*.user +/*.cpp +/Release +/.deps +/.libs +/Makefile +/Makefile.in +/xmltoolingtest +/x64 +/ipch \ No newline at end of file diff --git a/cpp-xmltooling.sln b/projects/vc10/cpp-xmltooling.sln similarity index 65% rename from cpp-xmltooling.sln rename to projects/vc10/cpp-xmltooling.sln index 7b85cf3..d0f8341 100644 --- a/cpp-xmltooling.sln +++ b/projects/vc10/cpp-xmltooling.sln @@ -3,82 +3,82 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{61BF324D-2532-49C9-93CE-DF0E89529D4F}" ProjectSection(SolutionItems) = preProject - m4\acinclude.m4 = m4\acinclude.m4 - m4\acx_pthread.m4 = m4\acx_pthread.m4 - m4\ax_create_pkgconfig_info.m4 = m4\ax_create_pkgconfig_info.m4 - m4\boost.m4 = m4\boost.m4 - config_win32.h = config_win32.h - configure.ac = configure.ac - doxygen.am = doxygen.am - doxygen.cfg = doxygen.cfg - m4\doxygen.m4 = m4\doxygen.m4 - Makefile.am = Makefile.am - xmltooling.spec.in = xmltooling.spec.in + ..\..\m4\acinclude.m4 = ..\..\m4\acinclude.m4 + ..\..\m4\acx_pthread.m4 = ..\..\m4\acx_pthread.m4 + ..\..\m4\ax_create_pkgconfig_info.m4 = ..\..\m4\ax_create_pkgconfig_info.m4 + ..\..\m4\boost.m4 = ..\..\m4\boost.m4 + ..\..\config_win32.h = ..\..\config_win32.h + ..\..\configure.ac = ..\..\configure.ac + ..\..\doxygen.am = ..\..\doxygen.am + ..\..\doxygen.cfg = ..\..\doxygen.cfg + ..\..\m4\doxygen.m4 = ..\..\m4\doxygen.m4 + ..\..\Makefile.am = ..\..\Makefile.am + ..\..\xmltooling.spec.in = ..\..\xmltooling.spec.in EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schemas", "Schemas", "{23EF5C29-2A13-4F73-99D1-96B8120F148E}" ProjectSection(SolutionItems) = preProject - schemas\catalog.xml.in = schemas\catalog.xml.in - schemas\Makefile.am = schemas\Makefile.am - schemas\soap-envelope.xsd = schemas\soap-envelope.xsd - schemas\xenc-schema.xsd = schemas\xenc-schema.xsd - schemas\xenc11-schema.xsd = schemas\xenc11-schema.xsd - schemas\xml.xsd = schemas\xml.xsd - schemas\xmldsig-core-schema.xsd = schemas\xmldsig-core-schema.xsd - schemas\xmldsig11-schema.xsd = schemas\xmldsig11-schema.xsd - schemas\xmltooling.xsd = schemas\xmltooling.xsd + ..\..\schemas\catalog.xml.in = ..\..\schemas\catalog.xml.in + ..\..\schemas\Makefile.am = ..\..\schemas\Makefile.am + ..\..\schemas\soap-envelope.xsd = ..\..\schemas\soap-envelope.xsd + ..\..\schemas\xenc-schema.xsd = ..\..\schemas\xenc-schema.xsd + ..\..\schemas\xenc11-schema.xsd = ..\..\schemas\xenc11-schema.xsd + ..\..\schemas\xml.xsd = ..\..\schemas\xml.xsd + ..\..\schemas\xmldsig-core-schema.xsd = ..\..\schemas\xmldsig-core-schema.xsd + ..\..\schemas\xmldsig11-schema.xsd = ..\..\schemas\xmldsig11-schema.xsd + ..\..\schemas\xmltooling.xsd = ..\..\schemas\xmltooling.xsd EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{EE6145CB-F979-4AD2-9D7D-6834345D1983}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "curl", "curl", "{85004FE4-CBD1-4A6D-B60D-EBBF0C267DEF}" ProjectSection(SolutionItems) = preProject - dependencies\curl\curl.spec.patch = dependencies\curl\curl.spec.patch - dependencies\curl\depend = dependencies\curl\depend - dependencies\curl\pkginfo = dependencies\curl\pkginfo - dependencies\curl\postinstall = dependencies\curl\postinstall + ..\..\dependencies\curl\curl.spec.patch = ..\..\dependencies\curl\curl.spec.patch + ..\..\dependencies\curl\depend = ..\..\dependencies\curl\depend + ..\..\dependencies\curl\pkginfo = ..\..\dependencies\curl\pkginfo + ..\..\dependencies\curl\postinstall = ..\..\dependencies\curl\postinstall EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "openssl", "openssl", "{F284B9F5-612F-45B2-9D2F-A084EC6C91B5}" ProjectSection(SolutionItems) = preProject - dependencies\openssl\pkginfo = dependencies\openssl\pkginfo - dependencies\openssl\postinstall = dependencies\openssl\postinstall + ..\..\dependencies\openssl\pkginfo = ..\..\dependencies\openssl\pkginfo + ..\..\dependencies\openssl\postinstall = ..\..\dependencies\openssl\postinstall EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xerces", "xerces", "{06F58C02-6110-4D42-9981-B326910B3E2D}" ProjectSection(SolutionItems) = preProject - dependencies\xerces\pkginfo = dependencies\xerces\pkginfo - dependencies\xerces\Portfile = dependencies\xerces\Portfile - dependencies\xerces\xerces-c.spec = dependencies\xerces\xerces-c.spec + ..\..\dependencies\xerces\pkginfo = dependencies\xerces\pkginfo + ..\..\dependencies\xerces\Portfile = ..\..\dependencies\xerces\Portfile + ..\..\dependencies\xerces\xerces-c.spec = ..\..\dependencies\xerces\xerces-c.spec EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xml-security", "xml-security", "{549A0182-0C7A-4F29-9A9F-E112C3E394E1}" ProjectSection(SolutionItems) = preProject - dependencies\xml-security\depend = dependencies\xml-security\depend - dependencies\xml-security\pkginfo = dependencies\xml-security\pkginfo - dependencies\xml-security\Portfile = dependencies\xml-security\Portfile + ..\..\dependencies\xml-security\depend = ..\..\dependencies\xml-security\depend + ..\..\dependencies\xml-security\pkginfo = ..\..\dependencies\xml-security\pkginfo + ..\..\dependencies\xml-security\Portfile = ..\..\dependencies\xml-security\Portfile EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "log4shib", "log4shib", "{96FDD5D7-1231-4953-8DB6-8A5133553AB9}" ProjectSection(SolutionItems) = preProject - dependencies\log4shib\pkginfo = dependencies\log4shib\pkginfo - dependencies\log4shib\postinstall = dependencies\log4shib\postinstall + ..\..\dependencies\log4shib\pkginfo = ..\..\dependencies\log4shib\pkginfo + ..\..\dependencies\log4shib\postinstall = ..\..\dependencies\log4shib\postinstall EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "log4cpp", "log4cpp", "{F2F0B2B6-6E60-4E61-81D2-305D1779622E}" ProjectSection(SolutionItems) = preProject - dependencies\log4cpp\pkginfo = dependencies\log4cpp\pkginfo - dependencies\log4cpp\postinstall = dependencies\log4cpp\postinstall + ..\..\dependencies\log4cpp\pkginfo = ..\..\dependencies\log4cpp\pkginfo + ..\..\dependencies\log4cpp\postinstall = ..\..\dependencies\log4cpp\postinstall EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{847EC34E-0069-4427-B42C-1B6E29906930}" ProjectSection(SolutionItems) = preProject - doc\CURL.LICENSE = doc\CURL.LICENSE - doc\LICENSE.txt = doc\LICENSE.txt - doc\LOG4CPP.LICENSE = doc\LOG4CPP.LICENSE - doc\Makefile.am = doc\Makefile.am - doc\OPENSSL.LICENSE = doc\OPENSSL.LICENSE - doc\README.txt = doc\README.txt + ..\..\doc\CURL.LICENSE = ..\..\doc\CURL.LICENSE + ..\..\doc\LICENSE.txt = ..\..\doc\LICENSE.txt + ..\..\doc\LOG4CPP.LICENSE = ..\..\doc\LOG4CPP.LICENSE + ..\..\doc\Makefile.am = ..\..\doc\Makefile.am + ..\..\doc\OPENSSL.LICENSE = ..\..\doc\OPENSSL.LICENSE + ..\..\doc\README.txt = ..\..\doc\README.txt EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmltooling", "xmltooling\xmltooling.vcxproj", "{06B55A46-D3B3-41AE-B5A5-B57830BA010D}" diff --git a/projects/vc10/xmltooling/.gitignore b/projects/vc10/xmltooling/.gitignore new file mode 100644 index 0000000..d083c64 --- /dev/null +++ b/projects/vc10/xmltooling/.gitignore @@ -0,0 +1,15 @@ +/Debug +/*.user +/Release +/config_pub.h +/.deps +/.libs +/Makefile +/Makefile.in +/stamp-h2 +/xmltooling-lite-Debug +/xmltooling-lite-Release +/x64 +/*.aps +/*.lo +/*.la diff --git a/xmltooling/xmltooling-lite.vcxproj b/projects/vc10/xmltooling/xmltooling-lite.vcxproj similarity index 62% rename from xmltooling/xmltooling-lite.vcxproj rename to projects/vc10/xmltooling/xmltooling-lite.vcxproj index cdcead2..442a0b6 100644 --- a/xmltooling/xmltooling-lite.vcxproj +++ b/projects/vc10/xmltooling/xmltooling-lite.vcxproj @@ -58,18 +58,20 @@ - + <_ProjectFileVersion>10.0.30319.1 $(ProjectName)-$(Configuration)\ true - $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\Build\VC10\$(Configuration)\ + $(SolutionDir)..\..\Build\VC10\$(Platform)\$(Configuration)\ $(Platform)\$(ProjectName)-$(Configuration)\ true $(ProjectName)-$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\Build\VC10\$(Configuration)\ + $(SolutionDir)..\..\Build\VC10\$(Platform)\$(Configuration)\ $(Platform)\$(ProjectName)-$(Configuration)\ AllRules.ruleset @@ -91,7 +93,7 @@ Disabled - $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;$(ProjectDir)..\..\..\XMLTooling;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;XMLTOOLING_LITE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -121,7 +123,7 @@ Disabled - $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;$(ProjectDir)..\..\..\XMLTooling;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;XMLTOOLING_LITE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -145,7 +147,7 @@ - $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;$(ProjectDir)..\..\..\XMLTooling;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XMLTOOLING_LITE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -174,7 +176,7 @@ X64 - $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;$(ProjectDir)..\..\..\XMLTooling;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XMLTOOLING_LITE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -197,93 +199,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + diff --git a/xmltooling/xmltooling-lite.vcxproj.filters b/projects/vc10/xmltooling/xmltooling-lite.vcxproj.filters similarity index 54% rename from xmltooling/xmltooling-lite.vcxproj.filters rename to projects/vc10/xmltooling/xmltooling-lite.vcxproj.filters index 9650fff..ea32ab5 100644 --- a/xmltooling/xmltooling-lite.vcxproj.filters +++ b/projects/vc10/xmltooling/xmltooling-lite.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -48,250 +48,250 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\io - + Source Files\io - + Source Files\io - + Source Files\io - + Source Files\impl - + Source Files\impl - + Source Files\validation - + Source Files\soap\impl - + Source Files\soap\impl - + Source Files\soap\impl - + Source Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\io - + Header Files\io - + Header Files\impl - + Header Files\impl - + Header Files\validation - + Header Files\validation - + Header Files\soap - + Header Files\soap - + Header Files\soap - + Header Files\soap - + Resource Files - - + + - \ No newline at end of file + diff --git a/projects/vc10/xmltooling/xmltooling.vcxproj b/projects/vc10/xmltooling/xmltooling.vcxproj new file mode 100644 index 0000000..b4db45e --- /dev/null +++ b/projects/vc10/xmltooling/xmltooling.vcxproj @@ -0,0 +1,347 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {06B55A46-D3B3-41AE-B5A5-B57830BA010D} + xmltooling + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + true + $(SolutionDir)..\..\Build\VC10\$(Configuration)\ + $(SolutionDir)..\..\Build\VC10\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)..\..\Build\VC10\$(Configuration)\ + $(SolutionDir)..\..\Build\VC10\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + $(ProjectName)1_5D + $(ProjectName)1_5D + $(ProjectName)1_5 + $(ProjectName)1_5 + + + + Disabled + $(SolutionDir)..\..\;$(ProjectDir)\..\..\..\XMLTooling\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + EnableFastChecks + + + true + Level3 + EditAndContinue + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + + + wsock32.lib;log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;libeay32D.lib;ssleay32D.lib;libcurl5d_imp.lib;%(AdditionalDependencies) + true + Windows + + + $(TargetDir)$(ProjectName)1D.lib + + + + + X64 + + + Disabled + $(SolutionDir)..\..\;$(ProjectDir)\..\..\..\XMLTooling;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + EnableFastChecks + + + true + Level3 + ProgramDatabase + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + + + wsock32.lib;log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;libeay32D.lib;ssleay32D.lib;libcurl5d_imp.lib;%(AdditionalDependencies) + true + Windows + + + $(TargetDir)$(ProjectName)1D.lib + + + + + $(SolutionDir)..\..\;$(ProjectDir)\..\..\..\XMLTooling\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + + + Level3 + ProgramDatabase + + + wsock32.lib;log4shib1.lib;xerces-c_3.lib;xsec_1.lib;libeay32.lib;ssleay32.lib;libcurl5_imp.lib;%(AdditionalDependencies) + true + Windows + true + true + + + $(TargetDir)$(ProjectName)1.lib + + + + + X64 + + + $(SolutionDir)..\..\;$(ProjectDir)\..\..\..\XMLTooling\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + + + Level3 + ProgramDatabase + + + wsock32.lib;log4shib1.lib;xerces-c_3.lib;xsec_1.lib;libeay32.lib;ssleay32.lib;libcurl5_imp.lib;%(AdditionalDependencies) + true + Windows + true + true + + + $(TargetDir)$(ProjectName)1.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xmltooling/xmltooling.vcxproj.filters b/projects/vc10/xmltooling/xmltooling.vcxproj.filters similarity index 53% rename from xmltooling/xmltooling.vcxproj.filters rename to projects/vc10/xmltooling/xmltooling.vcxproj.filters index 99d1289..670536a 100644 --- a/xmltooling/xmltooling.vcxproj.filters +++ b/projects/vc10/xmltooling/xmltooling.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -75,444 +75,444 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\util - + Source Files\io - + Source Files\io - + Source Files\io - + Source Files\io - + Source Files\impl - + Source Files\impl - + Source Files\impl - + Source Files\validation - + Source Files\signature\impl - + Source Files\signature\impl - + Source Files\signature\impl - + Source Files\signature\impl - + Source Files\encryption\impl - + Source Files\encryption\impl - + Source Files\encryption\impl - + Source Files\encryption\impl - + Source Files\encryption\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\security\impl - + Source Files\soap\impl - + Source Files\soap\impl - + Source Files\soap\impl - + Source Files\soap\impl - + Source Files - + Source Files\security\impl - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\util - + Header Files\io - + Header Files\io - + Header Files\io - + Header Files\io - + Header Files\io - + Header Files\io - + Header Files\impl - + Header Files\impl - + Header Files\validation - + Header Files\validation - + Header Files\signature - + Header Files\signature - + Header Files\signature - + Header Files\signature - + Header Files\encryption - + Header Files\encryption - + Header Files\encryption - + Header Files\encryption - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\security - + Header Files\soap - + Header Files\soap - + Header Files\soap - + Header Files\soap - + Header Files\soap - + Header Files\security - + Header Files\security - + Header Files\security @@ -525,4 +525,4 @@ - \ No newline at end of file + diff --git a/xmltoolingtest/xmltoolingtest.vcxproj b/projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj similarity index 92% rename from xmltoolingtest/xmltoolingtest.vcxproj rename to projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj index cbe4f74..09f873b 100644 --- a/xmltoolingtest/xmltoolingtest.vcxproj +++ b/projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj @@ -59,16 +59,18 @@ - + <_ProjectFileVersion>10.0.30319.1 true - $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\ + $(SolutionDir)\..\..\Build\VC10\$(Configuration)\ $(Platform)\$(Configuration)\ true - $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\Build\VC10\$(Configuration)\ + $(SolutionDir)..\..\Build\VC10\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ AllRules.ruleset @@ -86,7 +88,7 @@ Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -110,7 +112,7 @@ Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -128,7 +130,7 @@ - $(SolutionDir);%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -151,7 +153,7 @@ X64 - $(SolutionDir);%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -187,7 +189,7 @@ - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -201,7 +203,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -215,7 +217,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -229,7 +231,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -243,7 +245,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -257,7 +259,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -271,7 +273,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -285,7 +287,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -299,7 +301,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -313,7 +315,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -325,7 +327,7 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -337,7 +339,7 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -351,7 +353,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -365,7 +367,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -379,7 +381,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -393,7 +395,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -407,7 +409,7 @@ %(Filename).cpp;%(Outputs) - + perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)" %(Filename).cpp;%(Outputs) @@ -421,10 +423,10 @@ %(Filename).cpp;%(Outputs) - + - + diff --git a/xmltoolingtest/xmltoolingtest.vcxproj.filters b/projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj.filters similarity index 68% rename from xmltoolingtest/xmltoolingtest.vcxproj.filters rename to projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj.filters index cc2f1cf..d099072 100644 --- a/xmltoolingtest/xmltoolingtest.vcxproj.filters +++ b/projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -64,64 +64,64 @@ - + Unit Tests - + - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - + Unit Tests - \ No newline at end of file + diff --git a/xmltooling/xmltooling.vcxproj b/xmltooling/xmltooling.vcxproj deleted file mode 100644 index 59faf8b..0000000 --- a/xmltooling/xmltooling.vcxproj +++ /dev/null @@ -1,346 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {06B55A46-D3B3-41AE-B5A5-B57830BA010D} - xmltooling - Win32Proj - - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - $(ProjectName)1_5D - $(ProjectName)1_5D - $(ProjectName)1_5 - $(ProjectName)1_5 - - - - Disabled - $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - - - true - Level3 - EditAndContinue - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - - - wsock32.lib;log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;libeay32D.lib;ssleay32D.lib;libcurl5d_imp.lib;%(AdditionalDependencies) - true - Windows - - - $(TargetDir)$(ProjectName)1D.lib - - - - - X64 - - - Disabled - $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - - - true - Level3 - ProgramDatabase - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - - - wsock32.lib;log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;libeay32D.lib;ssleay32D.lib;libcurl5d_imp.lib;%(AdditionalDependencies) - true - Windows - - - $(TargetDir)$(ProjectName)1D.lib - - - - - $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - - - Level3 - ProgramDatabase - - - wsock32.lib;log4shib1.lib;xerces-c_3.lib;xsec_1.lib;libeay32.lib;ssleay32.lib;libcurl5_imp.lib;%(AdditionalDependencies) - true - Windows - true - true - - - $(TargetDir)$(ProjectName)1.lib - - - - - X64 - - - $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - - - Level3 - ProgramDatabase - - - wsock32.lib;log4shib1.lib;xerces-c_3.lib;xsec_1.lib;libeay32.lib;ssleay32.lib;libcurl5_imp.lib;%(AdditionalDependencies) - true - Windows - true - true - - - $(TargetDir)$(ProjectName)1.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.1.4