From 3e7f722ca69472d16dece1d4e793ea506f7ccc84 Mon Sep 17 00:00:00 2001 From: aaron0x Date: Sun, 20 Sep 2015 05:21:36 +0800 Subject: [PATCH 001/131] 1. move flipBytes(float/double) to ByteOrder. 2. remove redundant code from BinaryWriter and BinaryReader. --- Foundation/include/Poco/BinaryReader.h | 27 ++++ Foundation/include/Poco/BinaryWriter.h | 29 ++++ Foundation/include/Poco/ByteOrder.h | 30 +++- Foundation/src/BinaryReader.cpp | 115 +++----------- Foundation/src/BinaryWriter.cpp | 165 +++------------------ Foundation/testsuite/src/ByteOrderTest.cpp | 40 +++++ 6 files changed, 165 insertions(+), 241 deletions(-) diff --git a/Foundation/include/Poco/BinaryReader.h b/Foundation/include/Poco/BinaryReader.h index cc4c60489..2f05f8650 100644 --- a/Foundation/include/Poco/BinaryReader.h +++ b/Foundation/include/Poco/BinaryReader.h @@ -23,6 +23,7 @@ #include "Poco/Foundation.h" #include "Poco/Buffer.h" #include "Poco/MemoryStream.h" +#include "Poco/ByteOrder.h" #include #include @@ -151,6 +152,32 @@ public: /// Returns the number of available bytes in the stream. private: + template + BinaryReader& read(T& value, bool flipBytes) + { + _istr.read((char*) &value, sizeof(value)); + if (flipBytes) value = ByteOrder::flipBytes(value); + return *this; + } + + template + void read7BitEncoded(T& value) + { + char c; + value = 0; + int s = 0; + do + { + c = 0; + _istr.read(&c, 1); + T x = (c & 0x7F); + x <<= s; + value += x; + s += 7; + } + while (c & 0x80); + } + std::istream& _istr; bool _flipBytes; TextConverter* _pTextConverter; diff --git a/Foundation/include/Poco/BinaryWriter.h b/Foundation/include/Poco/BinaryWriter.h index e038349b5..24163cf5d 100644 --- a/Foundation/include/Poco/BinaryWriter.h +++ b/Foundation/include/Poco/BinaryWriter.h @@ -23,6 +23,7 @@ #include "Poco/Foundation.h" #include "Poco/Buffer.h" #include "Poco/MemoryStream.h" +#include "Poco/ByteOrder.h" #include #include @@ -160,6 +161,34 @@ public: /// either BIG_ENDIAN_BYTE_ORDER or LITTLE_ENDIAN_BYTE_ORDER. private: + template + BinaryWriter& write(T value, bool flipBytes) + { + if (flipBytes) + { + T fValue = ByteOrder::flipBytes(value); + _ostr.write((const char*) &fValue, sizeof(fValue)); + } + else + { + _ostr.write((const char*) &value, sizeof(value)); + } + return *this; + } + + template + void write7BitEncoded(T value) + { + do + { + unsigned char c = (unsigned char) (value & 0x7F); + value >>= 7; + if (value) c |= 0x80; + _ostr.write((const char*) &c, 1); + } + while (value); + } + std::ostream& _ostr; bool _flipBytes; TextConverter* _pTextConverter; diff --git a/Foundation/include/Poco/ByteOrder.h b/Foundation/include/Poco/ByteOrder.h index 78022f760..4fa0e4fbb 100644 --- a/Foundation/include/Poco/ByteOrder.h +++ b/Foundation/include/Poco/ByteOrder.h @@ -24,7 +24,6 @@ #include // builtins #endif - namespace Poco { @@ -38,6 +37,8 @@ public: static UInt16 flipBytes(UInt16 value); static Int32 flipBytes(Int32 value); static UInt32 flipBytes(UInt32 value); + static float flipBytes(float value); + static double flipBytes(double value); #if defined(POCO_HAVE_INT64) static Int64 flipBytes(Int64 value); static UInt64 flipBytes(UInt64 value); @@ -96,6 +97,21 @@ public: static Int64 fromNetwork(Int64 value); static UInt64 fromNetwork (UInt64 value); #endif + +private: + template + static T flip(T value) + { + T flip = value; + std::size_t halfSize = sizeof(T) / 2; + char* flipP = reinterpret_cast(&flip); + + for (std::size_t i = 0; i < halfSize; i++) + { + std::swap(flipP[i], flipP[sizeof(T) - i - 1]); + } + return flip; + } }; @@ -152,6 +168,18 @@ inline Int32 ByteOrder::flipBytes(Int32 value) } +inline float ByteOrder::flipBytes(float value) +{ + return flip(value); +} + + +inline double ByteOrder::flipBytes(double value) +{ + return flip(value); +} + + #if defined(POCO_HAVE_INT64) inline UInt64 ByteOrder::flipBytes(UInt64 value) { diff --git a/Foundation/src/BinaryReader.cpp b/Foundation/src/BinaryReader.cpp index 8859b20f9..7956283f3 100644 --- a/Foundation/src/BinaryReader.cpp +++ b/Foundation/src/BinaryReader.cpp @@ -15,7 +15,6 @@ #include "Poco/BinaryReader.h" -#include "Poco/ByteOrder.h" #include "Poco/TextEncoding.h" #include "Poco/TextConverter.h" #include @@ -56,119 +55,81 @@ BinaryReader::~BinaryReader() BinaryReader& BinaryReader::operator >> (bool& value) { - _istr.read((char*) &value, sizeof(value)); - return *this; + return read(value, false); } BinaryReader& BinaryReader::operator >> (char& value) { - _istr.read((char*) &value, sizeof(value)); - return *this; + return read(value, false); } BinaryReader& BinaryReader::operator >> (unsigned char& value) { - _istr.read((char*) &value, sizeof(value)); - return *this; + return read(value, false); } BinaryReader& BinaryReader::operator >> (signed char& value) { - _istr.read((char*) &value, sizeof(value)); - return *this; + return read(value, false); } BinaryReader& BinaryReader::operator >> (short& value) { - _istr.read((char*) &value, sizeof(value)); - if (_flipBytes) value = ByteOrder::flipBytes(value); - return *this; + return read(value, _flipBytes); } BinaryReader& BinaryReader::operator >> (unsigned short& value) { - _istr.read((char*) &value, sizeof(value)); - if (_flipBytes) value = ByteOrder::flipBytes(value); - return *this; + return read(value, _flipBytes); } BinaryReader& BinaryReader::operator >> (int& value) { - _istr.read((char*) &value, sizeof(value)); - if (_flipBytes) value = ByteOrder::flipBytes(value); - return *this; + return read(value, _flipBytes); } BinaryReader& BinaryReader::operator >> (unsigned int& value) { - _istr.read((char*) &value, sizeof(value)); - if (_flipBytes) value = ByteOrder::flipBytes(value); - return *this; + return read(value, _flipBytes); } BinaryReader& BinaryReader::operator >> (long& value) { - _istr.read((char*) &value, sizeof(value)); #if defined(POCO_LONG_IS_64_BIT) - if (_flipBytes) value = ByteOrder::flipBytes((Int64) value); + return read((Int64&) value, _flipBytes); #else - if (_flipBytes) value = ByteOrder::flipBytes((Int32) value); + return read((Int32&) value, _flipBytes); #endif - return *this; } BinaryReader& BinaryReader::operator >> (unsigned long& value) { - _istr.read((char*) &value, sizeof(value)); #if defined(POCO_LONG_IS_64_BIT) - if (_flipBytes) value = ByteOrder::flipBytes((UInt64) value); + return read((UInt64&) value, _flipBytes); #else - if (_flipBytes) value = ByteOrder::flipBytes((UInt32) value); + return read((UInt32&) value, _flipBytes); #endif - return *this; } BinaryReader& BinaryReader::operator >> (float& value) { - if (_flipBytes) - { - char* ptr = (char*) &value; - ptr += sizeof(value); - for (unsigned i = 0; i < sizeof(value); ++i) - _istr.read(--ptr, 1); - } - else - { - _istr.read((char*) &value, sizeof(value)); - } - return *this; + return read(value, _flipBytes); } BinaryReader& BinaryReader::operator >> (double& value) { - if (_flipBytes) - { - char* ptr = (char*) &value; - ptr += sizeof(value); - for (unsigned i = 0; i < sizeof(value); ++i) - _istr.read(--ptr, 1); - } - else - { - _istr.read((char*) &value, sizeof(value)); - } - return *this; + return read(value, _flipBytes); } @@ -177,17 +138,13 @@ BinaryReader& BinaryReader::operator >> (double& value) BinaryReader& BinaryReader::operator >> (Int64& value) { - _istr.read((char*) &value, sizeof(value)); - if (_flipBytes) value = ByteOrder::flipBytes(value); - return *this; + return read(value, _flipBytes); } BinaryReader& BinaryReader::operator >> (UInt64& value) { - _istr.read((char*) &value, sizeof(value)); - if (_flipBytes) value = ByteOrder::flipBytes(value); - return *this; + return read(value, _flipBytes); } @@ -196,17 +153,11 @@ BinaryReader& BinaryReader::operator >> (UInt64& value) BinaryReader& BinaryReader::operator >> (std::string& value) { + if (!_istr.good()) return *this; + UInt32 size = 0; read7BitEncoded(size); - value.clear(); - if (!_istr.good()) return *this; - value.reserve(size); - while (size--) - { - char c; - if (!_istr.read(&c, 1).good()) break; - value += c; - } + readRaw(size, value); if (_pTextConverter) { std::string converted; @@ -219,19 +170,7 @@ BinaryReader& BinaryReader::operator >> (std::string& value) void BinaryReader::read7BitEncoded(UInt32& value) { - char c; - value = 0; - int s = 0; - do - { - c = 0; - _istr.read(&c, 1); - UInt32 x = (c & 0x7F); - x <<= s; - value += x; - s += 7; - } - while (c & 0x80); + read7BitEncoded(value); } @@ -240,19 +179,7 @@ void BinaryReader::read7BitEncoded(UInt32& value) void BinaryReader::read7BitEncoded(UInt64& value) { - char c; - value = 0; - int s = 0; - do - { - c = 0; - _istr.read(&c, 1); - UInt64 x = (c & 0x7F); - x <<= s; - value += x; - s += 7; - } - while (c & 0x80); + read7BitEncoded(value); } diff --git a/Foundation/src/BinaryWriter.cpp b/Foundation/src/BinaryWriter.cpp index 03348b061..a508af094 100644 --- a/Foundation/src/BinaryWriter.cpp +++ b/Foundation/src/BinaryWriter.cpp @@ -15,7 +15,6 @@ #include "Poco/BinaryWriter.h" -#include "Poco/ByteOrder.h" #include "Poco/TextEncoding.h" #include "Poco/TextConverter.h" #include @@ -56,161 +55,81 @@ BinaryWriter::~BinaryWriter() BinaryWriter& BinaryWriter::operator << (bool value) { - _ostr.write((const char*) &value, sizeof(value)); - return *this; + return write(value, false); } BinaryWriter& BinaryWriter::operator << (char value) { - _ostr.write((const char*) &value, sizeof(value)); - return *this; + return write(value, false); } BinaryWriter& BinaryWriter::operator << (unsigned char value) { - _ostr.write((const char*) &value, sizeof(value)); - return *this; + return write(value, false); } BinaryWriter& BinaryWriter::operator << (signed char value) { - _ostr.write((const char*) &value, sizeof(value)); - return *this; + return write(value, false); } BinaryWriter& BinaryWriter::operator << (short value) { - if (_flipBytes) - { - short fValue = ByteOrder::flipBytes(value); - _ostr.write((const char*) &fValue, sizeof(fValue)); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; + return write(value, _flipBytes); } BinaryWriter& BinaryWriter::operator << (unsigned short value) { - if (_flipBytes) - { - unsigned short fValue = ByteOrder::flipBytes(value); - _ostr.write((const char*) &fValue, sizeof(fValue)); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; + return write(value, _flipBytes); } BinaryWriter& BinaryWriter::operator << (int value) { - if (_flipBytes) - { - int fValue = ByteOrder::flipBytes(value); - _ostr.write((const char*) &fValue, sizeof(fValue)); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; + return write(value, _flipBytes); } BinaryWriter& BinaryWriter::operator << (unsigned int value) { - if (_flipBytes) - { - unsigned int fValue = ByteOrder::flipBytes(value); - _ostr.write((const char*) &fValue, sizeof(fValue)); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; + return write(value, _flipBytes); } BinaryWriter& BinaryWriter::operator << (long value) { - if (_flipBytes) - { #if defined(POCO_LONG_IS_64_BIT) - long fValue = ByteOrder::flipBytes((Int64) value); + return write((Int64) value, _flipBytes); #else - long fValue = ByteOrder::flipBytes((Int32) value); + return write((Int32) value, _flipBytes); #endif - _ostr.write((const char*) &fValue, sizeof(fValue)); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; } BinaryWriter& BinaryWriter::operator << (unsigned long value) { - if (_flipBytes) - { #if defined(POCO_LONG_IS_64_BIT) - long fValue = ByteOrder::flipBytes((UInt64) value); + return write((UInt64) value, _flipBytes); #else - long fValue = ByteOrder::flipBytes((UInt32) value); + return write((UInt32) value, _flipBytes); #endif - _ostr.write((const char*) &fValue, sizeof(fValue)); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; } BinaryWriter& BinaryWriter::operator << (float value) { - if (_flipBytes) - { - const char* ptr = (const char*) &value; - ptr += sizeof(value); - for (unsigned i = 0; i < sizeof(value); ++i) - _ostr.write(--ptr, 1); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; + return write(value, _flipBytes); } BinaryWriter& BinaryWriter::operator << (double value) { - if (_flipBytes) - { - const char* ptr = (const char*) &value; - ptr += sizeof(value); - for (unsigned i = 0; i < sizeof(value); ++i) - _ostr.write(--ptr, 1); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; + return write(value, _flipBytes); } @@ -219,31 +138,13 @@ BinaryWriter& BinaryWriter::operator << (double value) BinaryWriter& BinaryWriter::operator << (Int64 value) { - if (_flipBytes) - { - Int64 fValue = ByteOrder::flipBytes(value); - _ostr.write((const char*) &fValue, sizeof(fValue)); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; + write(value, _flipBytes); } BinaryWriter& BinaryWriter::operator << (UInt64 value) { - if (_flipBytes) - { - UInt64 fValue = ByteOrder::flipBytes(value); - _ostr.write((const char*) &fValue, sizeof(fValue)); - } - else - { - _ostr.write((const char*) &value, sizeof(value)); - } - return *this; + write(value, _flipBytes); } @@ -252,21 +153,7 @@ BinaryWriter& BinaryWriter::operator << (UInt64 value) BinaryWriter& BinaryWriter::operator << (const std::string& value) { - if (_pTextConverter) - { - std::string converted; - _pTextConverter->convert(value, converted); - UInt32 length = (UInt32) converted.size(); - write7BitEncoded(length); - _ostr.write(converted.data(), length); - } - else - { - UInt32 length = (UInt32) value.size(); - write7BitEncoded(length); - _ostr.write(value.data(), length); - } - return *this; + return *this << value.c_str(); } @@ -294,14 +181,7 @@ BinaryWriter& BinaryWriter::operator << (const char* value) void BinaryWriter::write7BitEncoded(UInt32 value) { - do - { - unsigned char c = (unsigned char) (value & 0x7F); - value >>= 7; - if (value) c |= 0x80; - _ostr.write((const char*) &c, 1); - } - while (value); + write7BitEncoded(value); } @@ -310,14 +190,7 @@ void BinaryWriter::write7BitEncoded(UInt32 value) void BinaryWriter::write7BitEncoded(UInt64 value) { - do - { - unsigned char c = (unsigned char) (value & 0x7F); - value >>= 7; - if (value) c |= 0x80; - _ostr.write((const char*) &c, 1); - } - while (value); + write7BitEncoded(value); } diff --git a/Foundation/testsuite/src/ByteOrderTest.cpp b/Foundation/testsuite/src/ByteOrderTest.cpp index f34cb8616..f7baca8f5 100644 --- a/Foundation/testsuite/src/ByteOrderTest.cpp +++ b/Foundation/testsuite/src/ByteOrderTest.cpp @@ -67,6 +67,46 @@ void ByteOrderTest::testByteOrderFlip() flip = ByteOrder::flipBytes(flip); assert (flip == norm); } + { + unsigned char c = 0x00; + float norm = 0; + unsigned char* normP = reinterpret_cast(&norm); + for (unsigned i = 0; i < sizeof(float); i++) + { + normP[i] |= c; + c += 0x11; + } + + float flip = ByteOrder::flipBytes(norm); + unsigned char* flipP = reinterpret_cast(&flip); + for (unsigned i = 0; i < sizeof(float); i++) + { + assert(normP[i] == flipP[sizeof(float) - 1 - i]); + } + + flip = ByteOrder::flipBytes(flip); + assert (flip == norm); + } + { + unsigned char c = 0x00; + double norm = 0; + unsigned char* normP = reinterpret_cast(&norm); + for (unsigned i = 0; i < sizeof(double); i++) + { + normP[i] |= c; + c += 0x11; + } + + double flip = ByteOrder::flipBytes(norm); + unsigned char* flipP = reinterpret_cast(&flip); + for (unsigned i = 0; i < sizeof(double); i++) + { + assert(normP[i] == flipP[sizeof(double) - 1 - i]); + } + + flip = ByteOrder::flipBytes(flip); + assert (flip == norm); + } #if defined(POCO_HAVE_INT64) { Int64 norm = (Int64(0x8899AABB) << 32) + 0xCCDDEEFF; From 7d079772ef7ba83f7ab0e3ff2391535a0dc12d11 Mon Sep 17 00:00:00 2001 From: aaron0x Date: Sun, 20 Sep 2015 05:35:04 +0800 Subject: [PATCH 002/131] add missing return. --- Foundation/src/BinaryWriter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Foundation/src/BinaryWriter.cpp b/Foundation/src/BinaryWriter.cpp index a508af094..65d18ed55 100644 --- a/Foundation/src/BinaryWriter.cpp +++ b/Foundation/src/BinaryWriter.cpp @@ -138,13 +138,13 @@ BinaryWriter& BinaryWriter::operator << (double value) BinaryWriter& BinaryWriter::operator << (Int64 value) { - write(value, _flipBytes); + return write(value, _flipBytes); } BinaryWriter& BinaryWriter::operator << (UInt64 value) { - write(value, _flipBytes); + return write(value, _flipBytes); } From 928a7ffce8fba6d1e368efedba2d52cf0a0757f4 Mon Sep 17 00:00:00 2001 From: aaron0x Date: Sun, 20 Sep 2015 19:52:30 +0800 Subject: [PATCH 003/131] avoid redundant strlen. --- Foundation/include/Poco/BinaryWriter.h | 2 ++ Foundation/src/BinaryWriter.cpp | 42 +++++++++++++++----------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Foundation/include/Poco/BinaryWriter.h b/Foundation/include/Poco/BinaryWriter.h index 24163cf5d..0ea99839c 100644 --- a/Foundation/include/Poco/BinaryWriter.h +++ b/Foundation/include/Poco/BinaryWriter.h @@ -189,6 +189,8 @@ private: while (value); } + BinaryWriter& write(const char* value, std::size_t length); + std::ostream& _ostr; bool _flipBytes; TextConverter* _pTextConverter; diff --git a/Foundation/src/BinaryWriter.cpp b/Foundation/src/BinaryWriter.cpp index 65d18ed55..7c7d59829 100644 --- a/Foundation/src/BinaryWriter.cpp +++ b/Foundation/src/BinaryWriter.cpp @@ -153,29 +153,13 @@ BinaryWriter& BinaryWriter::operator << (UInt64 value) BinaryWriter& BinaryWriter::operator << (const std::string& value) { - return *this << value.c_str(); + return write(value.c_str(), value.length()); } BinaryWriter& BinaryWriter::operator << (const char* value) { - poco_check_ptr (value); - - if (_pTextConverter) - { - std::string converted; - _pTextConverter->convert(value, static_cast(std::strlen(value)), converted); - UInt32 length = (UInt32) converted.size(); - write7BitEncoded(length); - _ostr.write(converted.data(), length); - } - else - { - UInt32 length = static_cast(std::strlen(value)); - write7BitEncoded(length); - _ostr.write(value, length); - } - return *this; + return write(value, std::strlen(value)); } @@ -223,4 +207,26 @@ void BinaryWriter::flush() } +BinaryWriter& BinaryWriter::write(const char* value, std::size_t length) +{ + poco_check_ptr (value); + + if (_pTextConverter) + { + std::string converted; + _pTextConverter->convert(value, static_cast(length), converted); + UInt32 convertedLength = (UInt32) converted.length(); + write7BitEncoded(convertedLength); + _ostr.write(converted.data(), convertedLength); + } + else + { + UInt32 lengthUInt32 = static_cast(length); + write7BitEncoded(lengthUInt32); + _ostr.write(value, lengthUInt32); + } + return *this; +} + + } // namespace Poco From ce641c216a82acf34a921afae6066277810d8d3e Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Wed, 6 Jan 2016 13:48:48 +0100 Subject: [PATCH 004/131] Move include/CppUnit to include/Poco/CppUnit Signed-off-by: FrancisANDRE --- CppUnit/CMakeLists.txt | 2 +- CppUnit/CppUnit_vs120.vcxproj | 36 +- CppUnit/CppUnit_vs120.vcxproj.filters | 32 +- CppUnit/Makefile | 2 +- CppUnit/include/{ => Poco}/CppUnit/CppUnit.h | 22 +- .../{ => Poco}/CppUnit/CppUnitException.h | 10 +- CppUnit/include/{ => Poco}/CppUnit/Guards.h | 6 +- CppUnit/include/{ => Poco}/CppUnit/Orthodox.h | 10 +- .../include/{ => Poco}/CppUnit/RepeatedTest.h | 14 +- CppUnit/include/{ => Poco}/CppUnit/Test.h | 10 +- .../include/{ => Poco}/CppUnit/TestCaller.h | 10 +- CppUnit/include/{ => Poco}/CppUnit/TestCase.h | 16 +- .../{ => Poco}/CppUnit/TestDecorator.h | 14 +- .../include/{ => Poco}/CppUnit/TestFailure.h | 14 +- .../include/{ => Poco}/CppUnit/TestResult.h | 14 +- .../include/{ => Poco}/CppUnit/TestRunner.h | 10 +- .../include/{ => Poco}/CppUnit/TestSetup.h | 14 +- .../include/{ => Poco}/CppUnit/TestSuite.h | 14 +- .../{ => Poco}/CppUnit/TextTestResult.h | 12 +- CppUnit/include/{ => Poco}/CppUnit/estring.h | 8 +- CppUnit/src/CppUnitException.cpp | 2 +- CppUnit/src/TestCase.cpp | 6 +- CppUnit/src/TestDecorator.cpp | 2 +- CppUnit/src/TestFailure.cpp | 4 +- CppUnit/src/TestResult.cpp | 2 +- CppUnit/src/TestRunner.cpp | 8 +- CppUnit/src/TestSuite.cpp | 4 +- CppUnit/src/TextTestResult.cpp | 8 +- Cygwin/Makefile | 346 ++++++++++++++++++ 29 files changed, 499 insertions(+), 153 deletions(-) rename CppUnit/include/{ => Poco}/CppUnit/CppUnit.h (73%) rename CppUnit/include/{ => Poco}/CppUnit/CppUnitException.h (93%) rename CppUnit/include/{ => Poco}/CppUnit/Guards.h (70%) rename CppUnit/include/{ => Poco}/CppUnit/Orthodox.h (91%) rename CppUnit/include/{ => Poco}/CppUnit/RepeatedTest.h (78%) rename CppUnit/include/{ => Poco}/CppUnit/Test.h (81%) rename CppUnit/include/{ => Poco}/CppUnit/TestCaller.h (89%) rename CppUnit/include/{ => Poco}/CppUnit/TestCase.h (96%) rename CppUnit/include/{ => Poco}/CppUnit/TestDecorator.h (62%) rename CppUnit/include/{ => Poco}/CppUnit/TestFailure.h (82%) rename CppUnit/include/{ => Poco}/CppUnit/TestResult.h (94%) rename CppUnit/include/{ => Poco}/CppUnit/TestRunner.h (91%) rename CppUnit/include/{ => Poco}/CppUnit/TestSetup.h (61%) rename CppUnit/include/{ => Poco}/CppUnit/TestSuite.h (84%) rename CppUnit/include/{ => Poco}/CppUnit/TextTestResult.h (77%) rename CppUnit/include/{ => Poco}/CppUnit/estring.h (88%) create mode 100644 Cygwin/Makefile diff --git a/CppUnit/CMakeLists.txt b/CppUnit/CMakeLists.txt index 3efc09a09..ae60ff0ec 100644 --- a/CppUnit/CMakeLists.txt +++ b/CppUnit/CMakeLists.txt @@ -1,4 +1,4 @@ -set(LIBNAME "CppUnit") +set(LIBNAME "PocoCppUnit") # Sources file(GLOB SRCS_G "src/*.cpp") diff --git a/CppUnit/CppUnit_vs120.vcxproj b/CppUnit/CppUnit_vs120.vcxproj index f43a397dc..9c45b9377 100644 --- a/CppUnit/CppUnit_vs120.vcxproj +++ b/CppUnit/CppUnit_vs120.vcxproj @@ -128,7 +128,7 @@ Default false include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -180,7 +180,7 @@ Speed true include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs120.vcxproj.filters b/CppUnit/CppUnit_vs120.vcxproj.filters index 6ad984e0c..c3f929a6a 100644 --- a/CppUnit/CppUnit_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_vs120.vcxproj.filters @@ -37,52 +37,52 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files diff --git a/CppUnit/Makefile b/CppUnit/Makefile index d2c3974cb..43e7ea053 100644 --- a/CppUnit/Makefile +++ b/CppUnit/Makefile @@ -11,7 +11,7 @@ include $(POCO_BASE)/build/rules/global objects = CppUnitException TestDecorator TestResult TestSuite \ TestCase TestFailure TestRunner TextTestResult -target = CppUnit +target = PocoCppUnit target_version = 1 target_libs = diff --git a/CppUnit/include/CppUnit/CppUnit.h b/CppUnit/include/Poco/CppUnit/CppUnit.h similarity index 73% rename from CppUnit/include/CppUnit/CppUnit.h rename to CppUnit/include/Poco/CppUnit/CppUnit.h index 57583bc8b..1a4f2d692 100644 --- a/CppUnit/include/CppUnit/CppUnit.h +++ b/CppUnit/include/Poco/CppUnit/CppUnit.h @@ -5,8 +5,8 @@ // -#ifndef CppUnit_CppUnit_INCLUDED -#define CppUnit_CppUnit_INCLUDED +#ifndef Poco_CppUnit__CppUnitINCLUDED +#define Poco_CppUnit__CppUnitINCLUDED // @@ -21,26 +21,26 @@ // // The following block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the CppUnit_EXPORTS +// from a DLL simpler. All files within this DLL are compiled with the Poco_CppUnitEXPORTS // symbol defined on the command line. this symbol should not be defined on any project // that uses this DLL. This way any other project whose source files include this file see -// CppUnit_API functions as being imported from a DLL, wheras this DLL sees symbols +// Poco_CppUnit_API functions as being imported from a DLL, wheras this DLL sees symbols // defined with this macro as being exported. // #if defined(_WIN32) && defined(POCO_DLL) - #if defined(CppUnit_EXPORTS) - #define CppUnit_API __declspec(dllexport) + #if defined(Poco_CppUnit_EXPORTS) + #define Poco_CppUnit_API __declspec(dllexport) #else - #define CppUnit_API __declspec(dllimport) + #define Poco_CppUnit_API __declspec(dllimport) #endif #endif -#if !defined(CppUnit_API) +#if !defined(Poco_CppUnit_API) #if defined (__GNUC__) && (__GNUC__ >= 4) - #define CppUnit_API __attribute__ ((visibility ("default"))) + #define Poco_CppUnit_API __attribute__ ((visibility ("default"))) #else - #define CppUnit_API + #define Poco_CppUnit_API #endif #endif @@ -57,4 +57,4 @@ #endif -#endif // CppUnit_CppUnit_INCLUDED +#endif // Poco_CppUnit__CppUnitINCLUDED diff --git a/CppUnit/include/CppUnit/CppUnitException.h b/CppUnit/include/Poco/CppUnit/CppUnitException.h similarity index 93% rename from CppUnit/include/CppUnit/CppUnitException.h rename to CppUnit/include/Poco/CppUnit/CppUnitException.h index 27c50a3cb..7cd0fc519 100644 --- a/CppUnit/include/CppUnit/CppUnitException.h +++ b/CppUnit/include/Poco/CppUnit/CppUnitException.h @@ -5,11 +5,11 @@ // -#ifndef CppUnit_CppUnitException_INCLUDED -#define CppUnit_CppUnitException_INCLUDED +#ifndef Poco_CppUnit_CppUnitException_INCLUDED +#define Poco_CppUnit_CppUnitException_INCLUDED -#include "CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnit.h" #include #include @@ -17,7 +17,7 @@ namespace CppUnit { -class CppUnit_API CppUnitException: public std::exception +class Poco_CppUnit_API CppUnitException: public std::exception /// CppUnitException is an exception that serves /// descriptive strings through its what() method { @@ -138,4 +138,4 @@ inline const std::string& CppUnitException::fileName() const } // namespace CppUnit -#endif // CppUnit_CppUnitException_INCLUDED +#endif // Poco_CppUnit_CppUnitException_INCLUDED diff --git a/CppUnit/include/CppUnit/Guards.h b/CppUnit/include/Poco/CppUnit/Guards.h similarity index 70% rename from CppUnit/include/CppUnit/Guards.h rename to CppUnit/include/Poco/CppUnit/Guards.h index ef8a7d6ab..e8b6fb152 100644 --- a/CppUnit/include/CppUnit/Guards.h +++ b/CppUnit/include/Poco/CppUnit/Guards.h @@ -5,8 +5,8 @@ // -#ifndef CppUnit_Guards_INCLUDED -#define CppUnit_Guards_INCLUDED +#ifndef Poco_CppUnit_Guards_INCLUDED +#define Poco_CppUnit_Guards_INCLUDED // Prevent copy construction and assignment for a class @@ -16,4 +16,4 @@ private: \ className& operator = (const className& other); -#endif // CppUnit_Guards_INCLUDED +#endif // Poco_CppUnit_Guards_INCLUDED diff --git a/CppUnit/include/CppUnit/Orthodox.h b/CppUnit/include/Poco/CppUnit/Orthodox.h similarity index 91% rename from CppUnit/include/CppUnit/Orthodox.h rename to CppUnit/include/Poco/CppUnit/Orthodox.h index 9da0f5493..201c61475 100644 --- a/CppUnit/include/CppUnit/Orthodox.h +++ b/CppUnit/include/Poco/CppUnit/Orthodox.h @@ -5,12 +5,12 @@ // -#ifndef CppUnit_Orthodox_INCLUDED -#define CppUnit_Orthodox_INCLUDED +#ifndef Poco_CppUnit_Orthodox_INCLUDED +#define Poco_CppUnit_Orthodox_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/TestCase.h" namespace CppUnit { @@ -102,4 +102,4 @@ ClassUnderTest Orthodox::call(ClassUnderTest object) } // namespace CppUnit -#endif // CppUnit_Orthodox_INCLUDED +#endif // Poco_CppUnit_Orthodox_INCLUDED diff --git a/CppUnit/include/CppUnit/RepeatedTest.h b/CppUnit/include/Poco/CppUnit/RepeatedTest.h similarity index 78% rename from CppUnit/include/CppUnit/RepeatedTest.h rename to CppUnit/include/Poco/CppUnit/RepeatedTest.h index 1842762ef..739e3d14e 100644 --- a/CppUnit/include/CppUnit/RepeatedTest.h +++ b/CppUnit/include/Poco/CppUnit/RepeatedTest.h @@ -5,13 +5,13 @@ // -#ifndef CppUnit_RepeatedTest_INCLUDED -#define CppUnit_RepeatedTest_INCLUDED +#ifndef Poco_CppUnit_RepeatedTest_INCLUDED +#define Poco_CppUnit_RepeatedTest_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/Guards.h" -#include "CppUnit/TestDecorator.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/Guards.h" +#include "Poco/CppUnit/TestDecorator.h" namespace CppUnit { @@ -26,7 +26,7 @@ class TestResult; * Does not assume ownership of the test it decorates * */ -class CppUnit_API RepeatedTest: public TestDecorator +class Poco_CppUnit_API RepeatedTest: public TestDecorator { REFERENCEOBJECT (RepeatedTest) @@ -74,4 +74,4 @@ inline void RepeatedTest::run(TestResult *result) } // namespace CppUnit -#endif // CppUnit_RepeatedTest_INCLUDED +#endif // Poco_CppUnit_RepeatedTest_INCLUDED diff --git a/CppUnit/include/CppUnit/Test.h b/CppUnit/include/Poco/CppUnit/Test.h similarity index 81% rename from CppUnit/include/CppUnit/Test.h rename to CppUnit/include/Poco/CppUnit/Test.h index 84be16793..fcd462e47 100644 --- a/CppUnit/include/CppUnit/Test.h +++ b/CppUnit/include/Poco/CppUnit/Test.h @@ -5,11 +5,11 @@ // -#ifndef CppUnit_Test_INCLUDED -#define CppUnit_Test_INCLUDED +#ifndef Poco_CppUnit_Test_INCLUDED +#define Poco_CppUnit_Test_INCLUDED -#include "CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnit.h" #include @@ -24,7 +24,7 @@ class TestResult; * See TestResult. * */ -class CppUnit_API Test +class Poco_CppUnit_API Test { public: virtual ~Test() = 0; @@ -62,4 +62,4 @@ inline std::string Test::toString() } // namespace CppUnit -#endif // CppUnit_Test_INCLUDED +#endif // Poco_CppUnit_Test_INCLUDED diff --git a/CppUnit/include/CppUnit/TestCaller.h b/CppUnit/include/Poco/CppUnit/TestCaller.h similarity index 89% rename from CppUnit/include/CppUnit/TestCaller.h rename to CppUnit/include/Poco/CppUnit/TestCaller.h index 1c555939d..208ab50ae 100644 --- a/CppUnit/include/CppUnit/TestCaller.h +++ b/CppUnit/include/Poco/CppUnit/TestCaller.h @@ -5,11 +5,11 @@ // -#ifndef CppUnit_TestCaller_INCLUDED -#define CppUnit_TestCaller_INCLUDED +#ifndef Poco_CppUnit_TestCaller_INCLUDED +#define Poco_CppUnit_TestCaller_INCLUDED -#include "CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnit.h" #include "Guards.h" #include "TestCase.h" #include @@ -96,8 +96,8 @@ private: } // namespace CppUnit -#define CppUnit_addTest(suite, cls, mth) \ +#define Poco_CppUnit_addTest(suite, cls, mth) \ suite->addTest(new CppUnit::TestCaller(#mth, &cls::mth)) -#endif // CppUnit_TestCaller_INCLUDED +#endif // Poco_CppUnit_TestCaller_INCLUDED diff --git a/CppUnit/include/CppUnit/TestCase.h b/CppUnit/include/Poco/CppUnit/TestCase.h similarity index 96% rename from CppUnit/include/CppUnit/TestCase.h rename to CppUnit/include/Poco/CppUnit/TestCase.h index 60b07b811..a07f8f2eb 100644 --- a/CppUnit/include/CppUnit/TestCase.h +++ b/CppUnit/include/Poco/CppUnit/TestCase.h @@ -5,14 +5,14 @@ // -#ifndef CppUnit_TestCase_INCLUDED -#define CppUnit_TestCase_INCLUDED +#ifndef Poco_CppUnit_TestCase_INCLUDED +#define Poco_CppUnit_TestCase_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/Guards.h" -#include "CppUnit/Test.h" -#include "CppUnit/CppUnitException.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/Guards.h" +#include "Poco/CppUnit/Test.h" +#include "Poco/CppUnit/CppUnitException.h" #include #include @@ -83,7 +83,7 @@ class TestResult; * see TestResult, TestSuite and TestCaller * */ -class CppUnit_API TestCase: public Test +class Poco_CppUnit_API TestCase: public Test { REFERENCEOBJECT (TestCase) @@ -254,4 +254,4 @@ inline std::string TestCase::toString() } // namespace CppUnit -#endif // CppUnit_TestCase_INCLUDED +#endif // Poco_CppUnit_TestCase_INCLUDED diff --git a/CppUnit/include/CppUnit/TestDecorator.h b/CppUnit/include/Poco/CppUnit/TestDecorator.h similarity index 62% rename from CppUnit/include/CppUnit/TestDecorator.h rename to CppUnit/include/Poco/CppUnit/TestDecorator.h index ac57c591e..cde751020 100644 --- a/CppUnit/include/CppUnit/TestDecorator.h +++ b/CppUnit/include/Poco/CppUnit/TestDecorator.h @@ -5,13 +5,13 @@ // -#ifndef CppUnit_TestDecorator_INCLUDED -#define CppUnit_TestDecorator_INCLUDED +#ifndef Poco_CppUnit_TestDecorator_INCLUDED +#define Poco_CppUnit_TestDecorator_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/Guards.h" -#include "CppUnit/Test.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/Guards.h" +#include "Poco/CppUnit/Test.h" namespace CppUnit { @@ -26,7 +26,7 @@ class TestResult; * Does not assume ownership of the test it decorates * */ -class CppUnit_API TestDecorator: public Test +class Poco_CppUnit_API TestDecorator: public Test { REFERENCEOBJECT(TestDecorator) @@ -49,4 +49,4 @@ protected: } // namespace CppUnit -#endif // CppUnit_TestDecorator_INCLUDED +#endif // Poco_CppUnit_TestDecorator_INCLUDED diff --git a/CppUnit/include/CppUnit/TestFailure.h b/CppUnit/include/Poco/CppUnit/TestFailure.h similarity index 82% rename from CppUnit/include/CppUnit/TestFailure.h rename to CppUnit/include/Poco/CppUnit/TestFailure.h index c1f845d72..860e7852f 100644 --- a/CppUnit/include/CppUnit/TestFailure.h +++ b/CppUnit/include/Poco/CppUnit/TestFailure.h @@ -5,13 +5,13 @@ // -#ifndef CppUnit_TestFailure_INCLUDED -#define CppUnit_TestFailure_INCLUDED +#ifndef Poco_CppUnit_TestFailure_INCLUDED +#define Poco_CppUnit_TestFailure_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/CppUnitException.h" -#include "CppUnit/Guards.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnitException.h" +#include "Poco/CppUnit/Guards.h" namespace CppUnit { @@ -33,7 +33,7 @@ class Test; * see TestSuite * */ -class CppUnit_API TestFailure +class Poco_CppUnit_API TestFailure { REFERENCEOBJECT (TestFailure) @@ -81,6 +81,6 @@ inline CppUnitException* TestFailure::thrownException() } // namespace CppUnit -#endif // CppUnit_TestFailure_INCLUDED +#endif // Poco_CppUnit_TestFailure_INCLUDED diff --git a/CppUnit/include/CppUnit/TestResult.h b/CppUnit/include/Poco/CppUnit/TestResult.h similarity index 94% rename from CppUnit/include/CppUnit/TestResult.h rename to CppUnit/include/Poco/CppUnit/TestResult.h index 22fbd44c4..e0d4c00c1 100644 --- a/CppUnit/include/CppUnit/TestResult.h +++ b/CppUnit/include/Poco/CppUnit/TestResult.h @@ -5,13 +5,13 @@ // -#ifndef CppUnit_TestResult_INCLUDED -#define CppUnit_TestResult_INCLUDED +#ifndef Poco_CppUnit_TestResult_INCLUDED +#define Poco_CppUnit_TestResult_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/Guards.h" -#include "CppUnit/TestFailure.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/Guards.h" +#include "Poco/CppUnit/TestFailure.h" #include @@ -41,7 +41,7 @@ class Test; * * see Test */ -class CppUnit_API TestResult +class Poco_CppUnit_API TestResult { REFERENCEOBJECT (TestResult) @@ -228,4 +228,4 @@ inline void TestResult::setSynchronizationObject(SynchronizationObject* syncObje } // namespace CppUnit -#endif // CppUnit_TestResult_INCLUDED +#endif // Poco_CppUnit_TestResult_INCLUDED diff --git a/CppUnit/include/CppUnit/TestRunner.h b/CppUnit/include/Poco/CppUnit/TestRunner.h similarity index 91% rename from CppUnit/include/CppUnit/TestRunner.h rename to CppUnit/include/Poco/CppUnit/TestRunner.h index e43934659..f92ccdce1 100644 --- a/CppUnit/include/CppUnit/TestRunner.h +++ b/CppUnit/include/Poco/CppUnit/TestRunner.h @@ -5,11 +5,11 @@ // -#ifndef CppUnit_TestRunner_INCLUDED -#define CppUnit_TestRunner_INCLUDED +#ifndef Poco_CppUnit_TestRunner_INCLUDED +#define Poco_CppUnit_TestRunner_INCLUDED -#include "CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnit.h" #include #include #include @@ -38,7 +38,7 @@ class Test; * TestRunner [-all] [-print] [-wait] ExampleTestCase * */ -class CppUnit_API TestRunner +class Poco_CppUnit_API TestRunner { typedef std::pair Mapping; typedef std::vector Mappings; @@ -100,4 +100,4 @@ private: #endif -#endif // CppUnit_TestRunner_INCLUDED +#endif // Poco_CppUnit_TestRunner_INCLUDED diff --git a/CppUnit/include/CppUnit/TestSetup.h b/CppUnit/include/Poco/CppUnit/TestSetup.h similarity index 61% rename from CppUnit/include/CppUnit/TestSetup.h rename to CppUnit/include/Poco/CppUnit/TestSetup.h index 789a076e5..a68825488 100644 --- a/CppUnit/include/CppUnit/TestSetup.h +++ b/CppUnit/include/Poco/CppUnit/TestSetup.h @@ -5,13 +5,13 @@ // -#ifndef CppUnit_TestSetup_INCLUDED -#define CppUnit_TestSetup_INCLUDED +#ifndef Poco_CppUnit_TestSetup_INCLUDED +#define Poco_CppUnit_TestSetup_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/Guards.h" -#include "CppUnit/TestDecorator.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/Guards.h" +#include "Poco/CppUnit/TestDecorator.h" namespace CppUnit { @@ -21,7 +21,7 @@ class Test; class TestResult; -class CppUnit_API TestSetup: public TestDecorator +class Poco_CppUnit_API TestSetup: public TestDecorator { REFERENCEOBJECT (TestSetup) @@ -54,4 +54,4 @@ inline void TestSetup::run(TestResult* result) } // namespace CppUnit -#endif // CppUnit_TestSetup_INCLUDED +#endif // Poco_CppUnit_TestSetup_INCLUDED diff --git a/CppUnit/include/CppUnit/TestSuite.h b/CppUnit/include/Poco/CppUnit/TestSuite.h similarity index 84% rename from CppUnit/include/CppUnit/TestSuite.h rename to CppUnit/include/Poco/CppUnit/TestSuite.h index 197cf2747..907e51077 100644 --- a/CppUnit/include/CppUnit/TestSuite.h +++ b/CppUnit/include/Poco/CppUnit/TestSuite.h @@ -5,13 +5,13 @@ // -#ifndef CppUnit_TestSuite_INCLUDED -#define CppUnit_TestSuite_INCLUDED +#ifndef Poco_CppUnit_TestSuite_INCLUDED +#define Poco_CppUnit_TestSuite_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/Guards.h" -#include "CppUnit/Test.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/Guards.h" +#include "Poco/CppUnit/Test.h" #include #include @@ -35,7 +35,7 @@ class TestResult; * * see Test and TestCaller */ -class CppUnit_API TestSuite: public Test +class Poco_CppUnit_API TestSuite: public Test { REFERENCEOBJECT (TestSuite) @@ -95,4 +95,4 @@ inline const std::vector TestSuite::tests() const } // namespace CppUnit -#endif // CppUnit_TestSuite_INCLUDED +#endif // Poco_CppUnit_TestSuite_INCLUDED diff --git a/CppUnit/include/CppUnit/TextTestResult.h b/CppUnit/include/Poco/CppUnit/TextTestResult.h similarity index 77% rename from CppUnit/include/CppUnit/TextTestResult.h rename to CppUnit/include/Poco/CppUnit/TextTestResult.h index d3b191fd9..8279cd893 100644 --- a/CppUnit/include/CppUnit/TextTestResult.h +++ b/CppUnit/include/Poco/CppUnit/TextTestResult.h @@ -5,12 +5,12 @@ // -#ifndef CppUnit_TextTestResult_INCLUDED -#define CppUnit_TextTestResult_INCLUDED +#ifndef Poco_CppUnit_TextTestResult_INCLUDED +#define Poco_CppUnit_TextTestResult_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/TestResult.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/TestResult.h" #include #include @@ -18,7 +18,7 @@ namespace CppUnit { -class CppUnit_API TextTestResult: public TestResult +class Poco_CppUnit_API TextTestResult: public TestResult { public: TextTestResult(); @@ -53,4 +53,4 @@ inline std::ostream& operator<< (std::ostream& stream, TextTestResult& result) } // namespace CppUnit -#endif // CppUnit_TextTestResult_INCLUDED +#endif // Poco_CppUnit_TextTestResult_INCLUDED diff --git a/CppUnit/include/CppUnit/estring.h b/CppUnit/include/Poco/CppUnit/estring.h similarity index 88% rename from CppUnit/include/CppUnit/estring.h rename to CppUnit/include/Poco/CppUnit/estring.h index cc3fe99d9..0637f10ff 100644 --- a/CppUnit/include/CppUnit/estring.h +++ b/CppUnit/include/Poco/CppUnit/estring.h @@ -5,11 +5,11 @@ // -#ifndef CppUnit_estring_INCLUDED -#define CppUnit_estring_INCLUDED +#ifndef Poco_CppUnit_estring_INCLUDED +#define Poco_CppUnit_estring_INCLUDED -#include "CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnit.h" #include #include @@ -70,4 +70,4 @@ inline std::string estring(const void* ptr) } // namespace CppUnit -#endif // CppUnit_estring_INCLUDED +#endif // Poco_CppUnit_estring_INCLUDED diff --git a/CppUnit/src/CppUnitException.cpp b/CppUnit/src/CppUnitException.cpp index fa4edfcaf..b13981f09 100644 --- a/CppUnit/src/CppUnitException.cpp +++ b/CppUnit/src/CppUnitException.cpp @@ -5,7 +5,7 @@ // -#include "CppUnit/CppUnitException.h" +#include "Poco/CppUnit/CppUnitException.h" namespace CppUnit { diff --git a/CppUnit/src/TestCase.cpp b/CppUnit/src/TestCase.cpp index 0e8669d97..7931dd8fd 100644 --- a/CppUnit/src/TestCase.cpp +++ b/CppUnit/src/TestCase.cpp @@ -7,9 +7,9 @@ #include #include -#include "CppUnit/TestCase.h" -#include "CppUnit/TestResult.h" -#include "CppUnit/estring.h" +#include "Poco/CppUnit/TestCase.h" +#include "Poco/CppUnit/TestResult.h" +#include "Poco/CppUnit/estring.h" #include #include diff --git a/CppUnit/src/TestDecorator.cpp b/CppUnit/src/TestDecorator.cpp index 40f4b6662..7963829bf 100644 --- a/CppUnit/src/TestDecorator.cpp +++ b/CppUnit/src/TestDecorator.cpp @@ -5,7 +5,7 @@ // -#include "CppUnit/TestDecorator.h" +#include "Poco/CppUnit/TestDecorator.h" namespace CppUnit { diff --git a/CppUnit/src/TestFailure.cpp b/CppUnit/src/TestFailure.cpp index bfae51606..f52c0ad6f 100644 --- a/CppUnit/src/TestFailure.cpp +++ b/CppUnit/src/TestFailure.cpp @@ -5,8 +5,8 @@ // -#include "CppUnit/TestFailure.h" -#include "CppUnit/Test.h" +#include "Poco/CppUnit/TestFailure.h" +#include "Poco/CppUnit/Test.h" namespace CppUnit { diff --git a/CppUnit/src/TestResult.cpp b/CppUnit/src/TestResult.cpp index d6e3fcbbf..b124146e9 100644 --- a/CppUnit/src/TestResult.cpp +++ b/CppUnit/src/TestResult.cpp @@ -5,7 +5,7 @@ // -#include "CppUnit/TestResult.h" +#include "Poco/CppUnit/TestResult.h" namespace CppUnit { diff --git a/CppUnit/src/TestRunner.cpp b/CppUnit/src/TestRunner.cpp index 196fbdeed..e1e814028 100644 --- a/CppUnit/src/TestRunner.cpp +++ b/CppUnit/src/TestRunner.cpp @@ -5,10 +5,10 @@ // -#include "CppUnit/TestRunner.h" -#include "CppUnit/Test.h" -#include "CppUnit/TestSuite.h" -#include "CppUnit/TextTestResult.h" +#include "Poco/CppUnit/TestRunner.h" +#include "Poco/CppUnit/Test.h" +#include "Poco/CppUnit/TestSuite.h" +#include "Poco/CppUnit/TextTestResult.h" #include diff --git a/CppUnit/src/TestSuite.cpp b/CppUnit/src/TestSuite.cpp index 066949243..b0daa5167 100644 --- a/CppUnit/src/TestSuite.cpp +++ b/CppUnit/src/TestSuite.cpp @@ -5,8 +5,8 @@ // -#include "CppUnit/TestSuite.h" -#include "CppUnit/TestResult.h" +#include "Poco/CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestResult.h" namespace CppUnit { diff --git a/CppUnit/src/TextTestResult.cpp b/CppUnit/src/TextTestResult.cpp index 25e7cadab..b7eb8f09a 100644 --- a/CppUnit/src/TextTestResult.cpp +++ b/CppUnit/src/TextTestResult.cpp @@ -5,10 +5,10 @@ // -#include "CppUnit/TextTestResult.h" -#include "CppUnit/CppUnitException.h" -#include "CppUnit/Test.h" -#include "CppUnit/estring.h" +#include "Poco/CppUnit/TextTestResult.h" +#include "Poco/CppUnit/CppUnitException.h" +#include "Poco/CppUnit/Test.h" +#include "Poco/CppUnit/estring.h" #include #include #include diff --git a/Cygwin/Makefile b/Cygwin/Makefile new file mode 100644 index 000000000..6d3f769d8 --- /dev/null +++ b/Cygwin/Makefile @@ -0,0 +1,346 @@ +# +# Makefile +# +# The global Makefile for POCO [generated by mkrelease] +# + +sinclude config.make +sinclude config.build + +ifndef POCO_BASE +$(warning WARNING: POCO_BASE is not defined. Assuming current directory.) +export POCO_BASE=$(shell pwd) +endif + +ifndef POCO_PREFIX +export POCO_PREFIX=/usr/local +endif + +ifndef POCO_BUILD +export POCO_BUILD=$(POCO_BASE) +endif + +# +# Determine OS +# +POCO_HOST_OSNAME = $(shell uname) +ifeq ($(findstring CYGWIN,$(POCO_HOST_OSNAME)),CYGWIN) +POCO_HOST_OSNAME = Cygwin +endif + +ifeq ($(findstring MINGW,$(POCO_HOST_OSNAME)),MINGW) +POCO_HOST_OSNAME = MinGW +endif +POCO_HOST_OSARCH ?= $(subst /,-,$(shell uname -m | tr ' ' _)) + +# +# If POCO_CONFIG is not set, use the OS name as configuration name +# +ifndef POCO_CONFIG +POCO_CONFIG = $(POCO_HOST_OSNAME) +endif +#$(info POCO_CONFIG = $(POCO_CONFIG)) + +# +# Include System Specific Settings +# +include $(POCO_BASE)/build/config/$(POCO_CONFIG) + +# +# Determine operating system +# +ifndef POCO_TARGET_OSNAME +OSNAME := $(POCO_HOST_OSNAME) +else +OSNAME := $(POCO_TARGET_OSNAME) +endif +#$(info OSNAME = $(OSNAME)) + +ifndef POCO_TARGET_OSARCH +OSARCH := $(POCO_HOST_OSARCH) +else +OSARCH := $(POCO_TARGET_OSARCH) +endif +#$(info OSARCH = $(OSARCH)) + +.PHONY: poco all libexecs cppunit tests samples cleans clean distclean install + +# TESTS and SAMPLES are set in config.make +poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples) +all: libexecs tests samples + +INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) +COMPONENTS = Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF + +cppunit: + $(MAKE) -C $(POCO_BASE)/CppUnit + +CppUnit-clean: + \$(MAKE) -C \$(POCO_BASE)/CppUnit clean + +install: libexecs + mkdir -p $(INSTALLDIR)/include/Poco + mkdir -p $(INSTALLDIR)/lib + mkdir -p $(INSTALLDIR)/bin + for comp in $(filter-out $(foreach f,$(OMIT),$f%),$(COMPONENTS)) ; do \ + if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ + cp -Rf $(POCO_BASE)/$$comp/include/* $(INSTALLDIR)/include/ ; \ + fi ; \ + if [ -d "$(POCO_BUILD)/$$comp/bin" ] ; then \ + find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ + fi ; \ + done +ifeq ($(OSNAME), Cygwin) + find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type f -exec cp -f {} $(INSTALLDIR)/bin \; + find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/bin \; +endif + find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; + find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; + +libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec +tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests +samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples MongoDB-samples Zip-samples PageCompiler-samples PDF-samples +cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean + +.PHONY: $(libexecs) +.PHONY: $(tests) +.PHONY: $(samples) +.PHONY: $(cleans) + +libexecs: $(filter-out $(foreach f,$(OMIT),$f%),$(libexecs)) +tests: $(filter-out $(foreach f,$(OMIT),$f%),$(tests)) +samples: $(filter-out $(foreach f,$(OMIT),$f%),$(samples)) +cleans: $(filter-out $(foreach f,$(OMIT),$f%),$(cleans)) + +Foundation-libexec: + $(MAKE) -C $(POCO_BASE)/Foundation + +Foundation-tests: Foundation-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Foundation/testsuite + +Foundation-samples: Foundation-libexec + $(MAKE) -C $(POCO_BASE)/Foundation/samples + +Foundation-clean: + $(MAKE) -C $(POCO_BASE)/Foundation clean + $(MAKE) -C $(POCO_BASE)/Foundation/testsuite clean + $(MAKE) -C $(POCO_BASE)/Foundation/samples clean + +XML-libexec: Foundation-libexec + $(MAKE) -C $(POCO_BASE)/XML + +XML-tests: XML-libexec cppunit + $(MAKE) -C $(POCO_BASE)/XML/testsuite + +XML-samples: XML-libexec + $(MAKE) -C $(POCO_BASE)/XML/samples + +XML-clean: + $(MAKE) -C $(POCO_BASE)/XML clean + $(MAKE) -C $(POCO_BASE)/XML/testsuite clean + $(MAKE) -C $(POCO_BASE)/XML/samples clean + +JSON-libexec: Foundation-libexec + $(MAKE) -C $(POCO_BASE)/JSON + +JSON-tests: JSON-libexec cppunit + $(MAKE) -C $(POCO_BASE)/JSON/testsuite + +JSON-samples: JSON-libexec + $(MAKE) -C $(POCO_BASE)/JSON/samples + +JSON-clean: + $(MAKE) -C $(POCO_BASE)/JSON clean + $(MAKE) -C $(POCO_BASE)/JSON/testsuite clean + $(MAKE) -C $(POCO_BASE)/JSON/samples clean + +Util-libexec: Foundation-libexec XML-libexec JSON-libexec + $(MAKE) -C $(POCO_BASE)/Util + +Util-tests: Util-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Util/testsuite + +Util-samples: Util-libexec + $(MAKE) -C $(POCO_BASE)/Util/samples + +Util-clean: + $(MAKE) -C $(POCO_BASE)/Util clean + $(MAKE) -C $(POCO_BASE)/Util/testsuite clean + $(MAKE) -C $(POCO_BASE)/Util/samples clean + +Net-libexec: Foundation-libexec + $(MAKE) -C $(POCO_BASE)/Net + +Net-tests: Net-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Net/testsuite + +Net-samples: Net-libexec Foundation-libexec XML-libexec Util-libexec + $(MAKE) -C $(POCO_BASE)/Net/samples + +Net-clean: + $(MAKE) -C $(POCO_BASE)/Net clean + $(MAKE) -C $(POCO_BASE)/Net/testsuite clean + $(MAKE) -C $(POCO_BASE)/Net/samples clean + +Crypto-libexec: Foundation-libexec + $(MAKE) -C $(POCO_BASE)/Crypto + +Crypto-tests: Crypto-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Crypto/testsuite + +Crypto-samples: Crypto-libexec Foundation-libexec Util-libexec + $(MAKE) -C $(POCO_BASE)/Crypto/samples + +Crypto-clean: + $(MAKE) -C $(POCO_BASE)/Crypto clean + $(MAKE) -C $(POCO_BASE)/Crypto/testsuite clean + $(MAKE) -C $(POCO_BASE)/Crypto/samples clean + +NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec Crypto-libexec + $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL + +NetSSL_OpenSSL-tests: NetSSL_OpenSSL-libexec cppunit + $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite + +NetSSL_OpenSSL-samples: NetSSL_OpenSSL-libexec + $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples + +NetSSL_OpenSSL-clean: + $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL clean + $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite clean + $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples clean + +Data-libexec: Foundation-libexec + $(MAKE) -C $(POCO_BASE)/Data + +Data-tests: Data-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Data/testsuite + +Data-samples: Data-libexec Data-libexec Data/SQLite-libexec + $(MAKE) -C $(POCO_BASE)/Data/samples + +Data-clean: + $(MAKE) -C $(POCO_BASE)/Data clean + $(MAKE) -C $(POCO_BASE)/Data/testsuite clean + $(MAKE) -C $(POCO_BASE)/Data/samples clean + +Data/SQLite-libexec: Foundation-libexec Data-libexec + $(MAKE) -C $(POCO_BASE)/Data/SQLite + +Data/SQLite-tests: Data/SQLite-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite + +Data/SQLite-clean: + $(MAKE) -C $(POCO_BASE)/Data/SQLite clean + $(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite clean + +Data/ODBC-libexec: Foundation-libexec Data-libexec + $(MAKE) -C $(POCO_BASE)/Data/ODBC + +Data/ODBC-tests: Data/ODBC-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite + +Data/ODBC-clean: + $(MAKE) -C $(POCO_BASE)/Data/ODBC clean + $(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite clean + +Data/MySQL-libexec: Foundation-libexec Data-libexec + $(MAKE) -C $(POCO_BASE)/Data/MySQL + +Data/MySQL-tests: Data/MySQL-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite + +Data/MySQL-clean: + $(MAKE) -C $(POCO_BASE)/Data/MySQL clean + $(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite clean + +MongoDB-libexec: Foundation-libexec Net-libexec + $(MAKE) -C $(POCO_BASE)/MongoDB + +MongoDB-tests: MongoDB-libexec cppunit + $(MAKE) -C $(POCO_BASE)/MongoDB/testsuite + +MongoDB-samples: MongoDB-libexec + $(MAKE) -C $(POCO_BASE)/MongoDB/samples + +MongoDB-clean: + $(MAKE) -C $(POCO_BASE)/MongoDB clean + $(MAKE) -C $(POCO_BASE)/MongoDB/testsuite clean + $(MAKE) -C $(POCO_BASE)/MongoDB/samples clean + +Redis-libexec: Foundation-libexec Net-libexec + $(MAKE) -C $(POCO_BASE)/Redis + +Redis-tests: Redis-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Redis/testsuite + +#No samples yet ... uncomment this when added, and add Redis-samples to samples above +#Redis-samples: Redis-libexec +# $(MAKE) -C $(POCO_BASE)/Redis/samples + +Redis-clean: + $(MAKE) -C $(POCO_BASE)/Redis clean + $(MAKE) -C $(POCO_BASE)/Redis/testsuite clean +# $(MAKE) -C $(POCO_BASE)/Redis/samples clean + +Zip-libexec: Foundation-libexec Net-libexec Util-libexec XML-libexec + $(MAKE) -C $(POCO_BASE)/Zip + +Zip-tests: Zip-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Zip/testsuite + +Zip-samples: Zip-libexec + $(MAKE) -C $(POCO_BASE)/Zip/samples + +Zip-clean: + $(MAKE) -C $(POCO_BASE)/Zip clean + $(MAKE) -C $(POCO_BASE)/Zip/testsuite clean + $(MAKE) -C $(POCO_BASE)/Zip/samples clean + +PageCompiler-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec + $(MAKE) -C $(POCO_BASE)/PageCompiler + +PageCompiler-samples: PageCompiler-libexec + $(MAKE) -C $(POCO_BASE)/PageCompiler/samples + +PageCompiler-clean: + $(MAKE) -C $(POCO_BASE)/PageCompiler clean + $(MAKE) -C $(POCO_BASE)/PageCompiler/samples clean + +PageCompiler/File2Page-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec + $(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page + +PageCompiler/File2Page-clean: + $(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page clean + +CppParser-libexec: Foundation-libexec + $(MAKE) -C $(POCO_BASE)/CppParser + +CppParser-tests: CppParser-libexec cppunit + $(MAKE) -C $(POCO_BASE)/CppParser/testsuite + +CppParser-clean: + $(MAKE) -C $(POCO_BASE)/CppParser clean + $(MAKE) -C $(POCO_BASE)/CppParser/testsuite clean + +PDF-libexec: Foundation-libexec + $(MAKE) -C $(POCO_BASE)/PDF + +PDF-tests: PDF-libexec cppunit + $(MAKE) -C $(POCO_BASE)/PDF/testsuite + +PDF-samples: PDF-libexec + $(MAKE) -C $(POCO_BASE)/PDF/samples + +PDF-clean: + $(MAKE) -C $(POCO_BASE)/PDF clean + $(MAKE) -C $(POCO_BASE)/PDF/testsuite clean + $(MAKE) -C $(POCO_BASE)/PDF/samples clean + +clean: cleans CppUnit-clean + +distclean: + rm -rf $(POCO_BUILD)/lib + find $(POCO_BUILD) -name obj -type d -print0 | xargs -0 rm -rf + find $(POCO_BUILD) -name .dep -type d -print0 | xargs -0 rm -rf + find $(POCO_BUILD) -name bin -type d -print0 | xargs -0 rm -rf From d03ac30383cee630280eec9bc17f5756e3de24fd Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 6 Jan 2016 15:09:45 +0100 Subject: [PATCH 005/131] Remove wrong directory. --- Cygwin/Makefile | 346 ------------------------------------------------ 1 file changed, 346 deletions(-) delete mode 100644 Cygwin/Makefile diff --git a/Cygwin/Makefile b/Cygwin/Makefile deleted file mode 100644 index 6d3f769d8..000000000 --- a/Cygwin/Makefile +++ /dev/null @@ -1,346 +0,0 @@ -# -# Makefile -# -# The global Makefile for POCO [generated by mkrelease] -# - -sinclude config.make -sinclude config.build - -ifndef POCO_BASE -$(warning WARNING: POCO_BASE is not defined. Assuming current directory.) -export POCO_BASE=$(shell pwd) -endif - -ifndef POCO_PREFIX -export POCO_PREFIX=/usr/local -endif - -ifndef POCO_BUILD -export POCO_BUILD=$(POCO_BASE) -endif - -# -# Determine OS -# -POCO_HOST_OSNAME = $(shell uname) -ifeq ($(findstring CYGWIN,$(POCO_HOST_OSNAME)),CYGWIN) -POCO_HOST_OSNAME = Cygwin -endif - -ifeq ($(findstring MINGW,$(POCO_HOST_OSNAME)),MINGW) -POCO_HOST_OSNAME = MinGW -endif -POCO_HOST_OSARCH ?= $(subst /,-,$(shell uname -m | tr ' ' _)) - -# -# If POCO_CONFIG is not set, use the OS name as configuration name -# -ifndef POCO_CONFIG -POCO_CONFIG = $(POCO_HOST_OSNAME) -endif -#$(info POCO_CONFIG = $(POCO_CONFIG)) - -# -# Include System Specific Settings -# -include $(POCO_BASE)/build/config/$(POCO_CONFIG) - -# -# Determine operating system -# -ifndef POCO_TARGET_OSNAME -OSNAME := $(POCO_HOST_OSNAME) -else -OSNAME := $(POCO_TARGET_OSNAME) -endif -#$(info OSNAME = $(OSNAME)) - -ifndef POCO_TARGET_OSARCH -OSARCH := $(POCO_HOST_OSARCH) -else -OSARCH := $(POCO_TARGET_OSARCH) -endif -#$(info OSARCH = $(OSARCH)) - -.PHONY: poco all libexecs cppunit tests samples cleans clean distclean install - -# TESTS and SAMPLES are set in config.make -poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples) -all: libexecs tests samples - -INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) -COMPONENTS = Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF - -cppunit: - $(MAKE) -C $(POCO_BASE)/CppUnit - -CppUnit-clean: - \$(MAKE) -C \$(POCO_BASE)/CppUnit clean - -install: libexecs - mkdir -p $(INSTALLDIR)/include/Poco - mkdir -p $(INSTALLDIR)/lib - mkdir -p $(INSTALLDIR)/bin - for comp in $(filter-out $(foreach f,$(OMIT),$f%),$(COMPONENTS)) ; do \ - if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ - cp -Rf $(POCO_BASE)/$$comp/include/* $(INSTALLDIR)/include/ ; \ - fi ; \ - if [ -d "$(POCO_BUILD)/$$comp/bin" ] ; then \ - find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ - fi ; \ - done -ifeq ($(OSNAME), Cygwin) - find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type f -exec cp -f {} $(INSTALLDIR)/bin \; - find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/bin \; -endif - find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; - find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; - -libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec -tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests -samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples MongoDB-samples Zip-samples PageCompiler-samples PDF-samples -cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean - -.PHONY: $(libexecs) -.PHONY: $(tests) -.PHONY: $(samples) -.PHONY: $(cleans) - -libexecs: $(filter-out $(foreach f,$(OMIT),$f%),$(libexecs)) -tests: $(filter-out $(foreach f,$(OMIT),$f%),$(tests)) -samples: $(filter-out $(foreach f,$(OMIT),$f%),$(samples)) -cleans: $(filter-out $(foreach f,$(OMIT),$f%),$(cleans)) - -Foundation-libexec: - $(MAKE) -C $(POCO_BASE)/Foundation - -Foundation-tests: Foundation-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Foundation/testsuite - -Foundation-samples: Foundation-libexec - $(MAKE) -C $(POCO_BASE)/Foundation/samples - -Foundation-clean: - $(MAKE) -C $(POCO_BASE)/Foundation clean - $(MAKE) -C $(POCO_BASE)/Foundation/testsuite clean - $(MAKE) -C $(POCO_BASE)/Foundation/samples clean - -XML-libexec: Foundation-libexec - $(MAKE) -C $(POCO_BASE)/XML - -XML-tests: XML-libexec cppunit - $(MAKE) -C $(POCO_BASE)/XML/testsuite - -XML-samples: XML-libexec - $(MAKE) -C $(POCO_BASE)/XML/samples - -XML-clean: - $(MAKE) -C $(POCO_BASE)/XML clean - $(MAKE) -C $(POCO_BASE)/XML/testsuite clean - $(MAKE) -C $(POCO_BASE)/XML/samples clean - -JSON-libexec: Foundation-libexec - $(MAKE) -C $(POCO_BASE)/JSON - -JSON-tests: JSON-libexec cppunit - $(MAKE) -C $(POCO_BASE)/JSON/testsuite - -JSON-samples: JSON-libexec - $(MAKE) -C $(POCO_BASE)/JSON/samples - -JSON-clean: - $(MAKE) -C $(POCO_BASE)/JSON clean - $(MAKE) -C $(POCO_BASE)/JSON/testsuite clean - $(MAKE) -C $(POCO_BASE)/JSON/samples clean - -Util-libexec: Foundation-libexec XML-libexec JSON-libexec - $(MAKE) -C $(POCO_BASE)/Util - -Util-tests: Util-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Util/testsuite - -Util-samples: Util-libexec - $(MAKE) -C $(POCO_BASE)/Util/samples - -Util-clean: - $(MAKE) -C $(POCO_BASE)/Util clean - $(MAKE) -C $(POCO_BASE)/Util/testsuite clean - $(MAKE) -C $(POCO_BASE)/Util/samples clean - -Net-libexec: Foundation-libexec - $(MAKE) -C $(POCO_BASE)/Net - -Net-tests: Net-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Net/testsuite - -Net-samples: Net-libexec Foundation-libexec XML-libexec Util-libexec - $(MAKE) -C $(POCO_BASE)/Net/samples - -Net-clean: - $(MAKE) -C $(POCO_BASE)/Net clean - $(MAKE) -C $(POCO_BASE)/Net/testsuite clean - $(MAKE) -C $(POCO_BASE)/Net/samples clean - -Crypto-libexec: Foundation-libexec - $(MAKE) -C $(POCO_BASE)/Crypto - -Crypto-tests: Crypto-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Crypto/testsuite - -Crypto-samples: Crypto-libexec Foundation-libexec Util-libexec - $(MAKE) -C $(POCO_BASE)/Crypto/samples - -Crypto-clean: - $(MAKE) -C $(POCO_BASE)/Crypto clean - $(MAKE) -C $(POCO_BASE)/Crypto/testsuite clean - $(MAKE) -C $(POCO_BASE)/Crypto/samples clean - -NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec Crypto-libexec - $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL - -NetSSL_OpenSSL-tests: NetSSL_OpenSSL-libexec cppunit - $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite - -NetSSL_OpenSSL-samples: NetSSL_OpenSSL-libexec - $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples - -NetSSL_OpenSSL-clean: - $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL clean - $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite clean - $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples clean - -Data-libexec: Foundation-libexec - $(MAKE) -C $(POCO_BASE)/Data - -Data-tests: Data-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Data/testsuite - -Data-samples: Data-libexec Data-libexec Data/SQLite-libexec - $(MAKE) -C $(POCO_BASE)/Data/samples - -Data-clean: - $(MAKE) -C $(POCO_BASE)/Data clean - $(MAKE) -C $(POCO_BASE)/Data/testsuite clean - $(MAKE) -C $(POCO_BASE)/Data/samples clean - -Data/SQLite-libexec: Foundation-libexec Data-libexec - $(MAKE) -C $(POCO_BASE)/Data/SQLite - -Data/SQLite-tests: Data/SQLite-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite - -Data/SQLite-clean: - $(MAKE) -C $(POCO_BASE)/Data/SQLite clean - $(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite clean - -Data/ODBC-libexec: Foundation-libexec Data-libexec - $(MAKE) -C $(POCO_BASE)/Data/ODBC - -Data/ODBC-tests: Data/ODBC-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite - -Data/ODBC-clean: - $(MAKE) -C $(POCO_BASE)/Data/ODBC clean - $(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite clean - -Data/MySQL-libexec: Foundation-libexec Data-libexec - $(MAKE) -C $(POCO_BASE)/Data/MySQL - -Data/MySQL-tests: Data/MySQL-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite - -Data/MySQL-clean: - $(MAKE) -C $(POCO_BASE)/Data/MySQL clean - $(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite clean - -MongoDB-libexec: Foundation-libexec Net-libexec - $(MAKE) -C $(POCO_BASE)/MongoDB - -MongoDB-tests: MongoDB-libexec cppunit - $(MAKE) -C $(POCO_BASE)/MongoDB/testsuite - -MongoDB-samples: MongoDB-libexec - $(MAKE) -C $(POCO_BASE)/MongoDB/samples - -MongoDB-clean: - $(MAKE) -C $(POCO_BASE)/MongoDB clean - $(MAKE) -C $(POCO_BASE)/MongoDB/testsuite clean - $(MAKE) -C $(POCO_BASE)/MongoDB/samples clean - -Redis-libexec: Foundation-libexec Net-libexec - $(MAKE) -C $(POCO_BASE)/Redis - -Redis-tests: Redis-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Redis/testsuite - -#No samples yet ... uncomment this when added, and add Redis-samples to samples above -#Redis-samples: Redis-libexec -# $(MAKE) -C $(POCO_BASE)/Redis/samples - -Redis-clean: - $(MAKE) -C $(POCO_BASE)/Redis clean - $(MAKE) -C $(POCO_BASE)/Redis/testsuite clean -# $(MAKE) -C $(POCO_BASE)/Redis/samples clean - -Zip-libexec: Foundation-libexec Net-libexec Util-libexec XML-libexec - $(MAKE) -C $(POCO_BASE)/Zip - -Zip-tests: Zip-libexec cppunit - $(MAKE) -C $(POCO_BASE)/Zip/testsuite - -Zip-samples: Zip-libexec - $(MAKE) -C $(POCO_BASE)/Zip/samples - -Zip-clean: - $(MAKE) -C $(POCO_BASE)/Zip clean - $(MAKE) -C $(POCO_BASE)/Zip/testsuite clean - $(MAKE) -C $(POCO_BASE)/Zip/samples clean - -PageCompiler-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec - $(MAKE) -C $(POCO_BASE)/PageCompiler - -PageCompiler-samples: PageCompiler-libexec - $(MAKE) -C $(POCO_BASE)/PageCompiler/samples - -PageCompiler-clean: - $(MAKE) -C $(POCO_BASE)/PageCompiler clean - $(MAKE) -C $(POCO_BASE)/PageCompiler/samples clean - -PageCompiler/File2Page-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec - $(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page - -PageCompiler/File2Page-clean: - $(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page clean - -CppParser-libexec: Foundation-libexec - $(MAKE) -C $(POCO_BASE)/CppParser - -CppParser-tests: CppParser-libexec cppunit - $(MAKE) -C $(POCO_BASE)/CppParser/testsuite - -CppParser-clean: - $(MAKE) -C $(POCO_BASE)/CppParser clean - $(MAKE) -C $(POCO_BASE)/CppParser/testsuite clean - -PDF-libexec: Foundation-libexec - $(MAKE) -C $(POCO_BASE)/PDF - -PDF-tests: PDF-libexec cppunit - $(MAKE) -C $(POCO_BASE)/PDF/testsuite - -PDF-samples: PDF-libexec - $(MAKE) -C $(POCO_BASE)/PDF/samples - -PDF-clean: - $(MAKE) -C $(POCO_BASE)/PDF clean - $(MAKE) -C $(POCO_BASE)/PDF/testsuite clean - $(MAKE) -C $(POCO_BASE)/PDF/samples clean - -clean: cleans CppUnit-clean - -distclean: - rm -rf $(POCO_BUILD)/lib - find $(POCO_BUILD) -name obj -type d -print0 | xargs -0 rm -rf - find $(POCO_BUILD) -name .dep -type d -print0 | xargs -0 rm -rf - find $(POCO_BUILD) -name bin -type d -print0 | xargs -0 rm -rf From ce797f7700d70280aec85fd3ec34fe0c6fcd5036 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 8 Jan 2016 00:17:13 +0100 Subject: [PATCH 006/131] Make CppUnit a component of Poco Signed-off-by: FrancisANDRE --- CppParser/testsuite/CMakeLists.txt | 2 +- CppParser/testsuite/Makefile | 2 +- CppParser/testsuite/TestSuite_vs120.vcxproj | 12 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 12 +- .../testsuite/src/AttributesParserTest.cpp | 4 +- .../testsuite/src/AttributesParserTest.h | 2 +- CppParser/testsuite/src/AttributesTestSuite.h | 2 +- CppParser/testsuite/src/CppParserTest.cpp | 4 +- CppParser/testsuite/src/CppParserTest.h | 2 +- CppParser/testsuite/src/CppParserTestSuite.h | 2 +- CppParser/testsuite/src/Driver.cpp | 2 +- CppUnit/CppUnit_CE_vs90.vcproj | 32 +- CppUnit/CppUnit_WEC2013_vs110.vcxproj | 54 +- CppUnit/CppUnit_WEC2013_vs120.vcxproj | 66 +- CppUnit/CppUnit_vs100.vcxproj | 84 +-- CppUnit/CppUnit_vs110.vcxproj | 78 +-- CppUnit/CppUnit_vs120.vcxproj | 52 +- CppUnit/CppUnit_vs140.vcxproj | 78 +-- CppUnit/CppUnit_vs90.vcproj | 66 +- CppUnit/CppUnit_x64_vs100.vcxproj | 78 +-- CppUnit/CppUnit_x64_vs110.vcxproj | 78 +-- CppUnit/CppUnit_x64_vs120.vcxproj | 78 +-- CppUnit/CppUnit_x64_vs140.vcxproj | 78 +-- CppUnit/CppUnit_x64_vs90.vcproj | 62 +- CppUnit/Makefile | 2 +- CppUnit/WinTestRunner/CMakeLists.txt | 2 +- .../include/WinTestRunner/WinTestRunner.h | 2 +- CppUnit/WinTestRunner/src/ActiveTest.h | 4 +- CppUnit/WinTestRunner/src/GUITestResult.h | 4 +- CppUnit/WinTestRunner/src/ProgressBar.h | 2 +- CppUnit/WinTestRunner/src/TestRunnerDlg.cpp | 2 +- CppUnit/WinTestRunner/src/TestRunnerDlg.h | 4 +- CppUnit/WinTestRunner/src/WinTestRunner.cpp | 2 +- CppUnit/include/Poco/CppUnit/CppUnit.h | 43 +- .../include/Poco/CppUnit/CppUnitException.h | 2 +- CppUnit/include/Poco/CppUnit/RepeatedTest.h | 2 +- CppUnit/include/Poco/CppUnit/Test.h | 2 +- CppUnit/include/Poco/CppUnit/TestCaller.h | 2 +- CppUnit/include/Poco/CppUnit/TestCase.h | 2 +- CppUnit/include/Poco/CppUnit/TestDecorator.h | 2 +- CppUnit/include/Poco/CppUnit/TestFailure.h | 2 +- CppUnit/include/Poco/CppUnit/TestResult.h | 2 +- CppUnit/include/Poco/CppUnit/TestRunner.h | 2 +- CppUnit/include/Poco/CppUnit/TestSetup.h | 2 +- CppUnit/include/Poco/CppUnit/TestSuite.h | 2 +- CppUnit/include/Poco/CppUnit/TextTestResult.h | 2 +- Crypto/testsuite/CMakeLists.txt | 2 +- Crypto/testsuite/Makefile | 2 +- Crypto/testsuite/TestSuite_vs120.vcxproj | 12 +- Crypto/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- Crypto/testsuite/src/CryptoTest.cpp | 4 +- Crypto/testsuite/src/CryptoTest.h | 2 +- Crypto/testsuite/src/CryptoTestSuite.h | 2 +- Crypto/testsuite/src/DigestEngineTest.cpp | 4 +- Crypto/testsuite/src/DigestEngineTest.h | 2 +- Crypto/testsuite/src/Driver.cpp | 2 +- Crypto/testsuite/src/RSATest.cpp | 4 +- Crypto/testsuite/src/RSATest.h | 2 +- Crypto/testsuite/src/WinCEDriver.cpp | 2 +- Data/MySQL/testsuite/CMakeLists.txt | 2 +- Data/MySQL/testsuite/Makefile | 2 +- Data/MySQL/testsuite/TestSuite_vs120.vcxproj | 12 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 12 +- Data/MySQL/testsuite/src/Driver.cpp | 2 +- Data/MySQL/testsuite/src/MySQLTest.cpp | 4 +- Data/MySQL/testsuite/src/MySQLTest.h | 2 +- Data/MySQL/testsuite/src/MySQLTestSuite.h | 2 +- Data/MySQL/testsuite/src/SQLExecutor.cpp | 2 +- Data/ODBC/testsuite/CMakeLists.txt | 2 +- Data/ODBC/testsuite/Makefile | 2 +- Data/ODBC/testsuite/TestSuite_vs120.vcxproj | 12 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 12 +- Data/ODBC/testsuite/src/Driver.cpp | 2 +- Data/ODBC/testsuite/src/ODBCAccessTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCAccessTest.h | 2 +- Data/ODBC/testsuite/src/ODBCDB2Test.cpp | 4 +- Data/ODBC/testsuite/src/ODBCMySQLTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCOracleTest.cpp | 4 +- .../ODBC/testsuite/src/ODBCPostgreSQLTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCTest.cpp | 4 +- Data/ODBC/testsuite/src/ODBCTest.h | 2 +- Data/ODBC/testsuite/src/ODBCTestSuite.h | 2 +- Data/ODBC/testsuite/src/SQLExecutor.cpp | 2 +- Data/SQLite/testsuite/CMakeLists.txt | 2 +- Data/SQLite/testsuite/Makefile | 2 +- Data/SQLite/testsuite/TestSuite_vs120.vcxproj | 12 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 12 +- Data/SQLite/testsuite/src/Driver.cpp | 2 +- Data/SQLite/testsuite/src/SQLiteTest.cpp | 4 +- Data/SQLite/testsuite/src/SQLiteTest.h | 2 +- Data/SQLite/testsuite/src/SQLiteTestSuite.h | 2 +- Data/SQLite/testsuite/src/WinCEDriver.cpp | 2 +- Data/testsuite/CMakeLists.txt | 2 +- Data/testsuite/Makefile | 2 +- Data/testsuite/TestSuite_vs120.vcxproj | 12 +- Data/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- Data/testsuite/src/DataTest.cpp | 4 +- Data/testsuite/src/DataTest.h | 2 +- Data/testsuite/src/DataTestSuite.h | 2 +- Data/testsuite/src/Driver.cpp | 2 +- Data/testsuite/src/SessionPoolTest.cpp | 4 +- Data/testsuite/src/SessionPoolTest.h | 2 +- Data/testsuite/src/WinCEDriver.cpp | 2 +- Foundation/testsuite/CMakeLists.txt | 2 +- Foundation/testsuite/Makefile-Driver | 2 +- Foundation/testsuite/TestSuite_vs120.vcxproj | 12 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 614 +++++++++--------- .../testsuite/src/ActiveDispatcherTest.cpp | 4 +- .../testsuite/src/ActiveDispatcherTest.h | 2 +- Foundation/testsuite/src/ActiveMethodTest.cpp | 4 +- Foundation/testsuite/src/ActiveMethodTest.h | 2 +- Foundation/testsuite/src/ActivityTest.cpp | 4 +- Foundation/testsuite/src/ActivityTest.h | 2 +- Foundation/testsuite/src/AnyTest.cpp | 4 +- Foundation/testsuite/src/AnyTest.h | 2 +- Foundation/testsuite/src/ArrayTest.cpp | 4 +- Foundation/testsuite/src/ArrayTest.h | 2 +- Foundation/testsuite/src/AutoPtrTest.cpp | 4 +- Foundation/testsuite/src/AutoPtrTest.h | 2 +- .../testsuite/src/AutoReleasePoolTest.cpp | 4 +- .../testsuite/src/AutoReleasePoolTest.h | 2 +- Foundation/testsuite/src/Base32Test.cpp | 4 +- Foundation/testsuite/src/Base32Test.h | 2 +- Foundation/testsuite/src/Base64Test.cpp | 4 +- Foundation/testsuite/src/Base64Test.h | 2 +- Foundation/testsuite/src/BasicEventTest.cpp | 4 +- Foundation/testsuite/src/BasicEventTest.h | 2 +- .../testsuite/src/BinaryReaderWriterTest.cpp | 4 +- .../testsuite/src/BinaryReaderWriterTest.h | 2 +- Foundation/testsuite/src/ByteOrderTest.cpp | 4 +- Foundation/testsuite/src/ByteOrderTest.h | 2 +- Foundation/testsuite/src/CacheTestSuite.h | 2 +- Foundation/testsuite/src/ChannelTest.cpp | 4 +- Foundation/testsuite/src/ChannelTest.h | 2 +- Foundation/testsuite/src/ClassLoaderTest.cpp | 4 +- Foundation/testsuite/src/ClassLoaderTest.h | 2 +- Foundation/testsuite/src/ClockTest.cpp | 4 +- Foundation/testsuite/src/ClockTest.h | 2 +- Foundation/testsuite/src/ConditionTest.cpp | 4 +- Foundation/testsuite/src/ConditionTest.h | 2 +- Foundation/testsuite/src/CoreTest.cpp | 4 +- Foundation/testsuite/src/CoreTest.h | 2 +- Foundation/testsuite/src/CoreTestSuite.h | 2 +- .../testsuite/src/CountingStreamTest.cpp | 4 +- Foundation/testsuite/src/CountingStreamTest.h | 2 +- Foundation/testsuite/src/CryptTestSuite.h | 2 +- .../testsuite/src/DateTimeFormatterTest.cpp | 4 +- .../testsuite/src/DateTimeFormatterTest.h | 2 +- .../testsuite/src/DateTimeParserTest.cpp | 4 +- Foundation/testsuite/src/DateTimeParserTest.h | 2 +- Foundation/testsuite/src/DateTimeTest.cpp | 4 +- Foundation/testsuite/src/DateTimeTest.h | 2 +- Foundation/testsuite/src/DateTimeTestSuite.h | 2 +- Foundation/testsuite/src/DigestStreamTest.cpp | 4 +- Foundation/testsuite/src/DigestStreamTest.h | 2 +- .../testsuite/src/DirectoryIteratorsTest.cpp | 4 +- .../testsuite/src/DirectoryIteratorsTest.h | 2 +- .../testsuite/src/DirectoryWatcherTest.cpp | 4 +- .../testsuite/src/DirectoryWatcherTest.h | 2 +- Foundation/testsuite/src/Driver.cpp | 2 +- .../testsuite/src/DynamicFactoryTest.cpp | 4 +- Foundation/testsuite/src/DynamicFactoryTest.h | 2 +- Foundation/testsuite/src/DynamicTestSuite.h | 2 +- Foundation/testsuite/src/EventTestSuite.h | 2 +- Foundation/testsuite/src/ExpireCacheTest.cpp | 4 +- Foundation/testsuite/src/ExpireCacheTest.h | 2 +- .../testsuite/src/ExpireLRUCacheTest.cpp | 4 +- Foundation/testsuite/src/ExpireLRUCacheTest.h | 2 +- .../testsuite/src/FIFOBufferStreamTest.cpp | 4 +- .../testsuite/src/FIFOBufferStreamTest.h | 2 +- Foundation/testsuite/src/FIFOBufferTest.cpp | 4 +- Foundation/testsuite/src/FIFOBufferTest.h | 2 +- .../testsuite/src/FIFOBufferTestSuite.h | 2 +- Foundation/testsuite/src/FIFOEventTest.cpp | 4 +- Foundation/testsuite/src/FIFOEventTest.h | 2 +- Foundation/testsuite/src/FPETest.cpp | 4 +- Foundation/testsuite/src/FPETest.h | 2 +- Foundation/testsuite/src/FileChannelTest.cpp | 4 +- Foundation/testsuite/src/FileChannelTest.h | 2 +- Foundation/testsuite/src/FileStreamTest.cpp | 4 +- Foundation/testsuite/src/FileStreamTest.h | 2 +- Foundation/testsuite/src/FileTest.cpp | 4 +- Foundation/testsuite/src/FileTest.h | 2 +- .../testsuite/src/FilesystemTestSuite.h | 2 +- Foundation/testsuite/src/FormatTest.cpp | 4 +- Foundation/testsuite/src/FormatTest.h | 2 +- .../testsuite/src/FoundationTestSuite.h | 2 +- Foundation/testsuite/src/GlobTest.cpp | 4 +- Foundation/testsuite/src/GlobTest.h | 2 +- Foundation/testsuite/src/HMACEngineTest.cpp | 4 +- Foundation/testsuite/src/HMACEngineTest.h | 2 +- Foundation/testsuite/src/HashMapTest.cpp | 4 +- Foundation/testsuite/src/HashMapTest.h | 2 +- Foundation/testsuite/src/HashSetTest.cpp | 4 +- Foundation/testsuite/src/HashSetTest.h | 2 +- Foundation/testsuite/src/HashTableTest.cpp | 4 +- Foundation/testsuite/src/HashTableTest.h | 2 +- Foundation/testsuite/src/HashingTestSuite.h | 2 +- Foundation/testsuite/src/HexBinaryTest.cpp | 4 +- Foundation/testsuite/src/HexBinaryTest.h | 2 +- Foundation/testsuite/src/LRUCacheTest.cpp | 4 +- Foundation/testsuite/src/LRUCacheTest.h | 2 +- .../testsuite/src/LineEndingConverterTest.cpp | 4 +- .../testsuite/src/LineEndingConverterTest.h | 2 +- .../testsuite/src/LinearHashTableTest.cpp | 4 +- .../testsuite/src/LinearHashTableTest.h | 2 +- Foundation/testsuite/src/ListMapTest.cpp | 4 +- Foundation/testsuite/src/ListMapTest.h | 2 +- .../testsuite/src/LocalDateTimeTest.cpp | 4 +- Foundation/testsuite/src/LocalDateTimeTest.h | 2 +- Foundation/testsuite/src/LogStreamTest.cpp | 4 +- Foundation/testsuite/src/LogStreamTest.h | 2 +- Foundation/testsuite/src/LoggerTest.cpp | 4 +- Foundation/testsuite/src/LoggerTest.h | 2 +- .../testsuite/src/LoggingFactoryTest.cpp | 4 +- Foundation/testsuite/src/LoggingFactoryTest.h | 2 +- .../testsuite/src/LoggingRegistryTest.cpp | 4 +- .../testsuite/src/LoggingRegistryTest.h | 2 +- Foundation/testsuite/src/LoggingTestSuite.h | 2 +- Foundation/testsuite/src/MD4EngineTest.cpp | 4 +- Foundation/testsuite/src/MD4EngineTest.h | 2 +- Foundation/testsuite/src/MD5EngineTest.cpp | 4 +- Foundation/testsuite/src/MD5EngineTest.h | 2 +- Foundation/testsuite/src/ManifestTest.cpp | 4 +- Foundation/testsuite/src/ManifestTest.h | 2 +- Foundation/testsuite/src/MemoryPoolTest.cpp | 4 +- Foundation/testsuite/src/MemoryPoolTest.h | 2 +- Foundation/testsuite/src/MemoryStreamTest.cpp | 4 +- Foundation/testsuite/src/MemoryStreamTest.h | 2 +- Foundation/testsuite/src/MutexTest.cpp | 4 +- Foundation/testsuite/src/MutexTest.h | 2 +- Foundation/testsuite/src/NDCTest.cpp | 4 +- Foundation/testsuite/src/NDCTest.h | 2 +- Foundation/testsuite/src/NamedEventTest.cpp | 4 +- Foundation/testsuite/src/NamedEventTest.h | 2 +- Foundation/testsuite/src/NamedMutexTest.cpp | 4 +- Foundation/testsuite/src/NamedMutexTest.h | 2 +- Foundation/testsuite/src/NamedTuplesTest.cpp | 4 +- Foundation/testsuite/src/NamedTuplesTest.h | 2 +- .../testsuite/src/NotificationCenterTest.cpp | 4 +- .../testsuite/src/NotificationCenterTest.h | 2 +- .../testsuite/src/NotificationQueueTest.cpp | 4 +- .../testsuite/src/NotificationQueueTest.h | 2 +- .../testsuite/src/NotificationsTestSuite.h | 2 +- Foundation/testsuite/src/NullStreamTest.cpp | 4 +- Foundation/testsuite/src/NullStreamTest.h | 2 +- .../testsuite/src/NumberFormatterTest.cpp | 4 +- .../testsuite/src/NumberFormatterTest.h | 2 +- Foundation/testsuite/src/NumberParserTest.cpp | 4 +- Foundation/testsuite/src/NumberParserTest.h | 2 +- Foundation/testsuite/src/ObjectPoolTest.cpp | 4 +- Foundation/testsuite/src/ObjectPoolTest.h | 2 +- Foundation/testsuite/src/PBKDF2EngineTest.cpp | 4 +- Foundation/testsuite/src/PBKDF2EngineTest.h | 2 +- Foundation/testsuite/src/PathTest.cpp | 4 +- Foundation/testsuite/src/PathTest.h | 2 +- .../testsuite/src/PatternFormatterTest.cpp | 4 +- .../testsuite/src/PatternFormatterTest.h | 2 +- .../testsuite/src/PriorityEventTest.cpp | 4 +- Foundation/testsuite/src/PriorityEventTest.h | 2 +- .../src/PriorityNotificationQueueTest.cpp | 4 +- .../src/PriorityNotificationQueueTest.h | 2 +- Foundation/testsuite/src/ProcessTest.cpp | 4 +- Foundation/testsuite/src/ProcessTest.h | 2 +- Foundation/testsuite/src/ProcessesTestSuite.h | 2 +- Foundation/testsuite/src/RWLockTest.cpp | 4 +- Foundation/testsuite/src/RWLockTest.h | 2 +- Foundation/testsuite/src/RandomStreamTest.cpp | 4 +- Foundation/testsuite/src/RandomStreamTest.h | 2 +- Foundation/testsuite/src/RandomTest.cpp | 4 +- Foundation/testsuite/src/RandomTest.h | 2 +- .../testsuite/src/RegularExpressionTest.cpp | 4 +- .../testsuite/src/RegularExpressionTest.h | 2 +- Foundation/testsuite/src/SHA1EngineTest.cpp | 4 +- Foundation/testsuite/src/SHA1EngineTest.h | 2 +- Foundation/testsuite/src/SemaphoreTest.cpp | 4 +- Foundation/testsuite/src/SemaphoreTest.h | 2 +- .../testsuite/src/SharedLibraryTest.cpp | 4 +- Foundation/testsuite/src/SharedLibraryTest.h | 2 +- .../testsuite/src/SharedLibraryTestSuite.h | 2 +- Foundation/testsuite/src/SharedMemoryTest.cpp | 4 +- Foundation/testsuite/src/SharedMemoryTest.h | 2 +- Foundation/testsuite/src/SharedPtrTest.cpp | 4 +- Foundation/testsuite/src/SharedPtrTest.h | 2 +- .../testsuite/src/SimpleFileChannelTest.cpp | 4 +- .../testsuite/src/SimpleFileChannelTest.h | 2 +- .../testsuite/src/SimpleHashTableTest.cpp | 4 +- .../testsuite/src/SimpleHashTableTest.h | 2 +- Foundation/testsuite/src/StopwatchTest.cpp | 4 +- Foundation/testsuite/src/StopwatchTest.h | 2 +- .../testsuite/src/StreamConverterTest.cpp | 4 +- .../testsuite/src/StreamConverterTest.h | 2 +- Foundation/testsuite/src/StreamCopierTest.cpp | 4 +- Foundation/testsuite/src/StreamCopierTest.h | 2 +- .../testsuite/src/StreamTokenizerTest.cpp | 4 +- .../testsuite/src/StreamTokenizerTest.h | 2 +- Foundation/testsuite/src/StreamsTestSuite.h | 2 +- Foundation/testsuite/src/StringTest.cpp | 4 +- Foundation/testsuite/src/StringTest.h | 2 +- .../testsuite/src/StringTokenizerTest.cpp | 4 +- .../testsuite/src/StringTokenizerTest.h | 2 +- Foundation/testsuite/src/TaskManagerTest.cpp | 4 +- Foundation/testsuite/src/TaskManagerTest.h | 2 +- Foundation/testsuite/src/TaskTest.cpp | 4 +- Foundation/testsuite/src/TaskTest.h | 2 +- Foundation/testsuite/src/TaskTestSuite.h | 2 +- Foundation/testsuite/src/TeeStreamTest.cpp | 4 +- Foundation/testsuite/src/TeeStreamTest.h | 2 +- .../testsuite/src/TextBufferIteratorTest.cpp | 4 +- .../testsuite/src/TextBufferIteratorTest.h | 2 +- .../testsuite/src/TextConverterTest.cpp | 4 +- Foundation/testsuite/src/TextConverterTest.h | 2 +- Foundation/testsuite/src/TextEncodingTest.cpp | 4 +- Foundation/testsuite/src/TextEncodingTest.h | 2 +- Foundation/testsuite/src/TextIteratorTest.cpp | 4 +- Foundation/testsuite/src/TextIteratorTest.h | 2 +- Foundation/testsuite/src/TextTestSuite.h | 2 +- Foundation/testsuite/src/ThreadLocalTest.cpp | 4 +- Foundation/testsuite/src/ThreadLocalTest.h | 2 +- Foundation/testsuite/src/ThreadPoolTest.cpp | 4 +- Foundation/testsuite/src/ThreadPoolTest.h | 2 +- Foundation/testsuite/src/ThreadTest.cpp | 4 +- Foundation/testsuite/src/ThreadTest.h | 2 +- Foundation/testsuite/src/ThreadingTestSuite.h | 2 +- .../src/TimedNotificationQueueTest.cpp | 4 +- .../src/TimedNotificationQueueTest.h | 2 +- Foundation/testsuite/src/TimerTest.cpp | 4 +- Foundation/testsuite/src/TimerTest.h | 2 +- Foundation/testsuite/src/TimespanTest.cpp | 4 +- Foundation/testsuite/src/TimespanTest.h | 2 +- Foundation/testsuite/src/TimestampTest.cpp | 4 +- Foundation/testsuite/src/TimestampTest.h | 2 +- Foundation/testsuite/src/TimezoneTest.cpp | 4 +- Foundation/testsuite/src/TimezoneTest.h | 2 +- Foundation/testsuite/src/TuplesTest.cpp | 4 +- Foundation/testsuite/src/TuplesTest.h | 2 +- Foundation/testsuite/src/TypeListTest.cpp | 4 +- Foundation/testsuite/src/TypeListTest.h | 2 +- .../testsuite/src/URIStreamOpenerTest.cpp | 4 +- .../testsuite/src/URIStreamOpenerTest.h | 2 +- Foundation/testsuite/src/URITest.cpp | 4 +- Foundation/testsuite/src/URITest.h | 2 +- Foundation/testsuite/src/URITestSuite.h | 2 +- Foundation/testsuite/src/UTF8StringTest.cpp | 4 +- Foundation/testsuite/src/UTF8StringTest.h | 2 +- .../testsuite/src/UUIDGeneratorTest.cpp | 4 +- Foundation/testsuite/src/UUIDGeneratorTest.h | 2 +- Foundation/testsuite/src/UUIDTest.cpp | 4 +- Foundation/testsuite/src/UUIDTest.h | 2 +- Foundation/testsuite/src/UUIDTestSuite.h | 2 +- .../testsuite/src/UnicodeConverterTest.cpp | 4 +- .../testsuite/src/UnicodeConverterTest.h | 2 +- .../testsuite/src/UniqueExpireCacheTest.cpp | 4 +- .../testsuite/src/UniqueExpireCacheTest.h | 2 +- .../src/UniqueExpireLRUCacheTest.cpp | 4 +- .../testsuite/src/UniqueExpireLRUCacheTest.h | 2 +- Foundation/testsuite/src/VarTest.cpp | 4 +- Foundation/testsuite/src/VarTest.h | 2 +- Foundation/testsuite/src/WinCEDriver.cpp | 2 +- Foundation/testsuite/src/ZLibTest.cpp | 4 +- Foundation/testsuite/src/ZLibTest.h | 2 +- JSON/testsuite/CMakeLists.txt | 2 +- JSON/testsuite/Makefile | 2 +- JSON/testsuite/TestSuite_vs120.vcxproj | 12 +- JSON/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- JSON/testsuite/src/Driver.cpp | 2 +- JSON/testsuite/src/JSONTest.cpp | 4 +- JSON/testsuite/src/JSONTest.h | 2 +- JSON/testsuite/src/JSONTestSuite.h | 2 +- JSON/testsuite/src/WinCEDriver.cpp | 2 +- Makefile | 2 +- MongoDB/testsuite/CMakeLists.txt | 2 +- MongoDB/testsuite/Makefile | 2 +- MongoDB/testsuite/TestSuite_vs120.vcxproj | 12 +- MongoDB/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- MongoDB/testsuite/src/Driver.cpp | 2 +- MongoDB/testsuite/src/MongoDBTest.cpp | 4 +- MongoDB/testsuite/src/MongoDBTest.h | 2 +- MongoDB/testsuite/src/MongoDBTestSuite.h | 2 +- MongoDB/testsuite/src/WinCEDriver.cpp | 2 +- Net/testsuite/CMakeLists.txt | 2 +- Net/testsuite/Makefile | 2 +- Net/testsuite/TestSuite_vs120.vcxproj | 12 +- Net/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- Net/testsuite/src/DNSTest.cpp | 4 +- Net/testsuite/src/DNSTest.h | 2 +- Net/testsuite/src/DatagramSocketTest.cpp | 4 +- Net/testsuite/src/DatagramSocketTest.h | 2 +- Net/testsuite/src/DialogSocketTest.cpp | 4 +- Net/testsuite/src/DialogSocketTest.h | 2 +- Net/testsuite/src/Driver.cpp | 2 +- Net/testsuite/src/FTPClientSessionTest.cpp | 4 +- Net/testsuite/src/FTPClientSessionTest.h | 2 +- Net/testsuite/src/FTPClientTestSuite.h | 2 +- Net/testsuite/src/FTPStreamFactoryTest.cpp | 4 +- Net/testsuite/src/FTPStreamFactoryTest.h | 2 +- Net/testsuite/src/HTMLFormTest.cpp | 4 +- Net/testsuite/src/HTMLFormTest.h | 2 +- Net/testsuite/src/HTMLTestSuite.h | 2 +- Net/testsuite/src/HTTPClientSessionTest.cpp | 4 +- Net/testsuite/src/HTTPClientSessionTest.h | 2 +- Net/testsuite/src/HTTPClientTestSuite.h | 2 +- Net/testsuite/src/HTTPCookieTest.cpp | 4 +- Net/testsuite/src/HTTPCookieTest.h | 2 +- Net/testsuite/src/HTTPCredentialsTest.cpp | 4 +- Net/testsuite/src/HTTPCredentialsTest.h | 2 +- Net/testsuite/src/HTTPRequestTest.cpp | 4 +- Net/testsuite/src/HTTPRequestTest.h | 2 +- Net/testsuite/src/HTTPResponseTest.cpp | 4 +- Net/testsuite/src/HTTPResponseTest.h | 2 +- Net/testsuite/src/HTTPServerTest.cpp | 4 +- Net/testsuite/src/HTTPServerTest.h | 2 +- Net/testsuite/src/HTTPServerTestSuite.h | 2 +- Net/testsuite/src/HTTPStreamFactoryTest.cpp | 4 +- Net/testsuite/src/HTTPStreamFactoryTest.h | 2 +- Net/testsuite/src/HTTPTestSuite.h | 2 +- Net/testsuite/src/ICMPClientTest.cpp | 4 +- Net/testsuite/src/ICMPClientTest.h | 2 +- Net/testsuite/src/ICMPClientTestSuite.h | 2 +- Net/testsuite/src/ICMPSocketTest.cpp | 4 +- Net/testsuite/src/ICMPSocketTest.h | 2 +- Net/testsuite/src/IPAddressTest.cpp | 4 +- Net/testsuite/src/IPAddressTest.h | 2 +- Net/testsuite/src/MailMessageTest.cpp | 4 +- Net/testsuite/src/MailMessageTest.h | 2 +- Net/testsuite/src/MailStreamTest.cpp | 4 +- Net/testsuite/src/MailStreamTest.h | 2 +- Net/testsuite/src/MailTestSuite.h | 2 +- Net/testsuite/src/MediaTypeTest.cpp | 4 +- Net/testsuite/src/MediaTypeTest.h | 2 +- Net/testsuite/src/MessageHeaderTest.cpp | 4 +- Net/testsuite/src/MessageHeaderTest.h | 2 +- Net/testsuite/src/MessagesTestSuite.h | 2 +- Net/testsuite/src/MulticastSocketTest.cpp | 4 +- Net/testsuite/src/MulticastSocketTest.h | 2 +- Net/testsuite/src/MultipartReaderTest.cpp | 4 +- Net/testsuite/src/MultipartReaderTest.h | 2 +- Net/testsuite/src/MultipartWriterTest.cpp | 4 +- Net/testsuite/src/MultipartWriterTest.h | 2 +- Net/testsuite/src/NTPClientTest.cpp | 4 +- Net/testsuite/src/NTPClientTest.h | 2 +- Net/testsuite/src/NTPClientTestSuite.h | 2 +- Net/testsuite/src/NameValueCollectionTest.cpp | 4 +- Net/testsuite/src/NameValueCollectionTest.h | 2 +- Net/testsuite/src/NetCoreTestSuite.h | 2 +- Net/testsuite/src/NetTestSuite.h | 2 +- Net/testsuite/src/NetworkInterfaceTest.cpp | 4 +- Net/testsuite/src/NetworkInterfaceTest.h | 2 +- Net/testsuite/src/OAuth10CredentialsTest.cpp | 4 +- Net/testsuite/src/OAuth10CredentialsTest.h | 2 +- Net/testsuite/src/OAuth20CredentialsTest.cpp | 4 +- Net/testsuite/src/OAuth20CredentialsTest.h | 2 +- Net/testsuite/src/OAuthTestSuite.h | 2 +- Net/testsuite/src/POP3ClientSessionTest.cpp | 4 +- Net/testsuite/src/POP3ClientSessionTest.h | 2 +- Net/testsuite/src/QuotedPrintableTest.cpp | 4 +- Net/testsuite/src/QuotedPrintableTest.h | 2 +- Net/testsuite/src/RawSocketTest.cpp | 4 +- Net/testsuite/src/RawSocketTest.h | 2 +- Net/testsuite/src/ReactorTestSuite.h | 2 +- Net/testsuite/src/SMTPClientSessionTest.cpp | 4 +- Net/testsuite/src/SMTPClientSessionTest.h | 2 +- Net/testsuite/src/SocketAddressTest.cpp | 4 +- Net/testsuite/src/SocketAddressTest.h | 2 +- Net/testsuite/src/SocketReactorTest.cpp | 4 +- Net/testsuite/src/SocketReactorTest.h | 2 +- Net/testsuite/src/SocketStreamTest.cpp | 4 +- Net/testsuite/src/SocketStreamTest.h | 2 +- Net/testsuite/src/SocketTest.cpp | 4 +- Net/testsuite/src/SocketTest.h | 2 +- Net/testsuite/src/SocketsTestSuite.h | 2 +- Net/testsuite/src/SyslogTest.cpp | 4 +- Net/testsuite/src/SyslogTest.h | 2 +- Net/testsuite/src/TCPServerTest.cpp | 4 +- Net/testsuite/src/TCPServerTest.h | 2 +- Net/testsuite/src/TCPServerTestSuite.h | 2 +- Net/testsuite/src/WebSocketTest.cpp | 4 +- Net/testsuite/src/WebSocketTest.h | 2 +- Net/testsuite/src/WebSocketTestSuite.h | 2 +- Net/testsuite/src/WinCEDriver.cpp | 2 +- NetSSL_OpenSSL/testsuite/CMakeLists.txt | 2 +- NetSSL_OpenSSL/testsuite/Makefile | 2 +- .../testsuite/TestSuite_vs120.vcxproj | 12 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 12 +- NetSSL_OpenSSL/testsuite/src/Driver.cpp | 2 +- .../testsuite/src/HTTPSClientSessionTest.cpp | 4 +- .../testsuite/src/HTTPSClientSessionTest.h | 2 +- .../testsuite/src/HTTPSClientTestSuite.h | 2 +- .../testsuite/src/HTTPSServerTest.cpp | 4 +- .../testsuite/src/HTTPSServerTest.h | 2 +- .../testsuite/src/HTTPSServerTestSuite.h | 2 +- .../testsuite/src/HTTPSStreamFactoryTest.cpp | 4 +- .../testsuite/src/HTTPSStreamFactoryTest.h | 2 +- .../testsuite/src/NetSSLTestSuite.h | 2 +- .../testsuite/src/TCPServerTest.cpp | 4 +- NetSSL_OpenSSL/testsuite/src/TCPServerTest.h | 2 +- .../testsuite/src/TCPServerTestSuite.h | 2 +- .../testsuite/src/WebSocketTest.cpp | 4 +- NetSSL_OpenSSL/testsuite/src/WebSocketTest.h | 2 +- .../testsuite/src/WebSocketTestSuite.h | 2 +- NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp | 2 +- NetSSL_Win/testsuite/CMakeLists.txt | 2 +- NetSSL_Win/testsuite/TestSuite_vs120.vcxproj | 12 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 12 +- NetSSL_Win/testsuite/src/Driver.cpp | 2 +- .../testsuite/src/HTTPSClientSessionTest.cpp | 4 +- .../testsuite/src/HTTPSClientSessionTest.h | 2 +- .../testsuite/src/HTTPSClientTestSuite.h | 2 +- NetSSL_Win/testsuite/src/HTTPSServerTest.cpp | 4 +- NetSSL_Win/testsuite/src/HTTPSServerTest.h | 2 +- .../testsuite/src/HTTPSServerTestSuite.h | 2 +- .../testsuite/src/HTTPSStreamFactoryTest.cpp | 4 +- .../testsuite/src/HTTPSStreamFactoryTest.h | 2 +- NetSSL_Win/testsuite/src/NetSSLTestSuite.h | 2 +- NetSSL_Win/testsuite/src/TCPServerTest.cpp | 4 +- NetSSL_Win/testsuite/src/TCPServerTest.h | 2 +- NetSSL_Win/testsuite/src/TCPServerTestSuite.h | 2 +- NetSSL_Win/testsuite/src/WebSocketTest.cpp | 4 +- NetSSL_Win/testsuite/src/WebSocketTest.h | 2 +- NetSSL_Win/testsuite/src/WebSocketTestSuite.h | 2 +- NetSSL_Win/testsuite/src/WinCEDriver.cpp | 2 +- PDF/testsuite/CMakeLists.txt | 2 +- PDF/testsuite/Makefile | 2 +- PDF/testsuite/TestSuite_vs120.vcxproj | 12 +- PDF/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- PDF/testsuite/src/Driver.cpp | 2 +- PDF/testsuite/src/PDFTest.cpp | 4 +- PDF/testsuite/src/PDFTest.h | 2 +- PDF/testsuite/src/PDFTestSuite.h | 2 +- .../HTTPTimeServer/src/TimeHandler.cpp | 4 +- .../Win32/testsuite/debug_shared.template | 2 +- .../Win32/testsuite/debug_static_md.template | 2 +- .../Win32/testsuite/debug_static_mt.template | 2 +- .../Win32/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../vs100/x64/testsuite/debug_shared.template | 2 +- .../x64/testsuite/debug_static_md.template | 2 +- .../x64/testsuite/debug_static_mt.template | 2 +- .../x64/testsuite/release_shared.template | 2 +- .../x64/testsuite/release_static_md.template | 2 +- .../x64/testsuite/release_static_mt.template | 2 +- .../Win32/testsuite/debug_shared.template | 2 +- .../Win32/testsuite/debug_static_md.template | 2 +- .../Win32/testsuite/debug_static_mt.template | 2 +- .../Win32/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../WinCE/testsuite/debug_shared.template | 2 +- .../WinCE/testsuite/debug_static_md.template | 2 +- .../WinCE/testsuite/debug_static_mt.template | 2 +- .../WinCE/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../vs110/x64/testsuite/debug_shared.template | 2 +- .../x64/testsuite/debug_static_md.template | 2 +- .../x64/testsuite/debug_static_mt.template | 2 +- .../x64/testsuite/release_shared.template | 2 +- .../x64/testsuite/release_static_md.template | 2 +- .../x64/testsuite/release_static_mt.template | 2 +- .../Win32/testsuite/debug_shared.template | 2 +- .../Win32/testsuite/debug_static_md.template | 2 +- .../Win32/testsuite/debug_static_mt.template | 2 +- .../Win32/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../WinCE/testsuite/debug_shared.template | 2 +- .../WinCE/testsuite/debug_static_md.template | 2 +- .../WinCE/testsuite/debug_static_mt.template | 2 +- .../WinCE/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../vs120/x64/testsuite/debug_shared.template | 2 +- .../x64/testsuite/debug_static_md.template | 2 +- .../x64/testsuite/debug_static_mt.template | 2 +- .../x64/testsuite/release_shared.template | 2 +- .../x64/testsuite/release_static_md.template | 2 +- .../x64/testsuite/release_static_mt.template | 2 +- .../Win32/testsuite/debug_shared.template | 2 +- .../Win32/testsuite/debug_static_md.template | 2 +- .../Win32/testsuite/debug_static_mt.template | 2 +- .../Win32/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../vs140/x64/testsuite/debug_shared.template | 2 +- .../x64/testsuite/debug_static_md.template | 2 +- .../x64/testsuite/debug_static_mt.template | 2 +- .../x64/testsuite/release_shared.template | 2 +- .../x64/testsuite/release_static_md.template | 2 +- .../x64/testsuite/release_static_mt.template | 2 +- .../Win32/testsuite/debug_shared.template | 2 +- .../Win32/testsuite/debug_static_md.template | 2 +- .../Win32/testsuite/debug_static_mt.template | 2 +- .../Win32/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../WinCE/testsuite/debug_shared.template | 2 +- .../WinCE/testsuite/debug_static_md.template | 2 +- .../WinCE/testsuite/debug_static_mt.template | 2 +- .../WinCE/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../vs90/x64/testsuite/debug_shared.template | 2 +- .../x64/testsuite/debug_static_md.template | 2 +- .../x64/testsuite/debug_static_mt.template | 2 +- .../x64/testsuite/release_shared.template | 2 +- .../x64/testsuite/release_static_md.template | 2 +- .../x64/testsuite/release_static_mt.template | 2 +- Redis/testsuite/CMakeLists.txt | 2 +- Redis/testsuite/Makefile | 2 +- Redis/testsuite/src/Driver.cpp | 2 +- Redis/testsuite/src/RedisTest.cpp | 4 +- Redis/testsuite/src/RedisTest.h | 2 +- Redis/testsuite/src/RedisTestSuite.h | 2 +- Redis/testsuite/src/WinCEDriver.cpp | 2 +- Util/testsuite/CMakeLists.txt | 2 +- Util/testsuite/Makefile | 2 +- Util/testsuite/TestSuite_vs120.vcxproj | 12 +- Util/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- .../src/AbstractConfigurationTest.cpp | 2 +- .../testsuite/src/AbstractConfigurationTest.h | 2 +- .../testsuite/src/ConfigurationMapperTest.cpp | 4 +- Util/testsuite/src/ConfigurationTestSuite.h | 2 +- Util/testsuite/src/ConfigurationViewTest.cpp | 4 +- Util/testsuite/src/Driver.cpp | 2 +- .../src/FilesystemConfigurationTest.cpp | 4 +- Util/testsuite/src/HelpFormatterTest.cpp | 4 +- Util/testsuite/src/HelpFormatterTest.h | 2 +- .../src/IniFileConfigurationTest.cpp | 4 +- Util/testsuite/src/JSONConfigurationTest.cpp | 4 +- .../src/LayeredConfigurationTest.cpp | 4 +- .../testsuite/src/LoggingConfiguratorTest.cpp | 4 +- Util/testsuite/src/LoggingConfiguratorTest.h | 2 +- Util/testsuite/src/MapConfigurationTest.cpp | 4 +- Util/testsuite/src/OptionProcessorTest.cpp | 4 +- Util/testsuite/src/OptionProcessorTest.h | 2 +- Util/testsuite/src/OptionSetTest.cpp | 4 +- Util/testsuite/src/OptionSetTest.h | 2 +- Util/testsuite/src/OptionTest.cpp | 4 +- Util/testsuite/src/OptionTest.h | 2 +- Util/testsuite/src/OptionsTestSuite.h | 2 +- .../src/PropertyFileConfigurationTest.cpp | 4 +- .../testsuite/src/SystemConfigurationTest.cpp | 4 +- Util/testsuite/src/SystemConfigurationTest.h | 2 +- Util/testsuite/src/TimerTest.cpp | 4 +- Util/testsuite/src/TimerTest.h | 2 +- Util/testsuite/src/TimerTestSuite.h | 2 +- Util/testsuite/src/UtilTestSuite.h | 2 +- Util/testsuite/src/ValidatorTest.cpp | 4 +- Util/testsuite/src/ValidatorTest.h | 2 +- Util/testsuite/src/WinCEDriver.cpp | 2 +- Util/testsuite/src/WinConfigurationTest.cpp | 4 +- Util/testsuite/src/WinConfigurationTest.h | 2 +- Util/testsuite/src/WinRegistryTest.cpp | 4 +- Util/testsuite/src/WinRegistryTest.h | 2 +- Util/testsuite/src/WindowsTestSuite.h | 2 +- Util/testsuite/src/XMLConfigurationTest.cpp | 4 +- XML/testsuite/CMakeLists.txt | 2 +- XML/testsuite/Makefile | 2 +- XML/testsuite/TestSuite_vs120.vcxproj | 12 +- XML/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- XML/testsuite/src/AttributesImplTest.cpp | 4 +- XML/testsuite/src/AttributesImplTest.h | 2 +- XML/testsuite/src/ChildNodesTest.cpp | 4 +- XML/testsuite/src/ChildNodesTest.h | 2 +- XML/testsuite/src/DOMTestSuite.h | 2 +- XML/testsuite/src/DocumentTest.cpp | 4 +- XML/testsuite/src/DocumentTest.h | 2 +- XML/testsuite/src/DocumentTypeTest.cpp | 4 +- XML/testsuite/src/DocumentTypeTest.h | 2 +- XML/testsuite/src/Driver.cpp | 2 +- XML/testsuite/src/ElementTest.cpp | 4 +- XML/testsuite/src/ElementTest.h | 2 +- XML/testsuite/src/EventTest.cpp | 4 +- XML/testsuite/src/EventTest.h | 2 +- XML/testsuite/src/NamePoolTest.cpp | 4 +- XML/testsuite/src/NamePoolTest.h | 2 +- XML/testsuite/src/NameTest.cpp | 4 +- XML/testsuite/src/NameTest.h | 2 +- XML/testsuite/src/NamespaceSupportTest.cpp | 4 +- XML/testsuite/src/NamespaceSupportTest.h | 2 +- XML/testsuite/src/NodeAppenderTest.cpp | 4 +- XML/testsuite/src/NodeAppenderTest.h | 2 +- XML/testsuite/src/NodeIteratorTest.cpp | 4 +- XML/testsuite/src/NodeIteratorTest.h | 2 +- XML/testsuite/src/NodeTest.cpp | 4 +- XML/testsuite/src/NodeTest.h | 2 +- XML/testsuite/src/ParserWriterTest.cpp | 4 +- XML/testsuite/src/ParserWriterTest.h | 2 +- XML/testsuite/src/SAXParserTest.cpp | 4 +- XML/testsuite/src/SAXParserTest.h | 2 +- XML/testsuite/src/SAXTestSuite.h | 2 +- XML/testsuite/src/TextTest.cpp | 4 +- XML/testsuite/src/TextTest.h | 2 +- XML/testsuite/src/TreeWalkerTest.cpp | 4 +- XML/testsuite/src/TreeWalkerTest.h | 2 +- XML/testsuite/src/WinCEDriver.cpp | 2 +- XML/testsuite/src/XMLStreamParserTest.cpp | 4 +- XML/testsuite/src/XMLStreamParserTest.h | 2 +- XML/testsuite/src/XMLTestSuite.h | 2 +- XML/testsuite/src/XMLWriterTest.cpp | 4 +- XML/testsuite/src/XMLWriterTest.h | 2 +- Zip/testsuite/CMakeLists.txt | 2 +- Zip/testsuite/Makefile | 2 +- Zip/testsuite/TestSuite_vs120.vcxproj | 12 +- Zip/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- Zip/testsuite/src/CompressTest.cpp | 4 +- Zip/testsuite/src/CompressTest.h | 2 +- Zip/testsuite/src/Driver.cpp | 2 +- Zip/testsuite/src/PartialStreamTest.cpp | 4 +- Zip/testsuite/src/PartialStreamTest.h | 2 +- Zip/testsuite/src/WinCEDriver.cpp | 2 +- Zip/testsuite/src/ZipTest.cpp | 4 +- Zip/testsuite/src/ZipTest.h | 2 +- Zip/testsuite/src/ZipTestSuite.h | 2 +- 717 files changed, 1872 insertions(+), 1843 deletions(-) diff --git a/CppParser/testsuite/CMakeLists.txt b/CppParser/testsuite/CMakeLists.txt index 26b83b5b2..4283a2992 100644 --- a/CppParser/testsuite/CMakeLists.txt +++ b/CppParser/testsuite/CMakeLists.txt @@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoCppParser PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoCppParser PocoFoundation PocoCppUnit ) diff --git a/CppParser/testsuite/Makefile b/CppParser/testsuite/Makefile index 0e209175d..bcc78aa92 100644 --- a/CppParser/testsuite/Makefile +++ b/CppParser/testsuite/Makefile @@ -14,6 +14,6 @@ objects = CppParserTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoCppParser PocoFoundation CppUnit +target_libs = PocoCppParser PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/CppParser/testsuite/TestSuite_vs120.vcxproj b/CppParser/testsuite/TestSuite_vs120.vcxproj index 65b39d0c0..e3c95a1ff 100644 --- a/CppParser/testsuite/TestSuite_vs120.vcxproj +++ b/CppParser/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj index 91b676543..a7a0b7cc1 100644 --- a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/src/AttributesParserTest.cpp b/CppParser/testsuite/src/AttributesParserTest.cpp index bcc8fcc6d..aa9b25234 100644 --- a/CppParser/testsuite/src/AttributesParserTest.cpp +++ b/CppParser/testsuite/src/AttributesParserTest.cpp @@ -11,8 +11,8 @@ #include "AttributesParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/CppParser/Attributes.h" #include "Poco/CppParser/AttributesParser.h" #include diff --git a/CppParser/testsuite/src/AttributesParserTest.h b/CppParser/testsuite/src/AttributesParserTest.h index 78ff718b8..df5a03afb 100644 --- a/CppParser/testsuite/src/AttributesParserTest.h +++ b/CppParser/testsuite/src/AttributesParserTest.h @@ -17,7 +17,7 @@ #include "Poco/CppParser/CppParser.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AttributesParserTest: public CppUnit::TestCase diff --git a/CppParser/testsuite/src/AttributesTestSuite.h b/CppParser/testsuite/src/AttributesTestSuite.h index 6d62a98e6..3dff3f0ec 100644 --- a/CppParser/testsuite/src/AttributesTestSuite.h +++ b/CppParser/testsuite/src/AttributesTestSuite.h @@ -16,7 +16,7 @@ #define AttributesTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class AttributesTestSuite diff --git a/CppParser/testsuite/src/CppParserTest.cpp b/CppParser/testsuite/src/CppParserTest.cpp index 004ce4f82..d1af53176 100644 --- a/CppParser/testsuite/src/CppParserTest.cpp +++ b/CppParser/testsuite/src/CppParserTest.cpp @@ -11,8 +11,8 @@ #include "CppParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/CppParser/Utility.h" #include "Poco/CppParser/Symbol.h" #include diff --git a/CppParser/testsuite/src/CppParserTest.h b/CppParser/testsuite/src/CppParserTest.h index 006ac6d37..5d6aabf15 100644 --- a/CppParser/testsuite/src/CppParserTest.h +++ b/CppParser/testsuite/src/CppParserTest.h @@ -17,7 +17,7 @@ #include "Poco/CppParser/CppParser.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CppParserTest: public CppUnit::TestCase diff --git a/CppParser/testsuite/src/CppParserTestSuite.h b/CppParser/testsuite/src/CppParserTestSuite.h index 3ba97606d..7d1284c07 100644 --- a/CppParser/testsuite/src/CppParserTestSuite.h +++ b/CppParser/testsuite/src/CppParserTestSuite.h @@ -16,7 +16,7 @@ #define CppParserTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CppParserTestSuite diff --git a/CppParser/testsuite/src/Driver.cpp b/CppParser/testsuite/src/Driver.cpp index b03341e07..d20639504 100644 --- a/CppParser/testsuite/src/Driver.cpp +++ b/CppParser/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "CppParserTestSuite.h" diff --git a/CppUnit/CppUnit_CE_vs90.vcproj b/CppUnit/CppUnit_CE_vs90.vcproj index b7235dba5..02c7dd3a6 100644 --- a/CppUnit/CppUnit_CE_vs90.vcproj +++ b/CppUnit/CppUnit_CE_vs90.vcproj @@ -626,67 +626,67 @@ Filter="*.h" > diff --git a/CppUnit/CppUnit_WEC2013_vs110.vcxproj b/CppUnit/CppUnit_WEC2013_vs110.vcxproj index 6cfe507c8..d6fcb7322 100644 --- a/CppUnit/CppUnit_WEC2013_vs110.vcxproj +++ b/CppUnit/CppUnit_WEC2013_vs110.vcxproj @@ -149,12 +149,12 @@ NotSet - ..\bin\$(Platform)\CppUnitd.dll + ..\bin\$(Platform)\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\$(Platform)\CppUnitd.pdb - ..\lib\$(Platform)\CppUnitd.lib + ..\bin\$(Platform)\$(TargetName).pdb + ..\lib\$(Platform)\$(TargetName).lib @@ -187,12 +187,12 @@ 0x0c07 - ..\bin\$(Platform)\CppUnit.dll + ..\bin\$(Platform)\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\$(Platform)\CppUnit.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -214,7 +214,7 @@ $(IntDir) - ..\lib\$(Platform)\CppUnitmdd.pdb + ..\lib\$(Platform)\$(TargetName).pdb Level3 true Default @@ -225,7 +225,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmdd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -258,7 +258,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -280,7 +280,7 @@ $(IntDir) - ..\lib\$(Platform)\CppUnitmtd.pdb + ..\lib\$(Platform)\$(TargetName).pdb Level3 true Default @@ -291,7 +291,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmtd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -324,7 +324,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmt.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -338,22 +338,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_WEC2013_vs120.vcxproj b/CppUnit/CppUnit_WEC2013_vs120.vcxproj index a863a58bb..cfacfc879 100644 --- a/CppUnit/CppUnit_WEC2013_vs120.vcxproj +++ b/CppUnit/CppUnit_WEC2013_vs120.vcxproj @@ -111,12 +111,12 @@ obj\$(Platform)\$(Configuration)\ ..\lib\$(Platform)\ obj\$(Platform)\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + $(ProjectName)d + $(ProjectName) + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)md + $(ProjectName)mt @@ -149,12 +149,12 @@ NotSet - ..\bin\$(Platform)\CppUnitd.dll + ..\bin\$(Platform)\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\$(Platform)\CppUnitd.pdb - ..\lib\$(Platform)\CppUnitd.lib + ..\bin\$(Platform)\$(TargetName).pdb + ..\lib\$(Platform)\$(TargetName).lib @@ -187,12 +187,12 @@ 0x0c07 - ..\bin\$(Platform)\CppUnit.dll + ..\bin\$(Platform)\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\$(Platform)\CppUnit.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -214,7 +214,7 @@ $(IntDir) - ..\lib\$(Platform)\CppUnitmdd.pdb + ..\lib\$(Platform)\$(TargetName).pdb Level3 true Default @@ -225,7 +225,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmdd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -258,7 +258,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -280,7 +280,7 @@ $(IntDir) - ..\lib\$(Platform)\CppUnitmtd.pdb + ..\lib\$(Platform)\$(TargetName).pdb Level3 true Default @@ -291,7 +291,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmtd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -324,7 +324,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmt.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -338,22 +338,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs100.vcxproj b/CppUnit/CppUnit_vs100.vcxproj index 9e3900390..ad2e9031a 100644 --- a/CppUnit/CppUnit_vs100.vcxproj +++ b/CppUnit/CppUnit_vs100.vcxproj @@ -100,12 +100,12 @@ obj\$(Configuration)\ ..\lib\ obj\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + $(ProjectName)d + $(ProjectName) + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)md + $(ProjectName)mt @@ -113,7 +113,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -122,7 +122,7 @@ Default false include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -148,12 +148,12 @@ NotSet - ..\bin\CppUnitd.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\$(TargetName).pdb + ..\lib\$(TargetName).lib MachineX86 @@ -163,7 +163,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -174,7 +174,7 @@ Speed true include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -196,12 +196,12 @@ 0x0c07 - ..\bin\CppUnit.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\CppUnit.lib + ..\lib\$(TargetName).lib MachineX86 @@ -211,7 +211,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -233,7 +233,7 @@ $(IntDir) - ..\lib\CppUnitmdd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -245,7 +245,7 @@ 0x0c07 - ..\lib\CppUnitmdd.lib + ..\lib\$(TargetName).lib @@ -254,7 +254,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -287,7 +287,7 @@ 0x0c07 - ..\lib\CppUnitmd.lib + ..\lib\$(TargetName).lib @@ -296,7 +296,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -318,7 +318,7 @@ $(IntDir) - ..\lib\CppUnitmtd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -330,7 +330,7 @@ 0x0c07 - ..\lib\CppUnitmtd.lib + ..\lib\$(TargetName).lib @@ -339,7 +339,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -372,11 +372,11 @@ 0x0c07 - ..\lib\CppUnitmt.lib + ..\lib\$(TargetName).lib - + @@ -386,22 +386,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs110.vcxproj b/CppUnit/CppUnit_vs110.vcxproj index f7c991872..d181547a4 100644 --- a/CppUnit/CppUnit_vs110.vcxproj +++ b/CppUnit/CppUnit_vs110.vcxproj @@ -106,12 +106,12 @@ obj\$(Configuration)\ ..\lib\ obj\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + $(ProjectName)d + $(ProjectName) + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)md + $(ProjectName)mt @@ -119,7 +119,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin\CppUnitd.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\$(TargetName).pdb + ..\lib\$(TargetName).lib MachineX86 @@ -169,7 +169,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin\CppUnit.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\CppUnit.lib + ..\lib\$(TargetName).lib MachineX86 @@ -217,7 +217,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib\CppUnitmdd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib\CppUnitmdd.lib + ..\lib\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib\CppUnitmd.lib + ..\lib\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib\CppUnitmtd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib\CppUnitmtd.lib + ..\lib\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib\CppUnitmt.lib + ..\lib\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs120.vcxproj b/CppUnit/CppUnit_vs120.vcxproj index 9c45b9377..8755a64a5 100644 --- a/CppUnit/CppUnit_vs120.vcxproj +++ b/CppUnit/CppUnit_vs120.vcxproj @@ -106,12 +106,12 @@ obj\$(Configuration)\ ..\lib\ obj\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + Poco$(ProjectName)d + Poco$(ProjectName) + Poco$(ProjectName)mdd + Poco$(ProjectName)mtd + Poco$(ProjectName)md + Poco$(ProjectName)mt @@ -119,7 +119,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -128,7 +128,7 @@ Default false include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -154,12 +154,12 @@ NotSet - ..\bin\CppUnitd.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\$(TargetName).pdb + ..\lib\$(TargetName).lib MachineX86 @@ -169,7 +169,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -180,7 +180,7 @@ Speed true include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -202,12 +202,12 @@ 0x0c07 - ..\bin\CppUnit.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\CppUnit.lib + ..\lib\$(TargetName).lib MachineX86 @@ -217,7 +217,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib\CppUnitmdd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib\CppUnitmdd.lib + ..\lib\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib\CppUnitmd.lib + ..\lib\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib\CppUnitmtd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib\CppUnitmtd.lib + ..\lib\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib\CppUnitmt.lib + ..\lib\$(TargetName).lib @@ -392,7 +392,7 @@ - + diff --git a/CppUnit/CppUnit_vs140.vcxproj b/CppUnit/CppUnit_vs140.vcxproj index bd263a6eb..e1b94d3a4 100644 --- a/CppUnit/CppUnit_vs140.vcxproj +++ b/CppUnit/CppUnit_vs140.vcxproj @@ -106,12 +106,12 @@ obj\$(Configuration)\ ..\lib\ obj\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + PocoCppUnitd + PocoCppUnit + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnitmd + PocoCppUnitmt @@ -119,7 +119,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin\CppUnitd.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\$(TargetName).pdb + ..\lib\$(TargetName).lib MachineX86 @@ -169,7 +169,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin\CppUnit.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\CppUnit.lib + ..\lib\$(TargetName).lib MachineX86 @@ -217,7 +217,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib\CppUnitmdd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib\CppUnitmdd.lib + ..\lib\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib\CppUnitmd.lib + ..\lib\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib\CppUnitmtd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib\CppUnitmtd.lib + ..\lib\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib\CppUnitmt.lib + ..\lib\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs90.vcproj b/CppUnit/CppUnit_vs90.vcproj index f1c8158f0..3f871434b 100644 --- a/CppUnit/CppUnit_vs90.vcproj +++ b/CppUnit/CppUnit_vs90.vcproj @@ -42,7 +42,7 @@ MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\lib\CppUnit.tlb" + TypeLibraryName=".\lib\$(TargetName).tlb" HeaderFileName="" /> diff --git a/CppUnit/CppUnit_x64_vs100.vcxproj b/CppUnit/CppUnit_x64_vs100.vcxproj index 655826ff5..2579f04cd 100644 --- a/CppUnit/CppUnit_x64_vs100.vcxproj +++ b/CppUnit/CppUnit_x64_vs100.vcxproj @@ -100,12 +100,12 @@ obj64\$(Configuration)\ ..\lib64\ obj64\$(Configuration)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + $(ProjectName)64d + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)64 + $(ProjectName)64md + $(ProjectName)64mt @@ -113,7 +113,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -148,12 +148,12 @@ NotSet - ..\bin64\CppUnit64d.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\$(TargetName).pdb + ..\lib64\$(TargetName).lib MachineX64 @@ -163,7 +163,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -196,12 +196,12 @@ 0x0c07 - ..\bin64\CppUnit64.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib64\CppUnit.lib + ..\lib64\$(TargetName).lib MachineX64 @@ -211,7 +211,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -233,7 +233,7 @@ $(IntDir) - ..\lib64\CppUnitmdd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -245,7 +245,7 @@ 0x0c07 - ..\lib64\CppUnitmdd.lib + ..\lib64\$(TargetName).lib @@ -254,7 +254,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -287,7 +287,7 @@ 0x0c07 - ..\lib64\CppUnitmd.lib + ..\lib64\$(TargetName).lib @@ -296,7 +296,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -318,7 +318,7 @@ $(IntDir) - ..\lib64\CppUnitmtd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -330,7 +330,7 @@ 0x0c07 - ..\lib64\CppUnitmtd.lib + ..\lib64\$(TargetName).lib @@ -339,7 +339,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -372,7 +372,7 @@ 0x0c07 - ..\lib64\CppUnitmt.lib + ..\lib64\$(TargetName).lib @@ -386,22 +386,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_x64_vs110.vcxproj b/CppUnit/CppUnit_x64_vs110.vcxproj index c5a56904a..236eb020a 100644 --- a/CppUnit/CppUnit_x64_vs110.vcxproj +++ b/CppUnit/CppUnit_x64_vs110.vcxproj @@ -106,12 +106,12 @@ obj64\$(Configuration)\ ..\lib64\ obj64\$(Configuration)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + $(ProjectName)64d + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)64 + $(ProjectName)64md + $(ProjectName)64mt @@ -119,7 +119,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin64\CppUnit64d.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\$(TargetName).pdb + ..\lib64\$(TargetName).lib MachineX64 @@ -169,7 +169,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin64\CppUnit64.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib64\CppUnit.lib + ..\lib64\$(TargetName).lib MachineX64 @@ -217,7 +217,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib64\CppUnitmdd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib64\CppUnitmdd.lib + ..\lib64\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib64\CppUnitmd.lib + ..\lib64\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib64\CppUnitmtd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib64\CppUnitmtd.lib + ..\lib64\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib64\CppUnitmt.lib + ..\lib64\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_x64_vs120.vcxproj b/CppUnit/CppUnit_x64_vs120.vcxproj index b20ad3937..d62c1a5a1 100644 --- a/CppUnit/CppUnit_x64_vs120.vcxproj +++ b/CppUnit/CppUnit_x64_vs120.vcxproj @@ -106,12 +106,12 @@ obj64\$(Configuration)\ ..\lib64\ obj64\$(Configuration)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + Poco$(ProjectName)64d + Poco$(ProjectName)mdd + Poco$(ProjectName)mtd + Poco$(ProjectName)64 + Poco$(ProjectName)md + Poco$(ProjectName)mt @@ -119,7 +119,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin64\CppUnit64d.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\$(TargetName).pdb + ..\lib64\Poco$(ProjectName)d.lib MachineX64 @@ -169,7 +169,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin64\CppUnit64.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib64\CppUnit.lib + ..\lib64\Poco$(ProjectName).lib MachineX64 @@ -217,7 +217,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib64\CppUnitmdd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib64\CppUnitmdd.lib + ..\lib64\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib64\CppUnitmd.lib + ..\lib64\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib64\CppUnitmtd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib64\CppUnitmtd.lib + ..\lib64\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib64\CppUnitmt.lib + ..\lib64\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_x64_vs140.vcxproj b/CppUnit/CppUnit_x64_vs140.vcxproj index 67519df3c..9c6f83f72 100644 --- a/CppUnit/CppUnit_x64_vs140.vcxproj +++ b/CppUnit/CppUnit_x64_vs140.vcxproj @@ -106,12 +106,12 @@ obj64\$(Configuration)\ ..\lib64\ obj64\$(Configuration)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + PocoCppUnit64d + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit64 + PocoCppUnit64md + PocoCppUnit64mt @@ -119,7 +119,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin64\CppUnit64d.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\$(TargetName).pdb + ..\lib64\PocoCppUnit64d.lib MachineX64 @@ -169,7 +169,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin64\CppUnit64.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib64\CppUnit.lib + ..\lib64\PocoCppUnit64.lib MachineX64 @@ -217,7 +217,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib64\CppUnitmdd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib64\CppUnitmdd.lib + ..\lib64\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib64\CppUnitmd.lib + ..\lib64\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib64\CppUnitmtd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib64\CppUnitmtd.lib + ..\lib64\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib64\CppUnitmt.lib + ..\lib64\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_x64_vs90.vcproj b/CppUnit/CppUnit_x64_vs90.vcproj index 1f9e7b07b..9167c334a 100644 --- a/CppUnit/CppUnit_x64_vs90.vcproj +++ b/CppUnit/CppUnit_x64_vs90.vcproj @@ -42,7 +42,7 @@ MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\lib64\CppUnit.tlb" + TypeLibraryName=".\lib64\$(TargetName).tlb" HeaderFileName="" /> diff --git a/CppUnit/Makefile b/CppUnit/Makefile index 43e7ea053..ba8c05295 100644 --- a/CppUnit/Makefile +++ b/CppUnit/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.4/CppUnit/Makefile#1 $ +# $Id: //poco/1.4/PocoCppUnit/Makefile#1 $ # # Makefile for Poco CppUnit # diff --git a/CppUnit/WinTestRunner/CMakeLists.txt b/CppUnit/WinTestRunner/CMakeLists.txt index 27416cb8d..1195a4d1d 100644 --- a/CppUnit/WinTestRunner/CMakeLists.txt +++ b/CppUnit/WinTestRunner/CMakeLists.txt @@ -20,7 +20,7 @@ set_target_properties( "${LIBNAME}" PROPERTIES VERSION "1" SOVERSION "1" DEFINE_SYMBOL WinTestRunner_EXPORTS) -target_link_libraries( "${LIBNAME}" CppUnit ) +target_link_libraries( "${LIBNAME}" PocoCppUnit ) target_include_directories( "${LIBNAME}" PUBLIC $ diff --git a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h b/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h index 2e7ac7014..55b646c81 100644 --- a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h +++ b/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h @@ -22,7 +22,7 @@ #endif -#include "CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnit.h" #include #include diff --git a/CppUnit/WinTestRunner/src/ActiveTest.h b/CppUnit/WinTestRunner/src/ActiveTest.h index bf9df5e7d..4b8724e9c 100644 --- a/CppUnit/WinTestRunner/src/ActiveTest.h +++ b/CppUnit/WinTestRunner/src/ActiveTest.h @@ -9,8 +9,8 @@ #define ActiveTest_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/TestDecorator.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/TestDecorator.h" #include diff --git a/CppUnit/WinTestRunner/src/GUITestResult.h b/CppUnit/WinTestRunner/src/GUITestResult.h index 3fae4e00a..a017e48f7 100644 --- a/CppUnit/WinTestRunner/src/GUITestResult.h +++ b/CppUnit/WinTestRunner/src/GUITestResult.h @@ -9,8 +9,8 @@ #define GuiTestResult_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/TestResult.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/TestResult.h" #include diff --git a/CppUnit/WinTestRunner/src/ProgressBar.h b/CppUnit/WinTestRunner/src/ProgressBar.h index 09eaa4796..03384b5fe 100644 --- a/CppUnit/WinTestRunner/src/ProgressBar.h +++ b/CppUnit/WinTestRunner/src/ProgressBar.h @@ -9,7 +9,7 @@ #define ProgressBar_INCLUDED -#include "CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnit.h" #include diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp b/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp index b8aca676a..03b66b56f 100644 --- a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp +++ b/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp @@ -13,7 +13,7 @@ #include "ActiveTest.h" #include "GUITestResult.h" #include "ProgressBar.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" #include "TestRunnerDlg.h" diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.h b/CppUnit/WinTestRunner/src/TestRunnerDlg.h index 8357bda2e..f31bc3adc 100644 --- a/CppUnit/WinTestRunner/src/TestRunnerDlg.h +++ b/CppUnit/WinTestRunner/src/TestRunnerDlg.h @@ -9,8 +9,8 @@ #define TestRunnerDlg_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/CppUnitException.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnitException.h" #include "ActiveTest.h" #include #include "../res/Resource.h" diff --git a/CppUnit/WinTestRunner/src/WinTestRunner.cpp b/CppUnit/WinTestRunner/src/WinTestRunner.cpp index cc5ff5721..cc9edb584 100644 --- a/CppUnit/WinTestRunner/src/WinTestRunner.cpp +++ b/CppUnit/WinTestRunner/src/WinTestRunner.cpp @@ -7,7 +7,7 @@ #include "WinTestRunner/WinTestRunner.h" #include "TestRunnerDlg.h" -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include diff --git a/CppUnit/include/Poco/CppUnit/CppUnit.h b/CppUnit/include/Poco/CppUnit/CppUnit.h index 1a4f2d692..6729a903d 100644 --- a/CppUnit/include/Poco/CppUnit/CppUnit.h +++ b/CppUnit/include/Poco/CppUnit/CppUnit.h @@ -24,23 +24,52 @@ // from a DLL simpler. All files within this DLL are compiled with the Poco_CppUnitEXPORTS // symbol defined on the command line. this symbol should not be defined on any project // that uses this DLL. This way any other project whose source files include this file see -// Poco_CppUnit_API functions as being imported from a DLL, wheras this DLL sees symbols +// CppUnit_API functions as being imported from a DLL, wheras this DLL sees symbols // defined with this macro as being exported. // #if defined(_WIN32) && defined(POCO_DLL) - #if defined(Poco_CppUnit_EXPORTS) - #define Poco_CppUnit_API __declspec(dllexport) + #if defined(CppUnit_EXPORTS) + #define CppUnit_API __declspec(dllexport) #else - #define Poco_CppUnit_API __declspec(dllimport) + #define CppUnit_API __declspec(dllimport) #endif #endif -#if !defined(Poco_CppUnit_API) +#if !defined(CppUnit_API) #if defined (__GNUC__) && (__GNUC__ >= 4) - #define Poco_CppUnit_API __attribute__ ((visibility ("default"))) + #define CppUnit_API __attribute__ ((visibility ("default"))) #else - #define Poco_CppUnit_API + #define CppUnit_API + #endif +#endif + +// +// Automatically link Foundation library. +// +#if defined(_MSC_VER) + #if defined(POCO_DLL) + #if defined(_DEBUG) + #define POCO_LIB_SUFFIX "d.lib" + #else + #define POCO_LIB_SUFFIX ".lib" + #endif + #elif defined(_DLL) + #if defined(_DEBUG) + #define POCO_LIB_SUFFIX "mdd.lib" + #else + #define POCO_LIB_SUFFIX "md.lib" + #endif + #else + #if defined(_DEBUG) + #define POCO_LIB_SUFFIX "mtd.lib" + #else + #define POCO_LIB_SUFFIX "mt.lib" + #endif + #endif + + #if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(CppUnit_EXPORTS) + #pragma comment(lib, "PocoCppUnit" POCO_LIB_SUFFIX) #endif #endif diff --git a/CppUnit/include/Poco/CppUnit/CppUnitException.h b/CppUnit/include/Poco/CppUnit/CppUnitException.h index 7cd0fc519..670290c58 100644 --- a/CppUnit/include/Poco/CppUnit/CppUnitException.h +++ b/CppUnit/include/Poco/CppUnit/CppUnitException.h @@ -17,7 +17,7 @@ namespace CppUnit { -class Poco_CppUnit_API CppUnitException: public std::exception +class CppUnit_API CppUnitException: public std::exception /// CppUnitException is an exception that serves /// descriptive strings through its what() method { diff --git a/CppUnit/include/Poco/CppUnit/RepeatedTest.h b/CppUnit/include/Poco/CppUnit/RepeatedTest.h index 739e3d14e..a23021837 100644 --- a/CppUnit/include/Poco/CppUnit/RepeatedTest.h +++ b/CppUnit/include/Poco/CppUnit/RepeatedTest.h @@ -26,7 +26,7 @@ class TestResult; * Does not assume ownership of the test it decorates * */ -class Poco_CppUnit_API RepeatedTest: public TestDecorator +class CppUnit_API RepeatedTest: public TestDecorator { REFERENCEOBJECT (RepeatedTest) diff --git a/CppUnit/include/Poco/CppUnit/Test.h b/CppUnit/include/Poco/CppUnit/Test.h index fcd462e47..0d4128500 100644 --- a/CppUnit/include/Poco/CppUnit/Test.h +++ b/CppUnit/include/Poco/CppUnit/Test.h @@ -24,7 +24,7 @@ class TestResult; * See TestResult. * */ -class Poco_CppUnit_API Test +class CppUnit_API Test { public: virtual ~Test() = 0; diff --git a/CppUnit/include/Poco/CppUnit/TestCaller.h b/CppUnit/include/Poco/CppUnit/TestCaller.h index 208ab50ae..d859bb7ce 100644 --- a/CppUnit/include/Poco/CppUnit/TestCaller.h +++ b/CppUnit/include/Poco/CppUnit/TestCaller.h @@ -96,7 +96,7 @@ private: } // namespace CppUnit -#define Poco_CppUnit_addTest(suite, cls, mth) \ +#define CppUnit_addTest(suite, cls, mth) \ suite->addTest(new CppUnit::TestCaller(#mth, &cls::mth)) diff --git a/CppUnit/include/Poco/CppUnit/TestCase.h b/CppUnit/include/Poco/CppUnit/TestCase.h index a07f8f2eb..cbe648a57 100644 --- a/CppUnit/include/Poco/CppUnit/TestCase.h +++ b/CppUnit/include/Poco/CppUnit/TestCase.h @@ -83,7 +83,7 @@ class TestResult; * see TestResult, TestSuite and TestCaller * */ -class Poco_CppUnit_API TestCase: public Test +class CppUnit_API TestCase: public Test { REFERENCEOBJECT (TestCase) diff --git a/CppUnit/include/Poco/CppUnit/TestDecorator.h b/CppUnit/include/Poco/CppUnit/TestDecorator.h index cde751020..dc781ac31 100644 --- a/CppUnit/include/Poco/CppUnit/TestDecorator.h +++ b/CppUnit/include/Poco/CppUnit/TestDecorator.h @@ -26,7 +26,7 @@ class TestResult; * Does not assume ownership of the test it decorates * */ -class Poco_CppUnit_API TestDecorator: public Test +class CppUnit_API TestDecorator: public Test { REFERENCEOBJECT(TestDecorator) diff --git a/CppUnit/include/Poco/CppUnit/TestFailure.h b/CppUnit/include/Poco/CppUnit/TestFailure.h index 860e7852f..830dec1c8 100644 --- a/CppUnit/include/Poco/CppUnit/TestFailure.h +++ b/CppUnit/include/Poco/CppUnit/TestFailure.h @@ -33,7 +33,7 @@ class Test; * see TestSuite * */ -class Poco_CppUnit_API TestFailure +class CppUnit_API TestFailure { REFERENCEOBJECT (TestFailure) diff --git a/CppUnit/include/Poco/CppUnit/TestResult.h b/CppUnit/include/Poco/CppUnit/TestResult.h index e0d4c00c1..3470a8b53 100644 --- a/CppUnit/include/Poco/CppUnit/TestResult.h +++ b/CppUnit/include/Poco/CppUnit/TestResult.h @@ -41,7 +41,7 @@ class Test; * * see Test */ -class Poco_CppUnit_API TestResult +class CppUnit_API TestResult { REFERENCEOBJECT (TestResult) diff --git a/CppUnit/include/Poco/CppUnit/TestRunner.h b/CppUnit/include/Poco/CppUnit/TestRunner.h index f92ccdce1..8b859f5f8 100644 --- a/CppUnit/include/Poco/CppUnit/TestRunner.h +++ b/CppUnit/include/Poco/CppUnit/TestRunner.h @@ -38,7 +38,7 @@ class Test; * TestRunner [-all] [-print] [-wait] ExampleTestCase * */ -class Poco_CppUnit_API TestRunner +class CppUnit_API TestRunner { typedef std::pair Mapping; typedef std::vector Mappings; diff --git a/CppUnit/include/Poco/CppUnit/TestSetup.h b/CppUnit/include/Poco/CppUnit/TestSetup.h index a68825488..57be08f19 100644 --- a/CppUnit/include/Poco/CppUnit/TestSetup.h +++ b/CppUnit/include/Poco/CppUnit/TestSetup.h @@ -21,7 +21,7 @@ class Test; class TestResult; -class Poco_CppUnit_API TestSetup: public TestDecorator +class CppUnit_API TestSetup: public TestDecorator { REFERENCEOBJECT (TestSetup) diff --git a/CppUnit/include/Poco/CppUnit/TestSuite.h b/CppUnit/include/Poco/CppUnit/TestSuite.h index 907e51077..7aba91da0 100644 --- a/CppUnit/include/Poco/CppUnit/TestSuite.h +++ b/CppUnit/include/Poco/CppUnit/TestSuite.h @@ -35,7 +35,7 @@ class TestResult; * * see Test and TestCaller */ -class Poco_CppUnit_API TestSuite: public Test +class CppUnit_API TestSuite: public Test { REFERENCEOBJECT (TestSuite) diff --git a/CppUnit/include/Poco/CppUnit/TextTestResult.h b/CppUnit/include/Poco/CppUnit/TextTestResult.h index 8279cd893..901e740a9 100644 --- a/CppUnit/include/Poco/CppUnit/TextTestResult.h +++ b/CppUnit/include/Poco/CppUnit/TextTestResult.h @@ -18,7 +18,7 @@ namespace CppUnit { -class Poco_CppUnit_API TextTestResult: public TestResult +class CppUnit_API TextTestResult: public TestResult { public: TextTestResult(); diff --git a/Crypto/testsuite/CMakeLists.txt b/Crypto/testsuite/CMakeLists.txt index a3ce109ec..cd158f0c6 100644 --- a/Crypto/testsuite/CMakeLists.txt +++ b/Crypto/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoCrypto PocoXML PocoUtil PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoCrypto PocoXML PocoUtil PocoFoundation PocoCppUnit ) if(UNIX) target_link_libraries( ${TESTUNIT} pthread) endif(UNIX) diff --git a/Crypto/testsuite/Makefile b/Crypto/testsuite/Makefile index e1702500c..7921f1eda 100644 --- a/Crypto/testsuite/Makefile +++ b/Crypto/testsuite/Makefile @@ -20,6 +20,6 @@ objects = CryptoTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoCrypto PocoFoundation CppUnit +target_libs = PocoCrypto PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj b/Crypto/testsuite/TestSuite_vs120.vcxproj index 854eb0df2..5eb21b838 100644 --- a/Crypto/testsuite/TestSuite_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj index f4873256a..92a483c98 100644 --- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/src/CryptoTest.cpp b/Crypto/testsuite/src/CryptoTest.cpp index cfc9e67f3..c5e46512d 100644 --- a/Crypto/testsuite/src/CryptoTest.cpp +++ b/Crypto/testsuite/src/CryptoTest.cpp @@ -11,8 +11,8 @@ #include "CryptoTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Crypto/CipherFactory.h" #include "Poco/Crypto/Cipher.h" #include "Poco/Crypto/CipherKey.h" diff --git a/Crypto/testsuite/src/CryptoTest.h b/Crypto/testsuite/src/CryptoTest.h index 95b655f6a..14300a749 100644 --- a/Crypto/testsuite/src/CryptoTest.h +++ b/Crypto/testsuite/src/CryptoTest.h @@ -17,7 +17,7 @@ #include "Poco/Crypto/Crypto.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CryptoTest: public CppUnit::TestCase diff --git a/Crypto/testsuite/src/CryptoTestSuite.h b/Crypto/testsuite/src/CryptoTestSuite.h index 0469b7cae..1c6b0a130 100644 --- a/Crypto/testsuite/src/CryptoTestSuite.h +++ b/Crypto/testsuite/src/CryptoTestSuite.h @@ -16,7 +16,7 @@ #define CryptoTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CryptoTestSuite diff --git a/Crypto/testsuite/src/DigestEngineTest.cpp b/Crypto/testsuite/src/DigestEngineTest.cpp index e1763e6bf..3d5160f46 100644 --- a/Crypto/testsuite/src/DigestEngineTest.cpp +++ b/Crypto/testsuite/src/DigestEngineTest.cpp @@ -11,8 +11,8 @@ #include "DigestEngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Crypto/DigestEngine.h" diff --git a/Crypto/testsuite/src/DigestEngineTest.h b/Crypto/testsuite/src/DigestEngineTest.h index 89fc24d30..7a395b990 100644 --- a/Crypto/testsuite/src/DigestEngineTest.h +++ b/Crypto/testsuite/src/DigestEngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Crypto/Crypto.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DigestEngineTest: public CppUnit::TestCase diff --git a/Crypto/testsuite/src/Driver.cpp b/Crypto/testsuite/src/Driver.cpp index 96ff4f221..afcb3708f 100644 --- a/Crypto/testsuite/src/Driver.cpp +++ b/Crypto/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "CryptoTestSuite.h" #include "Poco/Crypto/Crypto.h" diff --git a/Crypto/testsuite/src/RSATest.cpp b/Crypto/testsuite/src/RSATest.cpp index 690cfa096..f67d71ae5 100644 --- a/Crypto/testsuite/src/RSATest.cpp +++ b/Crypto/testsuite/src/RSATest.cpp @@ -11,8 +11,8 @@ #include "RSATest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Crypto/RSADigestEngine.h" #include "Poco/Crypto/CipherFactory.h" #include "Poco/Crypto/Cipher.h" diff --git a/Crypto/testsuite/src/RSATest.h b/Crypto/testsuite/src/RSATest.h index ebef26753..609a6c2de 100644 --- a/Crypto/testsuite/src/RSATest.h +++ b/Crypto/testsuite/src/RSATest.h @@ -17,7 +17,7 @@ #include "Poco/Crypto/Crypto.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RSATest: public CppUnit::TestCase diff --git a/Crypto/testsuite/src/WinCEDriver.cpp b/Crypto/testsuite/src/WinCEDriver.cpp index 704c23157..6cabc793c 100644 --- a/Crypto/testsuite/src/WinCEDriver.cpp +++ b/Crypto/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "CryptoTestSuite.h" #include "Poco/Crypto/Crypto.h" #include diff --git a/Data/MySQL/testsuite/CMakeLists.txt b/Data/MySQL/testsuite/CMakeLists.txt index 01ae1c1db..dc350033a 100644 --- a/Data/MySQL/testsuite/CMakeLists.txt +++ b/Data/MySQL/testsuite/CMakeLists.txt @@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoDataMySQL PocoData PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoDataMySQL PocoData PocoFoundation PocoCppUnit ) diff --git a/Data/MySQL/testsuite/Makefile b/Data/MySQL/testsuite/Makefile index a845628f3..a4b8f10ff 100644 --- a/Data/MySQL/testsuite/Makefile +++ b/Data/MySQL/testsuite/Makefile @@ -17,6 +17,6 @@ objects = MySQLTestSuite Driver MySQLTest SQLExecutor target = testrunner target_version = 1 -target_libs = PocoDataMySQL PocoData PocoFoundation CppUnit +target_libs = PocoDataMySQL PocoData PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj index 54dcd4475..ffab9cb71 100644 --- a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;libmysql.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnit.lib;libmysql.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj index 5b357abea..afca2df9a 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;libmysql.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnit.lib;libmysql.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/src/Driver.cpp b/Data/MySQL/testsuite/src/Driver.cpp index fc1b33660..390a12fe2 100644 --- a/Data/MySQL/testsuite/src/Driver.cpp +++ b/Data/MySQL/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "MySQLTestSuite.h" diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp index 1ab1f59a6..bc98d83b5 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.cpp +++ b/Data/MySQL/testsuite/src/MySQLTest.cpp @@ -11,8 +11,8 @@ #include "MySQLTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Tuple.h" diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h index d3eea4a65..2afbfa50d 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.h +++ b/Data/MySQL/testsuite/src/MySQLTest.h @@ -19,7 +19,7 @@ #include "Poco/Data/MySQL/MySQL.h" #include "Poco/Data/Session.h" #include "Poco/SharedPtr.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "SQLExecutor.h" diff --git a/Data/MySQL/testsuite/src/MySQLTestSuite.h b/Data/MySQL/testsuite/src/MySQLTestSuite.h index c6bc62f65..b21ea668e 100644 --- a/Data/MySQL/testsuite/src/MySQLTestSuite.h +++ b/Data/MySQL/testsuite/src/MySQLTestSuite.h @@ -16,7 +16,7 @@ #define MySQLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class MySQLTestSuite { diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 00cfb351f..404b7af4a 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -10,7 +10,7 @@ // -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "SQLExecutor.h" #include "Poco/String.h" #include "Poco/Format.h" diff --git a/Data/ODBC/testsuite/CMakeLists.txt b/Data/ODBC/testsuite/CMakeLists.txt index 30cc13695..7ac827094 100644 --- a/Data/ODBC/testsuite/CMakeLists.txt +++ b/Data/ODBC/testsuite/CMakeLists.txt @@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoDataODBC PocoData PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoDataODBC PocoData PocoFoundation PocoCppUnit ) diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile index b50776cb3..11e5b2982 100644 --- a/Data/ODBC/testsuite/Makefile +++ b/Data/ODBC/testsuite/Makefile @@ -37,6 +37,6 @@ endif target = testrunner target_version = 1 -target_libs = PocoDataODBC PocoData PocoFoundation CppUnit +target_libs = PocoDataODBC PocoData PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj index f9e88a477..c56158ea1 100644 --- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj index 5c87ec804..1b29b1cf9 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/src/Driver.cpp b/Data/ODBC/testsuite/src/Driver.cpp index 599ad5460..934f89915 100644 --- a/Data/ODBC/testsuite/src/Driver.cpp +++ b/Data/ODBC/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "ODBCTestSuite.h" diff --git a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp index c09f00bd8..df16aa579 100644 --- a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp @@ -11,8 +11,8 @@ #include "ODBCAccessTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Exception.h" diff --git a/Data/ODBC/testsuite/src/ODBCAccessTest.h b/Data/ODBC/testsuite/src/ODBCAccessTest.h index d29587b02..8321790d5 100644 --- a/Data/ODBC/testsuite/src/ODBCAccessTest.h +++ b/Data/ODBC/testsuite/src/ODBCAccessTest.h @@ -20,7 +20,7 @@ #include "Poco/Data/Session.h" #include "Poco/Data/ODBC/Utility.h" #include "Poco/SharedPtr.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "SQLExecutor.h" diff --git a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp index dc4078eb4..ad77170de 100644 --- a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp +++ b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp @@ -11,8 +11,8 @@ #include "ODBCDB2Test.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Any.h" diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp index ba1aedf30..f148e3092 100644 --- a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp @@ -12,8 +12,8 @@ #include "ODBCMySQLTest.h" #include "ODBCTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Tuple.h" diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp index 75ecd7c2c..410816325 100644 --- a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp @@ -11,8 +11,8 @@ #include "ODBCOracleTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Tuple.h" #include "Poco/Format.h" diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp index a4f9b95d6..2c4c2e158 100644 --- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp @@ -11,8 +11,8 @@ #include "ODBCPostgreSQLTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "ODBCTest.h" #include "Poco/Format.h" #include "Poco/Any.h" diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp index 3ba078628..d8c218d36 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp @@ -11,8 +11,8 @@ #include "ODBCSQLServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Any.h" diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp index 9c47b5c16..2cf641e56 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp @@ -11,8 +11,8 @@ #include "ODBCSQLiteTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Exception.h" diff --git a/Data/ODBC/testsuite/src/ODBCTest.cpp b/Data/ODBC/testsuite/src/ODBCTest.cpp index fe1323f5d..3d7b0c610 100644 --- a/Data/ODBC/testsuite/src/ODBCTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCTest.cpp @@ -11,8 +11,8 @@ #include "ODBCTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Any.h" diff --git a/Data/ODBC/testsuite/src/ODBCTest.h b/Data/ODBC/testsuite/src/ODBCTest.h index a0a09c01d..a185e0f51 100644 --- a/Data/ODBC/testsuite/src/ODBCTest.h +++ b/Data/ODBC/testsuite/src/ODBCTest.h @@ -17,7 +17,7 @@ #include "Poco/Data/ODBC/ODBC.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Data/Session.h" #include "Poco/Data/ODBC/Utility.h" #include "Poco/SharedPtr.h" diff --git a/Data/ODBC/testsuite/src/ODBCTestSuite.h b/Data/ODBC/testsuite/src/ODBCTestSuite.h index 4c967fca9..5a0ca760b 100644 --- a/Data/ODBC/testsuite/src/ODBCTestSuite.h +++ b/Data/ODBC/testsuite/src/ODBCTestSuite.h @@ -16,7 +16,7 @@ #define ODBCTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ODBCTestSuite diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp index 9baf6d7f4..43538f565 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.cpp +++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp @@ -10,7 +10,7 @@ // -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "SQLExecutor.h" #include "Poco/String.h" #include "Poco/Format.h" diff --git a/Data/SQLite/testsuite/CMakeLists.txt b/Data/SQLite/testsuite/CMakeLists.txt index 536c8742d..0e1699d3d 100644 --- a/Data/SQLite/testsuite/CMakeLists.txt +++ b/Data/SQLite/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoDataSQLite PocoData PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoDataSQLite PocoData PocoFoundation PocoCppUnit ) diff --git a/Data/SQLite/testsuite/Makefile b/Data/SQLite/testsuite/Makefile index b8b3c965a..95977b01e 100644 --- a/Data/SQLite/testsuite/Makefile +++ b/Data/SQLite/testsuite/Makefile @@ -13,6 +13,6 @@ objects = SQLiteTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoDataSQLite PocoData PocoFoundation CppUnit +target_libs = PocoDataSQLite PocoData PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj index a293790e0..d09b41273 100644 --- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj index 65b61bd5b..4e51b521f 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/src/Driver.cpp b/Data/SQLite/testsuite/src/Driver.cpp index 2688cddb2..2b6311b36 100644 --- a/Data/SQLite/testsuite/src/Driver.cpp +++ b/Data/SQLite/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "SQLiteTestSuite.h" diff --git a/Data/SQLite/testsuite/src/SQLiteTest.cpp b/Data/SQLite/testsuite/src/SQLiteTest.cpp index 254474940..59529fb0e 100644 --- a/Data/SQLite/testsuite/src/SQLiteTest.cpp +++ b/Data/SQLite/testsuite/src/SQLiteTest.cpp @@ -11,8 +11,8 @@ #include "SQLiteTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Data/Date.h" #include "Poco/Data/Time.h" #include "Poco/Data/LOB.h" diff --git a/Data/SQLite/testsuite/src/SQLiteTest.h b/Data/SQLite/testsuite/src/SQLiteTest.h index 57b37522a..746b6e321 100644 --- a/Data/SQLite/testsuite/src/SQLiteTest.h +++ b/Data/SQLite/testsuite/src/SQLiteTest.h @@ -17,7 +17,7 @@ #include "Poco/Data/SQLite/SQLite.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" namespace Poco { diff --git a/Data/SQLite/testsuite/src/SQLiteTestSuite.h b/Data/SQLite/testsuite/src/SQLiteTestSuite.h index b52d2b9dd..2fff2397e 100644 --- a/Data/SQLite/testsuite/src/SQLiteTestSuite.h +++ b/Data/SQLite/testsuite/src/SQLiteTestSuite.h @@ -16,7 +16,7 @@ #define SQLiteTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class SQLiteTestSuite diff --git a/Data/SQLite/testsuite/src/WinCEDriver.cpp b/Data/SQLite/testsuite/src/WinCEDriver.cpp index 9027a28be..66f5ffe6e 100644 --- a/Data/SQLite/testsuite/src/WinCEDriver.cpp +++ b/Data/SQLite/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "SQLiteTestSuite.h" #include diff --git a/Data/testsuite/CMakeLists.txt b/Data/testsuite/CMakeLists.txt index b20cff408..c372c2b8f 100644 --- a/Data/testsuite/CMakeLists.txt +++ b/Data/testsuite/CMakeLists.txt @@ -23,4 +23,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoData PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoData PocoUtil PocoXML PocoFoundation PocoCppUnit) diff --git a/Data/testsuite/Makefile b/Data/testsuite/Makefile index 6425cfdd7..c2fb2932d 100644 --- a/Data/testsuite/Makefile +++ b/Data/testsuite/Makefile @@ -22,6 +22,6 @@ objects = DataTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoData PocoFoundation CppUnit +target_libs = PocoData PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Data/testsuite/TestSuite_vs120.vcxproj b/Data/testsuite/TestSuite_vs120.vcxproj index 2f2a5411d..f49222d74 100644 --- a/Data/testsuite/TestSuite_vs120.vcxproj +++ b/Data/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs120.vcxproj b/Data/testsuite/TestSuite_x64_vs120.vcxproj index 9ba2740a9..7725608ca 100644 --- a/Data/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/src/DataTest.cpp b/Data/testsuite/src/DataTest.cpp index bec8145fc..1f2a1e00d 100644 --- a/Data/testsuite/src/DataTest.cpp +++ b/Data/testsuite/src/DataTest.cpp @@ -11,8 +11,8 @@ #include "DataTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Data/Session.h" #include "Poco/Data/SessionFactory.h" #include "Poco/Data/LOB.h" diff --git a/Data/testsuite/src/DataTest.h b/Data/testsuite/src/DataTest.h index 98e83d8e9..091bb328b 100644 --- a/Data/testsuite/src/DataTest.h +++ b/Data/testsuite/src/DataTest.h @@ -20,7 +20,7 @@ #include "Poco/BinaryReader.h" #include "Poco/BinaryWriter.h" #include "Poco/Data/Row.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DataTest: public CppUnit::TestCase diff --git a/Data/testsuite/src/DataTestSuite.h b/Data/testsuite/src/DataTestSuite.h index 670d7911b..f89edd69a 100644 --- a/Data/testsuite/src/DataTestSuite.h +++ b/Data/testsuite/src/DataTestSuite.h @@ -16,7 +16,7 @@ #define DataTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class DataTestSuite diff --git a/Data/testsuite/src/Driver.cpp b/Data/testsuite/src/Driver.cpp index 7aa0003a2..daa8e11b6 100644 --- a/Data/testsuite/src/Driver.cpp +++ b/Data/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "DataTestSuite.h" diff --git a/Data/testsuite/src/SessionPoolTest.cpp b/Data/testsuite/src/SessionPoolTest.cpp index e290ca0f8..9c07516fb 100644 --- a/Data/testsuite/src/SessionPoolTest.cpp +++ b/Data/testsuite/src/SessionPoolTest.cpp @@ -11,8 +11,8 @@ #include "SessionPoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Data/SessionPool.h" #include "Poco/Data/SessionPoolContainer.h" #include "Poco/Thread.h" diff --git a/Data/testsuite/src/SessionPoolTest.h b/Data/testsuite/src/SessionPoolTest.h index 4c24381df..1f761827d 100644 --- a/Data/testsuite/src/SessionPoolTest.h +++ b/Data/testsuite/src/SessionPoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Data/Data.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SessionPoolTest: public CppUnit::TestCase diff --git a/Data/testsuite/src/WinCEDriver.cpp b/Data/testsuite/src/WinCEDriver.cpp index 71c7ebda0..89f60439a 100644 --- a/Data/testsuite/src/WinCEDriver.cpp +++ b/Data/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "DataTestSuite.h" #include diff --git a/Foundation/testsuite/CMakeLists.txt b/Foundation/testsuite/CMakeLists.txt index ba7366ae2..4ed3c2baf 100644 --- a/Foundation/testsuite/CMakeLists.txt +++ b/Foundation/testsuite/CMakeLists.txt @@ -28,7 +28,7 @@ add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TESTUNIT} -all) set_tests_properties(${LIBNAME} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=.") # The SharedLibaryTest has to look for shared libraries in the working directory -target_link_libraries( ${TESTUNIT} PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoFoundation PocoCppUnit ) if(UNIX) target_link_libraries( ${TESTUNIT} pthread) endif(UNIX) diff --git a/Foundation/testsuite/Makefile-Driver b/Foundation/testsuite/Makefile-Driver index b018c49b9..7b94c6225 100644 --- a/Foundation/testsuite/Makefile-Driver +++ b/Foundation/testsuite/Makefile-Driver @@ -44,7 +44,7 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \ target = testrunner target_version = 1 -target_libs = PocoFoundation CppUnit +target_libs = PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj b/Foundation/testsuite/TestSuite_vs120.vcxproj index 5f8dcdc2c..efcf6554e 100644 --- a/Foundation/testsuite/TestSuite_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj index 7b1596b0d..1204d85a6 100644 --- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,13 +136,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -167,13 +167,13 @@ true true true - + Level3 - + Default - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -304,287 +304,287 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + \ No newline at end of file diff --git a/Foundation/testsuite/src/ActiveDispatcherTest.cpp b/Foundation/testsuite/src/ActiveDispatcherTest.cpp index d59bb6b4e..0c62a15d1 100644 --- a/Foundation/testsuite/src/ActiveDispatcherTest.cpp +++ b/Foundation/testsuite/src/ActiveDispatcherTest.cpp @@ -11,8 +11,8 @@ #include "ActiveDispatcherTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ActiveDispatcher.h" #include "Poco/ActiveMethod.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/ActiveDispatcherTest.h b/Foundation/testsuite/src/ActiveDispatcherTest.h index 2c4268c4b..8af9b49bb 100644 --- a/Foundation/testsuite/src/ActiveDispatcherTest.h +++ b/Foundation/testsuite/src/ActiveDispatcherTest.h @@ -14,7 +14,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ActiveDispatcherTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ActiveMethodTest.cpp b/Foundation/testsuite/src/ActiveMethodTest.cpp index 5d28ee330..821c0d506 100644 --- a/Foundation/testsuite/src/ActiveMethodTest.cpp +++ b/Foundation/testsuite/src/ActiveMethodTest.cpp @@ -11,8 +11,8 @@ #include "ActiveMethodTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ActiveMethod.h" #include "Poco/Thread.h" #include "Poco/Event.h" diff --git a/Foundation/testsuite/src/ActiveMethodTest.h b/Foundation/testsuite/src/ActiveMethodTest.h index 2b1f9474e..25f0f2407 100644 --- a/Foundation/testsuite/src/ActiveMethodTest.h +++ b/Foundation/testsuite/src/ActiveMethodTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ActiveMethodTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ActivityTest.cpp b/Foundation/testsuite/src/ActivityTest.cpp index 8c0bce179..df548318d 100644 --- a/Foundation/testsuite/src/ActivityTest.cpp +++ b/Foundation/testsuite/src/ActivityTest.cpp @@ -11,8 +11,8 @@ #include "ActivityTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Activity.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/ActivityTest.h b/Foundation/testsuite/src/ActivityTest.h index d99f19ebf..e7a8dbfbd 100644 --- a/Foundation/testsuite/src/ActivityTest.h +++ b/Foundation/testsuite/src/ActivityTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ActivityTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/AnyTest.cpp b/Foundation/testsuite/src/AnyTest.cpp index cd2b0da6e..046f9479f 100644 --- a/Foundation/testsuite/src/AnyTest.cpp +++ b/Foundation/testsuite/src/AnyTest.cpp @@ -11,8 +11,8 @@ #include "AnyTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/Any.h" #include "Poco/Bugcheck.h" diff --git a/Foundation/testsuite/src/AnyTest.h b/Foundation/testsuite/src/AnyTest.h index 8d8a5a14b..8578342fa 100644 --- a/Foundation/testsuite/src/AnyTest.h +++ b/Foundation/testsuite/src/AnyTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AnyTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ArrayTest.cpp b/Foundation/testsuite/src/ArrayTest.cpp index 55c492731..0a72165f9 100644 --- a/Foundation/testsuite/src/ArrayTest.cpp +++ b/Foundation/testsuite/src/ArrayTest.cpp @@ -11,8 +11,8 @@ #include "ArrayTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Array.h" #include #include diff --git a/Foundation/testsuite/src/ArrayTest.h b/Foundation/testsuite/src/ArrayTest.h index d843e42f5..9a1cca116 100644 --- a/Foundation/testsuite/src/ArrayTest.h +++ b/Foundation/testsuite/src/ArrayTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ArrayTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/AutoPtrTest.cpp b/Foundation/testsuite/src/AutoPtrTest.cpp index 31717aeab..fee0ee70b 100644 --- a/Foundation/testsuite/src/AutoPtrTest.cpp +++ b/Foundation/testsuite/src/AutoPtrTest.cpp @@ -11,8 +11,8 @@ #include "AutoPtrTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/AutoPtrTest.h b/Foundation/testsuite/src/AutoPtrTest.h index 1369de7a2..c7b95599c 100644 --- a/Foundation/testsuite/src/AutoPtrTest.h +++ b/Foundation/testsuite/src/AutoPtrTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AutoPtrTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/AutoReleasePoolTest.cpp b/Foundation/testsuite/src/AutoReleasePoolTest.cpp index 6db568d12..66eec9e5f 100644 --- a/Foundation/testsuite/src/AutoReleasePoolTest.cpp +++ b/Foundation/testsuite/src/AutoReleasePoolTest.cpp @@ -11,8 +11,8 @@ #include "AutoReleasePoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/AutoReleasePool.h" diff --git a/Foundation/testsuite/src/AutoReleasePoolTest.h b/Foundation/testsuite/src/AutoReleasePoolTest.h index a26f8d6cc..f107ee264 100644 --- a/Foundation/testsuite/src/AutoReleasePoolTest.h +++ b/Foundation/testsuite/src/AutoReleasePoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AutoReleasePoolTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/Base32Test.cpp b/Foundation/testsuite/src/Base32Test.cpp index 4bc1c33d4..397f78c54 100644 --- a/Foundation/testsuite/src/Base32Test.cpp +++ b/Foundation/testsuite/src/Base32Test.cpp @@ -11,8 +11,8 @@ #include "Base32Test.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Base32Encoder.h" #include "Poco/Base32Decoder.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/Base32Test.h b/Foundation/testsuite/src/Base32Test.h index 8b7f42233..ae118e757 100644 --- a/Foundation/testsuite/src/Base32Test.h +++ b/Foundation/testsuite/src/Base32Test.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class Base32Test: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/Base64Test.cpp b/Foundation/testsuite/src/Base64Test.cpp index f5af89e09..a03b0602f 100644 --- a/Foundation/testsuite/src/Base64Test.cpp +++ b/Foundation/testsuite/src/Base64Test.cpp @@ -11,8 +11,8 @@ #include "Base64Test.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Base64Encoder.h" #include "Poco/Base64Decoder.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/Base64Test.h b/Foundation/testsuite/src/Base64Test.h index 66280de4c..931ab0859 100644 --- a/Foundation/testsuite/src/Base64Test.h +++ b/Foundation/testsuite/src/Base64Test.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class Base64Test: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/BasicEventTest.cpp b/Foundation/testsuite/src/BasicEventTest.cpp index f593c1a79..f925c75dc 100644 --- a/Foundation/testsuite/src/BasicEventTest.cpp +++ b/Foundation/testsuite/src/BasicEventTest.cpp @@ -12,8 +12,8 @@ #include "BasicEventTest.h" #include "DummyDelegate.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Expire.h" #include "Poco/Delegate.h" #include "Poco/FunctionDelegate.h" diff --git a/Foundation/testsuite/src/BasicEventTest.h b/Foundation/testsuite/src/BasicEventTest.h index 4dc0d037e..408aa7534 100644 --- a/Foundation/testsuite/src/BasicEventTest.h +++ b/Foundation/testsuite/src/BasicEventTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/BasicEvent.h" #include "Poco/EventArgs.h" diff --git a/Foundation/testsuite/src/BinaryReaderWriterTest.cpp b/Foundation/testsuite/src/BinaryReaderWriterTest.cpp index b9f689908..5f43f5f11 100644 --- a/Foundation/testsuite/src/BinaryReaderWriterTest.cpp +++ b/Foundation/testsuite/src/BinaryReaderWriterTest.cpp @@ -11,8 +11,8 @@ #include "BinaryReaderWriterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/BinaryWriter.h" #include "Poco/BinaryReader.h" #include "Poco/Buffer.h" diff --git a/Foundation/testsuite/src/BinaryReaderWriterTest.h b/Foundation/testsuite/src/BinaryReaderWriterTest.h index c6dadbee7..87ed4b375 100644 --- a/Foundation/testsuite/src/BinaryReaderWriterTest.h +++ b/Foundation/testsuite/src/BinaryReaderWriterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/BinaryReader.h" #include "Poco/BinaryWriter.h" diff --git a/Foundation/testsuite/src/ByteOrderTest.cpp b/Foundation/testsuite/src/ByteOrderTest.cpp index f34cb8616..613053481 100644 --- a/Foundation/testsuite/src/ByteOrderTest.cpp +++ b/Foundation/testsuite/src/ByteOrderTest.cpp @@ -11,8 +11,8 @@ #include "ByteOrderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ByteOrder.h" diff --git a/Foundation/testsuite/src/ByteOrderTest.h b/Foundation/testsuite/src/ByteOrderTest.h index 61a76a486..2cb5596f9 100644 --- a/Foundation/testsuite/src/ByteOrderTest.h +++ b/Foundation/testsuite/src/ByteOrderTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ByteOrderTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/CacheTestSuite.h b/Foundation/testsuite/src/CacheTestSuite.h index 8a70b0905..9513eaa1f 100644 --- a/Foundation/testsuite/src/CacheTestSuite.h +++ b/Foundation/testsuite/src/CacheTestSuite.h @@ -16,7 +16,7 @@ #define CacheTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CacheTestSuite diff --git a/Foundation/testsuite/src/ChannelTest.cpp b/Foundation/testsuite/src/ChannelTest.cpp index 270d63a05..8f5281025 100644 --- a/Foundation/testsuite/src/ChannelTest.cpp +++ b/Foundation/testsuite/src/ChannelTest.cpp @@ -11,8 +11,8 @@ #include "ChannelTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SplitterChannel.h" #include "Poco/AsyncChannel.h" #include "Poco/AutoPtr.h" diff --git a/Foundation/testsuite/src/ChannelTest.h b/Foundation/testsuite/src/ChannelTest.h index 2b031ac87..5f92a7963 100644 --- a/Foundation/testsuite/src/ChannelTest.h +++ b/Foundation/testsuite/src/ChannelTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ChannelTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ClassLoaderTest.cpp b/Foundation/testsuite/src/ClassLoaderTest.cpp index a0e24104f..b631d75c1 100644 --- a/Foundation/testsuite/src/ClassLoaderTest.cpp +++ b/Foundation/testsuite/src/ClassLoaderTest.cpp @@ -11,8 +11,8 @@ #include "ClassLoaderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ClassLoader.h" #include "Poco/Manifest.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/ClassLoaderTest.h b/Foundation/testsuite/src/ClassLoaderTest.h index 68403f047..0fb8a7f00 100644 --- a/Foundation/testsuite/src/ClassLoaderTest.h +++ b/Foundation/testsuite/src/ClassLoaderTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ClassLoaderTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ClockTest.cpp b/Foundation/testsuite/src/ClockTest.cpp index 6adbf72f3..4b1e4f85a 100644 --- a/Foundation/testsuite/src/ClockTest.cpp +++ b/Foundation/testsuite/src/ClockTest.cpp @@ -11,8 +11,8 @@ #include "ClockTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Clock.h" #include "Poco/Thread.h" #include diff --git a/Foundation/testsuite/src/ClockTest.h b/Foundation/testsuite/src/ClockTest.h index b1a77ced8..e98164ef2 100644 --- a/Foundation/testsuite/src/ClockTest.h +++ b/Foundation/testsuite/src/ClockTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ClockTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ConditionTest.cpp b/Foundation/testsuite/src/ConditionTest.cpp index 9f341a6ce..a3e2b62ce 100644 --- a/Foundation/testsuite/src/ConditionTest.cpp +++ b/Foundation/testsuite/src/ConditionTest.cpp @@ -11,8 +11,8 @@ #include "ConditionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" #include "Poco/Condition.h" diff --git a/Foundation/testsuite/src/ConditionTest.h b/Foundation/testsuite/src/ConditionTest.h index d9a750a87..f9bf65a28 100644 --- a/Foundation/testsuite/src/ConditionTest.h +++ b/Foundation/testsuite/src/ConditionTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ConditionTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/CoreTest.cpp b/Foundation/testsuite/src/CoreTest.cpp index fe1a73dca..01166429c 100644 --- a/Foundation/testsuite/src/CoreTest.cpp +++ b/Foundation/testsuite/src/CoreTest.cpp @@ -11,8 +11,8 @@ #include "CoreTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Bugcheck.h" #include "Poco/Exception.h" #include "Poco/Environment.h" diff --git a/Foundation/testsuite/src/CoreTest.h b/Foundation/testsuite/src/CoreTest.h index 3b5a85f80..82cf7f5b1 100644 --- a/Foundation/testsuite/src/CoreTest.h +++ b/Foundation/testsuite/src/CoreTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CoreTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/CoreTestSuite.h b/Foundation/testsuite/src/CoreTestSuite.h index 2cccb675f..3b8b78237 100644 --- a/Foundation/testsuite/src/CoreTestSuite.h +++ b/Foundation/testsuite/src/CoreTestSuite.h @@ -16,7 +16,7 @@ #define CoreTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CoreTestSuite diff --git a/Foundation/testsuite/src/CountingStreamTest.cpp b/Foundation/testsuite/src/CountingStreamTest.cpp index be7ade9e3..859268406 100644 --- a/Foundation/testsuite/src/CountingStreamTest.cpp +++ b/Foundation/testsuite/src/CountingStreamTest.cpp @@ -11,8 +11,8 @@ #include "CountingStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/CountingStream.h" #include diff --git a/Foundation/testsuite/src/CountingStreamTest.h b/Foundation/testsuite/src/CountingStreamTest.h index d13ed53f7..9d0e39fcb 100644 --- a/Foundation/testsuite/src/CountingStreamTest.h +++ b/Foundation/testsuite/src/CountingStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CountingStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/CryptTestSuite.h b/Foundation/testsuite/src/CryptTestSuite.h index d24207782..1876090a3 100644 --- a/Foundation/testsuite/src/CryptTestSuite.h +++ b/Foundation/testsuite/src/CryptTestSuite.h @@ -16,7 +16,7 @@ #define CryptTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CryptTestSuite diff --git a/Foundation/testsuite/src/DateTimeFormatterTest.cpp b/Foundation/testsuite/src/DateTimeFormatterTest.cpp index f6b4b11b1..b0b949665 100644 --- a/Foundation/testsuite/src/DateTimeFormatterTest.cpp +++ b/Foundation/testsuite/src/DateTimeFormatterTest.cpp @@ -11,8 +11,8 @@ #include "DateTimeFormatterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DateTimeFormatter.h" #include "Poco/DateTimeFormat.h" #include "Poco/DateTime.h" diff --git a/Foundation/testsuite/src/DateTimeFormatterTest.h b/Foundation/testsuite/src/DateTimeFormatterTest.h index 2ff6747d4..7e8893f36 100644 --- a/Foundation/testsuite/src/DateTimeFormatterTest.h +++ b/Foundation/testsuite/src/DateTimeFormatterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DateTimeFormatterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DateTimeParserTest.cpp b/Foundation/testsuite/src/DateTimeParserTest.cpp index 57322c3e3..0a58e7038 100644 --- a/Foundation/testsuite/src/DateTimeParserTest.cpp +++ b/Foundation/testsuite/src/DateTimeParserTest.cpp @@ -11,8 +11,8 @@ #include "DateTimeParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DateTimeParser.h" #include "Poco/DateTimeFormat.h" #include "Poco/DateTime.h" diff --git a/Foundation/testsuite/src/DateTimeParserTest.h b/Foundation/testsuite/src/DateTimeParserTest.h index f1d4f2553..7accebcfe 100644 --- a/Foundation/testsuite/src/DateTimeParserTest.h +++ b/Foundation/testsuite/src/DateTimeParserTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DateTimeParserTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DateTimeTest.cpp b/Foundation/testsuite/src/DateTimeTest.cpp index 969e7bc9b..9261e8324 100644 --- a/Foundation/testsuite/src/DateTimeTest.cpp +++ b/Foundation/testsuite/src/DateTimeTest.cpp @@ -11,8 +11,8 @@ #include "DateTimeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DateTime.h" #include "Poco/Timestamp.h" #include "Poco/Timespan.h" diff --git a/Foundation/testsuite/src/DateTimeTest.h b/Foundation/testsuite/src/DateTimeTest.h index 7b8bb6e1a..0b5fd9e4f 100644 --- a/Foundation/testsuite/src/DateTimeTest.h +++ b/Foundation/testsuite/src/DateTimeTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DateTimeTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DateTimeTestSuite.h b/Foundation/testsuite/src/DateTimeTestSuite.h index 8b00fabfa..ae46cd2fd 100644 --- a/Foundation/testsuite/src/DateTimeTestSuite.h +++ b/Foundation/testsuite/src/DateTimeTestSuite.h @@ -16,7 +16,7 @@ #define DateTimeTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class DateTimeTestSuite diff --git a/Foundation/testsuite/src/DigestStreamTest.cpp b/Foundation/testsuite/src/DigestStreamTest.cpp index ba8982987..540745b75 100644 --- a/Foundation/testsuite/src/DigestStreamTest.cpp +++ b/Foundation/testsuite/src/DigestStreamTest.cpp @@ -12,8 +12,8 @@ #include "DigestStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DigestStream.h" #include "Poco/MD5Engine.h" #include diff --git a/Foundation/testsuite/src/DigestStreamTest.h b/Foundation/testsuite/src/DigestStreamTest.h index caf47971e..a140db75f 100644 --- a/Foundation/testsuite/src/DigestStreamTest.h +++ b/Foundation/testsuite/src/DigestStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DigestStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DirectoryIteratorsTest.cpp b/Foundation/testsuite/src/DirectoryIteratorsTest.cpp index d2d94ff79..d95d7aa7d 100644 --- a/Foundation/testsuite/src/DirectoryIteratorsTest.cpp +++ b/Foundation/testsuite/src/DirectoryIteratorsTest.cpp @@ -11,8 +11,8 @@ #include "DirectoryIteratorsTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DirectoryIterator.h" #include "Poco/SortedDirectoryIterator.h" #include "Poco/RecursiveDirectoryIterator.h" diff --git a/Foundation/testsuite/src/DirectoryIteratorsTest.h b/Foundation/testsuite/src/DirectoryIteratorsTest.h index 6eec889a5..cea356519 100644 --- a/Foundation/testsuite/src/DirectoryIteratorsTest.h +++ b/Foundation/testsuite/src/DirectoryIteratorsTest.h @@ -18,7 +18,7 @@ #include "Poco/Foundation.h" #include "Poco/Path.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DirectoryIteratorsTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DirectoryWatcherTest.cpp b/Foundation/testsuite/src/DirectoryWatcherTest.cpp index 24c718949..603d402e3 100644 --- a/Foundation/testsuite/src/DirectoryWatcherTest.cpp +++ b/Foundation/testsuite/src/DirectoryWatcherTest.cpp @@ -16,8 +16,8 @@ #ifndef POCO_NO_INOTIFY -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DirectoryWatcher.h" #include "Poco/Delegate.h" #include "Poco/FileStream.h" diff --git a/Foundation/testsuite/src/DirectoryWatcherTest.h b/Foundation/testsuite/src/DirectoryWatcherTest.h index 24fab5823..9ff0da113 100644 --- a/Foundation/testsuite/src/DirectoryWatcherTest.h +++ b/Foundation/testsuite/src/DirectoryWatcherTest.h @@ -24,7 +24,7 @@ #include "Poco/DirectoryWatcher.h" #include "Poco/Path.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DirectoryWatcherTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/Driver.cpp b/Foundation/testsuite/src/Driver.cpp index b9f21e804..1f18c8958 100644 --- a/Foundation/testsuite/src/Driver.cpp +++ b/Foundation/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "FoundationTestSuite.h" diff --git a/Foundation/testsuite/src/DynamicFactoryTest.cpp b/Foundation/testsuite/src/DynamicFactoryTest.cpp index 478aace1c..3a1e0f829 100644 --- a/Foundation/testsuite/src/DynamicFactoryTest.cpp +++ b/Foundation/testsuite/src/DynamicFactoryTest.cpp @@ -11,8 +11,8 @@ #include "DynamicFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DynamicFactory.h" #include "Poco/Exception.h" #include diff --git a/Foundation/testsuite/src/DynamicFactoryTest.h b/Foundation/testsuite/src/DynamicFactoryTest.h index 4b199bc35..76db47688 100644 --- a/Foundation/testsuite/src/DynamicFactoryTest.h +++ b/Foundation/testsuite/src/DynamicFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DynamicFactoryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DynamicTestSuite.h b/Foundation/testsuite/src/DynamicTestSuite.h index c8375fd6d..580a99e14 100644 --- a/Foundation/testsuite/src/DynamicTestSuite.h +++ b/Foundation/testsuite/src/DynamicTestSuite.h @@ -16,7 +16,7 @@ #define DynamicTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class DynamicTestSuite diff --git a/Foundation/testsuite/src/EventTestSuite.h b/Foundation/testsuite/src/EventTestSuite.h index 6952f8d44..1e78e806c 100644 --- a/Foundation/testsuite/src/EventTestSuite.h +++ b/Foundation/testsuite/src/EventTestSuite.h @@ -16,7 +16,7 @@ #define EventTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class EventTestSuite diff --git a/Foundation/testsuite/src/ExpireCacheTest.cpp b/Foundation/testsuite/src/ExpireCacheTest.cpp index 0e8cde480..ef65623f4 100644 --- a/Foundation/testsuite/src/ExpireCacheTest.cpp +++ b/Foundation/testsuite/src/ExpireCacheTest.cpp @@ -11,8 +11,8 @@ #include "ExpireCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/ExpireCache.h" #include "Poco/AccessExpireCache.h" diff --git a/Foundation/testsuite/src/ExpireCacheTest.h b/Foundation/testsuite/src/ExpireCacheTest.h index fc5accaa1..ccc46585d 100644 --- a/Foundation/testsuite/src/ExpireCacheTest.h +++ b/Foundation/testsuite/src/ExpireCacheTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ExpireCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp index 31ef4baaf..8631ebe83 100644 --- a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp +++ b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp @@ -11,8 +11,8 @@ #include "ExpireLRUCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/ExpireLRUCache.h" #include "Poco/AccessExpireLRUCache.h" diff --git a/Foundation/testsuite/src/ExpireLRUCacheTest.h b/Foundation/testsuite/src/ExpireLRUCacheTest.h index 0edf12475..30381fb95 100644 --- a/Foundation/testsuite/src/ExpireLRUCacheTest.h +++ b/Foundation/testsuite/src/ExpireLRUCacheTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ExpireLRUCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp index 1a07b91b0..67683dc3c 100644 --- a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp +++ b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp @@ -11,8 +11,8 @@ #include "FIFOBufferStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/FIFOBuffer.h" #include "Poco/FIFOBufferStream.h" #include "Poco/Delegate.h" diff --git a/Foundation/testsuite/src/FIFOBufferStreamTest.h b/Foundation/testsuite/src/FIFOBufferStreamTest.h index 0605d644b..85d75c725 100644 --- a/Foundation/testsuite/src/FIFOBufferStreamTest.h +++ b/Foundation/testsuite/src/FIFOBufferStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FIFOBufferStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FIFOBufferTest.cpp b/Foundation/testsuite/src/FIFOBufferTest.cpp index a3819d6ef..2bde55d36 100644 --- a/Foundation/testsuite/src/FIFOBufferTest.cpp +++ b/Foundation/testsuite/src/FIFOBufferTest.cpp @@ -11,8 +11,8 @@ #include "FIFOBufferTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Buffer.h" #include "Poco/Exception.h" #include "Poco/Delegate.h" diff --git a/Foundation/testsuite/src/FIFOBufferTest.h b/Foundation/testsuite/src/FIFOBufferTest.h index 8e4a8a64c..bb5ba8767 100644 --- a/Foundation/testsuite/src/FIFOBufferTest.h +++ b/Foundation/testsuite/src/FIFOBufferTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FIFOBufferTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FIFOBufferTestSuite.h b/Foundation/testsuite/src/FIFOBufferTestSuite.h index f0bce19a0..acbe506c8 100644 --- a/Foundation/testsuite/src/FIFOBufferTestSuite.h +++ b/Foundation/testsuite/src/FIFOBufferTestSuite.h @@ -16,7 +16,7 @@ #define FIFOBufferTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class FIFOBufferTestSuite diff --git a/Foundation/testsuite/src/FIFOEventTest.cpp b/Foundation/testsuite/src/FIFOEventTest.cpp index fdc4ac0e7..8951a78ad 100644 --- a/Foundation/testsuite/src/FIFOEventTest.cpp +++ b/Foundation/testsuite/src/FIFOEventTest.cpp @@ -12,8 +12,8 @@ #include "FIFOEventTest.h" #include "DummyDelegate.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Delegate.h" #include "Poco/Expire.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/FIFOEventTest.h b/Foundation/testsuite/src/FIFOEventTest.h index 1d7b31a7b..87e383989 100644 --- a/Foundation/testsuite/src/FIFOEventTest.h +++ b/Foundation/testsuite/src/FIFOEventTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/FIFOEvent.h" #include "Poco/EventArgs.h" diff --git a/Foundation/testsuite/src/FPETest.cpp b/Foundation/testsuite/src/FPETest.cpp index 5f4fba2b8..c398587d0 100644 --- a/Foundation/testsuite/src/FPETest.cpp +++ b/Foundation/testsuite/src/FPETest.cpp @@ -11,8 +11,8 @@ #include "FPETest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/FPEnvironment.h" diff --git a/Foundation/testsuite/src/FPETest.h b/Foundation/testsuite/src/FPETest.h index 82e13d80e..dbddf3791 100644 --- a/Foundation/testsuite/src/FPETest.h +++ b/Foundation/testsuite/src/FPETest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FPETest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FileChannelTest.cpp b/Foundation/testsuite/src/FileChannelTest.cpp index bb0c86643..c13d7aa1a 100644 --- a/Foundation/testsuite/src/FileChannelTest.cpp +++ b/Foundation/testsuite/src/FileChannelTest.cpp @@ -11,8 +11,8 @@ #include "FileChannelTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/FileChannel.h" #include "Poco/Message.h" #include "Poco/AutoPtr.h" diff --git a/Foundation/testsuite/src/FileChannelTest.h b/Foundation/testsuite/src/FileChannelTest.h index d70d67069..7561926fb 100644 --- a/Foundation/testsuite/src/FileChannelTest.h +++ b/Foundation/testsuite/src/FileChannelTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FileChannelTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FileStreamTest.cpp b/Foundation/testsuite/src/FileStreamTest.cpp index 27ad70b58..757f95e21 100644 --- a/Foundation/testsuite/src/FileStreamTest.cpp +++ b/Foundation/testsuite/src/FileStreamTest.cpp @@ -11,8 +11,8 @@ #include "FileStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/FileStream.h" #include "Poco/File.h" #include "Poco/TemporaryFile.h" diff --git a/Foundation/testsuite/src/FileStreamTest.h b/Foundation/testsuite/src/FileStreamTest.h index 8fca17353..0414c9d7e 100644 --- a/Foundation/testsuite/src/FileStreamTest.h +++ b/Foundation/testsuite/src/FileStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FileStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FileTest.cpp b/Foundation/testsuite/src/FileTest.cpp index 9b2117a11..99929ba1c 100644 --- a/Foundation/testsuite/src/FileTest.cpp +++ b/Foundation/testsuite/src/FileTest.cpp @@ -11,8 +11,8 @@ #include "FileTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/File.h" #include "Poco/TemporaryFile.h" #include "Poco/Path.h" diff --git a/Foundation/testsuite/src/FileTest.h b/Foundation/testsuite/src/FileTest.h index 0177a9eca..886e27569 100644 --- a/Foundation/testsuite/src/FileTest.h +++ b/Foundation/testsuite/src/FileTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FileTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FilesystemTestSuite.h b/Foundation/testsuite/src/FilesystemTestSuite.h index 7a6101af2..631f0bb5d 100644 --- a/Foundation/testsuite/src/FilesystemTestSuite.h +++ b/Foundation/testsuite/src/FilesystemTestSuite.h @@ -16,7 +16,7 @@ #define FilesystemTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class FilesystemTestSuite diff --git a/Foundation/testsuite/src/FormatTest.cpp b/Foundation/testsuite/src/FormatTest.cpp index 1ace4f9b5..44a228ee5 100644 --- a/Foundation/testsuite/src/FormatTest.cpp +++ b/Foundation/testsuite/src/FormatTest.cpp @@ -11,8 +11,8 @@ #include "FormatTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Any.h" #include "Poco/Format.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/FormatTest.h b/Foundation/testsuite/src/FormatTest.h index 87c15e762..16e86f6f6 100644 --- a/Foundation/testsuite/src/FormatTest.h +++ b/Foundation/testsuite/src/FormatTest.h @@ -14,7 +14,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FormatTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FoundationTestSuite.h b/Foundation/testsuite/src/FoundationTestSuite.h index 5f4404304..0013c5c5b 100644 --- a/Foundation/testsuite/src/FoundationTestSuite.h +++ b/Foundation/testsuite/src/FoundationTestSuite.h @@ -16,7 +16,7 @@ #define FoundationTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class FoundationTestSuite diff --git a/Foundation/testsuite/src/GlobTest.cpp b/Foundation/testsuite/src/GlobTest.cpp index 25c887ec6..6b2892537 100644 --- a/Foundation/testsuite/src/GlobTest.cpp +++ b/Foundation/testsuite/src/GlobTest.cpp @@ -11,8 +11,8 @@ #include "GlobTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Glob.h" #include "Poco/File.h" #include "Poco/Path.h" diff --git a/Foundation/testsuite/src/GlobTest.h b/Foundation/testsuite/src/GlobTest.h index d017c708a..439e63950 100644 --- a/Foundation/testsuite/src/GlobTest.h +++ b/Foundation/testsuite/src/GlobTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include diff --git a/Foundation/testsuite/src/HMACEngineTest.cpp b/Foundation/testsuite/src/HMACEngineTest.cpp index 2b21e1e6d..befeada21 100644 --- a/Foundation/testsuite/src/HMACEngineTest.cpp +++ b/Foundation/testsuite/src/HMACEngineTest.cpp @@ -11,8 +11,8 @@ #include "HMACEngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HMACEngine.h" #include "Poco/MD5Engine.h" diff --git a/Foundation/testsuite/src/HMACEngineTest.h b/Foundation/testsuite/src/HMACEngineTest.h index 9c2196a01..5b1a94c65 100644 --- a/Foundation/testsuite/src/HMACEngineTest.h +++ b/Foundation/testsuite/src/HMACEngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HMACEngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/HashMapTest.cpp b/Foundation/testsuite/src/HashMapTest.cpp index 5f14ad4ea..8725bf277 100644 --- a/Foundation/testsuite/src/HashMapTest.cpp +++ b/Foundation/testsuite/src/HashMapTest.cpp @@ -11,8 +11,8 @@ #include "HashMapTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HashMap.h" #include "Poco/Exception.h" #include diff --git a/Foundation/testsuite/src/HashMapTest.h b/Foundation/testsuite/src/HashMapTest.h index 4bc02bacc..ba6021cf5 100644 --- a/Foundation/testsuite/src/HashMapTest.h +++ b/Foundation/testsuite/src/HashMapTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HashMapTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/HashSetTest.cpp b/Foundation/testsuite/src/HashSetTest.cpp index 288ee57c7..a24bb8c65 100644 --- a/Foundation/testsuite/src/HashSetTest.cpp +++ b/Foundation/testsuite/src/HashSetTest.cpp @@ -11,8 +11,8 @@ #include "HashSetTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HashSet.h" #include diff --git a/Foundation/testsuite/src/HashSetTest.h b/Foundation/testsuite/src/HashSetTest.h index 3366631f3..5034ab3d2 100644 --- a/Foundation/testsuite/src/HashSetTest.h +++ b/Foundation/testsuite/src/HashSetTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HashSetTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/HashTableTest.cpp b/Foundation/testsuite/src/HashTableTest.cpp index da305b991..3152e63e6 100644 --- a/Foundation/testsuite/src/HashTableTest.cpp +++ b/Foundation/testsuite/src/HashTableTest.cpp @@ -11,8 +11,8 @@ #include "HashTableTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HashTable.h" #include "Poco/NumberFormatter.h" diff --git a/Foundation/testsuite/src/HashTableTest.h b/Foundation/testsuite/src/HashTableTest.h index 962c633b9..e5d216cad 100644 --- a/Foundation/testsuite/src/HashTableTest.h +++ b/Foundation/testsuite/src/HashTableTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HashTableTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/HashingTestSuite.h b/Foundation/testsuite/src/HashingTestSuite.h index eb0cd1268..b934d0d9b 100644 --- a/Foundation/testsuite/src/HashingTestSuite.h +++ b/Foundation/testsuite/src/HashingTestSuite.h @@ -16,7 +16,7 @@ #define HashingTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HashingTestSuite diff --git a/Foundation/testsuite/src/HexBinaryTest.cpp b/Foundation/testsuite/src/HexBinaryTest.cpp index fe3796dd6..ad5951e1a 100644 --- a/Foundation/testsuite/src/HexBinaryTest.cpp +++ b/Foundation/testsuite/src/HexBinaryTest.cpp @@ -11,8 +11,8 @@ #include "HexBinaryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HexBinaryEncoder.h" #include "Poco/HexBinaryDecoder.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/HexBinaryTest.h b/Foundation/testsuite/src/HexBinaryTest.h index e6c23ebb4..b11d413bd 100644 --- a/Foundation/testsuite/src/HexBinaryTest.h +++ b/Foundation/testsuite/src/HexBinaryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HexBinaryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LRUCacheTest.cpp b/Foundation/testsuite/src/LRUCacheTest.cpp index 24a64eb94..068eaf1fe 100644 --- a/Foundation/testsuite/src/LRUCacheTest.cpp +++ b/Foundation/testsuite/src/LRUCacheTest.cpp @@ -11,8 +11,8 @@ #include "LRUCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/LRUCache.h" #include "Poco/Bugcheck.h" diff --git a/Foundation/testsuite/src/LRUCacheTest.h b/Foundation/testsuite/src/LRUCacheTest.h index cf6623433..67935ff57 100644 --- a/Foundation/testsuite/src/LRUCacheTest.h +++ b/Foundation/testsuite/src/LRUCacheTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" #include "Poco/KeyValueArgs.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LRUCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LineEndingConverterTest.cpp b/Foundation/testsuite/src/LineEndingConverterTest.cpp index 70d85ba45..2179accfa 100644 --- a/Foundation/testsuite/src/LineEndingConverterTest.cpp +++ b/Foundation/testsuite/src/LineEndingConverterTest.cpp @@ -11,8 +11,8 @@ #include "LineEndingConverterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LineEndingConverter.h" #include "Poco/StreamCopier.h" #include diff --git a/Foundation/testsuite/src/LineEndingConverterTest.h b/Foundation/testsuite/src/LineEndingConverterTest.h index fea8bbfae..07b26c268 100644 --- a/Foundation/testsuite/src/LineEndingConverterTest.h +++ b/Foundation/testsuite/src/LineEndingConverterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LineEndingConverterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LinearHashTableTest.cpp b/Foundation/testsuite/src/LinearHashTableTest.cpp index 6c7607845..1f6b98c1d 100644 --- a/Foundation/testsuite/src/LinearHashTableTest.cpp +++ b/Foundation/testsuite/src/LinearHashTableTest.cpp @@ -11,8 +11,8 @@ #include "LinearHashTableTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LinearHashTable.h" #include "Poco/HashTable.h" #include "Poco/Stopwatch.h" diff --git a/Foundation/testsuite/src/LinearHashTableTest.h b/Foundation/testsuite/src/LinearHashTableTest.h index 1e7761cf8..71bcabd00 100644 --- a/Foundation/testsuite/src/LinearHashTableTest.h +++ b/Foundation/testsuite/src/LinearHashTableTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LinearHashTableTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ListMapTest.cpp b/Foundation/testsuite/src/ListMapTest.cpp index e3b1ae0c1..42e47cf48 100644 --- a/Foundation/testsuite/src/ListMapTest.cpp +++ b/Foundation/testsuite/src/ListMapTest.cpp @@ -11,8 +11,8 @@ #include "ListMapTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ListMap.h" #include "Poco/Exception.h" #include diff --git a/Foundation/testsuite/src/ListMapTest.h b/Foundation/testsuite/src/ListMapTest.h index 8bd3f7e94..3ee08591f 100644 --- a/Foundation/testsuite/src/ListMapTest.h +++ b/Foundation/testsuite/src/ListMapTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ListMapTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LocalDateTimeTest.cpp b/Foundation/testsuite/src/LocalDateTimeTest.cpp index f3381419e..b4d06f8b2 100644 --- a/Foundation/testsuite/src/LocalDateTimeTest.cpp +++ b/Foundation/testsuite/src/LocalDateTimeTest.cpp @@ -11,8 +11,8 @@ #include "LocalDateTimeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LocalDateTime.h" #include "Poco/DateTime.h" #include "Poco/Timestamp.h" diff --git a/Foundation/testsuite/src/LocalDateTimeTest.h b/Foundation/testsuite/src/LocalDateTimeTest.h index e1d0b439e..c7f21a100 100644 --- a/Foundation/testsuite/src/LocalDateTimeTest.h +++ b/Foundation/testsuite/src/LocalDateTimeTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LocalDateTimeTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LogStreamTest.cpp b/Foundation/testsuite/src/LogStreamTest.cpp index 3e8b6d1e3..d62cf3ac7 100644 --- a/Foundation/testsuite/src/LogStreamTest.cpp +++ b/Foundation/testsuite/src/LogStreamTest.cpp @@ -11,8 +11,8 @@ #include "LogStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Logger.h" #include "Poco/LogStream.h" #include "Poco/AutoPtr.h" diff --git a/Foundation/testsuite/src/LogStreamTest.h b/Foundation/testsuite/src/LogStreamTest.h index e66826d8e..2a44af003 100644 --- a/Foundation/testsuite/src/LogStreamTest.h +++ b/Foundation/testsuite/src/LogStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LogStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LoggerTest.cpp b/Foundation/testsuite/src/LoggerTest.cpp index 896d439e9..3ae79b37f 100644 --- a/Foundation/testsuite/src/LoggerTest.cpp +++ b/Foundation/testsuite/src/LoggerTest.cpp @@ -11,8 +11,8 @@ #include "LoggerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Logger.h" #include "Poco/AutoPtr.h" #include "TestChannel.h" diff --git a/Foundation/testsuite/src/LoggerTest.h b/Foundation/testsuite/src/LoggerTest.h index 3c0933b7d..0a711a513 100644 --- a/Foundation/testsuite/src/LoggerTest.h +++ b/Foundation/testsuite/src/LoggerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LoggerTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LoggingFactoryTest.cpp b/Foundation/testsuite/src/LoggingFactoryTest.cpp index 4ad770796..f11eafb8c 100644 --- a/Foundation/testsuite/src/LoggingFactoryTest.cpp +++ b/Foundation/testsuite/src/LoggingFactoryTest.cpp @@ -11,8 +11,8 @@ #include "LoggingFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LoggingFactory.h" #include "Poco/Instantiator.h" #include "Poco/Channel.h" diff --git a/Foundation/testsuite/src/LoggingFactoryTest.h b/Foundation/testsuite/src/LoggingFactoryTest.h index 065b9b749..8922870f8 100644 --- a/Foundation/testsuite/src/LoggingFactoryTest.h +++ b/Foundation/testsuite/src/LoggingFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LoggingFactoryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LoggingRegistryTest.cpp b/Foundation/testsuite/src/LoggingRegistryTest.cpp index 8ed076521..7d306c758 100644 --- a/Foundation/testsuite/src/LoggingRegistryTest.cpp +++ b/Foundation/testsuite/src/LoggingRegistryTest.cpp @@ -11,8 +11,8 @@ #include "LoggingRegistryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LoggingRegistry.h" #include "Poco/ConsoleChannel.h" #include "Poco/PatternFormatter.h" diff --git a/Foundation/testsuite/src/LoggingRegistryTest.h b/Foundation/testsuite/src/LoggingRegistryTest.h index aa93598ca..f13a3f75d 100644 --- a/Foundation/testsuite/src/LoggingRegistryTest.h +++ b/Foundation/testsuite/src/LoggingRegistryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LoggingRegistryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LoggingTestSuite.h b/Foundation/testsuite/src/LoggingTestSuite.h index b8cce69bf..2472f0b56 100644 --- a/Foundation/testsuite/src/LoggingTestSuite.h +++ b/Foundation/testsuite/src/LoggingTestSuite.h @@ -16,7 +16,7 @@ #define LoggingTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class LoggingTestSuite diff --git a/Foundation/testsuite/src/MD4EngineTest.cpp b/Foundation/testsuite/src/MD4EngineTest.cpp index c31a90096..a4702738c 100644 --- a/Foundation/testsuite/src/MD4EngineTest.cpp +++ b/Foundation/testsuite/src/MD4EngineTest.cpp @@ -11,8 +11,8 @@ #include "MD4EngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/MD4Engine.h" diff --git a/Foundation/testsuite/src/MD4EngineTest.h b/Foundation/testsuite/src/MD4EngineTest.h index b56ddddbe..b8e803129 100644 --- a/Foundation/testsuite/src/MD4EngineTest.h +++ b/Foundation/testsuite/src/MD4EngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MD4EngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/MD5EngineTest.cpp b/Foundation/testsuite/src/MD5EngineTest.cpp index b4c4fa24b..cf9af69e1 100644 --- a/Foundation/testsuite/src/MD5EngineTest.cpp +++ b/Foundation/testsuite/src/MD5EngineTest.cpp @@ -11,8 +11,8 @@ #include "MD5EngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/MD5Engine.h" diff --git a/Foundation/testsuite/src/MD5EngineTest.h b/Foundation/testsuite/src/MD5EngineTest.h index 97b86ec23..f0504c0f0 100644 --- a/Foundation/testsuite/src/MD5EngineTest.h +++ b/Foundation/testsuite/src/MD5EngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MD5EngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ManifestTest.cpp b/Foundation/testsuite/src/ManifestTest.cpp index 2a78b4f69..a4ddd09fd 100644 --- a/Foundation/testsuite/src/ManifestTest.cpp +++ b/Foundation/testsuite/src/ManifestTest.cpp @@ -11,8 +11,8 @@ #include "ManifestTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Manifest.h" #include "Poco/MetaObject.h" #include diff --git a/Foundation/testsuite/src/ManifestTest.h b/Foundation/testsuite/src/ManifestTest.h index f296eff64..35e3fd61a 100644 --- a/Foundation/testsuite/src/ManifestTest.h +++ b/Foundation/testsuite/src/ManifestTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ManifestTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/MemoryPoolTest.cpp b/Foundation/testsuite/src/MemoryPoolTest.cpp index dd482d822..ca8a9b246 100644 --- a/Foundation/testsuite/src/MemoryPoolTest.cpp +++ b/Foundation/testsuite/src/MemoryPoolTest.cpp @@ -11,8 +11,8 @@ #include "MemoryPoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/MemoryPool.h" #include diff --git a/Foundation/testsuite/src/MemoryPoolTest.h b/Foundation/testsuite/src/MemoryPoolTest.h index 8bc36edba..bfb2a365a 100644 --- a/Foundation/testsuite/src/MemoryPoolTest.h +++ b/Foundation/testsuite/src/MemoryPoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MemoryPoolTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/MemoryStreamTest.cpp b/Foundation/testsuite/src/MemoryStreamTest.cpp index 86ea9557a..480bafcc3 100644 --- a/Foundation/testsuite/src/MemoryStreamTest.cpp +++ b/Foundation/testsuite/src/MemoryStreamTest.cpp @@ -11,8 +11,8 @@ #include "MemoryStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Buffer.h" #include "Poco/MemoryStream.h" #include diff --git a/Foundation/testsuite/src/MemoryStreamTest.h b/Foundation/testsuite/src/MemoryStreamTest.h index 5a37005cc..7a0da9507 100644 --- a/Foundation/testsuite/src/MemoryStreamTest.h +++ b/Foundation/testsuite/src/MemoryStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MemoryStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/MutexTest.cpp b/Foundation/testsuite/src/MutexTest.cpp index 9b3f70f24..b248ddb70 100644 --- a/Foundation/testsuite/src/MutexTest.cpp +++ b/Foundation/testsuite/src/MutexTest.cpp @@ -11,8 +11,8 @@ #include "MutexTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/Mutex.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/MutexTest.h b/Foundation/testsuite/src/MutexTest.h index 1e20c5e63..82879f258 100644 --- a/Foundation/testsuite/src/MutexTest.h +++ b/Foundation/testsuite/src/MutexTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MutexTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NDCTest.cpp b/Foundation/testsuite/src/NDCTest.cpp index 9ae2a35dd..94c13418e 100644 --- a/Foundation/testsuite/src/NDCTest.cpp +++ b/Foundation/testsuite/src/NDCTest.cpp @@ -11,8 +11,8 @@ #include "NDCTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NestedDiagnosticContext.h" #include diff --git a/Foundation/testsuite/src/NDCTest.h b/Foundation/testsuite/src/NDCTest.h index 11a95df78..e6221f80e 100644 --- a/Foundation/testsuite/src/NDCTest.h +++ b/Foundation/testsuite/src/NDCTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NDCTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NamedEventTest.cpp b/Foundation/testsuite/src/NamedEventTest.cpp index 4f22197c8..320082dfa 100644 --- a/Foundation/testsuite/src/NamedEventTest.cpp +++ b/Foundation/testsuite/src/NamedEventTest.cpp @@ -11,8 +11,8 @@ #include "NamedEventTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NamedEvent.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/NamedEventTest.h b/Foundation/testsuite/src/NamedEventTest.h index 2921f8d61..7e902e6a0 100644 --- a/Foundation/testsuite/src/NamedEventTest.h +++ b/Foundation/testsuite/src/NamedEventTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamedEventTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NamedMutexTest.cpp b/Foundation/testsuite/src/NamedMutexTest.cpp index 3d3b3047f..41e5f2719 100644 --- a/Foundation/testsuite/src/NamedMutexTest.cpp +++ b/Foundation/testsuite/src/NamedMutexTest.cpp @@ -11,8 +11,8 @@ #include "NamedMutexTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NamedMutex.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/NamedMutexTest.h b/Foundation/testsuite/src/NamedMutexTest.h index e627e31e3..96e6e15cb 100644 --- a/Foundation/testsuite/src/NamedMutexTest.h +++ b/Foundation/testsuite/src/NamedMutexTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamedMutexTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NamedTuplesTest.cpp b/Foundation/testsuite/src/NamedTuplesTest.cpp index 3442e52b5..4ebafc8a0 100644 --- a/Foundation/testsuite/src/NamedTuplesTest.cpp +++ b/Foundation/testsuite/src/NamedTuplesTest.cpp @@ -11,8 +11,8 @@ #include "NamedTuplesTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NamedTuple.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/NamedTuplesTest.h b/Foundation/testsuite/src/NamedTuplesTest.h index 22580124b..bfe56563a 100644 --- a/Foundation/testsuite/src/NamedTuplesTest.h +++ b/Foundation/testsuite/src/NamedTuplesTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamedTuplesTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NotificationCenterTest.cpp b/Foundation/testsuite/src/NotificationCenterTest.cpp index fa5b98c71..bc0d932f7 100644 --- a/Foundation/testsuite/src/NotificationCenterTest.cpp +++ b/Foundation/testsuite/src/NotificationCenterTest.cpp @@ -11,8 +11,8 @@ #include "NotificationCenterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NotificationCenter.h" #include "Poco/Observer.h" #include "Poco/NObserver.h" diff --git a/Foundation/testsuite/src/NotificationCenterTest.h b/Foundation/testsuite/src/NotificationCenterTest.h index e5dd6f151..700d33c2f 100644 --- a/Foundation/testsuite/src/NotificationCenterTest.h +++ b/Foundation/testsuite/src/NotificationCenterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Notification.h" #include "Poco/AutoPtr.h" #include diff --git a/Foundation/testsuite/src/NotificationQueueTest.cpp b/Foundation/testsuite/src/NotificationQueueTest.cpp index 559869b34..3b3669989 100644 --- a/Foundation/testsuite/src/NotificationQueueTest.cpp +++ b/Foundation/testsuite/src/NotificationQueueTest.cpp @@ -11,8 +11,8 @@ #include "NotificationQueueTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NotificationQueue.h" #include "Poco/Notification.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/NotificationQueueTest.h b/Foundation/testsuite/src/NotificationQueueTest.h index e261a7c05..2ed2e162d 100644 --- a/Foundation/testsuite/src/NotificationQueueTest.h +++ b/Foundation/testsuite/src/NotificationQueueTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/NotificationQueue.h" #include "Poco/Mutex.h" #include diff --git a/Foundation/testsuite/src/NotificationsTestSuite.h b/Foundation/testsuite/src/NotificationsTestSuite.h index 7f9f6c563..ef653d272 100644 --- a/Foundation/testsuite/src/NotificationsTestSuite.h +++ b/Foundation/testsuite/src/NotificationsTestSuite.h @@ -16,7 +16,7 @@ #define NotificationsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NotificationsTestSuite diff --git a/Foundation/testsuite/src/NullStreamTest.cpp b/Foundation/testsuite/src/NullStreamTest.cpp index 27ceffb1e..cdd941a65 100644 --- a/Foundation/testsuite/src/NullStreamTest.cpp +++ b/Foundation/testsuite/src/NullStreamTest.cpp @@ -11,8 +11,8 @@ #include "NullStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NullStream.h" diff --git a/Foundation/testsuite/src/NullStreamTest.h b/Foundation/testsuite/src/NullStreamTest.h index c6c2b19b0..98781b145 100644 --- a/Foundation/testsuite/src/NullStreamTest.h +++ b/Foundation/testsuite/src/NullStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NullStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NumberFormatterTest.cpp b/Foundation/testsuite/src/NumberFormatterTest.cpp index e6935a711..a88fa09c3 100644 --- a/Foundation/testsuite/src/NumberFormatterTest.cpp +++ b/Foundation/testsuite/src/NumberFormatterTest.cpp @@ -11,8 +11,8 @@ #include "NumberFormatterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NumberFormatter.h" #include diff --git a/Foundation/testsuite/src/NumberFormatterTest.h b/Foundation/testsuite/src/NumberFormatterTest.h index fd0bacb80..1fee768b6 100644 --- a/Foundation/testsuite/src/NumberFormatterTest.h +++ b/Foundation/testsuite/src/NumberFormatterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NumberFormatterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NumberParserTest.cpp b/Foundation/testsuite/src/NumberParserTest.cpp index cb656494b..1071d40ff 100644 --- a/Foundation/testsuite/src/NumberParserTest.cpp +++ b/Foundation/testsuite/src/NumberParserTest.cpp @@ -11,8 +11,8 @@ #include "NumberParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/Types.h" #include "Poco/Format.h" diff --git a/Foundation/testsuite/src/NumberParserTest.h b/Foundation/testsuite/src/NumberParserTest.h index 510f4525e..3a64560a3 100644 --- a/Foundation/testsuite/src/NumberParserTest.h +++ b/Foundation/testsuite/src/NumberParserTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/NumberParser.h" #include "Poco/NumberFormatter.h" #undef max diff --git a/Foundation/testsuite/src/ObjectPoolTest.cpp b/Foundation/testsuite/src/ObjectPoolTest.cpp index 1f631f5fd..6f7a602b8 100644 --- a/Foundation/testsuite/src/ObjectPoolTest.cpp +++ b/Foundation/testsuite/src/ObjectPoolTest.cpp @@ -11,8 +11,8 @@ #include "ObjectPoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ObjectPool.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/ObjectPoolTest.h b/Foundation/testsuite/src/ObjectPoolTest.h index d70ae8e85..39b3887ed 100644 --- a/Foundation/testsuite/src/ObjectPoolTest.h +++ b/Foundation/testsuite/src/ObjectPoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ObjectPoolTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/PBKDF2EngineTest.cpp b/Foundation/testsuite/src/PBKDF2EngineTest.cpp index 5a3ed21e1..a3e004bab 100644 --- a/Foundation/testsuite/src/PBKDF2EngineTest.cpp +++ b/Foundation/testsuite/src/PBKDF2EngineTest.cpp @@ -11,8 +11,8 @@ #include "PBKDF2EngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/PBKDF2Engine.h" #include "Poco/HMACEngine.h" #include "Poco/SHA1Engine.h" diff --git a/Foundation/testsuite/src/PBKDF2EngineTest.h b/Foundation/testsuite/src/PBKDF2EngineTest.h index 1f8899665..7a81f194d 100644 --- a/Foundation/testsuite/src/PBKDF2EngineTest.h +++ b/Foundation/testsuite/src/PBKDF2EngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PBKDF2EngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/PathTest.cpp b/Foundation/testsuite/src/PathTest.cpp index a601e8067..ac8a92506 100644 --- a/Foundation/testsuite/src/PathTest.cpp +++ b/Foundation/testsuite/src/PathTest.cpp @@ -11,8 +11,8 @@ #include "PathTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Path.h" #include "Poco/Exception.h" #include "Poco/Random.h" diff --git a/Foundation/testsuite/src/PathTest.h b/Foundation/testsuite/src/PathTest.h index 1279589f1..e14aebebd 100644 --- a/Foundation/testsuite/src/PathTest.h +++ b/Foundation/testsuite/src/PathTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PathTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/PatternFormatterTest.cpp b/Foundation/testsuite/src/PatternFormatterTest.cpp index 77987996f..120a4ae8f 100644 --- a/Foundation/testsuite/src/PatternFormatterTest.cpp +++ b/Foundation/testsuite/src/PatternFormatterTest.cpp @@ -11,8 +11,8 @@ #include "PatternFormatterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/PatternFormatter.h" #include "Poco/Message.h" #include "Poco/DateTime.h" diff --git a/Foundation/testsuite/src/PatternFormatterTest.h b/Foundation/testsuite/src/PatternFormatterTest.h index 20478b7b5..251eab16b 100644 --- a/Foundation/testsuite/src/PatternFormatterTest.h +++ b/Foundation/testsuite/src/PatternFormatterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PatternFormatterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/PriorityEventTest.cpp b/Foundation/testsuite/src/PriorityEventTest.cpp index 749314792..82037c571 100644 --- a/Foundation/testsuite/src/PriorityEventTest.cpp +++ b/Foundation/testsuite/src/PriorityEventTest.cpp @@ -12,8 +12,8 @@ #include "PriorityEventTest.h" #include "DummyDelegate.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/PriorityDelegate.h" #include "Poco/PriorityExpire.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/PriorityEventTest.h b/Foundation/testsuite/src/PriorityEventTest.h index a7d972018..07d96d441 100644 --- a/Foundation/testsuite/src/PriorityEventTest.h +++ b/Foundation/testsuite/src/PriorityEventTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/PriorityEvent.h" #include "Poco/EventArgs.h" diff --git a/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp b/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp index 8240a2a84..e8be40a1f 100644 --- a/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp +++ b/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp @@ -11,8 +11,8 @@ #include "PriorityNotificationQueueTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/PriorityNotificationQueue.h" #include "Poco/Notification.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/PriorityNotificationQueueTest.h b/Foundation/testsuite/src/PriorityNotificationQueueTest.h index 72652881d..1c031efcb 100644 --- a/Foundation/testsuite/src/PriorityNotificationQueueTest.h +++ b/Foundation/testsuite/src/PriorityNotificationQueueTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/PriorityNotificationQueue.h" #include "Poco/Mutex.h" #include diff --git a/Foundation/testsuite/src/ProcessTest.cpp b/Foundation/testsuite/src/ProcessTest.cpp index 71d6eabb3..736507375 100644 --- a/Foundation/testsuite/src/ProcessTest.cpp +++ b/Foundation/testsuite/src/ProcessTest.cpp @@ -11,8 +11,8 @@ #include "ProcessTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Process.h" #include "Poco/Pipe.h" #include "Poco/PipeStream.h" diff --git a/Foundation/testsuite/src/ProcessTest.h b/Foundation/testsuite/src/ProcessTest.h index e22c2b7e6..f3e9d67d5 100644 --- a/Foundation/testsuite/src/ProcessTest.h +++ b/Foundation/testsuite/src/ProcessTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ProcessTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ProcessesTestSuite.h b/Foundation/testsuite/src/ProcessesTestSuite.h index 50a73942f..b2e52b890 100644 --- a/Foundation/testsuite/src/ProcessesTestSuite.h +++ b/Foundation/testsuite/src/ProcessesTestSuite.h @@ -16,7 +16,7 @@ #define ProcessesTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ProcessesTestSuite diff --git a/Foundation/testsuite/src/RWLockTest.cpp b/Foundation/testsuite/src/RWLockTest.cpp index e8b6a30f1..0c66064cc 100644 --- a/Foundation/testsuite/src/RWLockTest.cpp +++ b/Foundation/testsuite/src/RWLockTest.cpp @@ -11,8 +11,8 @@ #include "RWLockTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/RWLock.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/RWLockTest.h b/Foundation/testsuite/src/RWLockTest.h index fdda37e23..316ef8b70 100644 --- a/Foundation/testsuite/src/RWLockTest.h +++ b/Foundation/testsuite/src/RWLockTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RWLockTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/RandomStreamTest.cpp b/Foundation/testsuite/src/RandomStreamTest.cpp index 2d641062f..e549a92fd 100644 --- a/Foundation/testsuite/src/RandomStreamTest.cpp +++ b/Foundation/testsuite/src/RandomStreamTest.cpp @@ -11,8 +11,8 @@ #include "RandomStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/RandomStream.h" #include #include diff --git a/Foundation/testsuite/src/RandomStreamTest.h b/Foundation/testsuite/src/RandomStreamTest.h index c5be0d950..713c6a962 100644 --- a/Foundation/testsuite/src/RandomStreamTest.h +++ b/Foundation/testsuite/src/RandomStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RandomStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/RandomTest.cpp b/Foundation/testsuite/src/RandomTest.cpp index c5ed53590..1825600e3 100644 --- a/Foundation/testsuite/src/RandomTest.cpp +++ b/Foundation/testsuite/src/RandomTest.cpp @@ -11,8 +11,8 @@ #include "RandomTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Random.h" #include #include diff --git a/Foundation/testsuite/src/RandomTest.h b/Foundation/testsuite/src/RandomTest.h index 4b04dc848..ff5baa8a1 100644 --- a/Foundation/testsuite/src/RandomTest.h +++ b/Foundation/testsuite/src/RandomTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RandomTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/RegularExpressionTest.cpp b/Foundation/testsuite/src/RegularExpressionTest.cpp index cd6c1fb13..3f749e4af 100644 --- a/Foundation/testsuite/src/RegularExpressionTest.cpp +++ b/Foundation/testsuite/src/RegularExpressionTest.cpp @@ -11,8 +11,8 @@ #include "RegularExpressionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/RegularExpression.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/RegularExpressionTest.h b/Foundation/testsuite/src/RegularExpressionTest.h index ef49ae344..78a3cb06c 100644 --- a/Foundation/testsuite/src/RegularExpressionTest.h +++ b/Foundation/testsuite/src/RegularExpressionTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RegularExpressionTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SHA1EngineTest.cpp b/Foundation/testsuite/src/SHA1EngineTest.cpp index a0e95f3c2..8d5ae0e51 100644 --- a/Foundation/testsuite/src/SHA1EngineTest.cpp +++ b/Foundation/testsuite/src/SHA1EngineTest.cpp @@ -11,8 +11,8 @@ #include "SHA1EngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SHA1Engine.h" diff --git a/Foundation/testsuite/src/SHA1EngineTest.h b/Foundation/testsuite/src/SHA1EngineTest.h index 1f097b871..b47f1e40f 100644 --- a/Foundation/testsuite/src/SHA1EngineTest.h +++ b/Foundation/testsuite/src/SHA1EngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SHA1EngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SemaphoreTest.cpp b/Foundation/testsuite/src/SemaphoreTest.cpp index 515f6db10..4d0a7dde6 100644 --- a/Foundation/testsuite/src/SemaphoreTest.cpp +++ b/Foundation/testsuite/src/SemaphoreTest.cpp @@ -11,8 +11,8 @@ #include "SemaphoreTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" #include "Poco/Semaphore.h" diff --git a/Foundation/testsuite/src/SemaphoreTest.h b/Foundation/testsuite/src/SemaphoreTest.h index 5254fdc30..1f3510a26 100644 --- a/Foundation/testsuite/src/SemaphoreTest.h +++ b/Foundation/testsuite/src/SemaphoreTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SemaphoreTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SharedLibraryTest.cpp b/Foundation/testsuite/src/SharedLibraryTest.cpp index d53c1ea09..4808f0ba5 100644 --- a/Foundation/testsuite/src/SharedLibraryTest.cpp +++ b/Foundation/testsuite/src/SharedLibraryTest.cpp @@ -11,8 +11,8 @@ #include "SharedLibraryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SharedLibrary.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/SharedLibraryTest.h b/Foundation/testsuite/src/SharedLibraryTest.h index e41190e58..2c526e446 100644 --- a/Foundation/testsuite/src/SharedLibraryTest.h +++ b/Foundation/testsuite/src/SharedLibraryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SharedLibraryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SharedLibraryTestSuite.h b/Foundation/testsuite/src/SharedLibraryTestSuite.h index fedd3ed2d..e1334f616 100644 --- a/Foundation/testsuite/src/SharedLibraryTestSuite.h +++ b/Foundation/testsuite/src/SharedLibraryTestSuite.h @@ -16,7 +16,7 @@ #define SharedLibraryTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class SharedLibraryTestSuite diff --git a/Foundation/testsuite/src/SharedMemoryTest.cpp b/Foundation/testsuite/src/SharedMemoryTest.cpp index 001e4dee3..d91f6049f 100644 --- a/Foundation/testsuite/src/SharedMemoryTest.cpp +++ b/Foundation/testsuite/src/SharedMemoryTest.cpp @@ -11,8 +11,8 @@ #include "SharedMemoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SharedMemory.h" #include "Poco/Path.h" #include "Poco/File.h" diff --git a/Foundation/testsuite/src/SharedMemoryTest.h b/Foundation/testsuite/src/SharedMemoryTest.h index e777f9c08..bef883f5a 100644 --- a/Foundation/testsuite/src/SharedMemoryTest.h +++ b/Foundation/testsuite/src/SharedMemoryTest.h @@ -18,7 +18,7 @@ #include "Poco/Foundation.h" #include "Poco/Path.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SharedMemoryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SharedPtrTest.cpp b/Foundation/testsuite/src/SharedPtrTest.cpp index 8dce9b1f4..68bc8190d 100644 --- a/Foundation/testsuite/src/SharedPtrTest.cpp +++ b/Foundation/testsuite/src/SharedPtrTest.cpp @@ -11,8 +11,8 @@ #include "SharedPtrTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SharedPtr.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/SharedPtrTest.h b/Foundation/testsuite/src/SharedPtrTest.h index 6b1eaf831..b3756ae8a 100644 --- a/Foundation/testsuite/src/SharedPtrTest.h +++ b/Foundation/testsuite/src/SharedPtrTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SharedPtrTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SimpleFileChannelTest.cpp b/Foundation/testsuite/src/SimpleFileChannelTest.cpp index aa320bedb..eb080b746 100644 --- a/Foundation/testsuite/src/SimpleFileChannelTest.cpp +++ b/Foundation/testsuite/src/SimpleFileChannelTest.cpp @@ -19,8 +19,8 @@ #include "Poco/DateTimeFormatter.h" #include "Poco/AutoPtr.h" #include "SimpleFileChannelTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" using Poco::SimpleFileChannel; diff --git a/Foundation/testsuite/src/SimpleFileChannelTest.h b/Foundation/testsuite/src/SimpleFileChannelTest.h index 16901c01a..c062578a0 100644 --- a/Foundation/testsuite/src/SimpleFileChannelTest.h +++ b/Foundation/testsuite/src/SimpleFileChannelTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SimpleFileChannelTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SimpleHashTableTest.cpp b/Foundation/testsuite/src/SimpleHashTableTest.cpp index 3ee4081eb..05710fbf0 100644 --- a/Foundation/testsuite/src/SimpleHashTableTest.cpp +++ b/Foundation/testsuite/src/SimpleHashTableTest.cpp @@ -11,8 +11,8 @@ #include "SimpleHashTableTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SimpleHashTable.h" #include "Poco/NumberFormatter.h" diff --git a/Foundation/testsuite/src/SimpleHashTableTest.h b/Foundation/testsuite/src/SimpleHashTableTest.h index 6c31e9e4d..85d655f27 100644 --- a/Foundation/testsuite/src/SimpleHashTableTest.h +++ b/Foundation/testsuite/src/SimpleHashTableTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SimpleHashTableTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StopwatchTest.cpp b/Foundation/testsuite/src/StopwatchTest.cpp index 87c8633f0..164a47b0a 100644 --- a/Foundation/testsuite/src/StopwatchTest.cpp +++ b/Foundation/testsuite/src/StopwatchTest.cpp @@ -11,8 +11,8 @@ #include "StopwatchTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Stopwatch.h" #include "Poco/Timestamp.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/StopwatchTest.h b/Foundation/testsuite/src/StopwatchTest.h index 92ab4bd58..adae374f7 100644 --- a/Foundation/testsuite/src/StopwatchTest.h +++ b/Foundation/testsuite/src/StopwatchTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StopwatchTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StreamConverterTest.cpp b/Foundation/testsuite/src/StreamConverterTest.cpp index 3d3e6368d..d6be3c896 100644 --- a/Foundation/testsuite/src/StreamConverterTest.cpp +++ b/Foundation/testsuite/src/StreamConverterTest.cpp @@ -11,8 +11,8 @@ #include "StreamConverterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/StreamConverter.h" #include "Poco/ASCIIEncoding.h" #include "Poco/Latin1Encoding.h" diff --git a/Foundation/testsuite/src/StreamConverterTest.h b/Foundation/testsuite/src/StreamConverterTest.h index 2db255e2e..6e779c135 100644 --- a/Foundation/testsuite/src/StreamConverterTest.h +++ b/Foundation/testsuite/src/StreamConverterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StreamConverterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StreamCopierTest.cpp b/Foundation/testsuite/src/StreamCopierTest.cpp index 2daa50e9b..b16a242cc 100644 --- a/Foundation/testsuite/src/StreamCopierTest.cpp +++ b/Foundation/testsuite/src/StreamCopierTest.cpp @@ -11,8 +11,8 @@ #include "StreamCopierTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/StreamCopier.h" #include diff --git a/Foundation/testsuite/src/StreamCopierTest.h b/Foundation/testsuite/src/StreamCopierTest.h index 51e43ffb5..229738668 100644 --- a/Foundation/testsuite/src/StreamCopierTest.h +++ b/Foundation/testsuite/src/StreamCopierTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StreamCopierTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StreamTokenizerTest.cpp b/Foundation/testsuite/src/StreamTokenizerTest.cpp index 5bd090e7e..935f902a3 100644 --- a/Foundation/testsuite/src/StreamTokenizerTest.cpp +++ b/Foundation/testsuite/src/StreamTokenizerTest.cpp @@ -11,8 +11,8 @@ #include "StreamTokenizerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/StreamTokenizer.h" #include "Poco/Token.h" #include "Poco/Ascii.h" diff --git a/Foundation/testsuite/src/StreamTokenizerTest.h b/Foundation/testsuite/src/StreamTokenizerTest.h index 7b7562b49..c4deeeba7 100644 --- a/Foundation/testsuite/src/StreamTokenizerTest.h +++ b/Foundation/testsuite/src/StreamTokenizerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StreamTokenizerTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StreamsTestSuite.h b/Foundation/testsuite/src/StreamsTestSuite.h index 8498e1e88..dfe6e884d 100644 --- a/Foundation/testsuite/src/StreamsTestSuite.h +++ b/Foundation/testsuite/src/StreamsTestSuite.h @@ -16,7 +16,7 @@ #define StreamsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class StreamsTestSuite diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index d3519cf94..5a1431cfb 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -11,8 +11,8 @@ #include "StringTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/JSONString.h" #include "Poco/Format.h" diff --git a/Foundation/testsuite/src/StringTest.h b/Foundation/testsuite/src/StringTest.h index 9974d930d..4c55e42d3 100644 --- a/Foundation/testsuite/src/StringTest.h +++ b/Foundation/testsuite/src/StringTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/NumericString.h" #include "Poco/MemoryStream.h" diff --git a/Foundation/testsuite/src/StringTokenizerTest.cpp b/Foundation/testsuite/src/StringTokenizerTest.cpp index a2e4f6127..3885ab433 100644 --- a/Foundation/testsuite/src/StringTokenizerTest.cpp +++ b/Foundation/testsuite/src/StringTokenizerTest.cpp @@ -11,8 +11,8 @@ #include #include "StringTokenizerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/StringTokenizer.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/StringTokenizerTest.h b/Foundation/testsuite/src/StringTokenizerTest.h index 5b5528368..9805d2132 100644 --- a/Foundation/testsuite/src/StringTokenizerTest.h +++ b/Foundation/testsuite/src/StringTokenizerTest.h @@ -15,7 +15,7 @@ #define StringTokenizerTest_INCLUDED #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StringTokenizerTest: public CppUnit::TestCase { diff --git a/Foundation/testsuite/src/TaskManagerTest.cpp b/Foundation/testsuite/src/TaskManagerTest.cpp index 85d5ea11b..8bdc3fe2c 100644 --- a/Foundation/testsuite/src/TaskManagerTest.cpp +++ b/Foundation/testsuite/src/TaskManagerTest.cpp @@ -11,8 +11,8 @@ #include "TaskManagerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/TaskManager.h" #include "Poco/Task.h" diff --git a/Foundation/testsuite/src/TaskManagerTest.h b/Foundation/testsuite/src/TaskManagerTest.h index 3cb9467fe..cd8dddf0b 100644 --- a/Foundation/testsuite/src/TaskManagerTest.h +++ b/Foundation/testsuite/src/TaskManagerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TaskManagerTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TaskTest.cpp b/Foundation/testsuite/src/TaskTest.cpp index c8ef856a5..16bdbf93a 100644 --- a/Foundation/testsuite/src/TaskTest.cpp +++ b/Foundation/testsuite/src/TaskTest.cpp @@ -11,8 +11,8 @@ #include "TaskTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Task.h" #include "Poco/Thread.h" #include "Poco/Event.h" diff --git a/Foundation/testsuite/src/TaskTest.h b/Foundation/testsuite/src/TaskTest.h index 5d022f224..07765ecb0 100644 --- a/Foundation/testsuite/src/TaskTest.h +++ b/Foundation/testsuite/src/TaskTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TaskTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TaskTestSuite.h b/Foundation/testsuite/src/TaskTestSuite.h index f0e6b4419..d5aa6c50e 100644 --- a/Foundation/testsuite/src/TaskTestSuite.h +++ b/Foundation/testsuite/src/TaskTestSuite.h @@ -16,7 +16,7 @@ #define TaskTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TaskTestSuite diff --git a/Foundation/testsuite/src/TeeStreamTest.cpp b/Foundation/testsuite/src/TeeStreamTest.cpp index d0d64e50f..40470b021 100644 --- a/Foundation/testsuite/src/TeeStreamTest.cpp +++ b/Foundation/testsuite/src/TeeStreamTest.cpp @@ -11,8 +11,8 @@ #include "TeeStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TeeStream.h" #include diff --git a/Foundation/testsuite/src/TeeStreamTest.h b/Foundation/testsuite/src/TeeStreamTest.h index 48595589b..63fcb25fd 100644 --- a/Foundation/testsuite/src/TeeStreamTest.h +++ b/Foundation/testsuite/src/TeeStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TeeStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextBufferIteratorTest.cpp b/Foundation/testsuite/src/TextBufferIteratorTest.cpp index 85854607c..7c010f74d 100644 --- a/Foundation/testsuite/src/TextBufferIteratorTest.cpp +++ b/Foundation/testsuite/src/TextBufferIteratorTest.cpp @@ -11,8 +11,8 @@ #include "TextBufferIteratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TextBufferIterator.h" #include "Poco/Latin1Encoding.h" #include "Poco/UTF8Encoding.h" diff --git a/Foundation/testsuite/src/TextBufferIteratorTest.h b/Foundation/testsuite/src/TextBufferIteratorTest.h index ab36e1c58..70e5e9180 100644 --- a/Foundation/testsuite/src/TextBufferIteratorTest.h +++ b/Foundation/testsuite/src/TextBufferIteratorTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextBufferIteratorTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextConverterTest.cpp b/Foundation/testsuite/src/TextConverterTest.cpp index afe304bc3..308493a05 100644 --- a/Foundation/testsuite/src/TextConverterTest.cpp +++ b/Foundation/testsuite/src/TextConverterTest.cpp @@ -11,8 +11,8 @@ #include "TextConverterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TextConverter.h" #include "Poco/ASCIIEncoding.h" #include "Poco/Latin1Encoding.h" diff --git a/Foundation/testsuite/src/TextConverterTest.h b/Foundation/testsuite/src/TextConverterTest.h index 897ca9a5a..3ee216b72 100644 --- a/Foundation/testsuite/src/TextConverterTest.h +++ b/Foundation/testsuite/src/TextConverterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextConverterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextEncodingTest.cpp b/Foundation/testsuite/src/TextEncodingTest.cpp index f9b0460ba..8de11b392 100644 --- a/Foundation/testsuite/src/TextEncodingTest.cpp +++ b/Foundation/testsuite/src/TextEncodingTest.cpp @@ -11,8 +11,8 @@ #include "TextEncodingTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TextEncoding.h" #include "Poco/Latin1Encoding.h" #include "Poco/Latin2Encoding.h" diff --git a/Foundation/testsuite/src/TextEncodingTest.h b/Foundation/testsuite/src/TextEncodingTest.h index 7a5f3d278..94244f216 100644 --- a/Foundation/testsuite/src/TextEncodingTest.h +++ b/Foundation/testsuite/src/TextEncodingTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextEncodingTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextIteratorTest.cpp b/Foundation/testsuite/src/TextIteratorTest.cpp index 42dc17e60..d17d393a6 100644 --- a/Foundation/testsuite/src/TextIteratorTest.cpp +++ b/Foundation/testsuite/src/TextIteratorTest.cpp @@ -11,8 +11,8 @@ #include "TextIteratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TextIterator.h" #include "Poco/Latin1Encoding.h" #include "Poco/UTF8Encoding.h" diff --git a/Foundation/testsuite/src/TextIteratorTest.h b/Foundation/testsuite/src/TextIteratorTest.h index e1760a92c..376df85ad 100644 --- a/Foundation/testsuite/src/TextIteratorTest.h +++ b/Foundation/testsuite/src/TextIteratorTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextIteratorTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextTestSuite.h b/Foundation/testsuite/src/TextTestSuite.h index 7181254c3..c628fae00 100644 --- a/Foundation/testsuite/src/TextTestSuite.h +++ b/Foundation/testsuite/src/TextTestSuite.h @@ -16,7 +16,7 @@ #define TextTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TextTestSuite diff --git a/Foundation/testsuite/src/ThreadLocalTest.cpp b/Foundation/testsuite/src/ThreadLocalTest.cpp index 61fc60351..f051260f7 100644 --- a/Foundation/testsuite/src/ThreadLocalTest.cpp +++ b/Foundation/testsuite/src/ThreadLocalTest.cpp @@ -11,8 +11,8 @@ #include "ThreadLocalTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ThreadLocal.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/ThreadLocalTest.h b/Foundation/testsuite/src/ThreadLocalTest.h index e2656ed5c..3e7dddd69 100644 --- a/Foundation/testsuite/src/ThreadLocalTest.h +++ b/Foundation/testsuite/src/ThreadLocalTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ThreadLocalTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ThreadPoolTest.cpp b/Foundation/testsuite/src/ThreadPoolTest.cpp index 3ec9cd262..ba9177050 100644 --- a/Foundation/testsuite/src/ThreadPoolTest.cpp +++ b/Foundation/testsuite/src/ThreadPoolTest.cpp @@ -11,8 +11,8 @@ #include "ThreadPoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ThreadPool.h" #include "Poco/RunnableAdapter.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/ThreadPoolTest.h b/Foundation/testsuite/src/ThreadPoolTest.h index 1da8babd2..297570e1a 100644 --- a/Foundation/testsuite/src/ThreadPoolTest.h +++ b/Foundation/testsuite/src/ThreadPoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Event.h" #include "Poco/Mutex.h" diff --git a/Foundation/testsuite/src/ThreadTest.cpp b/Foundation/testsuite/src/ThreadTest.cpp index 3306169f1..ad4f5df98 100644 --- a/Foundation/testsuite/src/ThreadTest.cpp +++ b/Foundation/testsuite/src/ThreadTest.cpp @@ -11,8 +11,8 @@ #include "ThreadTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" #include "Poco/ThreadTarget.h" diff --git a/Foundation/testsuite/src/ThreadTest.h b/Foundation/testsuite/src/ThreadTest.h index 3176ce4dd..b5bb56a32 100644 --- a/Foundation/testsuite/src/ThreadTest.h +++ b/Foundation/testsuite/src/ThreadTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ThreadTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ThreadingTestSuite.h b/Foundation/testsuite/src/ThreadingTestSuite.h index c42a17cb5..fd82d7de3 100644 --- a/Foundation/testsuite/src/ThreadingTestSuite.h +++ b/Foundation/testsuite/src/ThreadingTestSuite.h @@ -16,7 +16,7 @@ #define ThreadingTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ThreadingTestSuite diff --git a/Foundation/testsuite/src/TimedNotificationQueueTest.cpp b/Foundation/testsuite/src/TimedNotificationQueueTest.cpp index e21e74401..52418d19b 100644 --- a/Foundation/testsuite/src/TimedNotificationQueueTest.cpp +++ b/Foundation/testsuite/src/TimedNotificationQueueTest.cpp @@ -11,8 +11,8 @@ #include "TimedNotificationQueueTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TimedNotificationQueue.h" #include "Poco/Notification.h" #include "Poco/Timestamp.h" diff --git a/Foundation/testsuite/src/TimedNotificationQueueTest.h b/Foundation/testsuite/src/TimedNotificationQueueTest.h index c5eeb2c7c..ba620579d 100644 --- a/Foundation/testsuite/src/TimedNotificationQueueTest.h +++ b/Foundation/testsuite/src/TimedNotificationQueueTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/TimedNotificationQueue.h" #include "Poco/Mutex.h" #include diff --git a/Foundation/testsuite/src/TimerTest.cpp b/Foundation/testsuite/src/TimerTest.cpp index ecdef30be..1707a8562 100644 --- a/Foundation/testsuite/src/TimerTest.cpp +++ b/Foundation/testsuite/src/TimerTest.cpp @@ -11,8 +11,8 @@ #include "TimerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Thread.h" #include "Poco/Stopwatch.h" diff --git a/Foundation/testsuite/src/TimerTest.h b/Foundation/testsuite/src/TimerTest.h index c137a57b3..485d19ce7 100644 --- a/Foundation/testsuite/src/TimerTest.h +++ b/Foundation/testsuite/src/TimerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Timer.h" #include "Poco/Event.h" diff --git a/Foundation/testsuite/src/TimespanTest.cpp b/Foundation/testsuite/src/TimespanTest.cpp index 15e8afc73..1f146ee29 100644 --- a/Foundation/testsuite/src/TimespanTest.cpp +++ b/Foundation/testsuite/src/TimespanTest.cpp @@ -11,8 +11,8 @@ #include "TimespanTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Timespan.h" diff --git a/Foundation/testsuite/src/TimespanTest.h b/Foundation/testsuite/src/TimespanTest.h index 962572294..ad565c2a3 100644 --- a/Foundation/testsuite/src/TimespanTest.h +++ b/Foundation/testsuite/src/TimespanTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TimespanTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TimestampTest.cpp b/Foundation/testsuite/src/TimestampTest.cpp index 13679f0ff..a4e010ad8 100644 --- a/Foundation/testsuite/src/TimestampTest.cpp +++ b/Foundation/testsuite/src/TimestampTest.cpp @@ -11,8 +11,8 @@ #include "TimestampTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Timestamp.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/TimestampTest.h b/Foundation/testsuite/src/TimestampTest.h index 6ed4c046e..86ffaacfe 100644 --- a/Foundation/testsuite/src/TimestampTest.h +++ b/Foundation/testsuite/src/TimestampTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TimestampTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TimezoneTest.cpp b/Foundation/testsuite/src/TimezoneTest.cpp index 53446a1eb..b9b4818d0 100644 --- a/Foundation/testsuite/src/TimezoneTest.cpp +++ b/Foundation/testsuite/src/TimezoneTest.cpp @@ -11,8 +11,8 @@ #include "TimezoneTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Timezone.h" #include diff --git a/Foundation/testsuite/src/TimezoneTest.h b/Foundation/testsuite/src/TimezoneTest.h index 420b6dbbe..ee750d570 100644 --- a/Foundation/testsuite/src/TimezoneTest.h +++ b/Foundation/testsuite/src/TimezoneTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TimezoneTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TuplesTest.cpp b/Foundation/testsuite/src/TuplesTest.cpp index 241f19589..810de7751 100644 --- a/Foundation/testsuite/src/TuplesTest.cpp +++ b/Foundation/testsuite/src/TuplesTest.cpp @@ -11,8 +11,8 @@ #include "TuplesTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Tuple.h" #include "Poco/Void.h" #include diff --git a/Foundation/testsuite/src/TuplesTest.h b/Foundation/testsuite/src/TuplesTest.h index 9190f2cd3..c840c837f 100644 --- a/Foundation/testsuite/src/TuplesTest.h +++ b/Foundation/testsuite/src/TuplesTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TuplesTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TypeListTest.cpp b/Foundation/testsuite/src/TypeListTest.cpp index 02bcdd2b0..e101666b0 100644 --- a/Foundation/testsuite/src/TypeListTest.cpp +++ b/Foundation/testsuite/src/TypeListTest.cpp @@ -11,8 +11,8 @@ #include "TypeListTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Tuple.h" #include "Poco/TypeList.h" #include "Poco/Void.h" diff --git a/Foundation/testsuite/src/TypeListTest.h b/Foundation/testsuite/src/TypeListTest.h index 1aa0c34a6..4be96a227 100644 --- a/Foundation/testsuite/src/TypeListTest.h +++ b/Foundation/testsuite/src/TypeListTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TypeListTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/URIStreamOpenerTest.cpp b/Foundation/testsuite/src/URIStreamOpenerTest.cpp index 80ddb7452..295b715e3 100644 --- a/Foundation/testsuite/src/URIStreamOpenerTest.cpp +++ b/Foundation/testsuite/src/URIStreamOpenerTest.cpp @@ -11,8 +11,8 @@ #include "URIStreamOpenerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/URIStreamOpener.h" #include "Poco/URIStreamFactory.h" #include "Poco/URI.h" diff --git a/Foundation/testsuite/src/URIStreamOpenerTest.h b/Foundation/testsuite/src/URIStreamOpenerTest.h index 2d3543d76..ae781798b 100644 --- a/Foundation/testsuite/src/URIStreamOpenerTest.h +++ b/Foundation/testsuite/src/URIStreamOpenerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class URIStreamOpenerTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/URITest.cpp b/Foundation/testsuite/src/URITest.cpp index e7753f7e2..0a5bd774c 100644 --- a/Foundation/testsuite/src/URITest.cpp +++ b/Foundation/testsuite/src/URITest.cpp @@ -11,8 +11,8 @@ #include "URITest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/URI.h" #include "Poco/Path.h" diff --git a/Foundation/testsuite/src/URITest.h b/Foundation/testsuite/src/URITest.h index 83416c8f6..bec1c6864 100644 --- a/Foundation/testsuite/src/URITest.h +++ b/Foundation/testsuite/src/URITest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class URITest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/URITestSuite.h b/Foundation/testsuite/src/URITestSuite.h index 76d3c574f..244402f03 100644 --- a/Foundation/testsuite/src/URITestSuite.h +++ b/Foundation/testsuite/src/URITestSuite.h @@ -16,7 +16,7 @@ #define URITestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class URITestSuite diff --git a/Foundation/testsuite/src/UTF8StringTest.cpp b/Foundation/testsuite/src/UTF8StringTest.cpp index 1f14fea93..118db736b 100644 --- a/Foundation/testsuite/src/UTF8StringTest.cpp +++ b/Foundation/testsuite/src/UTF8StringTest.cpp @@ -11,8 +11,8 @@ #include "UTF8StringTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/UTF8String.h" diff --git a/Foundation/testsuite/src/UTF8StringTest.h b/Foundation/testsuite/src/UTF8StringTest.h index af59a299d..9b57a94f2 100644 --- a/Foundation/testsuite/src/UTF8StringTest.h +++ b/Foundation/testsuite/src/UTF8StringTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UTF8StringTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/UUIDGeneratorTest.cpp b/Foundation/testsuite/src/UUIDGeneratorTest.cpp index 8e69d3e6d..86a84080e 100644 --- a/Foundation/testsuite/src/UUIDGeneratorTest.cpp +++ b/Foundation/testsuite/src/UUIDGeneratorTest.cpp @@ -11,8 +11,8 @@ #include "UUIDGeneratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/UUIDGenerator.h" #include "Poco/UUID.h" #include "Poco/SHA1Engine.h" diff --git a/Foundation/testsuite/src/UUIDGeneratorTest.h b/Foundation/testsuite/src/UUIDGeneratorTest.h index b9f93e7d3..49b59335a 100644 --- a/Foundation/testsuite/src/UUIDGeneratorTest.h +++ b/Foundation/testsuite/src/UUIDGeneratorTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UUIDGeneratorTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/UUIDTest.cpp b/Foundation/testsuite/src/UUIDTest.cpp index 613fc0468..a5297608b 100644 --- a/Foundation/testsuite/src/UUIDTest.cpp +++ b/Foundation/testsuite/src/UUIDTest.cpp @@ -11,8 +11,8 @@ #include "UUIDTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/UUID.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/UUIDTest.h b/Foundation/testsuite/src/UUIDTest.h index baf877aca..abef55143 100644 --- a/Foundation/testsuite/src/UUIDTest.h +++ b/Foundation/testsuite/src/UUIDTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UUIDTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/UUIDTestSuite.h b/Foundation/testsuite/src/UUIDTestSuite.h index e6e4c3dcb..9f1f6b9a0 100644 --- a/Foundation/testsuite/src/UUIDTestSuite.h +++ b/Foundation/testsuite/src/UUIDTestSuite.h @@ -16,7 +16,7 @@ #define UUIDTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class UUIDTestSuite diff --git a/Foundation/testsuite/src/UnicodeConverterTest.cpp b/Foundation/testsuite/src/UnicodeConverterTest.cpp index 8e8cfbae0..1d26fef62 100644 --- a/Foundation/testsuite/src/UnicodeConverterTest.cpp +++ b/Foundation/testsuite/src/UnicodeConverterTest.cpp @@ -15,8 +15,8 @@ #include "Poco/UnicodeConverter.h" #include "UnicodeConverterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/UTFString.h" diff --git a/Foundation/testsuite/src/UnicodeConverterTest.h b/Foundation/testsuite/src/UnicodeConverterTest.h index 593f19bd1..deac47e6d 100644 --- a/Foundation/testsuite/src/UnicodeConverterTest.h +++ b/Foundation/testsuite/src/UnicodeConverterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/UnicodeConverter.h" #include "Poco/UTFString.h" #include diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp index 9b95f293b..e992fd745 100644 --- a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp +++ b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp @@ -11,8 +11,8 @@ #include "UniqueExpireCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/UniqueExpireCache.h" #include "Poco/UniqueAccessExpireCache.h" diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.h b/Foundation/testsuite/src/UniqueExpireCacheTest.h index 45071edda..7ee9bf426 100644 --- a/Foundation/testsuite/src/UniqueExpireCacheTest.h +++ b/Foundation/testsuite/src/UniqueExpireCacheTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UniqueExpireCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp index cac8e683f..d63bd3108 100644 --- a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp +++ b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp @@ -11,8 +11,8 @@ #include "UniqueExpireLRUCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/UniqueExpireLRUCache.h" #include "Poco/UniqueAccessExpireLRUCache.h" diff --git a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h index bcacfbe75..bf6249088 100644 --- a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h +++ b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UniqueExpireLRUCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/VarTest.cpp b/Foundation/testsuite/src/VarTest.cpp index 10d7d6271..e1743f985 100644 --- a/Foundation/testsuite/src/VarTest.cpp +++ b/Foundation/testsuite/src/VarTest.cpp @@ -11,8 +11,8 @@ #include "VarTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/Dynamic/Var.h" #include "Poco/Bugcheck.h" diff --git a/Foundation/testsuite/src/VarTest.h b/Foundation/testsuite/src/VarTest.h index f911042d5..00bcdd9ca 100644 --- a/Foundation/testsuite/src/VarTest.h +++ b/Foundation/testsuite/src/VarTest.h @@ -19,7 +19,7 @@ #include "Poco/Dynamic/Var.h" #include "Poco/Dynamic/VarIterator.h" #include "Poco/Exception.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class VarTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/WinCEDriver.cpp b/Foundation/testsuite/src/WinCEDriver.cpp index b1f6076f1..f0a24df66 100644 --- a/Foundation/testsuite/src/WinCEDriver.cpp +++ b/Foundation/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "FoundationTestSuite.h" #include diff --git a/Foundation/testsuite/src/ZLibTest.cpp b/Foundation/testsuite/src/ZLibTest.cpp index c7dad81bf..44656eb7e 100644 --- a/Foundation/testsuite/src/ZLibTest.cpp +++ b/Foundation/testsuite/src/ZLibTest.cpp @@ -11,8 +11,8 @@ #include "ZLibTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/InflatingStream.h" #include "Poco/DeflatingStream.h" #include "Poco/MemoryStream.h" diff --git a/Foundation/testsuite/src/ZLibTest.h b/Foundation/testsuite/src/ZLibTest.h index ab2f2a49d..0150afd14 100644 --- a/Foundation/testsuite/src/ZLibTest.h +++ b/Foundation/testsuite/src/ZLibTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ZLibTest: public CppUnit::TestCase diff --git a/JSON/testsuite/CMakeLists.txt b/JSON/testsuite/CMakeLists.txt index 7ef42b406..ef4a852ed 100644 --- a/JSON/testsuite/CMakeLists.txt +++ b/JSON/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoJSON PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoJSON PocoFoundation PocoCppUnit ) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/JSON/testsuite/Makefile b/JSON/testsuite/Makefile index 0514f380f..c8db2ae41 100644 --- a/JSON/testsuite/Makefile +++ b/JSON/testsuite/Makefile @@ -12,7 +12,7 @@ objects = Driver JSONTest JSONTestSuite target = testrunner target_version = 1 -target_libs = PocoJSON PocoFoundation CppUnit +target_libs = PocoJSON PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/JSON/testsuite/TestSuite_vs120.vcxproj b/JSON/testsuite/TestSuite_vs120.vcxproj index 4d0f4e926..4e92483f9 100644 --- a/JSON/testsuite/TestSuite_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs120.vcxproj b/JSON/testsuite/TestSuite_x64_vs120.vcxproj index 777a86080..d792a33fb 100644 --- a/JSON/testsuite/TestSuite_x64_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/src/Driver.cpp b/JSON/testsuite/src/Driver.cpp index d07c6872e..cc5c44ce5 100644 --- a/JSON/testsuite/src/Driver.cpp +++ b/JSON/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "JSONTestSuite.h" diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp index f7be93ff3..6417f9b1d 100644 --- a/JSON/testsuite/src/JSONTest.cpp +++ b/JSON/testsuite/src/JSONTest.cpp @@ -11,8 +11,8 @@ #include "JSONTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Path.h" #include "Poco/Environment.h" #include "Poco/File.h" diff --git a/JSON/testsuite/src/JSONTest.h b/JSON/testsuite/src/JSONTest.h index 1d5fe832f..637de2e50 100644 --- a/JSON/testsuite/src/JSONTest.h +++ b/JSON/testsuite/src/JSONTest.h @@ -17,7 +17,7 @@ #include "Poco/JSON/JSON.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/JSON/Object.h" #include "Poco/JSON/Parser.h" #include "Poco/JSON/Query.h" diff --git a/JSON/testsuite/src/JSONTestSuite.h b/JSON/testsuite/src/JSONTestSuite.h index 431d80869..1fc0f9c88 100644 --- a/JSON/testsuite/src/JSONTestSuite.h +++ b/JSON/testsuite/src/JSONTestSuite.h @@ -16,7 +16,7 @@ #define JSONTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class JSONTestSuite diff --git a/JSON/testsuite/src/WinCEDriver.cpp b/JSON/testsuite/src/WinCEDriver.cpp index e4a382055..4325fc282 100644 --- a/JSON/testsuite/src/WinCEDriver.cpp +++ b/JSON/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "JSONTestSuite.h" #include diff --git a/Makefile b/Makefile index 6d3f769d8..18d2cdd06 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples) all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) -COMPONENTS = Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF +COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit diff --git a/MongoDB/testsuite/CMakeLists.txt b/MongoDB/testsuite/CMakeLists.txt index d65c57f61..1f8f3da1a 100644 --- a/MongoDB/testsuite/CMakeLists.txt +++ b/MongoDB/testsuite/CMakeLists.txt @@ -20,4 +20,4 @@ set(TESTUNIT "${LIBNAME}-testrunner") add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoMongoDB PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoMongoDB PocoFoundation PocoCppUnit ) diff --git a/MongoDB/testsuite/Makefile b/MongoDB/testsuite/Makefile index 131145907..4fa053760 100644 --- a/MongoDB/testsuite/Makefile +++ b/MongoDB/testsuite/Makefile @@ -12,6 +12,6 @@ objects = Driver MongoDBTest MongoDBTestSuite target = testrunner target_version = 1 -target_libs = PocoMongoDB PocoFoundation PocoNet CppUnit +target_libs = PocoMongoDB PocoFoundation PocoNet PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/MongoDB/testsuite/TestSuite_vs120.vcxproj b/MongoDB/testsuite/TestSuite_vs120.vcxproj index 281dd04d7..dc30ecb7a 100644 --- a/MongoDB/testsuite/TestSuite_vs120.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj index 5d44f6868..0d26b83f3 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/src/Driver.cpp b/MongoDB/testsuite/src/Driver.cpp index 82ed47087..fa5817b05 100644 --- a/MongoDB/testsuite/src/Driver.cpp +++ b/MongoDB/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "MongoDBTestSuite.h" diff --git a/MongoDB/testsuite/src/MongoDBTest.cpp b/MongoDB/testsuite/src/MongoDBTest.cpp index e601e7f9b..c3a095fab 100644 --- a/MongoDB/testsuite/src/MongoDBTest.cpp +++ b/MongoDB/testsuite/src/MongoDBTest.cpp @@ -27,8 +27,8 @@ #include "Poco/UUIDGenerator.h" #include "MongoDBTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" using namespace Poco::MongoDB; diff --git a/MongoDB/testsuite/src/MongoDBTest.h b/MongoDB/testsuite/src/MongoDBTest.h index ab2055ec8..0772cac29 100644 --- a/MongoDB/testsuite/src/MongoDBTest.h +++ b/MongoDB/testsuite/src/MongoDBTest.h @@ -19,7 +19,7 @@ #include "Poco/MongoDB/MongoDB.h" #include "Poco/MongoDB/Connection.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MongoDBTest: public CppUnit::TestCase diff --git a/MongoDB/testsuite/src/MongoDBTestSuite.h b/MongoDB/testsuite/src/MongoDBTestSuite.h index 78fe83e61..493802908 100644 --- a/MongoDB/testsuite/src/MongoDBTestSuite.h +++ b/MongoDB/testsuite/src/MongoDBTestSuite.h @@ -16,7 +16,7 @@ #define MongoDBTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class MongoDBTestSuite diff --git a/MongoDB/testsuite/src/WinCEDriver.cpp b/MongoDB/testsuite/src/WinCEDriver.cpp index 4eb5b6801..1b9f5306e 100644 --- a/MongoDB/testsuite/src/WinCEDriver.cpp +++ b/MongoDB/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "MongoDBTestSuite.h" #include diff --git a/Net/testsuite/CMakeLists.txt b/Net/testsuite/CMakeLists.txt index 6f3585ccc..fdab1eb8a 100644 --- a/Net/testsuite/CMakeLists.txt +++ b/Net/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoNet PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoNet PocoUtil PocoXML PocoFoundation PocoCppUnit) diff --git a/Net/testsuite/Makefile b/Net/testsuite/Makefile index 1f0d65f31..a145759a0 100644 --- a/Net/testsuite/Makefile +++ b/Net/testsuite/Makefile @@ -32,7 +32,7 @@ objects = \ target = testrunner target_version = 1 -target_libs = PocoNet PocoFoundation CppUnit +target_libs = PocoNet PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Net/testsuite/TestSuite_vs120.vcxproj b/Net/testsuite/TestSuite_vs120.vcxproj index 1cb4fe2d9..3725063ec 100644 --- a/Net/testsuite/TestSuite_vs120.vcxproj +++ b/Net/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj b/Net/testsuite/TestSuite_x64_vs120.vcxproj index 160e63693..ad65cc320 100644 --- a/Net/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/src/DNSTest.cpp b/Net/testsuite/src/DNSTest.cpp index c230e7883..559cad4e0 100644 --- a/Net/testsuite/src/DNSTest.cpp +++ b/Net/testsuite/src/DNSTest.cpp @@ -11,8 +11,8 @@ #include "DNSTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/DNS.h" #include "Poco/Net/HostEntry.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/DNSTest.h b/Net/testsuite/src/DNSTest.h index e940585e3..a40f92f06 100644 --- a/Net/testsuite/src/DNSTest.h +++ b/Net/testsuite/src/DNSTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DNSTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/DatagramSocketTest.cpp b/Net/testsuite/src/DatagramSocketTest.cpp index 7d676bf0a..e9d516daf 100644 --- a/Net/testsuite/src/DatagramSocketTest.cpp +++ b/Net/testsuite/src/DatagramSocketTest.cpp @@ -11,8 +11,8 @@ #include "DatagramSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "UDPEchoServer.h" #include "Poco/Net/DatagramSocket.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/DatagramSocketTest.h b/Net/testsuite/src/DatagramSocketTest.h index a702b869b..e315307b3 100644 --- a/Net/testsuite/src/DatagramSocketTest.h +++ b/Net/testsuite/src/DatagramSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DatagramSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/DialogSocketTest.cpp b/Net/testsuite/src/DialogSocketTest.cpp index 156b04dcc..f9c895d12 100644 --- a/Net/testsuite/src/DialogSocketTest.cpp +++ b/Net/testsuite/src/DialogSocketTest.cpp @@ -11,8 +11,8 @@ #include "DialogSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "EchoServer.h" #include "Poco/Net/DialogSocket.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/DialogSocketTest.h b/Net/testsuite/src/DialogSocketTest.h index 93ac0171c..d91dd802a 100644 --- a/Net/testsuite/src/DialogSocketTest.h +++ b/Net/testsuite/src/DialogSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DialogSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/Driver.cpp b/Net/testsuite/src/Driver.cpp index e459d3986..3c379115a 100644 --- a/Net/testsuite/src/Driver.cpp +++ b/Net/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetTestSuite.h" diff --git a/Net/testsuite/src/FTPClientSessionTest.cpp b/Net/testsuite/src/FTPClientSessionTest.cpp index c3ef9f46d..062104265 100644 --- a/Net/testsuite/src/FTPClientSessionTest.cpp +++ b/Net/testsuite/src/FTPClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "FTPClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "DialogServer.h" #include "Poco/Net/FTPClientSession.h" #include "Poco/Net/DialogSocket.h" diff --git a/Net/testsuite/src/FTPClientSessionTest.h b/Net/testsuite/src/FTPClientSessionTest.h index 6e6fa238e..5b700355f 100644 --- a/Net/testsuite/src/FTPClientSessionTest.h +++ b/Net/testsuite/src/FTPClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" namespace Poco { diff --git a/Net/testsuite/src/FTPClientTestSuite.h b/Net/testsuite/src/FTPClientTestSuite.h index 4b573d02b..3f5631858 100644 --- a/Net/testsuite/src/FTPClientTestSuite.h +++ b/Net/testsuite/src/FTPClientTestSuite.h @@ -16,7 +16,7 @@ #define FTPClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class FTPClientTestSuite diff --git a/Net/testsuite/src/FTPStreamFactoryTest.cpp b/Net/testsuite/src/FTPStreamFactoryTest.cpp index 2b0bec91c..1a7e78d94 100644 --- a/Net/testsuite/src/FTPStreamFactoryTest.cpp +++ b/Net/testsuite/src/FTPStreamFactoryTest.cpp @@ -11,8 +11,8 @@ #include "FTPStreamFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "DialogServer.h" #include "Poco/Net/FTPStreamFactory.h" #include "Poco/Net/DialogSocket.h" diff --git a/Net/testsuite/src/FTPStreamFactoryTest.h b/Net/testsuite/src/FTPStreamFactoryTest.h index 07e067bec..af90f10a5 100644 --- a/Net/testsuite/src/FTPStreamFactoryTest.h +++ b/Net/testsuite/src/FTPStreamFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FTPStreamFactoryTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTMLFormTest.cpp b/Net/testsuite/src/HTMLFormTest.cpp index 2289a026d..6966d50ad 100644 --- a/Net/testsuite/src/HTMLFormTest.cpp +++ b/Net/testsuite/src/HTMLFormTest.cpp @@ -11,8 +11,8 @@ #include "HTMLFormTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTMLForm.h" #include "Poco/Net/PartSource.h" #include "Poco/Net/StringPartSource.h" diff --git a/Net/testsuite/src/HTMLFormTest.h b/Net/testsuite/src/HTMLFormTest.h index 6c09421ee..e4ad6c41f 100644 --- a/Net/testsuite/src/HTMLFormTest.h +++ b/Net/testsuite/src/HTMLFormTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTMLFormTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTMLTestSuite.h b/Net/testsuite/src/HTMLTestSuite.h index 2e87a28fa..242c81107 100644 --- a/Net/testsuite/src/HTMLTestSuite.h +++ b/Net/testsuite/src/HTMLTestSuite.h @@ -16,7 +16,7 @@ #define HTMLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTMLTestSuite diff --git a/Net/testsuite/src/HTTPClientSessionTest.cpp b/Net/testsuite/src/HTTPClientSessionTest.cpp index 0903f2627..87a31d697 100644 --- a/Net/testsuite/src/HTTPClientSessionTest.cpp +++ b/Net/testsuite/src/HTTPClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "HTTPClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPClientSession.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPResponse.h" diff --git a/Net/testsuite/src/HTTPClientSessionTest.h b/Net/testsuite/src/HTTPClientSessionTest.h index 09824f7cf..4028db75f 100644 --- a/Net/testsuite/src/HTTPClientSessionTest.h +++ b/Net/testsuite/src/HTTPClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPClientSessionTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPClientTestSuite.h b/Net/testsuite/src/HTTPClientTestSuite.h index 12eef6add..d02ef56b3 100644 --- a/Net/testsuite/src/HTTPClientTestSuite.h +++ b/Net/testsuite/src/HTTPClientTestSuite.h @@ -16,7 +16,7 @@ #define HTTPClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPClientTestSuite diff --git a/Net/testsuite/src/HTTPCookieTest.cpp b/Net/testsuite/src/HTTPCookieTest.cpp index 65aebfdf3..c0d1f74d6 100644 --- a/Net/testsuite/src/HTTPCookieTest.cpp +++ b/Net/testsuite/src/HTTPCookieTest.cpp @@ -11,8 +11,8 @@ #include "HTTPCookieTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPCookie.h" #include "Poco/Timestamp.h" #include "Poco/Timespan.h" diff --git a/Net/testsuite/src/HTTPCookieTest.h b/Net/testsuite/src/HTTPCookieTest.h index a5900a46b..a2cd3d16a 100644 --- a/Net/testsuite/src/HTTPCookieTest.h +++ b/Net/testsuite/src/HTTPCookieTest.h @@ -18,7 +18,7 @@ #include "Poco/Net/Net.h" #include "Poco/DateTime.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPCookieTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPCredentialsTest.cpp b/Net/testsuite/src/HTTPCredentialsTest.cpp index d91351e3c..9741bd7b9 100644 --- a/Net/testsuite/src/HTTPCredentialsTest.cpp +++ b/Net/testsuite/src/HTTPCredentialsTest.cpp @@ -11,8 +11,8 @@ #include "HTTPCredentialsTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPResponse.h" #include "Poco/Net/HTTPBasicCredentials.h" diff --git a/Net/testsuite/src/HTTPCredentialsTest.h b/Net/testsuite/src/HTTPCredentialsTest.h index 4f0d3ac8a..daced6ba3 100644 --- a/Net/testsuite/src/HTTPCredentialsTest.h +++ b/Net/testsuite/src/HTTPCredentialsTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPCredentialsTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPRequestTest.cpp b/Net/testsuite/src/HTTPRequestTest.cpp index 1180d529a..ff72cad0d 100644 --- a/Net/testsuite/src/HTTPRequestTest.cpp +++ b/Net/testsuite/src/HTTPRequestTest.cpp @@ -11,8 +11,8 @@ #include "HTTPRequestTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/NetException.h" #include diff --git a/Net/testsuite/src/HTTPRequestTest.h b/Net/testsuite/src/HTTPRequestTest.h index cc389e659..12759606d 100644 --- a/Net/testsuite/src/HTTPRequestTest.h +++ b/Net/testsuite/src/HTTPRequestTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPRequestTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPResponseTest.cpp b/Net/testsuite/src/HTTPResponseTest.cpp index 424ecfd5a..49b865e1c 100644 --- a/Net/testsuite/src/HTTPResponseTest.cpp +++ b/Net/testsuite/src/HTTPResponseTest.cpp @@ -11,8 +11,8 @@ #include "HTTPResponseTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPResponse.h" #include "Poco/Net/HTTPCookie.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/HTTPResponseTest.h b/Net/testsuite/src/HTTPResponseTest.h index 9cd342041..59c69f3a0 100644 --- a/Net/testsuite/src/HTTPResponseTest.h +++ b/Net/testsuite/src/HTTPResponseTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPResponseTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPServerTest.cpp b/Net/testsuite/src/HTTPServerTest.cpp index 0479cc1b1..7dc31b554 100644 --- a/Net/testsuite/src/HTTPServerTest.cpp +++ b/Net/testsuite/src/HTTPServerTest.cpp @@ -11,8 +11,8 @@ #include "HTTPServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPServer.h" #include "Poco/Net/HTTPServerParams.h" #include "Poco/Net/AbstractHTTPRequestHandler.h" diff --git a/Net/testsuite/src/HTTPServerTest.h b/Net/testsuite/src/HTTPServerTest.h index 033d10f89..839a330a7 100644 --- a/Net/testsuite/src/HTTPServerTest.h +++ b/Net/testsuite/src/HTTPServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPServerTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPServerTestSuite.h b/Net/testsuite/src/HTTPServerTestSuite.h index c5fb36306..e483185eb 100644 --- a/Net/testsuite/src/HTTPServerTestSuite.h +++ b/Net/testsuite/src/HTTPServerTestSuite.h @@ -16,7 +16,7 @@ #define HTTPServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPServerTestSuite diff --git a/Net/testsuite/src/HTTPStreamFactoryTest.cpp b/Net/testsuite/src/HTTPStreamFactoryTest.cpp index 45e7d9b2f..9c513e87f 100644 --- a/Net/testsuite/src/HTTPStreamFactoryTest.cpp +++ b/Net/testsuite/src/HTTPStreamFactoryTest.cpp @@ -11,8 +11,8 @@ #include "HTTPStreamFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPStreamFactory.h" #include "Poco/Net/NetException.h" #include "Poco/URI.h" diff --git a/Net/testsuite/src/HTTPStreamFactoryTest.h b/Net/testsuite/src/HTTPStreamFactoryTest.h index a05b4479c..d01e64999 100644 --- a/Net/testsuite/src/HTTPStreamFactoryTest.h +++ b/Net/testsuite/src/HTTPStreamFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPStreamFactoryTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPTestSuite.h b/Net/testsuite/src/HTTPTestSuite.h index b2151615d..9def3b5c0 100644 --- a/Net/testsuite/src/HTTPTestSuite.h +++ b/Net/testsuite/src/HTTPTestSuite.h @@ -16,7 +16,7 @@ #define HTTPTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPTestSuite diff --git a/Net/testsuite/src/ICMPClientTest.cpp b/Net/testsuite/src/ICMPClientTest.cpp index c20766703..1ac1923a8 100644 --- a/Net/testsuite/src/ICMPClientTest.cpp +++ b/Net/testsuite/src/ICMPClientTest.cpp @@ -11,8 +11,8 @@ #include "ICMPClientTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/ICMPSocket.h" #include "Poco/Net/ICMPClient.h" #include "Poco/Net/ICMPEventArgs.h" diff --git a/Net/testsuite/src/ICMPClientTest.h b/Net/testsuite/src/ICMPClientTest.h index 32c84cb15..c19731b05 100644 --- a/Net/testsuite/src/ICMPClientTest.h +++ b/Net/testsuite/src/ICMPClientTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Net/ICMPClient.h" #include "Poco/Net/ICMPEventArgs.h" diff --git a/Net/testsuite/src/ICMPClientTestSuite.h b/Net/testsuite/src/ICMPClientTestSuite.h index 2d3e80501..1244e8520 100644 --- a/Net/testsuite/src/ICMPClientTestSuite.h +++ b/Net/testsuite/src/ICMPClientTestSuite.h @@ -16,7 +16,7 @@ #define ICMPClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ICMPClientTestSuite diff --git a/Net/testsuite/src/ICMPSocketTest.cpp b/Net/testsuite/src/ICMPSocketTest.cpp index 7611a1cd6..8906f3951 100644 --- a/Net/testsuite/src/ICMPSocketTest.cpp +++ b/Net/testsuite/src/ICMPSocketTest.cpp @@ -11,8 +11,8 @@ #include "ICMPSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "UDPEchoServer.h" #include "Poco/Net/ICMPSocket.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/ICMPSocketTest.h b/Net/testsuite/src/ICMPSocketTest.h index 2508924fb..413fd6866 100644 --- a/Net/testsuite/src/ICMPSocketTest.h +++ b/Net/testsuite/src/ICMPSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ICMPSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/IPAddressTest.cpp b/Net/testsuite/src/IPAddressTest.cpp index 8f122dc6e..e80db2dd0 100644 --- a/Net/testsuite/src/IPAddressTest.cpp +++ b/Net/testsuite/src/IPAddressTest.cpp @@ -11,8 +11,8 @@ #include "IPAddressTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/IPAddress.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/IPAddressTest.h b/Net/testsuite/src/IPAddressTest.h index 27837c354..0f53e5a5a 100644 --- a/Net/testsuite/src/IPAddressTest.h +++ b/Net/testsuite/src/IPAddressTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class IPAddressTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MailMessageTest.cpp b/Net/testsuite/src/MailMessageTest.cpp index 5fd56def7..bf2c95585 100644 --- a/Net/testsuite/src/MailMessageTest.cpp +++ b/Net/testsuite/src/MailMessageTest.cpp @@ -11,8 +11,8 @@ #include "MailMessageTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MailMessage.h" #include "Poco/Net/MailRecipient.h" #include "Poco/Net/PartHandler.h" diff --git a/Net/testsuite/src/MailMessageTest.h b/Net/testsuite/src/MailMessageTest.h index c52be7f07..11596fa49 100644 --- a/Net/testsuite/src/MailMessageTest.h +++ b/Net/testsuite/src/MailMessageTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MailMessageTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MailStreamTest.cpp b/Net/testsuite/src/MailStreamTest.cpp index 6ab95602a..30565db9c 100644 --- a/Net/testsuite/src/MailStreamTest.cpp +++ b/Net/testsuite/src/MailStreamTest.cpp @@ -11,8 +11,8 @@ #include "MailStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MailStream.h" #include "Poco/StreamCopier.h" #include diff --git a/Net/testsuite/src/MailStreamTest.h b/Net/testsuite/src/MailStreamTest.h index 57bda1998..6208da543 100644 --- a/Net/testsuite/src/MailStreamTest.h +++ b/Net/testsuite/src/MailStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MailStreamTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MailTestSuite.h b/Net/testsuite/src/MailTestSuite.h index 44a2a3037..580551a83 100644 --- a/Net/testsuite/src/MailTestSuite.h +++ b/Net/testsuite/src/MailTestSuite.h @@ -16,7 +16,7 @@ #define MailTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class MailTestSuite diff --git a/Net/testsuite/src/MediaTypeTest.cpp b/Net/testsuite/src/MediaTypeTest.cpp index 50e1158c1..6a2e717b3 100644 --- a/Net/testsuite/src/MediaTypeTest.cpp +++ b/Net/testsuite/src/MediaTypeTest.cpp @@ -11,8 +11,8 @@ #include "MediaTypeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MediaType.h" diff --git a/Net/testsuite/src/MediaTypeTest.h b/Net/testsuite/src/MediaTypeTest.h index 7a8030126..b76948d89 100644 --- a/Net/testsuite/src/MediaTypeTest.h +++ b/Net/testsuite/src/MediaTypeTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MediaTypeTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MessageHeaderTest.cpp b/Net/testsuite/src/MessageHeaderTest.cpp index 793119f02..86552bcfa 100644 --- a/Net/testsuite/src/MessageHeaderTest.cpp +++ b/Net/testsuite/src/MessageHeaderTest.cpp @@ -11,8 +11,8 @@ #include "MessageHeaderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MessageHeader.h" #include "Poco/Net/NetException.h" #include diff --git a/Net/testsuite/src/MessageHeaderTest.h b/Net/testsuite/src/MessageHeaderTest.h index 156db25ed..c477b9208 100644 --- a/Net/testsuite/src/MessageHeaderTest.h +++ b/Net/testsuite/src/MessageHeaderTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MessageHeaderTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MessagesTestSuite.h b/Net/testsuite/src/MessagesTestSuite.h index 4da02b45d..75c897094 100644 --- a/Net/testsuite/src/MessagesTestSuite.h +++ b/Net/testsuite/src/MessagesTestSuite.h @@ -16,7 +16,7 @@ #define MessagesTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class MessagesTestSuite diff --git a/Net/testsuite/src/MulticastSocketTest.cpp b/Net/testsuite/src/MulticastSocketTest.cpp index 7191e2071..da178f104 100644 --- a/Net/testsuite/src/MulticastSocketTest.cpp +++ b/Net/testsuite/src/MulticastSocketTest.cpp @@ -16,8 +16,8 @@ #ifdef POCO_NET_HAS_INTERFACE -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "MulticastEchoServer.h" #include "Poco/Net/MulticastSocket.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/MulticastSocketTest.h b/Net/testsuite/src/MulticastSocketTest.h index dcdea0cab..f017e78e7 100644 --- a/Net/testsuite/src/MulticastSocketTest.h +++ b/Net/testsuite/src/MulticastSocketTest.h @@ -22,7 +22,7 @@ #ifdef POCO_NET_HAS_INTERFACE -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MulticastSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MultipartReaderTest.cpp b/Net/testsuite/src/MultipartReaderTest.cpp index a409e18e6..d34a0e42c 100644 --- a/Net/testsuite/src/MultipartReaderTest.cpp +++ b/Net/testsuite/src/MultipartReaderTest.cpp @@ -11,8 +11,8 @@ #include "MultipartReaderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MultipartReader.h" #include "Poco/Net/MessageHeader.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/MultipartReaderTest.h b/Net/testsuite/src/MultipartReaderTest.h index 3985423cd..6962095cf 100644 --- a/Net/testsuite/src/MultipartReaderTest.h +++ b/Net/testsuite/src/MultipartReaderTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MultipartReaderTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MultipartWriterTest.cpp b/Net/testsuite/src/MultipartWriterTest.cpp index 80beeb59c..62da0d066 100644 --- a/Net/testsuite/src/MultipartWriterTest.cpp +++ b/Net/testsuite/src/MultipartWriterTest.cpp @@ -11,8 +11,8 @@ #include "MultipartWriterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MultipartWriter.h" #include "Poco/Net/MessageHeader.h" #include diff --git a/Net/testsuite/src/MultipartWriterTest.h b/Net/testsuite/src/MultipartWriterTest.h index 0a4b55a57..96813c834 100644 --- a/Net/testsuite/src/MultipartWriterTest.h +++ b/Net/testsuite/src/MultipartWriterTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MultipartWriterTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/NTPClientTest.cpp b/Net/testsuite/src/NTPClientTest.cpp index 71b4a8418..64aa40724 100644 --- a/Net/testsuite/src/NTPClientTest.cpp +++ b/Net/testsuite/src/NTPClientTest.cpp @@ -11,8 +11,8 @@ #include "NTPClientTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/NTPClient.h" #include "Poco/Net/NTPEventArgs.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/NTPClientTest.h b/Net/testsuite/src/NTPClientTest.h index 3c71d8d16..33344e039 100644 --- a/Net/testsuite/src/NTPClientTest.h +++ b/Net/testsuite/src/NTPClientTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Net/NTPClient.h" #include "Poco/Net/NTPEventArgs.h" diff --git a/Net/testsuite/src/NTPClientTestSuite.h b/Net/testsuite/src/NTPClientTestSuite.h index dcafdb3e4..6e5bcc3ea 100644 --- a/Net/testsuite/src/NTPClientTestSuite.h +++ b/Net/testsuite/src/NTPClientTestSuite.h @@ -16,7 +16,7 @@ #define NTPClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NTPClientTestSuite diff --git a/Net/testsuite/src/NameValueCollectionTest.cpp b/Net/testsuite/src/NameValueCollectionTest.cpp index 7bf30e328..d800673b4 100644 --- a/Net/testsuite/src/NameValueCollectionTest.cpp +++ b/Net/testsuite/src/NameValueCollectionTest.cpp @@ -11,8 +11,8 @@ #include "NameValueCollectionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/NameValueCollection.h" #include "Poco/Exception.h" diff --git a/Net/testsuite/src/NameValueCollectionTest.h b/Net/testsuite/src/NameValueCollectionTest.h index 947f932c3..a6af74e2b 100644 --- a/Net/testsuite/src/NameValueCollectionTest.h +++ b/Net/testsuite/src/NameValueCollectionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NameValueCollectionTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/NetCoreTestSuite.h b/Net/testsuite/src/NetCoreTestSuite.h index f7f6c03da..eb2d86008 100644 --- a/Net/testsuite/src/NetCoreTestSuite.h +++ b/Net/testsuite/src/NetCoreTestSuite.h @@ -16,7 +16,7 @@ #define NetCoreTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NetCoreTestSuite diff --git a/Net/testsuite/src/NetTestSuite.h b/Net/testsuite/src/NetTestSuite.h index 9b04efad8..93734700d 100644 --- a/Net/testsuite/src/NetTestSuite.h +++ b/Net/testsuite/src/NetTestSuite.h @@ -16,7 +16,7 @@ #define NetTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NetTestSuite diff --git a/Net/testsuite/src/NetworkInterfaceTest.cpp b/Net/testsuite/src/NetworkInterfaceTest.cpp index 2214396b7..7f828f565 100644 --- a/Net/testsuite/src/NetworkInterfaceTest.cpp +++ b/Net/testsuite/src/NetworkInterfaceTest.cpp @@ -16,8 +16,8 @@ #ifdef POCO_NET_HAS_INTERFACE -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/NetworkInterface.h" #include "Poco/Net/IPAddress.h" #include diff --git a/Net/testsuite/src/NetworkInterfaceTest.h b/Net/testsuite/src/NetworkInterfaceTest.h index a71d8f873..d286054af 100644 --- a/Net/testsuite/src/NetworkInterfaceTest.h +++ b/Net/testsuite/src/NetworkInterfaceTest.h @@ -22,7 +22,7 @@ #ifdef POCO_NET_HAS_INTERFACE -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NetworkInterfaceTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/OAuth10CredentialsTest.cpp b/Net/testsuite/src/OAuth10CredentialsTest.cpp index c47b8ba6e..ad546419e 100644 --- a/Net/testsuite/src/OAuth10CredentialsTest.cpp +++ b/Net/testsuite/src/OAuth10CredentialsTest.cpp @@ -11,8 +11,8 @@ #include "OAuth10CredentialsTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPResponse.h" #include "Poco/Net/OAuth10Credentials.h" diff --git a/Net/testsuite/src/OAuth10CredentialsTest.h b/Net/testsuite/src/OAuth10CredentialsTest.h index eb035426f..028bd5892 100644 --- a/Net/testsuite/src/OAuth10CredentialsTest.h +++ b/Net/testsuite/src/OAuth10CredentialsTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OAuth10CredentialsTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/OAuth20CredentialsTest.cpp b/Net/testsuite/src/OAuth20CredentialsTest.cpp index 6735cf0f8..8f0594720 100644 --- a/Net/testsuite/src/OAuth20CredentialsTest.cpp +++ b/Net/testsuite/src/OAuth20CredentialsTest.cpp @@ -11,8 +11,8 @@ #include "OAuth20CredentialsTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/OAuth20Credentials.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/OAuth20CredentialsTest.h b/Net/testsuite/src/OAuth20CredentialsTest.h index f146d456f..3932195e0 100644 --- a/Net/testsuite/src/OAuth20CredentialsTest.h +++ b/Net/testsuite/src/OAuth20CredentialsTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OAuth20CredentialsTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/OAuthTestSuite.h b/Net/testsuite/src/OAuthTestSuite.h index 7ecb345f3..5d790ec79 100644 --- a/Net/testsuite/src/OAuthTestSuite.h +++ b/Net/testsuite/src/OAuthTestSuite.h @@ -16,7 +16,7 @@ #define OAuthTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class OAuthTestSuite diff --git a/Net/testsuite/src/POP3ClientSessionTest.cpp b/Net/testsuite/src/POP3ClientSessionTest.cpp index 61dd7112b..b9b0b23a3 100644 --- a/Net/testsuite/src/POP3ClientSessionTest.cpp +++ b/Net/testsuite/src/POP3ClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "POP3ClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "DialogServer.h" #include "Poco/Net/POP3ClientSession.h" #include "Poco/Net/MailMessage.h" diff --git a/Net/testsuite/src/POP3ClientSessionTest.h b/Net/testsuite/src/POP3ClientSessionTest.h index 8303f6efa..944cecfd9 100644 --- a/Net/testsuite/src/POP3ClientSessionTest.h +++ b/Net/testsuite/src/POP3ClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class POP3ClientSessionTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/QuotedPrintableTest.cpp b/Net/testsuite/src/QuotedPrintableTest.cpp index 78c6e1b11..d2b371fd6 100644 --- a/Net/testsuite/src/QuotedPrintableTest.cpp +++ b/Net/testsuite/src/QuotedPrintableTest.cpp @@ -11,8 +11,8 @@ #include "QuotedPrintableTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/QuotedPrintableEncoder.h" #include "Poco/Net/QuotedPrintableDecoder.h" #include diff --git a/Net/testsuite/src/QuotedPrintableTest.h b/Net/testsuite/src/QuotedPrintableTest.h index 57f992d06..2dabe8b45 100644 --- a/Net/testsuite/src/QuotedPrintableTest.h +++ b/Net/testsuite/src/QuotedPrintableTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class QuotedPrintableTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/RawSocketTest.cpp b/Net/testsuite/src/RawSocketTest.cpp index 2dc9c1d17..b043066af 100644 --- a/Net/testsuite/src/RawSocketTest.cpp +++ b/Net/testsuite/src/RawSocketTest.cpp @@ -11,8 +11,8 @@ #include "RawSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/RawSocket.h" #include "Poco/Net/RawSocketImpl.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/RawSocketTest.h b/Net/testsuite/src/RawSocketTest.h index a13bcec56..c159c5882 100644 --- a/Net/testsuite/src/RawSocketTest.h +++ b/Net/testsuite/src/RawSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RawSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/ReactorTestSuite.h b/Net/testsuite/src/ReactorTestSuite.h index 064a6fc9a..55705b9ce 100644 --- a/Net/testsuite/src/ReactorTestSuite.h +++ b/Net/testsuite/src/ReactorTestSuite.h @@ -16,7 +16,7 @@ #define ReactorTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ReactorTestSuite diff --git a/Net/testsuite/src/SMTPClientSessionTest.cpp b/Net/testsuite/src/SMTPClientSessionTest.cpp index bd785088e..a36f75e91 100644 --- a/Net/testsuite/src/SMTPClientSessionTest.cpp +++ b/Net/testsuite/src/SMTPClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "SMTPClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "DialogServer.h" #include "Poco/Net/SMTPClientSession.h" #include "Poco/Net/MailMessage.h" diff --git a/Net/testsuite/src/SMTPClientSessionTest.h b/Net/testsuite/src/SMTPClientSessionTest.h index 6d8961c59..f083790ae 100644 --- a/Net/testsuite/src/SMTPClientSessionTest.h +++ b/Net/testsuite/src/SMTPClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SMTPClientSessionTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketAddressTest.cpp b/Net/testsuite/src/SocketAddressTest.cpp index e54cedb21..fabf0b251 100644 --- a/Net/testsuite/src/SocketAddressTest.cpp +++ b/Net/testsuite/src/SocketAddressTest.cpp @@ -11,8 +11,8 @@ #include "SocketAddressTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/SocketAddress.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/SocketAddressTest.h b/Net/testsuite/src/SocketAddressTest.h index 2faa081c5..0235fc8dc 100644 --- a/Net/testsuite/src/SocketAddressTest.h +++ b/Net/testsuite/src/SocketAddressTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SocketAddressTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketReactorTest.cpp b/Net/testsuite/src/SocketReactorTest.cpp index fce4a70c7..938d900b1 100644 --- a/Net/testsuite/src/SocketReactorTest.cpp +++ b/Net/testsuite/src/SocketReactorTest.cpp @@ -11,8 +11,8 @@ #include "SocketReactorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/SocketReactor.h" #include "Poco/Net/SocketNotification.h" #include "Poco/Net/SocketConnector.h" diff --git a/Net/testsuite/src/SocketReactorTest.h b/Net/testsuite/src/SocketReactorTest.h index 6f3d13817..9e4dff90f 100644 --- a/Net/testsuite/src/SocketReactorTest.h +++ b/Net/testsuite/src/SocketReactorTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SocketReactorTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketStreamTest.cpp b/Net/testsuite/src/SocketStreamTest.cpp index e016e7f1f..8c9d15338 100644 --- a/Net/testsuite/src/SocketStreamTest.cpp +++ b/Net/testsuite/src/SocketStreamTest.cpp @@ -11,8 +11,8 @@ #include "SocketStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "EchoServer.h" #include "Poco/Net/SocketStream.h" #include "Poco/Net/StreamSocket.h" diff --git a/Net/testsuite/src/SocketStreamTest.h b/Net/testsuite/src/SocketStreamTest.h index 00f24363a..93ea5c4c9 100644 --- a/Net/testsuite/src/SocketStreamTest.h +++ b/Net/testsuite/src/SocketStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SocketStreamTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketTest.cpp b/Net/testsuite/src/SocketTest.cpp index 4c8603c15..c0030e9c2 100644 --- a/Net/testsuite/src/SocketTest.cpp +++ b/Net/testsuite/src/SocketTest.cpp @@ -11,8 +11,8 @@ #include "SocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "EchoServer.h" #include "Poco/Net/StreamSocket.h" #include "Poco/Net/ServerSocket.h" diff --git a/Net/testsuite/src/SocketTest.h b/Net/testsuite/src/SocketTest.h index 0b29662c0..a249aefc1 100644 --- a/Net/testsuite/src/SocketTest.h +++ b/Net/testsuite/src/SocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketsTestSuite.h b/Net/testsuite/src/SocketsTestSuite.h index 29efbe228..1aa0891b1 100644 --- a/Net/testsuite/src/SocketsTestSuite.h +++ b/Net/testsuite/src/SocketsTestSuite.h @@ -16,7 +16,7 @@ #define SocketsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class SocketsTestSuite diff --git a/Net/testsuite/src/SyslogTest.cpp b/Net/testsuite/src/SyslogTest.cpp index 1d3954946..51e7b05d7 100644 --- a/Net/testsuite/src/SyslogTest.cpp +++ b/Net/testsuite/src/SyslogTest.cpp @@ -11,8 +11,8 @@ #include "SyslogTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/RemoteSyslogChannel.h" #include "Poco/Net/RemoteSyslogListener.h" #include "Poco/Net/DNS.h" diff --git a/Net/testsuite/src/SyslogTest.h b/Net/testsuite/src/SyslogTest.h index cb4c9ea93..fcf66ff95 100644 --- a/Net/testsuite/src/SyslogTest.h +++ b/Net/testsuite/src/SyslogTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SyslogTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/TCPServerTest.cpp b/Net/testsuite/src/TCPServerTest.cpp index d0d8c49b4..9f11d461e 100644 --- a/Net/testsuite/src/TCPServerTest.cpp +++ b/Net/testsuite/src/TCPServerTest.cpp @@ -11,8 +11,8 @@ #include "TCPServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/TCPServer.h" #include "Poco/Net/TCPServerConnection.h" #include "Poco/Net/TCPServerConnectionFactory.h" diff --git a/Net/testsuite/src/TCPServerTest.h b/Net/testsuite/src/TCPServerTest.h index 5ef556c46..138a970ff 100644 --- a/Net/testsuite/src/TCPServerTest.h +++ b/Net/testsuite/src/TCPServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TCPServerTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/TCPServerTestSuite.h b/Net/testsuite/src/TCPServerTestSuite.h index 24a10f1ae..0bdf92935 100644 --- a/Net/testsuite/src/TCPServerTestSuite.h +++ b/Net/testsuite/src/TCPServerTestSuite.h @@ -16,7 +16,7 @@ #define TCPServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TCPServerTestSuite diff --git a/Net/testsuite/src/WebSocketTest.cpp b/Net/testsuite/src/WebSocketTest.cpp index cd092fd63..72f6dcaf3 100644 --- a/Net/testsuite/src/WebSocketTest.cpp +++ b/Net/testsuite/src/WebSocketTest.cpp @@ -11,8 +11,8 @@ #include "WebSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/WebSocket.h" #include "Poco/Net/SocketStream.h" #include "Poco/Net/HTTPClientSession.h" diff --git a/Net/testsuite/src/WebSocketTest.h b/Net/testsuite/src/WebSocketTest.h index 07f18a857..0db9f4086 100644 --- a/Net/testsuite/src/WebSocketTest.h +++ b/Net/testsuite/src/WebSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WebSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/WebSocketTestSuite.h b/Net/testsuite/src/WebSocketTestSuite.h index 83b5dbb81..17c148393 100644 --- a/Net/testsuite/src/WebSocketTestSuite.h +++ b/Net/testsuite/src/WebSocketTestSuite.h @@ -16,7 +16,7 @@ #define WebSocketTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class WebSocketTestSuite diff --git a/Net/testsuite/src/WinCEDriver.cpp b/Net/testsuite/src/WinCEDriver.cpp index f2f5742d8..7e449fd1e 100644 --- a/Net/testsuite/src/WinCEDriver.cpp +++ b/Net/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetTestSuite.h" #include diff --git a/NetSSL_OpenSSL/testsuite/CMakeLists.txt b/NetSSL_OpenSSL/testsuite/CMakeLists.txt index 5819a70d9..e3ca71508 100644 --- a/NetSSL_OpenSSL/testsuite/CMakeLists.txt +++ b/NetSSL_OpenSSL/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation PocoCppUnit) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/NetSSL_OpenSSL/testsuite/Makefile b/NetSSL_OpenSSL/testsuite/Makefile index 02bb9cea3..06082d337 100644 --- a/NetSSL_OpenSSL/testsuite/Makefile +++ b/NetSSL_OpenSSL/testsuite/Makefile @@ -22,6 +22,6 @@ objects = NetSSLTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoNetSSL PocoNet PocoCrypto PocoUtil PocoJSON PocoXML PocoFoundation CppUnit +target_libs = PocoNetSSL PocoNet PocoCrypto PocoUtil PocoJSON PocoXML PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj index 703ec1e07..31a4b6f49 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj index 7d2e37ebb..344922c71 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/src/Driver.cpp b/NetSSL_OpenSSL/testsuite/src/Driver.cpp index 5e65c53e8..70606a759 100644 --- a/NetSSL_OpenSSL/testsuite/src/Driver.cpp +++ b/NetSSL_OpenSSL/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetSSLTestSuite.h" #include "Poco/Path.h" #include "Poco/Util/Application.h" diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp index 93d0678dc..c1a420636 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPSClientSession.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPRequestHandler.h" diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h index 41e89c05e..206921ffc 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSClientSessionTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h b/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h index 94f7059da..548d5aa46 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h @@ -16,7 +16,7 @@ #define HTTPSClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPSClientTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp index 7e603dd26..c48855ab2 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPServer.h" #include "Poco/Net/HTTPServerParams.h" #include "Poco/Net/HTTPRequestHandler.h" diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h index 7ff9ed68e..68b2c488b 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSServerTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h index cc97bf2c1..a4b6449c5 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h @@ -16,7 +16,7 @@ #define HTTPSServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPSServerTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp index a19c20692..d83cefce8 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSStreamFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPSStreamFactory.h" #include "Poco/Net/NetException.h" #include "Poco/Util/Application.h" diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h index 13cfba3e0..448472d94 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSStreamFactoryTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h index afc1f5abb..4559e1b3c 100644 --- a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h @@ -16,7 +16,7 @@ #define NetSSLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NetSSLTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp index 4a39a1f12..d5b9edd52 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp @@ -11,8 +11,8 @@ #include "TCPServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/TCPServer.h" #include "Poco/Net/TCPServerConnection.h" #include "Poco/Net/TCPServerConnectionFactory.h" diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h index 8673230e3..7cc228c4a 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TCPServerTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h b/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h index 644bb9bf5..950283cd2 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h @@ -16,7 +16,7 @@ #define TCPServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TCPServerTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp index 1555d687b..cb84c562f 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp @@ -11,8 +11,8 @@ #include "WebSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/WebSocket.h" #include "Poco/Net/SocketStream.h" #include "Poco/Net/HTTPSClientSession.h" diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h index 939acf630..e3212f467 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WebSocketTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h b/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h index 83b5dbb81..17c148393 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h @@ -16,7 +16,7 @@ #define WebSocketTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class WebSocketTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp b/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp index a6cc405f5..3a049cec8 100644 --- a/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp +++ b/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetSSLTestSuite.h" #include "Poco/Util/Application.h" #include "Poco/Net/HTTPStreamFactory.h" diff --git a/NetSSL_Win/testsuite/CMakeLists.txt b/NetSSL_Win/testsuite/CMakeLists.txt index 5819a70d9..e3ca71508 100644 --- a/NetSSL_Win/testsuite/CMakeLists.txt +++ b/NetSSL_Win/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation PocoCppUnit) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj index 55cb0766c..547708afd 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj index 20c95e0b3..f96f35d95 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/src/Driver.cpp b/NetSSL_Win/testsuite/src/Driver.cpp index 9a497e4ad..a4cac6424 100644 --- a/NetSSL_Win/testsuite/src/Driver.cpp +++ b/NetSSL_Win/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetSSLTestSuite.h" #include "Poco/Util/Application.h" #include "Poco/Net/HTTPStreamFactory.h" diff --git a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp index 706b45a7f..f01050459 100644 --- a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp +++ b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPSClientSession.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPRequestHandler.h" diff --git a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.h b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.h index fee50dcb2..140606b65 100644 --- a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.h +++ b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSClientSessionTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/HTTPSClientTestSuite.h b/NetSSL_Win/testsuite/src/HTTPSClientTestSuite.h index dd83f9032..55a42bf69 100644 --- a/NetSSL_Win/testsuite/src/HTTPSClientTestSuite.h +++ b/NetSSL_Win/testsuite/src/HTTPSClientTestSuite.h @@ -16,7 +16,7 @@ #define HTTPSClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPSClientTestSuite diff --git a/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp b/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp index 4df59314a..40af0fbc4 100644 --- a/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp +++ b/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPServer.h" #include "Poco/Net/HTTPServerParams.h" #include "Poco/Net/HTTPRequestHandler.h" diff --git a/NetSSL_Win/testsuite/src/HTTPSServerTest.h b/NetSSL_Win/testsuite/src/HTTPSServerTest.h index dd3062e81..2b3ad7f02 100644 --- a/NetSSL_Win/testsuite/src/HTTPSServerTest.h +++ b/NetSSL_Win/testsuite/src/HTTPSServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSServerTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/HTTPSServerTestSuite.h b/NetSSL_Win/testsuite/src/HTTPSServerTestSuite.h index e16548843..0fea1ff6e 100644 --- a/NetSSL_Win/testsuite/src/HTTPSServerTestSuite.h +++ b/NetSSL_Win/testsuite/src/HTTPSServerTestSuite.h @@ -16,7 +16,7 @@ #define HTTPSServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPSServerTestSuite diff --git a/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.cpp b/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.cpp index ade7c79a4..0d011e309 100644 --- a/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.cpp +++ b/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSStreamFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPSStreamFactory.h" #include "Poco/Net/NetException.h" #include "Poco/Util/Application.h" diff --git a/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.h b/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.h index df195c44a..2d501a0cb 100644 --- a/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.h +++ b/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSStreamFactoryTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/NetSSLTestSuite.h b/NetSSL_Win/testsuite/src/NetSSLTestSuite.h index 103b0cf51..9b3b3a1fd 100644 --- a/NetSSL_Win/testsuite/src/NetSSLTestSuite.h +++ b/NetSSL_Win/testsuite/src/NetSSLTestSuite.h @@ -16,7 +16,7 @@ #define NetSSLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NetSSLTestSuite diff --git a/NetSSL_Win/testsuite/src/TCPServerTest.cpp b/NetSSL_Win/testsuite/src/TCPServerTest.cpp index 780510a67..cd3c59cb2 100644 --- a/NetSSL_Win/testsuite/src/TCPServerTest.cpp +++ b/NetSSL_Win/testsuite/src/TCPServerTest.cpp @@ -11,8 +11,8 @@ #include "TCPServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/TCPServer.h" #include "Poco/Net/TCPServerConnection.h" #include "Poco/Net/TCPServerConnectionFactory.h" diff --git a/NetSSL_Win/testsuite/src/TCPServerTest.h b/NetSSL_Win/testsuite/src/TCPServerTest.h index a71fe40a2..4b52a1dba 100644 --- a/NetSSL_Win/testsuite/src/TCPServerTest.h +++ b/NetSSL_Win/testsuite/src/TCPServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TCPServerTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/TCPServerTestSuite.h b/NetSSL_Win/testsuite/src/TCPServerTestSuite.h index e803a85d5..1b304f860 100644 --- a/NetSSL_Win/testsuite/src/TCPServerTestSuite.h +++ b/NetSSL_Win/testsuite/src/TCPServerTestSuite.h @@ -16,7 +16,7 @@ #define TCPServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TCPServerTestSuite diff --git a/NetSSL_Win/testsuite/src/WebSocketTest.cpp b/NetSSL_Win/testsuite/src/WebSocketTest.cpp index 1555d687b..cb84c562f 100644 --- a/NetSSL_Win/testsuite/src/WebSocketTest.cpp +++ b/NetSSL_Win/testsuite/src/WebSocketTest.cpp @@ -11,8 +11,8 @@ #include "WebSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/WebSocket.h" #include "Poco/Net/SocketStream.h" #include "Poco/Net/HTTPSClientSession.h" diff --git a/NetSSL_Win/testsuite/src/WebSocketTest.h b/NetSSL_Win/testsuite/src/WebSocketTest.h index 939acf630..e3212f467 100644 --- a/NetSSL_Win/testsuite/src/WebSocketTest.h +++ b/NetSSL_Win/testsuite/src/WebSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WebSocketTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/WebSocketTestSuite.h b/NetSSL_Win/testsuite/src/WebSocketTestSuite.h index 83b5dbb81..17c148393 100644 --- a/NetSSL_Win/testsuite/src/WebSocketTestSuite.h +++ b/NetSSL_Win/testsuite/src/WebSocketTestSuite.h @@ -16,7 +16,7 @@ #define WebSocketTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class WebSocketTestSuite diff --git a/NetSSL_Win/testsuite/src/WinCEDriver.cpp b/NetSSL_Win/testsuite/src/WinCEDriver.cpp index 3365f9bc1..e6d9d7a25 100644 --- a/NetSSL_Win/testsuite/src/WinCEDriver.cpp +++ b/NetSSL_Win/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetSSLTestSuite.h" #include "Poco/Util/Application.h" #include "Poco/Net/HTTPStreamFactory.h" diff --git a/PDF/testsuite/CMakeLists.txt b/PDF/testsuite/CMakeLists.txt index 79ca02515..6ccf6b057 100644 --- a/PDF/testsuite/CMakeLists.txt +++ b/PDF/testsuite/CMakeLists.txt @@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoPDF PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoPDF PocoFoundation PocoCppUnit ) diff --git a/PDF/testsuite/Makefile b/PDF/testsuite/Makefile index 1508a1aed..81cf471f4 100644 --- a/PDF/testsuite/Makefile +++ b/PDF/testsuite/Makefile @@ -12,6 +12,6 @@ objects = PDFTestSuite Driver PDFTest target = testrunner target_version = 1 -target_libs = PocoPDF PocoFoundation CppUnit +target_libs = PocoPDF PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/PDF/testsuite/TestSuite_vs120.vcxproj b/PDF/testsuite/TestSuite_vs120.vcxproj index f660ce367..b26d7762e 100644 --- a/PDF/testsuite/TestSuite_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs120.vcxproj b/PDF/testsuite/TestSuite_x64_vs120.vcxproj index e349275ba..85cc48da9 100644 --- a/PDF/testsuite/TestSuite_x64_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/src/Driver.cpp b/PDF/testsuite/src/Driver.cpp index c76cb9f36..2478a2027 100644 --- a/PDF/testsuite/src/Driver.cpp +++ b/PDF/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "PDFTestSuite.h" diff --git a/PDF/testsuite/src/PDFTest.cpp b/PDF/testsuite/src/PDFTest.cpp index 3f2483091..437d03f3a 100644 --- a/PDF/testsuite/src/PDFTest.cpp +++ b/PDF/testsuite/src/PDFTest.cpp @@ -11,8 +11,8 @@ #include "PDFTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" PDFTest::PDFTest(const std::string& name): CppUnit::TestCase(name) diff --git a/PDF/testsuite/src/PDFTest.h b/PDF/testsuite/src/PDFTest.h index a639da9d8..9cada4b86 100644 --- a/PDF/testsuite/src/PDFTest.h +++ b/PDF/testsuite/src/PDFTest.h @@ -17,7 +17,7 @@ #include "Poco/PDF/PDF.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PDFTest: public CppUnit::TestCase diff --git a/PDF/testsuite/src/PDFTestSuite.h b/PDF/testsuite/src/PDFTestSuite.h index fc8b28f2c..0ab961d7f 100644 --- a/PDF/testsuite/src/PDFTestSuite.h +++ b/PDF/testsuite/src/PDFTestSuite.h @@ -16,7 +16,7 @@ #define PDFTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class PDFTestSuite diff --git a/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp b/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp index ddd7a079e..f669bda86 100644 --- a/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp +++ b/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp @@ -21,7 +21,7 @@ void TimeHandler::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net responseStream << "\n"; responseStream << "\n"; responseStream << ""; -#line 6 "/cygdrive/z/git/poco/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp" +#line 6 "/cygdrive/z/git/poco-cppunit/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp" Poco::DateTime now; std::string dt(Poco::DateTimeFormatter::format(now, "%W, %e %b %y %H:%M:%S %Z")); @@ -33,7 +33,7 @@ void TimeHandler::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net responseStream << "\n"; responseStream << "\n"; responseStream << "

"; -#line 16 "/cygdrive/z/git/poco/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp" +#line 16 "/cygdrive/z/git/poco-cppunit/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp" responseStream << ( dt ); responseStream << "

\n"; responseStream << "\n"; diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_shared.template b/ProGen/templates/vs100/Win32/testsuite/debug_shared.template index a77aa9cbc..a193117ca 100644 --- a/ProGen/templates/vs100/Win32/testsuite/debug_shared.template +++ b/ProGen/templates/vs100/Win32/testsuite/debug_shared.template @@ -53,7 +53,7 @@ /> diff --git a/Util/testsuite/CMakeLists.txt b/Util/testsuite/CMakeLists.txt index c65d4565d..4ef22c101 100644 --- a/Util/testsuite/CMakeLists.txt +++ b/Util/testsuite/CMakeLists.txt @@ -24,4 +24,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoUtil PocoJSON PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoUtil PocoJSON PocoXML PocoFoundation PocoCppUnit) diff --git a/Util/testsuite/Makefile b/Util/testsuite/Makefile index e79c22233..7ced5e77f 100644 --- a/Util/testsuite/Makefile +++ b/Util/testsuite/Makefile @@ -21,7 +21,7 @@ objects = AbstractConfigurationTest ConfigurationTestSuite \ target = testrunner target_version = 1 -target_libs = PocoUtil PocoXML PocoJSON PocoFoundation CppUnit +target_libs = PocoUtil PocoXML PocoJSON PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Util/testsuite/TestSuite_vs120.vcxproj b/Util/testsuite/TestSuite_vs120.vcxproj index 165f52350..9bab91003 100644 --- a/Util/testsuite/TestSuite_vs120.vcxproj +++ b/Util/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs120.vcxproj b/Util/testsuite/TestSuite_x64_vs120.vcxproj index 436a3c6a2..f25dd6945 100644 --- a/Util/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/src/AbstractConfigurationTest.cpp b/Util/testsuite/src/AbstractConfigurationTest.cpp index c74ca5c0d..857e00a2b 100644 --- a/Util/testsuite/src/AbstractConfigurationTest.cpp +++ b/Util/testsuite/src/AbstractConfigurationTest.cpp @@ -11,7 +11,7 @@ #include "AbstractConfigurationTest.h" -#include "CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestCaller.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/AbstractConfigurationTest.h b/Util/testsuite/src/AbstractConfigurationTest.h index b6eb0c954..c5cf4ec19 100644 --- a/Util/testsuite/src/AbstractConfigurationTest.h +++ b/Util/testsuite/src/AbstractConfigurationTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/AutoPtr.h" #include "Poco/Util/AbstractConfiguration.h" diff --git a/Util/testsuite/src/ConfigurationMapperTest.cpp b/Util/testsuite/src/ConfigurationMapperTest.cpp index abf854b70..d900ad1ea 100644 --- a/Util/testsuite/src/ConfigurationMapperTest.cpp +++ b/Util/testsuite/src/ConfigurationMapperTest.cpp @@ -11,8 +11,8 @@ #include "ConfigurationMapperTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/ConfigurationMapper.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" diff --git a/Util/testsuite/src/ConfigurationTestSuite.h b/Util/testsuite/src/ConfigurationTestSuite.h index 2bc60fe63..4d3104645 100644 --- a/Util/testsuite/src/ConfigurationTestSuite.h +++ b/Util/testsuite/src/ConfigurationTestSuite.h @@ -16,7 +16,7 @@ #define ConfigurationTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ConfigurationTestSuite diff --git a/Util/testsuite/src/ConfigurationViewTest.cpp b/Util/testsuite/src/ConfigurationViewTest.cpp index db73b4f5b..1dc552bd6 100644 --- a/Util/testsuite/src/ConfigurationViewTest.cpp +++ b/Util/testsuite/src/ConfigurationViewTest.cpp @@ -11,8 +11,8 @@ #include "ConfigurationViewTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/Driver.cpp b/Util/testsuite/src/Driver.cpp index 89e235d55..ad57a8f14 100644 --- a/Util/testsuite/src/Driver.cpp +++ b/Util/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "UtilTestSuite.h" diff --git a/Util/testsuite/src/FilesystemConfigurationTest.cpp b/Util/testsuite/src/FilesystemConfigurationTest.cpp index b2eee7a66..0d8c13dbd 100644 --- a/Util/testsuite/src/FilesystemConfigurationTest.cpp +++ b/Util/testsuite/src/FilesystemConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "FilesystemConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/FilesystemConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/File.h" diff --git a/Util/testsuite/src/HelpFormatterTest.cpp b/Util/testsuite/src/HelpFormatterTest.cpp index 091f57482..309311452 100644 --- a/Util/testsuite/src/HelpFormatterTest.cpp +++ b/Util/testsuite/src/HelpFormatterTest.cpp @@ -11,8 +11,8 @@ #include "HelpFormatterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/Option.h" #include "Poco/Util/OptionSet.h" #include "Poco/Util/HelpFormatter.h" diff --git a/Util/testsuite/src/HelpFormatterTest.h b/Util/testsuite/src/HelpFormatterTest.h index 5b32526d9..b1584dd7a 100644 --- a/Util/testsuite/src/HelpFormatterTest.h +++ b/Util/testsuite/src/HelpFormatterTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HelpFormatterTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/IniFileConfigurationTest.cpp b/Util/testsuite/src/IniFileConfigurationTest.cpp index 6a8957fbf..2c077d1a5 100644 --- a/Util/testsuite/src/IniFileConfigurationTest.cpp +++ b/Util/testsuite/src/IniFileConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "IniFileConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/IniFileConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/JSONConfigurationTest.cpp b/Util/testsuite/src/JSONConfigurationTest.cpp index 0774566ab..91cf14590 100644 --- a/Util/testsuite/src/JSONConfigurationTest.cpp +++ b/Util/testsuite/src/JSONConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "JSONConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/JSONConfiguration.h" #include "Poco/JSON/JSONException.h" diff --git a/Util/testsuite/src/LayeredConfigurationTest.cpp b/Util/testsuite/src/LayeredConfigurationTest.cpp index 693cdcc01..52a2b2c47 100644 --- a/Util/testsuite/src/LayeredConfigurationTest.cpp +++ b/Util/testsuite/src/LayeredConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "LayeredConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/LayeredConfiguration.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" diff --git a/Util/testsuite/src/LoggingConfiguratorTest.cpp b/Util/testsuite/src/LoggingConfiguratorTest.cpp index d1dc56668..057e1cbf6 100644 --- a/Util/testsuite/src/LoggingConfiguratorTest.cpp +++ b/Util/testsuite/src/LoggingConfiguratorTest.cpp @@ -11,8 +11,8 @@ #include "LoggingConfiguratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/LoggingConfigurator.h" #include "Poco/Util/PropertyFileConfiguration.h" #include "Poco/LoggingRegistry.h" diff --git a/Util/testsuite/src/LoggingConfiguratorTest.h b/Util/testsuite/src/LoggingConfiguratorTest.h index cbd03a396..7d3074fb3 100644 --- a/Util/testsuite/src/LoggingConfiguratorTest.h +++ b/Util/testsuite/src/LoggingConfiguratorTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LoggingConfiguratorTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/MapConfigurationTest.cpp b/Util/testsuite/src/MapConfigurationTest.cpp index 26064e2df..85d6bff70 100644 --- a/Util/testsuite/src/MapConfigurationTest.cpp +++ b/Util/testsuite/src/MapConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "MapConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" diff --git a/Util/testsuite/src/OptionProcessorTest.cpp b/Util/testsuite/src/OptionProcessorTest.cpp index 708c64b7c..3b7273817 100644 --- a/Util/testsuite/src/OptionProcessorTest.cpp +++ b/Util/testsuite/src/OptionProcessorTest.cpp @@ -11,8 +11,8 @@ #include "OptionProcessorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/Option.h" #include "Poco/Util/OptionSet.h" #include "Poco/Util/OptionProcessor.h" diff --git a/Util/testsuite/src/OptionProcessorTest.h b/Util/testsuite/src/OptionProcessorTest.h index f8aef18ad..6f99828d2 100644 --- a/Util/testsuite/src/OptionProcessorTest.h +++ b/Util/testsuite/src/OptionProcessorTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OptionProcessorTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/OptionSetTest.cpp b/Util/testsuite/src/OptionSetTest.cpp index a4108e9d9..0fc1118ce 100644 --- a/Util/testsuite/src/OptionSetTest.cpp +++ b/Util/testsuite/src/OptionSetTest.cpp @@ -11,8 +11,8 @@ #include "OptionSetTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/OptionSet.h" #include "Poco/Util/Option.h" #include "Poco/Util/OptionException.h" diff --git a/Util/testsuite/src/OptionSetTest.h b/Util/testsuite/src/OptionSetTest.h index e3b806814..37ff9c12a 100644 --- a/Util/testsuite/src/OptionSetTest.h +++ b/Util/testsuite/src/OptionSetTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OptionSetTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/OptionTest.cpp b/Util/testsuite/src/OptionTest.cpp index 11cdeb2e9..c4d1c1b8f 100644 --- a/Util/testsuite/src/OptionTest.cpp +++ b/Util/testsuite/src/OptionTest.cpp @@ -11,8 +11,8 @@ #include "OptionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/Option.h" #include "Poco/Util/OptionException.h" diff --git a/Util/testsuite/src/OptionTest.h b/Util/testsuite/src/OptionTest.h index 14e7b246d..d1c1e585a 100644 --- a/Util/testsuite/src/OptionTest.h +++ b/Util/testsuite/src/OptionTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OptionTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/OptionsTestSuite.h b/Util/testsuite/src/OptionsTestSuite.h index e33e9fae4..40d00f446 100644 --- a/Util/testsuite/src/OptionsTestSuite.h +++ b/Util/testsuite/src/OptionsTestSuite.h @@ -16,7 +16,7 @@ #define OptionsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class OptionsTestSuite diff --git a/Util/testsuite/src/PropertyFileConfigurationTest.cpp b/Util/testsuite/src/PropertyFileConfigurationTest.cpp index 2ecabe9eb..2df77c48b 100644 --- a/Util/testsuite/src/PropertyFileConfigurationTest.cpp +++ b/Util/testsuite/src/PropertyFileConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "PropertyFileConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/PropertyFileConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/SystemConfigurationTest.cpp b/Util/testsuite/src/SystemConfigurationTest.cpp index f5d8d68c1..b8bacdd48 100644 --- a/Util/testsuite/src/SystemConfigurationTest.cpp +++ b/Util/testsuite/src/SystemConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "SystemConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/SystemConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/SystemConfigurationTest.h b/Util/testsuite/src/SystemConfigurationTest.h index 65ee5b77f..5183ec89f 100644 --- a/Util/testsuite/src/SystemConfigurationTest.h +++ b/Util/testsuite/src/SystemConfigurationTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SystemConfigurationTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/TimerTest.cpp b/Util/testsuite/src/TimerTest.cpp index 5c4d5ae5c..ce8ea5d1d 100644 --- a/Util/testsuite/src/TimerTest.cpp +++ b/Util/testsuite/src/TimerTest.cpp @@ -11,8 +11,8 @@ #include "TimerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/Timer.h" #include "Poco/Util/TimerTaskAdapter.h" diff --git a/Util/testsuite/src/TimerTest.h b/Util/testsuite/src/TimerTest.h index 6c4d03ef9..369103647 100644 --- a/Util/testsuite/src/TimerTest.h +++ b/Util/testsuite/src/TimerTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Util/TimerTask.h" #include "Poco/Event.h" diff --git a/Util/testsuite/src/TimerTestSuite.h b/Util/testsuite/src/TimerTestSuite.h index 34b663314..c41d6b944 100644 --- a/Util/testsuite/src/TimerTestSuite.h +++ b/Util/testsuite/src/TimerTestSuite.h @@ -16,7 +16,7 @@ #define TimerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TimerTestSuite diff --git a/Util/testsuite/src/UtilTestSuite.h b/Util/testsuite/src/UtilTestSuite.h index fe5d6b0b9..2c6fc0283 100644 --- a/Util/testsuite/src/UtilTestSuite.h +++ b/Util/testsuite/src/UtilTestSuite.h @@ -16,7 +16,7 @@ #define UtilTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class UtilTestSuite diff --git a/Util/testsuite/src/ValidatorTest.cpp b/Util/testsuite/src/ValidatorTest.cpp index 54066bb87..d6cacdc70 100644 --- a/Util/testsuite/src/ValidatorTest.cpp +++ b/Util/testsuite/src/ValidatorTest.cpp @@ -11,8 +11,8 @@ #include "ValidatorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/RegExpValidator.h" #include "Poco/Util/IntValidator.h" #include "Poco/Util/Option.h" diff --git a/Util/testsuite/src/ValidatorTest.h b/Util/testsuite/src/ValidatorTest.h index 7bc1d4223..dda953447 100644 --- a/Util/testsuite/src/ValidatorTest.h +++ b/Util/testsuite/src/ValidatorTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ValidatorTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/WinCEDriver.cpp b/Util/testsuite/src/WinCEDriver.cpp index 9af67a695..538ecdede 100644 --- a/Util/testsuite/src/WinCEDriver.cpp +++ b/Util/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "UtilTestSuite.h" #include diff --git a/Util/testsuite/src/WinConfigurationTest.cpp b/Util/testsuite/src/WinConfigurationTest.cpp index e557fc360..5b0f6257a 100644 --- a/Util/testsuite/src/WinConfigurationTest.cpp +++ b/Util/testsuite/src/WinConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "WinConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/WinRegistryConfiguration.h" #include "Poco/Util/WinRegistryKey.h" #include "Poco/Environment.h" diff --git a/Util/testsuite/src/WinConfigurationTest.h b/Util/testsuite/src/WinConfigurationTest.h index 23fc13b4a..1e7ed4796 100644 --- a/Util/testsuite/src/WinConfigurationTest.h +++ b/Util/testsuite/src/WinConfigurationTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WinConfigurationTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/WinRegistryTest.cpp b/Util/testsuite/src/WinRegistryTest.cpp index b4537243c..d7b8bfc6b 100644 --- a/Util/testsuite/src/WinRegistryTest.cpp +++ b/Util/testsuite/src/WinRegistryTest.cpp @@ -11,8 +11,8 @@ #include "WinRegistryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/WinRegistryKey.h" #include "Poco/Environment.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/WinRegistryTest.h b/Util/testsuite/src/WinRegistryTest.h index b006deb4f..78dcb3c5a 100644 --- a/Util/testsuite/src/WinRegistryTest.h +++ b/Util/testsuite/src/WinRegistryTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WinRegistryTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/WindowsTestSuite.h b/Util/testsuite/src/WindowsTestSuite.h index 4bbbb0065..beb2ce7e1 100644 --- a/Util/testsuite/src/WindowsTestSuite.h +++ b/Util/testsuite/src/WindowsTestSuite.h @@ -16,7 +16,7 @@ #define WindowsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class WindowsTestSuite diff --git a/Util/testsuite/src/XMLConfigurationTest.cpp b/Util/testsuite/src/XMLConfigurationTest.cpp index 7f3f0862c..3fc69006e 100644 --- a/Util/testsuite/src/XMLConfigurationTest.cpp +++ b/Util/testsuite/src/XMLConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "XMLConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/XMLConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/XML/testsuite/CMakeLists.txt b/XML/testsuite/CMakeLists.txt index 30b18a41f..c69a89961 100644 --- a/XML/testsuite/CMakeLists.txt +++ b/XML/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoXML PocoFoundation PocoCppUnit) diff --git a/XML/testsuite/Makefile b/XML/testsuite/Makefile index 5fd0b7406..d1843d431 100644 --- a/XML/testsuite/Makefile +++ b/XML/testsuite/Makefile @@ -17,7 +17,7 @@ objects = AttributesImplTest ChildNodesTest DOMTestSuite DocumentTest \ target = testrunner target_version = 1 -target_libs = PocoXML PocoFoundation CppUnit +target_libs = PocoXML PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/XML/testsuite/TestSuite_vs120.vcxproj b/XML/testsuite/TestSuite_vs120.vcxproj index 7f8d12d55..4437a391d 100644 --- a/XML/testsuite/TestSuite_vs120.vcxproj +++ b/XML/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs120.vcxproj b/XML/testsuite/TestSuite_x64_vs120.vcxproj index 6710d869a..cc05ee181 100644 --- a/XML/testsuite/TestSuite_x64_vs120.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/src/AttributesImplTest.cpp b/XML/testsuite/src/AttributesImplTest.cpp index c915cc0a6..3becee606 100644 --- a/XML/testsuite/src/AttributesImplTest.cpp +++ b/XML/testsuite/src/AttributesImplTest.cpp @@ -11,8 +11,8 @@ #include "AttributesImplTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SAX/AttributesImpl.h" diff --git a/XML/testsuite/src/AttributesImplTest.h b/XML/testsuite/src/AttributesImplTest.h index 671357a62..f160e7706 100644 --- a/XML/testsuite/src/AttributesImplTest.h +++ b/XML/testsuite/src/AttributesImplTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AttributesImplTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/ChildNodesTest.cpp b/XML/testsuite/src/ChildNodesTest.cpp index 562a4a6c1..cbf301a12 100644 --- a/XML/testsuite/src/ChildNodesTest.cpp +++ b/XML/testsuite/src/ChildNodesTest.cpp @@ -11,8 +11,8 @@ #include "ChildNodesTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/NodeList.h" diff --git a/XML/testsuite/src/ChildNodesTest.h b/XML/testsuite/src/ChildNodesTest.h index 913377dc2..dfdb0a82b 100644 --- a/XML/testsuite/src/ChildNodesTest.h +++ b/XML/testsuite/src/ChildNodesTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ChildNodesTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/DOMTestSuite.h b/XML/testsuite/src/DOMTestSuite.h index f76c91037..93b6e5650 100644 --- a/XML/testsuite/src/DOMTestSuite.h +++ b/XML/testsuite/src/DOMTestSuite.h @@ -16,7 +16,7 @@ #define DOMTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class DOMTestSuite diff --git a/XML/testsuite/src/DocumentTest.cpp b/XML/testsuite/src/DocumentTest.cpp index 687749dd7..7cf529098 100644 --- a/XML/testsuite/src/DocumentTest.cpp +++ b/XML/testsuite/src/DocumentTest.cpp @@ -11,8 +11,8 @@ #include "DocumentTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/Text.h" diff --git a/XML/testsuite/src/DocumentTest.h b/XML/testsuite/src/DocumentTest.h index d472fb79f..838f9ea8a 100644 --- a/XML/testsuite/src/DocumentTest.h +++ b/XML/testsuite/src/DocumentTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DocumentTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/DocumentTypeTest.cpp b/XML/testsuite/src/DocumentTypeTest.cpp index 1801e59cd..0cb830bea 100644 --- a/XML/testsuite/src/DocumentTypeTest.cpp +++ b/XML/testsuite/src/DocumentTypeTest.cpp @@ -11,8 +11,8 @@ #include "DocumentTypeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/DocumentType.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Notation.h" diff --git a/XML/testsuite/src/DocumentTypeTest.h b/XML/testsuite/src/DocumentTypeTest.h index 2f839aa45..d88f1d760 100644 --- a/XML/testsuite/src/DocumentTypeTest.h +++ b/XML/testsuite/src/DocumentTypeTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DocumentTypeTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/Driver.cpp b/XML/testsuite/src/Driver.cpp index fa39ed92e..176727012 100644 --- a/XML/testsuite/src/Driver.cpp +++ b/XML/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "XMLTestSuite.h" diff --git a/XML/testsuite/src/ElementTest.cpp b/XML/testsuite/src/ElementTest.cpp index 33aef2990..f62aa1c62 100644 --- a/XML/testsuite/src/ElementTest.cpp +++ b/XML/testsuite/src/ElementTest.cpp @@ -11,8 +11,8 @@ #include "ElementTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/Attr.h" diff --git a/XML/testsuite/src/ElementTest.h b/XML/testsuite/src/ElementTest.h index 0f5cce0a2..143797d17 100644 --- a/XML/testsuite/src/ElementTest.h +++ b/XML/testsuite/src/ElementTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ElementTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/EventTest.cpp b/XML/testsuite/src/EventTest.cpp index c41f14593..2b654c579 100644 --- a/XML/testsuite/src/EventTest.cpp +++ b/XML/testsuite/src/EventTest.cpp @@ -11,8 +11,8 @@ #include "EventTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Event.h" #include "Poco/DOM/MutationEvent.h" #include "Poco/DOM/EventListener.h" diff --git a/XML/testsuite/src/EventTest.h b/XML/testsuite/src/EventTest.h index a50abe472..e6f46a60c 100644 --- a/XML/testsuite/src/EventTest.h +++ b/XML/testsuite/src/EventTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class EventTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NamePoolTest.cpp b/XML/testsuite/src/NamePoolTest.cpp index 2faeae022..2ef21927e 100644 --- a/XML/testsuite/src/NamePoolTest.cpp +++ b/XML/testsuite/src/NamePoolTest.cpp @@ -11,8 +11,8 @@ #include "NamePoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/XML/NamePool.h" #include "Poco/XML/Name.h" #include "Poco/DOM/AutoPtr.h" diff --git a/XML/testsuite/src/NamePoolTest.h b/XML/testsuite/src/NamePoolTest.h index feaae8562..fed36e8ce 100644 --- a/XML/testsuite/src/NamePoolTest.h +++ b/XML/testsuite/src/NamePoolTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamePoolTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NameTest.cpp b/XML/testsuite/src/NameTest.cpp index 5a7711219..e611fbcb0 100644 --- a/XML/testsuite/src/NameTest.cpp +++ b/XML/testsuite/src/NameTest.cpp @@ -11,8 +11,8 @@ #include "NameTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/XML/Name.h" diff --git a/XML/testsuite/src/NameTest.h b/XML/testsuite/src/NameTest.h index ad307da71..4d24cec02 100644 --- a/XML/testsuite/src/NameTest.h +++ b/XML/testsuite/src/NameTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NameTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NamespaceSupportTest.cpp b/XML/testsuite/src/NamespaceSupportTest.cpp index b20c31b4a..7111448b4 100644 --- a/XML/testsuite/src/NamespaceSupportTest.cpp +++ b/XML/testsuite/src/NamespaceSupportTest.cpp @@ -11,8 +11,8 @@ #include "NamespaceSupportTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SAX/NamespaceSupport.h" diff --git a/XML/testsuite/src/NamespaceSupportTest.h b/XML/testsuite/src/NamespaceSupportTest.h index d243c877e..6d43c4f0f 100644 --- a/XML/testsuite/src/NamespaceSupportTest.h +++ b/XML/testsuite/src/NamespaceSupportTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamespaceSupportTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NodeAppenderTest.cpp b/XML/testsuite/src/NodeAppenderTest.cpp index 1da757a35..fce137d57 100644 --- a/XML/testsuite/src/NodeAppenderTest.cpp +++ b/XML/testsuite/src/NodeAppenderTest.cpp @@ -11,8 +11,8 @@ #include "NodeAppenderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/NodeAppender.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/Document.h" diff --git a/XML/testsuite/src/NodeAppenderTest.h b/XML/testsuite/src/NodeAppenderTest.h index 2616d8043..e72185065 100644 --- a/XML/testsuite/src/NodeAppenderTest.h +++ b/XML/testsuite/src/NodeAppenderTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NodeAppenderTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NodeIteratorTest.cpp b/XML/testsuite/src/NodeIteratorTest.cpp index 29c18c36e..8584fa174 100644 --- a/XML/testsuite/src/NodeIteratorTest.cpp +++ b/XML/testsuite/src/NodeIteratorTest.cpp @@ -11,8 +11,8 @@ #include "NodeIteratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/NodeIterator.h" #include "Poco/DOM/NodeFilter.h" #include "Poco/DOM/Document.h" diff --git a/XML/testsuite/src/NodeIteratorTest.h b/XML/testsuite/src/NodeIteratorTest.h index a01d5ebca..690228eaa 100644 --- a/XML/testsuite/src/NodeIteratorTest.h +++ b/XML/testsuite/src/NodeIteratorTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NodeIteratorTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NodeTest.cpp b/XML/testsuite/src/NodeTest.cpp index f443ef304..0a774fba7 100644 --- a/XML/testsuite/src/NodeTest.cpp +++ b/XML/testsuite/src/NodeTest.cpp @@ -11,8 +11,8 @@ #include "NodeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/DocumentFragment.h" diff --git a/XML/testsuite/src/NodeTest.h b/XML/testsuite/src/NodeTest.h index d46bfe67e..c67b18baf 100644 --- a/XML/testsuite/src/NodeTest.h +++ b/XML/testsuite/src/NodeTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NodeTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/ParserWriterTest.cpp b/XML/testsuite/src/ParserWriterTest.cpp index 8d15dd1cf..c2702a890 100644 --- a/XML/testsuite/src/ParserWriterTest.cpp +++ b/XML/testsuite/src/ParserWriterTest.cpp @@ -11,8 +11,8 @@ #include "ParserWriterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/DOMParser.h" #include "Poco/DOM/DOMWriter.h" #include "Poco/DOM/Document.h" diff --git a/XML/testsuite/src/ParserWriterTest.h b/XML/testsuite/src/ParserWriterTest.h index b6dab69f2..ebb8a09d4 100644 --- a/XML/testsuite/src/ParserWriterTest.h +++ b/XML/testsuite/src/ParserWriterTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ParserWriterTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/SAXParserTest.cpp b/XML/testsuite/src/SAXParserTest.cpp index 1e09271e9..24a3063ed 100644 --- a/XML/testsuite/src/SAXParserTest.cpp +++ b/XML/testsuite/src/SAXParserTest.cpp @@ -11,8 +11,8 @@ #include "SAXParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SAX/SAXParser.h" #include "Poco/SAX/InputSource.h" #include "Poco/SAX/EntityResolver.h" diff --git a/XML/testsuite/src/SAXParserTest.h b/XML/testsuite/src/SAXParserTest.h index 2410a5e44..debd07cd6 100644 --- a/XML/testsuite/src/SAXParserTest.h +++ b/XML/testsuite/src/SAXParserTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/SAX/XMLReader.h" diff --git a/XML/testsuite/src/SAXTestSuite.h b/XML/testsuite/src/SAXTestSuite.h index 3b0f88e82..ff49f4923 100644 --- a/XML/testsuite/src/SAXTestSuite.h +++ b/XML/testsuite/src/SAXTestSuite.h @@ -16,7 +16,7 @@ #define SAXTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class SAXTestSuite diff --git a/XML/testsuite/src/TextTest.cpp b/XML/testsuite/src/TextTest.cpp index fc7df67bd..713032eef 100644 --- a/XML/testsuite/src/TextTest.cpp +++ b/XML/testsuite/src/TextTest.cpp @@ -11,8 +11,8 @@ #include "TextTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Text.h" #include "Poco/DOM/CDATASection.h" #include "Poco/DOM/Element.h" diff --git a/XML/testsuite/src/TextTest.h b/XML/testsuite/src/TextTest.h index 772693ee1..5374a70db 100644 --- a/XML/testsuite/src/TextTest.h +++ b/XML/testsuite/src/TextTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/TreeWalkerTest.cpp b/XML/testsuite/src/TreeWalkerTest.cpp index e8f48e659..d7dbe28e5 100644 --- a/XML/testsuite/src/TreeWalkerTest.cpp +++ b/XML/testsuite/src/TreeWalkerTest.cpp @@ -11,8 +11,8 @@ #include "TreeWalkerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/TreeWalker.h" #include "Poco/DOM/NodeFilter.h" #include "Poco/DOM/Document.h" diff --git a/XML/testsuite/src/TreeWalkerTest.h b/XML/testsuite/src/TreeWalkerTest.h index d09b3cfa5..bf01ed88b 100644 --- a/XML/testsuite/src/TreeWalkerTest.h +++ b/XML/testsuite/src/TreeWalkerTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TreeWalkerTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/WinCEDriver.cpp b/XML/testsuite/src/WinCEDriver.cpp index a95ed5899..5369700cc 100644 --- a/XML/testsuite/src/WinCEDriver.cpp +++ b/XML/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "XMLTestSuite.h" #include diff --git a/XML/testsuite/src/XMLStreamParserTest.cpp b/XML/testsuite/src/XMLStreamParserTest.cpp index 09c96ae5b..058687573 100644 --- a/XML/testsuite/src/XMLStreamParserTest.cpp +++ b/XML/testsuite/src/XMLStreamParserTest.cpp @@ -10,8 +10,8 @@ // #include "XMLStreamParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/XML/XMLStreamParser.h" #include "Poco/Exception.h" #include diff --git a/XML/testsuite/src/XMLStreamParserTest.h b/XML/testsuite/src/XMLStreamParserTest.h index 2579a74c3..e90808606 100644 --- a/XML/testsuite/src/XMLStreamParserTest.h +++ b/XML/testsuite/src/XMLStreamParserTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class XMLStreamParserTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/XMLTestSuite.h b/XML/testsuite/src/XMLTestSuite.h index bafb5b79c..b9ebf992d 100644 --- a/XML/testsuite/src/XMLTestSuite.h +++ b/XML/testsuite/src/XMLTestSuite.h @@ -16,7 +16,7 @@ #define XMLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class XMLTestSuite diff --git a/XML/testsuite/src/XMLWriterTest.cpp b/XML/testsuite/src/XMLWriterTest.cpp index 10667d039..a311d5996 100644 --- a/XML/testsuite/src/XMLWriterTest.cpp +++ b/XML/testsuite/src/XMLWriterTest.cpp @@ -11,8 +11,8 @@ #include "XMLWriterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/XML/XMLWriter.h" #include "Poco/SAX/AttributesImpl.h" #include "Poco/Exception.h" diff --git a/XML/testsuite/src/XMLWriterTest.h b/XML/testsuite/src/XMLWriterTest.h index 65af24f83..2444921aa 100644 --- a/XML/testsuite/src/XMLWriterTest.h +++ b/XML/testsuite/src/XMLWriterTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class XMLWriterTest: public CppUnit::TestCase diff --git a/Zip/testsuite/CMakeLists.txt b/Zip/testsuite/CMakeLists.txt index dd7ee3a7b..3f9bc4eae 100644 --- a/Zip/testsuite/CMakeLists.txt +++ b/Zip/testsuite/CMakeLists.txt @@ -19,7 +19,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${TESTUNIT} PocoZip PocoNet PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoZip PocoNet PocoFoundation PocoCppUnit ) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/Zip/testsuite/Makefile b/Zip/testsuite/Makefile index 8b2ea6725..f4224edd2 100644 --- a/Zip/testsuite/Makefile +++ b/Zip/testsuite/Makefile @@ -13,6 +13,6 @@ objects = ZipTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoZip PocoNet PocoFoundation CppUnit +target_libs = PocoZip PocoNet PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Zip/testsuite/TestSuite_vs120.vcxproj b/Zip/testsuite/TestSuite_vs120.vcxproj index 005b74cbf..88c1e251a 100644 --- a/Zip/testsuite/TestSuite_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs120.vcxproj b/Zip/testsuite/TestSuite_x64_vs120.vcxproj index 2fd869eac..cf8b82e28 100644 --- a/Zip/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/src/CompressTest.cpp b/Zip/testsuite/src/CompressTest.cpp index d52124ce4..d14a4a959 100644 --- a/Zip/testsuite/src/CompressTest.cpp +++ b/Zip/testsuite/src/CompressTest.cpp @@ -17,8 +17,8 @@ #include "Poco/Zip/ZipManipulator.h" #include "Poco/File.h" #include "Poco/FileStream.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include #include #undef min diff --git a/Zip/testsuite/src/CompressTest.h b/Zip/testsuite/src/CompressTest.h index 2a7cba5a4..89f18db50 100644 --- a/Zip/testsuite/src/CompressTest.h +++ b/Zip/testsuite/src/CompressTest.h @@ -17,7 +17,7 @@ #include "Poco/Zip/Zip.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CompressTest: public CppUnit::TestCase diff --git a/Zip/testsuite/src/Driver.cpp b/Zip/testsuite/src/Driver.cpp index f43e656bd..bd22ae67a 100644 --- a/Zip/testsuite/src/Driver.cpp +++ b/Zip/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "ZipTestSuite.h" diff --git a/Zip/testsuite/src/PartialStreamTest.cpp b/Zip/testsuite/src/PartialStreamTest.cpp index bd98ad139..619472306 100644 --- a/Zip/testsuite/src/PartialStreamTest.cpp +++ b/Zip/testsuite/src/PartialStreamTest.cpp @@ -11,8 +11,8 @@ #include "PartialStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Zip/PartialStream.h" #include diff --git a/Zip/testsuite/src/PartialStreamTest.h b/Zip/testsuite/src/PartialStreamTest.h index 29f7c3385..8f663ebc2 100644 --- a/Zip/testsuite/src/PartialStreamTest.h +++ b/Zip/testsuite/src/PartialStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Zip/Zip.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PartialStreamTest: public CppUnit::TestCase diff --git a/Zip/testsuite/src/WinCEDriver.cpp b/Zip/testsuite/src/WinCEDriver.cpp index 23297e1b2..7c8e62f28 100644 --- a/Zip/testsuite/src/WinCEDriver.cpp +++ b/Zip/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "ZipTestSuite.h" #include diff --git a/Zip/testsuite/src/ZipTest.cpp b/Zip/testsuite/src/ZipTest.cpp index c73b5568c..5ef109286 100644 --- a/Zip/testsuite/src/ZipTest.cpp +++ b/Zip/testsuite/src/ZipTest.cpp @@ -23,8 +23,8 @@ #include "Poco/Path.h" #include "Poco/Delegate.h" #include "Poco/StreamCopier.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #undef min #include #include diff --git a/Zip/testsuite/src/ZipTest.h b/Zip/testsuite/src/ZipTest.h index caf2fd30d..5e2e2b85f 100644 --- a/Zip/testsuite/src/ZipTest.h +++ b/Zip/testsuite/src/ZipTest.h @@ -18,7 +18,7 @@ #include "Poco/Zip/Zip.h" #include "Poco/Zip/ZipLocalFileHeader.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ZipTest: public CppUnit::TestCase diff --git a/Zip/testsuite/src/ZipTestSuite.h b/Zip/testsuite/src/ZipTestSuite.h index 62f645693..21454e54a 100644 --- a/Zip/testsuite/src/ZipTestSuite.h +++ b/Zip/testsuite/src/ZipTestSuite.h @@ -16,7 +16,7 @@ #define ZipTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ZipTestSuite From c8a78f02d04b0adf57d13ce65960523e156fc5a4 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 8 Jan 2016 00:19:15 +0100 Subject: [PATCH 007/131] Make CppUnit a component of Poco Signed-off-by: FrancisANDRE --- CppUnit/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CppUnit/CMakeLists.txt b/CppUnit/CMakeLists.txt index ae60ff0ec..defc21371 100644 --- a/CppUnit/CMakeLists.txt +++ b/CppUnit/CMakeLists.txt @@ -22,4 +22,4 @@ target_include_directories( "${LIBNAME}" ) target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS}) -SIMPLE_INSTALL(${LIBNAME}) +POCO_INSTALL("${LIBNAME}") From f1b88218f2e6dd091e3be4b89f007b3d887851be Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 8 Jan 2016 09:05:47 +0100 Subject: [PATCH 008/131] Fix naming of libs for CppUnit Signed-off-by: FrancisANDRE --- CMakeLists.txt | 4 +++- CppUnit/CMakeLists.txt | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 203937825..6919fa8f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,7 @@ endif() include(PocoMacros) # Allow enabling and disabling components +option(ENABLE_CPPUNIT "Enable the CppUnit" ON) option(ENABLE_XML "Enable the XML" ON) option(ENABLE_JSON "Enable the JSON" ON) option(ENABLE_MONGODB "Enable MongoDB" ON) @@ -138,8 +139,9 @@ include(DefinePlatformSpecifc) # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file set(Poco_COMPONENTS "") -if (ENABLE_TESTS) +if (ENABLE_CPPUNIT) add_subdirectory(CppUnit) + list(APPEND Poco_COMPONENTS "CppUnit") endif () add_subdirectory(Foundation) diff --git a/CppUnit/CMakeLists.txt b/CppUnit/CMakeLists.txt index defc21371..04fda1c83 100644 --- a/CppUnit/CMakeLists.txt +++ b/CppUnit/CMakeLists.txt @@ -1,4 +1,5 @@ -set(LIBNAME "PocoCppUnit") +set(LIBNAME "CppUnit") +set(POCO_LIBNAME "Poco${LIBNAME}") # Sources file(GLOB SRCS_G "src/*.cpp") From 20de45a15f7589a1af69ebddf15c4ca5ca461a06 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 8 Jan 2016 10:48:33 +0100 Subject: [PATCH 009/131] Add aliasing and output_name. Signed-off-by: FrancisANDRE --- CppUnit/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CppUnit/CMakeLists.txt b/CppUnit/CMakeLists.txt index 04fda1c83..d37fdcac6 100644 --- a/CppUnit/CMakeLists.txt +++ b/CppUnit/CMakeLists.txt @@ -10,17 +10,23 @@ file(GLOB_RECURSE HDRS_G "include/*.h" ) POCO_HEADERS_AUTO( SRCS ${HDRS_G}) add_library( "${LIBNAME}" ${LIB_MODE} ${SRCS} ) +add_library( "${POCO_LIBNAME}" ALIAS "${LIBNAME}") set_target_properties( "${LIBNAME}" PROPERTIES VERSION "1" SOVERSION "1" - DEFINE_SYMBOL CppUnit_EXPORTS) -target_link_libraries( "${LIBNAME}" ) + OUTPUT_NAME ${POCO_LIBNAME} + DEFINE_SYMBOL CppUnit_EXPORTS + ) + target_include_directories( "${LIBNAME}" PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/src ) target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS}) POCO_INSTALL("${LIBNAME}") + + From 49cecabb9c4ab263adbb9ecc9c09af47296946b7 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 12 Jan 2016 07:30:42 +0100 Subject: [PATCH 010/131] Fix error in branch exclude regular expression Signed-off-by: FrancisANDRE --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c9edc8e7..58cb721fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: branches: except: - - /*?pp?eyor*/ + - /.*?pp?eyor.*/ before_install: From 7c34c12c9470a7370ffc820b1127c72745def4f2 Mon Sep 17 00:00:00 2001 From: zosrothko Date: Tue, 12 Jan 2016 08:12:23 +0100 Subject: [PATCH 011/131] restore silent mode on make --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58cb721fe..6d485331a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: branches: except: - - /.*?pp?eyor.*/ + - /.*pp.eyor.*/ before_install: @@ -45,7 +45,7 @@ matrix: compiler: clang os: osx script: - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite && make -j2 + - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite && make -s -j2 - cat config.* - sudo make install - ls -l /usr/local/lib/*Poco* @@ -82,7 +82,7 @@ matrix: compiler: gcc script: # disable tests, gcc-4.6 gets an internal compiler error - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=OFF .. && make -j2 && cd .. + - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=OFF .. && make -s -j2 && cd .. - env: TEST_NAME="gcc-4.8 (CMake)" compiler: gcc @@ -92,24 +92,24 @@ matrix: - sudo apt-get install -qq -y g++-4.8 - export CC="gcc-4.8" - export CXX="g++-4.8" - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -j2 && cd .. + - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && cd .. - env: TEST_NAME="Linux clang (CMake)" compiler: clang script: - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -j2 && cd .. + - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && cd .. - env: TEST_NAME="Linux arm-linux-gnueabi-g++ (CMake)" script: - export CC="arm-linux-gnueabi-gcc" - export CXX="arm-linux-gnueabi-g++" - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=OFF .. && make -j2 && cd .. + - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=OFF .. && make -s -j2 && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" script: - export CC="arm-linux-gnueabihf-gcc" - export CXX="arm-linux-gnueabihf-g++" - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=OFF .. && make -j2 && cd .. + - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=OFF .. && make -s -j2 && cd .. # TODO osx build # TODO run test suite From ac4ea768a9dd5dc2156e5691426790d921a78817 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Thu, 14 Jan 2016 19:49:00 +0100 Subject: [PATCH 012/131] Fix merge of .travis.yml --- .travis.yml | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 335e8fc7f..d0d587369 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,15 +47,10 @@ matrix: os: osx compiler: clang script: -<<<<<<< HEAD - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite && make -s -j2 -======= - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite && make -s -j2 - - cat config.* ->>>>>>> 7c34c12c9470a7370ffc820b1127c72745def4f2 - sudo make install - ./travis/OSX/runtests.sh @@ -107,66 +102,45 @@ matrix: - env: TEST_NAME="Linux gcc 4.6 (CMake)" compiler: gcc script: -<<<<<<< HEAD - export CC="gcc" - export CXX="g++" - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. -======= - # disable tests, gcc-4.6 gets an internal compiler error - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=OFF .. && make -s -j2 && cd .. ->>>>>>> 7c34c12c9470a7370ffc820b1127c72745def4f2 - + - env: TEST_NAME="Linux gcc 4.8 (CMake)" compiler: gcc script: - export CC="gcc-4.8" - export CXX="g++-4.8" -<<<<<<< HEAD - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. -======= - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && cd .. ->>>>>>> 7c34c12c9470a7370ffc820b1127c72745def4f2 - env: TEST_NAME="clang 3.4 (CMake)" compiler: clang script: -<<<<<<< HEAD - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. -======= - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && cd .. ->>>>>>> 7c34c12c9470a7370ffc820b1127c72745def4f2 - env: TEST_NAME="Linux arm-linux-gnueabi-g++ (CMake)" script: - export CC="arm-linux-gnueabi-gcc" - export CXX="arm-linux-gnueabi-g++" -<<<<<<< HEAD - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - make -s -j2 && cd .. -======= - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=OFF .. && make -s -j2 && cd .. ->>>>>>> 7c34c12c9470a7370ffc820b1127c72745def4f2 - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" script: - export CC="arm-linux-gnueabihf-gcc" - export CXX="arm-linux-gnueabihf-g++" -<<<<<<< HEAD - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - make -s -j2 && cd .. -======= - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=OFF .. && make -s -j2 && cd .. ->>>>>>> 7c34c12c9470a7370ffc820b1127c72745def4f2 # TODO osx build # TODO run test suite From 882e7922b9c6a1c29090de3eb76ecf62aa211e92 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 21 Jan 2016 04:30:25 +0100 Subject: [PATCH 013/131] Add *.opendb file generated by VS2015 Community Edition. Signed-off-by: FrancisANDRE --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index af48274f9..fdca5471a 100644 --- a/.gitignore +++ b/.gitignore @@ -77,6 +77,7 @@ Thumbs.db *.suo *.sdf *.opensdf +*.opendb *.tlb *.tlh *.ilk From 9972496811e0829a4ceec28168d83809fabb61b8 Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Thu, 21 Jan 2016 23:55:43 +0100 Subject: [PATCH 014/131] Add partition space information to File class Add File::totalSpaceImpl(), File::usableSpaceImpl() and File::freeSpaceImpl() to retrieve total, available and usable space in the filesystem for the specified path. --- Foundation/include/Poco/File.h | 9 ++++++ Foundation/include/Poco/File_UNIX.h | 3 ++ Foundation/include/Poco/File_VMS.h | 3 ++ Foundation/include/Poco/File_VX.h | 3 ++ Foundation/include/Poco/File_WIN32.h | 3 ++ Foundation/include/Poco/File_WIN32U.h | 3 ++ Foundation/include/Poco/File_WINCE.h | 3 ++ Foundation/src/File.cpp | 18 ++++++++++++ Foundation/src/File_UNIX.cpp | 42 +++++++++++++++++++++++++++ Foundation/src/File_VMS.cpp | 30 +++++++++++++++++++ Foundation/src/File_VX.cpp | 36 +++++++++++++++++++++++ Foundation/src/File_WIN32.cpp | 33 +++++++++++++++++++++ Foundation/src/File_WIN32U.cpp | 33 +++++++++++++++++++++ Foundation/src/File_WINCE.cpp | 33 +++++++++++++++++++++ Foundation/testsuite/src/FileTest.cpp | 37 +++++++++++++++++++++++ Foundation/testsuite/src/FileTest.h | 1 + 16 files changed, 290 insertions(+) diff --git a/Foundation/include/Poco/File.h b/Foundation/include/Poco/File.h index 4dc6d775c..00ba0a32d 100644 --- a/Foundation/include/Poco/File.h +++ b/Foundation/include/Poco/File.h @@ -208,6 +208,15 @@ public: /// Fills the vector with the names of all /// files in the directory. + FileSize totalSpace() const; + /// Returns the total size in bytes of the partition containing this path. + + FileSize usableSpace() const; + /// Returns the number of usable free bytes on the partition containing this path. + + FileSize freeSpace() const; + /// Returns the number of free bytes on the partition containing this path. + bool operator == (const File& file) const; bool operator != (const File& file) const; bool operator < (const File& file) const; diff --git a/Foundation/include/Poco/File_UNIX.h b/Foundation/include/Poco/File_UNIX.h index 06a64d07b..3642ebad0 100644 --- a/Foundation/include/Poco/File_UNIX.h +++ b/Foundation/include/Poco/File_UNIX.h @@ -58,6 +58,9 @@ protected: void removeImpl(); bool createFileImpl(); bool createDirectoryImpl(); + FileSizeImpl totalSpaceImpl() const; + FileSizeImpl usableSpaceImpl() const; + FileSizeImpl freeSpaceImpl() const; static void handleLastErrorImpl(const std::string& path); private: diff --git a/Foundation/include/Poco/File_VMS.h b/Foundation/include/Poco/File_VMS.h index 2e8395a1b..024ac453c 100644 --- a/Foundation/include/Poco/File_VMS.h +++ b/Foundation/include/Poco/File_VMS.h @@ -59,6 +59,9 @@ protected: void removeImpl(); bool createFileImpl(); bool createDirectoryImpl(); + FileSizeImpl totalSpaceImpl() const; + FileSizeImpl usableSpaceImpl() const; + FileSizeImpl freeSpaceImpl() const; static void handleLastError(const std::string& path); private: diff --git a/Foundation/include/Poco/File_VX.h b/Foundation/include/Poco/File_VX.h index a6470edc6..926c15f13 100644 --- a/Foundation/include/Poco/File_VX.h +++ b/Foundation/include/Poco/File_VX.h @@ -58,6 +58,9 @@ protected: void removeImpl(); bool createFileImpl(); bool createDirectoryImpl(); + FileSizeImpl totalSpaceImpl() const; + FileSizeImpl usableSpaceImpl() const; + FileSizeImpl freeSpaceImpl() const; static void handleLastErrorImpl(const std::string& path); private: diff --git a/Foundation/include/Poco/File_WIN32.h b/Foundation/include/Poco/File_WIN32.h index 2f06683c2..dad370f0f 100644 --- a/Foundation/include/Poco/File_WIN32.h +++ b/Foundation/include/Poco/File_WIN32.h @@ -59,6 +59,9 @@ protected: void removeImpl(); bool createFileImpl(); bool createDirectoryImpl(); + FileSizeImpl totalSpaceImpl() const; + FileSizeImpl usableSpaceImpl() const; + FileSizeImpl freeSpaceImpl() const; static void handleLastErrorImpl(const std::string& path); private: diff --git a/Foundation/include/Poco/File_WIN32U.h b/Foundation/include/Poco/File_WIN32U.h index 387751b4b..fe0c7499f 100644 --- a/Foundation/include/Poco/File_WIN32U.h +++ b/Foundation/include/Poco/File_WIN32U.h @@ -59,6 +59,9 @@ protected: void removeImpl(); bool createFileImpl(); bool createDirectoryImpl(); + FileSizeImpl totalSpaceImpl() const; + FileSizeImpl usableSpaceImpl() const; + FileSizeImpl freeSpaceImpl() const; static void handleLastErrorImpl(const std::string& path); private: diff --git a/Foundation/include/Poco/File_WINCE.h b/Foundation/include/Poco/File_WINCE.h index 05f75e2a8..9a8dd5dd1 100644 --- a/Foundation/include/Poco/File_WINCE.h +++ b/Foundation/include/Poco/File_WINCE.h @@ -59,6 +59,9 @@ protected: void removeImpl(); bool createFileImpl(); bool createDirectoryImpl(); + FileSizeImpl totalSpaceImpl() const; + FileSizeImpl usableSpaceImpl() const; + FileSizeImpl freeSpaceImpl() const; static void handleLastErrorImpl(const std::string& path); private: diff --git a/Foundation/src/File.cpp b/Foundation/src/File.cpp index 5ecb84edf..06ba25b6a 100644 --- a/Foundation/src/File.cpp +++ b/Foundation/src/File.cpp @@ -316,6 +316,24 @@ void File::list(std::vector& files) const } +File::FileSize File::totalSpace() const +{ + return totalSpaceImpl(); +} + + +File::FileSize File::usableSpace() const +{ + return usableSpaceImpl(); +} + + +File::FileSize File::freeSpace() const +{ + return freeSpaceImpl(); +} + + void File::list(std::vector& files) const { files.clear(); diff --git a/Foundation/src/File_UNIX.cpp b/Foundation/src/File_UNIX.cpp index 84a606a65..9546b8e2b 100644 --- a/Foundation/src/File_UNIX.cpp +++ b/Foundation/src/File_UNIX.cpp @@ -20,6 +20,12 @@ #include #include #include +#if defined(POCO_OS_FAMILY_BSD) +#include +#include +#else +#include +#endif #include #include #include @@ -408,6 +414,42 @@ bool FileImpl::createDirectoryImpl() } +FileImpl::FileSizeImpl FileImpl::totalSpaceImpl() const +{ + poco_assert(!_path.empty()); + + struct statfs stats; + if (statfs(_path.c_str(), &stats) != 0) + handleLastErrorImpl(_path); + + return (FileSizeImpl)stats.f_blocks * (FileSizeImpl)stats.f_bsize; +} + + +FileImpl::FileSizeImpl FileImpl::usableSpaceImpl() const +{ + poco_assert(!_path.empty()); + + struct statfs stats; + if (statfs(_path.c_str(), &stats) != 0) + handleLastErrorImpl(_path); + + return (FileSizeImpl)stats.f_bavail * (FileSizeImpl)stats.f_bsize; +} + + +FileImpl::FileSizeImpl FileImpl::freeSpaceImpl() const +{ + poco_assert(!_path.empty()); + + struct statfs stats; + if (statfs(_path.c_str(), &stats) != 0) + handleLastErrorImpl(_path); + + return (FileSizeImpl)stats.f_bfree * (FileSizeImpl)stats.f_bsize; +} + + void FileImpl::handleLastErrorImpl(const std::string& path) { switch (errno) diff --git a/Foundation/src/File_VMS.cpp b/Foundation/src/File_VMS.cpp index 40880ed29..a8b640e47 100644 --- a/Foundation/src/File_VMS.cpp +++ b/Foundation/src/File_VMS.cpp @@ -350,6 +350,36 @@ bool FileImpl::createDirectoryImpl() } +FileImpl::FileSizeImpl FileImpl::totalSpaceImpl() const +{ + poco_assert(!_path.empty()); + + // TODO: implement + + return -1; +} + + +FileImpl::FileSizeImpl FileImpl::usableSpaceImpl() const +{ + poco_assert(!_path.empty()); + + // TODO: implement + + return -1; +} + + +FileImpl::FileSizeImpl FileImpl::freeSpaceImpl() const +{ + poco_assert(!_path.empty()); + + // TODO: implement + + return -1; +} + + void FileImpl::handleLastErrorImpl(const std::string& path) { switch (errno) diff --git a/Foundation/src/File_VX.cpp b/Foundation/src/File_VX.cpp index 13878f2a6..4a59082b9 100644 --- a/Foundation/src/File_VX.cpp +++ b/Foundation/src/File_VX.cpp @@ -330,6 +330,42 @@ bool FileImpl::createDirectoryImpl() } +FileImpl::FileSizeImpl FileImpl::totalSpaceImpl() const +{ + poco_assert(!_path.empty()); + + struct statfs stats; + if (statfs(_path.c_str(), &stats) != 0) + handleLastErrorImpl(_path); + + return (FileSizeImpl)stats.f_blocks * (FileSizeImpl)stats.f_bsize; +} + + +FileImpl::FileSizeImpl FileImpl::usableSpaceImpl() const +{ + poco_assert(!_path.empty()); + + struct statfs stats; + if (statfs(_path.c_str(), &stats) != 0) + handleLastErrorImpl(_path); + + return (FileSizeImpl)stats.f_bavail * (FileSizeImpl)stats.f_bsize; +} + + +FileImpl::FileSizeImpl FileImpl::freeSpaceImpl() const +{ + poco_assert(!_path.empty()); + + struct statfs stats; + if (statfs(_path.c_str(), &stats) != 0) + handleLastErrorImpl(_path); + + return (FileSizeImpl)stats.f_bfree * (FileSizeImpl)stats.f_bsize; +} + + void FileImpl::handleLastErrorImpl(const std::string& path) { switch (errno) diff --git a/Foundation/src/File_WIN32.cpp b/Foundation/src/File_WIN32.cpp index 343f80ca0..9cb92e3ea 100644 --- a/Foundation/src/File_WIN32.cpp +++ b/Foundation/src/File_WIN32.cpp @@ -349,6 +349,39 @@ bool FileImpl::createDirectoryImpl() } +FileImpl::FileSizeImpl FileImpl::totalSpaceImpl() const +{ + poco_assert(!_path.empty()); + + ULARGE_INTEGER space; + if (!GetDiskFreeSpaceEx(_path.c_str(), NULL, &space, NULL)) + handleLastErrorImpl(_path); + return space.QuadPart; +} + + +FileImpl::FileSizeImpl FileImpl::usableSpaceImpl() const +{ + poco_assert(!_path.empty()); + + ULARGE_INTEGER space; + if (!GetDiskFreeSpaceEx(_path.c_str(), &space, NULL, NULL)) + handleLastErrorImpl(_path); + return space.QuadPart; +} + + +FileImpl::FileSizeImpl FileImpl::freeSpaceImpl() const +{ + poco_assert(!_path.empty()); + + ULARGE_INTEGER space; + if (!GetDiskFreeSpaceEx(_path.c_str(), NULL, NULL, &space)) + handleLastErrorImpl(_path); + return space.QuadPart; +} + + void FileImpl::handleLastErrorImpl(const std::string& path) { DWORD err = GetLastError(); diff --git a/Foundation/src/File_WIN32U.cpp b/Foundation/src/File_WIN32U.cpp index 94bc2e553..3bdff0171 100644 --- a/Foundation/src/File_WIN32U.cpp +++ b/Foundation/src/File_WIN32U.cpp @@ -357,6 +357,39 @@ bool FileImpl::createDirectoryImpl() } +FileImpl::FileSizeImpl FileImpl::totalSpaceImpl() const +{ + poco_assert(!_path.empty()); + + ULARGE_INTEGER space; + if (!GetDiskFreeSpaceExW(_upath.c_str(), NULL, &space, NULL)) + handleLastErrorImpl(_path); + return space.QuadPart; +} + + +FileImpl::FileSizeImpl FileImpl::usableSpaceImpl() const +{ + poco_assert(!_path.empty()); + + ULARGE_INTEGER space; + if (!GetDiskFreeSpaceExW(_upath.c_str(), &space, NULL, NULL)) + handleLastErrorImpl(_path); + return space.QuadPart; +} + + +FileImpl::FileSizeImpl FileImpl::freeSpaceImpl() const +{ + poco_assert(!_path.empty()); + + ULARGE_INTEGER space; + if (!GetDiskFreeSpaceExW(_upath.c_str(), NULL, NULL, &space)) + handleLastErrorImpl(_path); + return space.QuadPart; +} + + void FileImpl::handleLastErrorImpl(const std::string& path) { DWORD err = GetLastError(); diff --git a/Foundation/src/File_WINCE.cpp b/Foundation/src/File_WINCE.cpp index c321a76ee..a11b1c822 100644 --- a/Foundation/src/File_WINCE.cpp +++ b/Foundation/src/File_WINCE.cpp @@ -348,6 +348,39 @@ bool FileImpl::createDirectoryImpl() } +FileImpl::FileSizeImpl FileImpl::totalSpaceImpl() const +{ + poco_assert(!_path.empty()); + + ULARGE_INTEGER space; + if (!GetDiskFreeSpaceExW(_upath.c_str(), NULL, &space, NULL)) + handleLastErrorImpl(_path); + return space.QuadPart; +} + + +FileImpl::FileSizeImpl FileImpl::usableSpaceImpl() const +{ + poco_assert(!_path.empty()); + + ULARGE_INTEGER space; + if (!GetDiskFreeSpaceExW(_upath.c_str(), &space, NULL, NULL)) + handleLastErrorImpl(_path); + return space.QuadPart; +} + + +FileImpl::FileSizeImpl FileImpl::freeSpaceImpl() const +{ + poco_assert(!_path.empty()); + + ULARGE_INTEGER space; + if (!GetDiskFreeSpaceExW(_upath.c_str(), NULL, NULL, &space)) + handleLastErrorImpl(_path); + return space.QuadPart; +} + + void FileImpl::handleLastErrorImpl(const std::string& path) { switch (GetLastError()) diff --git a/Foundation/testsuite/src/FileTest.cpp b/Foundation/testsuite/src/FileTest.cpp index fc0810e41..3334159b9 100644 --- a/Foundation/testsuite/src/FileTest.cpp +++ b/Foundation/testsuite/src/FileTest.cpp @@ -180,6 +180,33 @@ void FileTest::testFileAttributes1() catch (Exception&) { } + + try + { + f.totalSpace(); + failmsg("file does not exist - must throw exception"); + } + catch (Exception&) + { + } + + try + { + f.usableSpace(); + failmsg("file does not exist - must throw exception"); + } + catch (Exception&) + { + } + + try + { + f.freeSpace(); + failmsg("file does not exist - must throw exception"); + } + catch (Exception&) + { + } } @@ -317,6 +344,15 @@ void FileTest::testSize() } +void FileTest::testSpace() +{ + File f(Path::home()); + assert(f.totalSpace() > 0); + assert(f.usableSpace() > 0); + assert(f.freeSpace() > 0); +} + + void FileTest::testDirectory() { File d("testdir"); @@ -525,6 +561,7 @@ CppUnit::Test* FileTest::suite() CppUnit_addTest(pSuite, FileTest, testCompare); CppUnit_addTest(pSuite, FileTest, testSwap); CppUnit_addTest(pSuite, FileTest, testSize); + CppUnit_addTest(pSuite, FileTest, testSpace); CppUnit_addTest(pSuite, FileTest, testDirectory); CppUnit_addTest(pSuite, FileTest, testCopy); CppUnit_addTest(pSuite, FileTest, testMove); diff --git a/Foundation/testsuite/src/FileTest.h b/Foundation/testsuite/src/FileTest.h index 0177a9eca..6560a0492 100644 --- a/Foundation/testsuite/src/FileTest.h +++ b/Foundation/testsuite/src/FileTest.h @@ -33,6 +33,7 @@ public: void testCompare(); void testSwap(); void testSize(); + void testSpace(); void testDirectory(); void testCopy(); void testMove(); From 5608e84af4359a5f096d66e346a69b27d47d0a9c Mon Sep 17 00:00:00 2001 From: Alexander Galanin Date: Sun, 24 Jan 2016 12:53:57 +0300 Subject: [PATCH 015/131] Data::SQLite: added support for named bind parameters --- Data/SQLite/src/SQLiteStatementImpl.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Data/SQLite/src/SQLiteStatementImpl.cpp b/Data/SQLite/src/SQLiteStatementImpl.cpp index 5f0b6c725..72a6bab51 100644 --- a/Data/SQLite/src/SQLiteStatementImpl.cpp +++ b/Data/SQLite/src/SQLiteStatementImpl.cpp @@ -197,7 +197,11 @@ void SQLiteStatementImpl::bindImpl() if (boundRowCount != (*_bindBegin)->numOfRowsHandled()) throw BindingException("Size mismatch in Bindings. All Bindings MUST have the same size"); - (*_bindBegin)->bind(pos); + std::size_t namedBindPos = 0; + if (!(*_bindBegin)->name().empty()) + namedBindPos = (std::size_t)sqlite3_bind_parameter_index(_pStmt, (*_bindBegin)->name().c_str()); + + (*_bindBegin)->bind((namedBindPos != 0) ? namedBindPos : pos); pos += (*_bindBegin)->numOfColumnsHandled(); } From d59885b4d386cb3bea4bdbc48a9bce4a3271bde6 Mon Sep 17 00:00:00 2001 From: Yukarin Date: Tue, 2 Feb 2016 23:05:11 +0300 Subject: [PATCH 016/131] Add iODBC support --- cmake/FindODBC.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/FindODBC.cmake b/cmake/FindODBC.cmake index 9e229ed4a..888143b1d 100644 --- a/cmake/FindODBC.cmake +++ b/cmake/FindODBC.cmake @@ -18,9 +18,12 @@ find_path(ODBC_INCLUDE_DIRECTORIES HINTS /usr/include /usr/include/odbc + /usr/include/iodbc /usr/local/include /usr/local/include/odbc + /usr/local/include/iodbc /usr/local/odbc/include + /usr/local/iodbc/include "C:/Program Files/ODBC/include" "C:/Program Files/Microsoft SDKs/Windows/v7.0/include" "C:/Program Files/Microsoft SDKs/Windows/v6.0a/include" @@ -29,13 +32,16 @@ find_path(ODBC_INCLUDE_DIRECTORIES ) find_library(ODBC_LIBRARIES - NAMES iodbc odbc odbcinst odbc32 + NAMES iodbc odbc iodbcinst odbcinst odbc32 HINTS /usr/lib /usr/lib/odbc + /usr/lib/iodbc /usr/local/lib /usr/local/lib/odbc + /usr/local/lib/iodbc /usr/local/odbc/lib + /usr/local/iodbc/lib "C:/Program Files/ODBC/lib" "C:/ODBC/lib/debug" "C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib" From dd9c4e607ed3b31ae2f8985f9e24ff9e5611a464 Mon Sep 17 00:00:00 2001 From: teminian Date: Wed, 17 Feb 2016 17:00:34 +0900 Subject: [PATCH 017/131] Improved support for MinGW-w64 Added following #defines which is not defined in MinGW header: #define _RC_CHOP 0x00000300 #define _RC_UP 0x00000200 #define _RC_DOWN 0x00000100 #define _RC_NEAR 0x00000000 Use isfinite(), instead of _finite(), for isInfiniteImpl(). Use isnan(), instead of _isnan(), for isNaNImpl(). Use copysign(), instead of _copysign(), for copySignImpl(). --- Foundation/include/Poco/FPEnvironment_WIN32.h | 52 ++++++++++++++++--- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/Foundation/include/Poco/FPEnvironment_WIN32.h b/Foundation/include/Poco/FPEnvironment_WIN32.h index 79a9fb16f..b3af2925c 100644 --- a/Foundation/include/Poco/FPEnvironment_WIN32.h +++ b/Foundation/include/Poco/FPEnvironment_WIN32.h @@ -43,6 +43,12 @@ # define _SW_DENORMAL 0x00080000 // denormal status bit #endif +#ifdef __MINGW32__ + #define _RC_CHOP 0x00000300 + #define _RC_UP 0x00000200 + #define _RC_DOWN 0x00000100 + #define _RC_NEAR 0x00000000 +#endif namespace Poco { @@ -94,49 +100,81 @@ private: // inline bool FPEnvironmentImpl::isInfiniteImpl(float value) { +#ifdef __MINGW32__ + return isfinite(value) == 0; +#else return _finite(value) == 0; +#endif } inline bool FPEnvironmentImpl::isInfiniteImpl(double value) { - return _finite(value) == 0; +#ifdef __MINGW32__ + return isfinite(value) == 0; +#else + return _finite(value) == 0; +#endif } inline bool FPEnvironmentImpl::isInfiniteImpl(long double value) { - return _finite(value) == 0; +#ifdef __MINGW32__ + return isfinite(value) == 0; +#else + return _finite(value) == 0; +#endif } inline bool FPEnvironmentImpl::isNaNImpl(float value) { - return _isnan(value) != 0; +#ifdef __MINGW32__ + return isnan(value) != 0; +#else + return _isnan(value) != 0; +#endif } inline bool FPEnvironmentImpl::isNaNImpl(double value) { - return _isnan(value) != 0; +#ifdef __MINGW32__ + return isnan(value) != 0; +#else + return _isnan(value) != 0; +#endif } inline bool FPEnvironmentImpl::isNaNImpl(long double value) { - return _isnan(value) != 0; +#ifdef __MINGW32__ + return isnan(value) != 0; +#else + return _isnan(value) != 0; +#endif } inline float FPEnvironmentImpl::copySignImpl(float target, float source) { - return float(_copysign(target, source)); +#ifdef __MINGW32__ + return float(copysign(target, source)); +#else + return float(_copysign(target, source)); +#endif } inline double FPEnvironmentImpl::copySignImpl(double target, double source) { - return _copysign(target, source); +#ifdef __MINGW32__ + return copysign(target, source); +#else + return _copysign(target, source); +#endif } From 8228fedde47c472cdae018e04c0a8af6ce65f82b Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Wed, 2 Mar 2016 10:03:39 +0100 Subject: [PATCH 018/131] Fix displayed version. Signed-off-by: FrancisANDRE --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8e4f4ee49..0c9973fd2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: poco-1.7.0 {branch}-{build} +version: poco-{branch}-{build} cache: - c:\mysql-5.7.9-win32 From 84a0485bb992b269f2bdaed7c82064f306f8c6de Mon Sep 17 00:00:00 2001 From: Matej Kenda Date: Wed, 2 Mar 2016 21:26:49 +0100 Subject: [PATCH 019/131] GH-1167: Remove expat CPP sources from globbed C++ source file list. --- XML/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt index 372465d85..47d46431c 100644 --- a/XML/CMakeLists.txt +++ b/XML/CMakeLists.txt @@ -1,8 +1,13 @@ set(LIBNAME "XML") set(POCO_LIBNAME "Poco${LIBNAME}") +# Expat CPP sources to be excluded from globbed SRCS_G +# They are added back on the list if POCO_UNBUNDLED is not set +set(EXPAT_CPP "${CMAKE_CURRENT_SOURCE_DIR}/src/xmlparse.cpp") + # Sources file(GLOB SRCS_G "src/*.cpp") +list(REMOVE_ITEM SRCS_G ${EXPAT_CPP}) POCO_SOURCES_AUTO( SRCS ${SRCS_G}) # Headers From 830894792df7ea98eab0dd35913eef5cfd9725e1 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 4 Mar 2016 14:03:25 +0100 Subject: [PATCH 020/131] fixed GH #1171: Poco::Data::RecordSet: rowCount not reset after execute --- Data/src/StatementImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/src/StatementImpl.cpp b/Data/src/StatementImpl.cpp index 502887d77..a7c0dd02d 100644 --- a/Data/src/StatementImpl.cpp +++ b/Data/src/StatementImpl.cpp @@ -125,9 +125,9 @@ void StatementImpl::assignSubTotal(bool doReset, size_t firstDs) if (_extractors[counter].size()) { if (doReset) - *it += CountVec::value_type(_extractors[counter][0]->numOfRowsHandled()); - else *it = CountVec::value_type(_extractors[counter][0]->numOfRowsHandled()); + else + *it += CountVec::value_type(_extractors[counter][0]->numOfRowsHandled()); } } } From 6017de359879def88f32bec3fb10882279e4430a Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 5 Mar 2016 11:57:09 +0100 Subject: [PATCH 021/131] AppVeyor CI for Data/PostgreSQL Signed-off-by: FrancisANDRE --- Data/PostgreSQL/PostgreSQL_vs120.sln | 46 +-- Data/PostgreSQL/PostgreSQL_vs120.vcxproj | 308 +++++++++++++++++ .../PostgreSQL_vs120.vcxproj.filters | 84 +++++ Data/PostgreSQL/PostgreSQL_x64_vs120.sln | 49 +-- Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj | 306 ++++++++++++++++ .../testsuite/TestSuite_vs120.vcxproj | 327 ++++++++++++++++++ .../testsuite/TestSuite_x64_vs120.vcxproj | 327 ++++++++++++++++++ .../testsuite/src/PostgreSQLTest.cpp | 50 ++- .../PostgreSQL/testsuite/src/PostgreSQLTest.h | 6 + Data/PostgreSQL/testsuite/src/SQLExecutor.cpp | 17 +- Data/PostgreSQL/testsuite/src/SQLExecutor.h | 4 +- appveyor.yml | 51 ++- components | 1 + 13 files changed, 1476 insertions(+), 100 deletions(-) create mode 100644 Data/PostgreSQL/PostgreSQL_vs120.vcxproj create mode 100644 Data/PostgreSQL/PostgreSQL_vs120.vcxproj.filters create mode 100644 Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj create mode 100644 Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj create mode 100644 Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj diff --git a/Data/PostgreSQL/PostgreSQL_vs120.sln b/Data/PostgreSQL/PostgreSQL_vs120.sln index 006fd28a3..7324e9a28 100644 --- a/Data/PostgreSQL/PostgreSQL_vs120.sln +++ b/Data/PostgreSQL/PostgreSQL_vs120.sln @@ -1,5 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostgreSQL", "PostgreSQL_vs120.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" @@ -10,49 +12,37 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 debug_static_md|Win32 = debug_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_shared|Win32 = release_shared|Win32 release_static_md|Win32 = release_static_md|Win32 + release_static_mt|Win32 = release_static_mt|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Build.0 = release_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Build.0 = release_shared|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Build.0 = release_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Build.0 = release_shared|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/PostgreSQL/PostgreSQL_vs120.vcxproj b/Data/PostgreSQL/PostgreSQL_vs120.vcxproj new file mode 100644 index 000000000..a3bbcf224 --- /dev/null +++ b/Data/PostgreSQL/PostgreSQL_vs120.vcxproj @@ -0,0 +1,308 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + PostgreSQL + {73E19FDE-1570-488C-B3DB-72A60FADD408} + PostgreSQL + Win32Proj + + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoDataPostgreSQLd + PocoDataPostgreSQLmdd + PocoDataPostgreSQLmtd + PocoDataPostgreSQL + PocoDataPostgreSQLmd + PocoDataPostgreSQLmt + + + ..\..\bin\ + obj\PostgreSQL\$(Configuration)\ + true + + + ..\..\bin\ + obj\PostgreSQL\$(Configuration)\ + false + + + ..\..\lib\ + obj\PostgreSQL\$(Configuration)\ + + + ..\..\lib\ + obj\PostgreSQL\$(Configuration)\ + + + ..\..\lib\ + obj\PostgreSQL\$(Configuration)\ + + + ..\..\lib\ + obj\PostgreSQL\$(Configuration)\ + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libpq.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataPostgreSQLd.dll + true + true + ..\..\bin\PocoDataPostgreSQLd.pdb + ..\..\lib;%(AdditionalLibraryDirectories) + Console + ..\..\lib\PocoDataPostgreSQLd.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + CppUnit.lib;libpq.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataPostgreSQL.dll + true + false + ..\..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib\PocoDataPostgreSQL.lib + MachineX86 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib\PocoDataPostgreSQLmtd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib\PocoDataPostgreSQLmtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\..\lib\PocoDataPostgreSQLmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib\PocoDataPostgreSQLmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib\PocoDataPostgreSQLmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\..\lib\PocoDataPostgreSQLmd.pdb + Level3 + + Default + + + libpq.lib;%(AdditionalDependencies) + ..\..\lib\PocoDataPostgreSQLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/PostgreSQL/PostgreSQL_vs120.vcxproj.filters b/Data/PostgreSQL/PostgreSQL_vs120.vcxproj.filters new file mode 100644 index 000000000..03e1ca51e --- /dev/null +++ b/Data/PostgreSQL/PostgreSQL_vs120.vcxproj.filters @@ -0,0 +1,84 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs120.sln b/Data/PostgreSQL/PostgreSQL_x64_vs120.sln index cef748cec..46f74ea9b 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs120.sln +++ b/Data/PostgreSQL/PostgreSQL_x64_vs120.sln @@ -1,58 +1,45 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostgreSQL", "PostgreSQL_x64_vs120.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" - ProjectSection(ProjectDependencies) = postProject - {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} - EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 debug_static_md|x64 = debug_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_shared|x64 = release_shared|x64 release_static_md|x64 = release_static_md|x64 + release_static_mt|x64 = release_static_mt|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.ActiveCfg = debug_shared|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Build.0 = debug_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.ActiveCfg = release_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Build.0 = release_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Deploy.0 = release_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.ActiveCfg = release_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Build.0 = release_shared|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Build.0 = release_static_mt|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.ActiveCfg = debug_shared|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Build.0 = debug_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.ActiveCfg = release_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Build.0 = release_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Deploy.0 = release_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.ActiveCfg = release_shared|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Build.0 = release_shared|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.ActiveCfg = release_static_md|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Build.0 = release_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Build.0 = release_static_mt|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj b/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj new file mode 100644 index 000000000..d4b00450b --- /dev/null +++ b/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj @@ -0,0 +1,306 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + PostgreSQL + {73E19FDE-1570-488C-B3DB-72A60FADD408} + PostgreSQL + Win32Proj + + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoDataPostgreSQL64d + PocoDataPostgreSQLmdd + PocoDataPostgreSQLmtd + PocoDataPostgreSQL64 + PocoDataPostgreSQLmd + PocoDataPostgreSQLmt + + + ..\..\bin64\ + obj64\PostgreSQL\$(Configuration)\ + true + + + ..\..\bin64\ + obj64\PostgreSQL\$(Configuration)\ + false + + + ..\..\lib64\ + obj64\PostgreSQL\$(Configuration)\ + + + ..\..\lib64\ + obj64\PostgreSQL\$(Configuration)\ + + + ..\..\lib64\ + obj64\PostgreSQL\$(Configuration)\ + + + ..\..\lib64\ + obj64\PostgreSQL\$(Configuration)\ + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libpq.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataPostgreSQL64d.dll + true + true + ..\..\bin64\PocoDataPostgreSQL64d.pdb + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + ..\..\lib64\PocoDataPostgreSQLd.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libpq.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataPostgreSQL64.dll + true + false + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib64\PocoDataPostgreSQL.lib + MachineX64 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib64\PocoDataPostgreSQLmtd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib64\PocoDataPostgreSQLmtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\..\lib64\PocoDataPostgreSQLmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib64\PocoDataPostgreSQLmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib64\PocoDataPostgreSQLmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\..\lib64\PocoDataPostgreSQLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj new file mode 100644 index 000000000..3a5039783 --- /dev/null +++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj @@ -0,0 +1,327 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v120 + + + Application + Dynamic + MultiByte + v120 + + + Application + Static + MultiByte + v120 + + + Application + Static + MultiByte + v120 + + + Application + false + v120 + MultiByte + + + Application + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin\ + obj\TestSuite\$(Configuration)\ + true + + + bin\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + CppUnitd.lib;libpq.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libpq.lib;CppUnit.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj new file mode 100644 index 000000000..e3e8e5dae --- /dev/null +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -0,0 +1,327 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v120 + + + Application + Dynamic + MultiByte + v120 + + + Application + Static + MultiByte + v120 + + + Application + Static + MultiByte + v120 + + + Application + false + MultiByte + v120 + + + Application + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin64\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + CppUnitd.lib;libpq.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + CppUnit.lib;libpq.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp index 5e5246258..54a7deb6a 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp @@ -33,6 +33,7 @@ #include "PostgreSQLTest.h" #include "CppUnit/TestCaller.h" #include "CppUnit/TestSuite.h" +#include "Poco/Environment.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Tuple.h" @@ -58,25 +59,41 @@ using Poco::Int32; using Poco::Nullable; using Poco::Tuple; using Poco::NamedTuple; +using Poco::Environment; Poco::SharedPtr PostgreSQLTest::_pSession = 0; Poco::SharedPtr PostgreSQLTest::_pExecutor = 0; // -// Parameters for barebone-test -#define POSTGRESQL_USER "postgres" -#define POSTGRESQL_PWD "postgres" -#define POSTGRESQL_HOST "localhost" -#define POSTGRESQL_PORT "5432" -#define POSTGRESQL_DB "postgres" +// Connection string +std::string PostgreSQLTest::_dbConnString; // -// Connection string -std::string PostgreSQLTest::_dbConnString = "host=" POSTGRESQL_HOST - " user=" POSTGRESQL_USER - " password=" POSTGRESQL_PWD - " dbname=" POSTGRESQL_DB - " port=" POSTGRESQL_PORT; +// Parameters for barebone-test +// +std::string PostgreSQLTest::getHost() { + return "localhost"; +} +std::string PostgreSQLTest::getPort() { + return "5432"; +} +std::string PostgreSQLTest::getBase(){ + return "postgres"; +} +std::string PostgreSQLTest::getUser(){ + return "postgres"; +} +std::string PostgreSQLTest::getPassword(){ + if (Environment::has("APPVEYOR")) + { + return "Password12!"; + } + else + { + return "postgres"; + } +} + PostgreSQLTest::PostgreSQLTest(const std::string& name): @@ -103,9 +120,10 @@ void PostgreSQLTest::dbInfo(Session& session) void PostgreSQLTest::testConnectNoDB() { - std::string dbConnString = "host=" POSTGRESQL_HOST - " user=" POSTGRESQL_USER - " password=" POSTGRESQL_PWD; + std::string dbConnString; + dbConnString += "host=" + getHost(); + dbConnString += " user=" + getUser(); + dbConnString += " password=" + getPassword(); try { @@ -275,7 +293,7 @@ void PostgreSQLTest::testPostgreSQLOIDs() 142 }; - _pExecutor->oidPostgreSQLTest(POSTGRESQL_HOST, POSTGRESQL_USER, POSTGRESQL_PWD, POSTGRESQL_DB, POSTGRESQL_PORT, tableCreateString.c_str(), OIDArray); + _pExecutor->oidPostgreSQLTest(getHost(), getUser(), getPassword(), getBase(), getPort(), tableCreateString.c_str(), OIDArray); } diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h index fe74c53e0..638067cbe 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h @@ -147,6 +147,12 @@ private: static void dbInfo(Poco::Data::Session& session); + static std::string getHost(); + static std::string getPort(); + static std::string getBase(); + static std::string getUser(); + static std::string getPassword(); + static std::string _dbConnString; static Poco::SharedPtr _pSession; static Poco::SharedPtr _pExecutor; diff --git a/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp b/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp index b2cb3c197..747a02748 100644 --- a/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp +++ b/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp @@ -33,6 +33,7 @@ #include "CppUnit/TestCase.h" #include "SQLExecutor.h" #include "Poco/String.h" +#include "Poco/ByteOrder.h" #include "Poco/Format.h" #include "Poco/Tuple.h" #include "Poco/Types.h" @@ -47,13 +48,6 @@ #include "Poco/Data/Transaction.h" #include "Poco/Data/PostgreSQL/PostgreSQLException.h" -#ifdef _WIN32 -#include -#else -#include -#include -#endif - #include #include @@ -64,6 +58,7 @@ using Poco::Data::PostgreSQL::PostgreSQLException; using Poco::Data::PostgreSQL::ConnectionException; using Poco::Data::PostgreSQL::StatementException; using Poco::format; +using Poco::ByteOrder; using Poco::Tuple; using Poco::DateTime; using Poco::Any; @@ -177,7 +172,7 @@ SQLExecutor::~SQLExecutor() { } -void SQLExecutor::oidPostgreSQLTest(const char* host, const char* user, const char* pwd, const char* db, const char* port, const char* tableCreateString, const Oid anOIDArray[]) +void SQLExecutor::oidPostgreSQLTest(std::string host, std::string user, std::string pwd, std::string db, std::string port, const char* tableCreateString, const Oid anOIDArray[]) { std::string connectionString; @@ -281,7 +276,7 @@ void SQLExecutor::oidPostgreSQLTest(const char* host, const char* user, const ch } -void SQLExecutor::barebonePostgreSQLTest(const char* host, const char* user, const char* pwd, const char* db, const char* port, const char* tableCreateString) +void SQLExecutor::barebonePostgreSQLTest(std::string host, std::string user, std::string pwd, std::string db, std::string port, const char* tableCreateString) { std::string connectionString; @@ -344,7 +339,7 @@ void SQLExecutor::barebonePostgreSQLTest(const char* host, const char* user, con PQclear(pResult); std::string str[3] = { "111", "222", "333" }; - int fourth = htonl((Poco::UInt32) 4); + int fourth = ByteOrder::toNetwork((Poco::UInt32) 4); float fifth = 1.5; const char *paramValues[5] = { 0 }; @@ -468,7 +463,7 @@ void SQLExecutor::barebonePostgreSQLTest(const char* host, const char* user, con * we'd better coerce to the local byte order. */ - fourth = ntohl(*((Poco::UInt32 *) pSelectResult[ 3 ])); + fourth = ByteOrder::fromNetwork(*((Poco::UInt32 *) pSelectResult[ 3 ])); fifth = *((float *) pSelectResult[ 4 ]); assert (0 == std::strncmp("111", pSelectResult[0], 3)); diff --git a/Data/PostgreSQL/testsuite/src/SQLExecutor.h b/Data/PostgreSQL/testsuite/src/SQLExecutor.h index 8a07dde35..5c33be6e7 100644 --- a/Data/PostgreSQL/testsuite/src/SQLExecutor.h +++ b/Data/PostgreSQL/testsuite/src/SQLExecutor.h @@ -59,10 +59,10 @@ public: SQLExecutor(const std::string& name, Poco::Data::Session* _pSession); ~SQLExecutor(); - void oidPostgreSQLTest(const char* host, const char* user, const char* pwd, const char* db, const char* port, const char* tableCreateString, const Oid anOIDArray[]); + void oidPostgreSQLTest(std::string host, std::string user, std::string pwd, std::string db, std::string port, const char* tableCreateString, const Oid anOIDArray[]); /// This function verifies the PostgreSQL Column type OIDs are consistent between releases - void barebonePostgreSQLTest(const char* host, const char* user, const char* pwd, const char* db, const char* port, const char* tableCreateString); + void barebonePostgreSQLTest(std::string host, std::string user, std::string pwd, std::string db, std::string port, const char* tableCreateString); /// This function uses "bare bone" API calls (i.e. calls are not /// "wrapped" in PocoData framework structures). /// The purpose of the function is to verify that driver behaves diff --git a/appveyor.yml b/appveyor.yml index 8e4f4ee49..da63465f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: poco-1.7.0 {branch}-{build} +version: build {branch}-{build} cache: - c:\mysql-5.7.9-win32 @@ -9,19 +9,25 @@ cache: hosts: localhost: 127.0.0.1 db.server.com: 127.0.0.2 - -services: + # mysql : server: localhost, port: 3306 # mysql : user : root, password: Password12! # - mysql # mongodb config : C:\mongodb\mongod.cfg # mongodb database: C:\mongodb\data\db + +# Server name: localhost +# Server port: 5432 +# postgres account password: Password12! +services: + - postgresql94 - mongodb + platform: - - Win32 - x64 + - Win32 # ------------------------------------------------------------------------------------------- # building debug configuration doubles the round time and isn't so useful. @@ -37,9 +43,6 @@ environment: matrix: - - builder: cmake - vsver: 120 - - builder: msbuild vsver: 120 linkmode: shared @@ -76,13 +79,15 @@ environment: # vsver: 140 # linkmode: static_mt + - builder: cmake + vsver: 120 matrix: fast_finish: true install: + - set POCO_BASE=%CD% - set PATH=C:\ProgramData\chocolatey\bin;%PATH% - - systeminfo - c:\cygwin\bin\uname -a - c:\cygwin\bin\cat /proc/cpuinfo - c:\cygwin\bin\cat /proc/meminfo @@ -146,8 +151,7 @@ install: } } } -# ------------------------------------------------------------------------------------------- - +# ------------------------------------------------------------------------------------------- # MySQL 32 bit is not available by default on AppVeyor # ------------------------------------------------------------------------------------------- - ps: | @@ -165,9 +169,9 @@ install: } } # ------------------------------------------------------------------------------------------- + before_build: - - set POCO_BASE=%CD% - ps: | if ($env:vsver -eq "110") { @@ -199,7 +203,9 @@ before_build: popd write-host "`nVisual Studio $yyyy CLI variables set." -ForegroundColor Yellow +# ------------------------------------------------------------------------------------------- # MySQL +# ------------------------------------------------------------------------------------------- - ps: | if ($env:platform -eq "Win32") { @@ -212,6 +218,21 @@ before_build: $env:LIB = "C:\Program Files\MySql\MySQL Server 5.6\lib;" + $env:LIB } +# ------------------------------------------------------------------------------------------- +# PostgreSQL +# ------------------------------------------------------------------------------------------- + - ps: | + if ($env:platform -eq "Win32") + { + $env:INCLUDE = "C:\Program Files (x86)\PostgreSQL\9.4\include;" + $env:INCLUDE + $env:LIB = "C:\Program Files (x86)\PostgreSQL\9.4\lib;" + $env:LIB + } + if ($env:platform -eq "x64") + { + $env:INCLUDE = "C:\Program Files\PostgreSQL\9.4\include;" + $env:INCLUDE + $env:LIB = "C:\Program Files\PostgreSQL\9.4\lib;" + $env:LIB + } + after_build: - ps: | $line='-------------------------------------------------------------------------------------'; @@ -309,6 +330,11 @@ build_script: } before_test: +# ------------------------------------------------------------------------------------------- +# PostgreSQL + - set PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH% +# ------------------------------------------------------------------------------------------- + - ps: | $line='-------------------------------------------------------------------------------------'; $CPPUNIT_IGNORE=''; @@ -338,10 +364,12 @@ test_script: if ($env:platform -eq "Win32") { $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = ''; + $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Data/PostgreSQL', 'Redis', 'PDF') } if ($env:platform -eq "x64") { $env:PATH = "$env:POCO_BASE\bin64;" + $env:PATH;$suffix = 64; + $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Redis', 'PDF') } Write-Host -ForegroundColor Yellow '>>> current directory is ' $(get-location).Path; @@ -352,7 +380,6 @@ test_script: $components; Write-Host -ForegroundColor Yellow $line; - $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Redis', 'PDF') Write-Host excluded; Write-Host -ForegroundColor Yellow $line; diff --git a/components b/components index a415f7da3..a93a69823 100644 --- a/components +++ b/components @@ -12,6 +12,7 @@ Data Data/SQLite Data/ODBC Data/MySQL +Data/PostgreSQL Zip PageCompiler PageCompiler/File2Page From 4b9c6693331b063ae84b3be2c45013d681df0dac Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 5 Mar 2016 12:00:19 +0100 Subject: [PATCH 022/131] Travis CI for Data/PostgreSQL Signed-off-by: FrancisANDRE --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d39eac516..879e4f198 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,11 @@ before_install: services: - mongodb - redis-server + - postgresql + +addons: + postgresql: "9.3" + notifications: slack: @@ -46,7 +51,7 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite && make -s -j2 + - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 - sudo make install - ./travis/OSX/runtests.sh @@ -141,7 +146,7 @@ matrix: # TODO osx build # TODO run test suite # script: - # - ./configure && make -s -j2 + # - ./configure && make -s -i -j2 # - sudo ifconfig -a # - sudo ifconfig venet0 multicast # - sudo ifconfig -a From 780ff0838b24d36b43ffa8bf96a9460a8fa5f269 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 5 Mar 2016 12:18:34 +0100 Subject: [PATCH 023/131] Enroll Data/PostgreSQL Signed-off-by: FrancisANDRE --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 515378df7..683472445 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples) all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) -COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF +COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Data/PostgreSQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit @@ -99,10 +99,10 @@ endif find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; -libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec -tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests +libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Data/PostgreSQL-libexec MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec +tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Data/PostgreSQL-tests MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples MongoDB-samples Zip-samples PageCompiler-samples PDF-samples -cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean +cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean Data/PostgreSQL-clean MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean .PHONY: $(libexecs) .PHONY: $(tests) @@ -256,6 +256,16 @@ Data/MySQL-clean: $(MAKE) -C $(POCO_BASE)/Data/MySQL clean $(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite clean +Data/PostgreSQL-libexec: Foundation-libexec Data-libexec + $(MAKE) -C $(POCO_BASE)/Data/PostgreSQL + +Data/PostgreSQL-tests: Data/PostgreSQL-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Data/PostgreSQL/testsuite + +Data/PostgreSQL-clean: + $(MAKE) -C $(POCO_BASE)/Data/PostgreSQL clean + $(MAKE) -C $(POCO_BASE)/Data/PostgreSQL/testsuite clean + MongoDB-libexec: Foundation-libexec Net-libexec $(MAKE) -C $(POCO_BASE)/MongoDB From edbe20a1bd46117341939b2c1dd2423e8a923252 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 5 Mar 2016 13:57:46 +0100 Subject: [PATCH 024/131] Setup the connection string when needed. Signed-off-by: FrancisANDRE --- Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj | 1 + Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj index 3a5039783..5bef6df89 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj @@ -103,6 +103,7 @@ bin\ obj\TestSuite\$(Configuration)\ true + C:\Progra~2\PostgreSQL\9.5\bin;$(ExecutablePath) bin\ diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp index 54a7deb6a..67aa79150 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp @@ -1045,6 +1045,12 @@ CppUnit::Test* PostgreSQLTest::suite() { PostgreSQL::Connector::registerConnector(); + _dbConnString += "host=" + getHost(); + _dbConnString += " user=" + getUser(); + _dbConnString += " password=" + getPassword(); + _dbConnString += " dbname=" + getBase(); + _dbConnString += " port=" + getPort(); + try { _pSession = new Session(PostgreSQL::Connector::KEY, _dbConnString); From 2e8674a54d157b3539fe1fdc9332df6b9c25ac3c Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 5 Mar 2016 14:42:18 +0100 Subject: [PATCH 025/131] prevent TCPServer thread from stopping of poll() throws (due to resource issues) --- Net/src/TCPServer.cpp | 52 ++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/Net/src/TCPServer.cpp b/Net/src/TCPServer.cpp index 201890969..82b7cbfc5 100644 --- a/Net/src/TCPServer.cpp +++ b/Net/src/TCPServer.cpp @@ -115,33 +115,43 @@ void TCPServer::run() while (!_stopped) { Poco::Timespan timeout(250000); - if (_socket.poll(timeout, Socket::SELECT_READ)) + try { - try + if (_socket.poll(timeout, Socket::SELECT_READ)) { - StreamSocket ss = _socket.acceptConnection(); - // enable nodelay per default: OSX really needs that -#if defined(POCO_OS_FAMILY_UNIX) - if (ss.address().family() != AddressFamily::UNIX_LOCAL) -#endif + try { - ss.setNoDelay(true); + StreamSocket ss = _socket.acceptConnection(); + // enable nodelay per default: OSX really needs that + #if defined(POCO_OS_FAMILY_UNIX) + if (ss.address().family() != AddressFamily::UNIX_LOCAL) + #endif + { + ss.setNoDelay(true); + } + _pDispatcher->enqueue(ss); + } + catch (Poco::Exception& exc) + { + ErrorHandler::handle(exc); + } + catch (std::exception& exc) + { + ErrorHandler::handle(exc); + } + catch (...) + { + ErrorHandler::handle(); } - _pDispatcher->enqueue(ss); - } - catch (Poco::Exception& exc) - { - ErrorHandler::handle(exc); - } - catch (std::exception& exc) - { - ErrorHandler::handle(exc); - } - catch (...) - { - ErrorHandler::handle(); } } + catch (Poco::Exception& exc) + { + ErrorHandler::handle(exc); + // possibly a resource issue since poll() failed; + // give some time to recover before trying again + Poco::Thread::sleep(50); + } } } From 67de3be8602ff72490ab360879f29a15ddd8be35 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 5 Mar 2016 17:48:49 +0100 Subject: [PATCH 026/131] style fix --- Net/src/TCPServer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Net/src/TCPServer.cpp b/Net/src/TCPServer.cpp index 82b7cbfc5..945e67904 100644 --- a/Net/src/TCPServer.cpp +++ b/Net/src/TCPServer.cpp @@ -123,9 +123,9 @@ void TCPServer::run() { StreamSocket ss = _socket.acceptConnection(); // enable nodelay per default: OSX really needs that - #if defined(POCO_OS_FAMILY_UNIX) +#if defined(POCO_OS_FAMILY_UNIX) if (ss.address().family() != AddressFamily::UNIX_LOCAL) - #endif +#endif { ss.setNoDelay(true); } From 7f38fc4ef0a06f03304ce0d049974b8c630e5fe1 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 5 Mar 2016 17:55:28 +0100 Subject: [PATCH 027/131] Add Data/PostgreSQL to CMake build Signed-off-by: FrancisANDRE --- CMakeLists.txt | 1 + Data/CMakeLists.txt | 11 +++++++++++ cmake/FindPostgreSQL.cmake | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 203937825..5b38de57e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,7 @@ option(ENABLE_CRYPTO "Enable Crypto" ON) option(ENABLE_DATA "Enable Data" ON) option(ENABLE_DATA_SQLITE "Enable Data SQlite" ON) option(ENABLE_DATA_MYSQL "Enable Data MySQL" ON) +option(ENABLE_DATA_POSTGRESQL "Enable Data PosgreSQL" ON) option(ENABLE_DATA_ODBC "Enable Data ODBC" ON) option(ENABLE_SEVENZIP "Enable SevenZip" OFF) option(ENABLE_ZIP "Enable Zip" ON) diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt index 3d6044ab9..2c06eca4f 100644 --- a/Data/CMakeLists.txt +++ b/Data/CMakeLists.txt @@ -55,6 +55,17 @@ if(ENABLE_DATA_MYSQL) endif(MYSQL_FOUND) endif(ENABLE_DATA_MYSQL) +if(ENABLE_DATA_POSTGRESQL) + find_package(PostgreSQL) + if(POSTGRESQL_FOUND) + include_directories("${POSTGRESQL_INCLUDE_DIR}") + message(STATUS "PostgreSQL Support Enabled") + add_subdirectory( PostgreSQL ) + else() + message(STATUS "PostgreSQL Support Disabled - no PostgreSQL library") + endif(POSTGRESQL_FOUND) +endif(ENABLE_DATA_POSTGRESQL) + if(ENABLE_DATA_ODBC) find_package(ODBC) if(WIN32 AND NOT WINCE) diff --git a/cmake/FindPostgreSQL.cmake b/cmake/FindPostgreSQL.cmake index 6c383f0e3..efa995943 100644 --- a/cmake/FindPostgreSQL.cmake +++ b/cmake/FindPostgreSQL.cmake @@ -13,7 +13,9 @@ ENDIF (PGSQL_INCLUDE_DIR) FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h $ENV{ProgramFiles}/PostgreSQL/*/include + $ENV{ProgramFiles}/PostgreSQL/*/*/include $ENV{SystemDrive}/PostgreSQL/*/include + $ENV{SystemDrive}/PostgreSQL/*/*/include /usr/local/pgsql/include /usr/local/postgresql/include /usr/local/include/pgsql @@ -30,7 +32,9 @@ SET(PGSQL_NAMES pq libpq) SET(PGSQL_SEARCH_LIB_PATHS ${PGSQL_SEARCH_LIB_PATHS} $ENV{ProgramFiles}/PostgreSQL/*/lib + $ENV{ProgramFiles}/PostgreSQL/*/*/lib $ENV{SystemDrive}/PostgreSQL/*/lib + $ENV{SystemDrive}/PostgreSQL/*/*/lib /usr/local/pgsql/lib /usr/local/lib /usr/lib From d1b7f14dd5cd17719fb57746a4c3f3074545208a Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 5 Mar 2016 17:56:32 +0100 Subject: [PATCH 028/131] Avoid building Data/PostgreSQL on Cygwin since the lib front end does not exist. Signed-off-by: FrancisANDRE --- Makefile | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 683472445..b45e627f0 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,13 @@ poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples) all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) -COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Data/PostgreSQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF + +COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL +COMPONENTS += Data Data/SQLite Data/ODBC Data/MySQL +ifneq ($(OSNAME), Cygwin) +COMPONENTS += Data/PostgreSQL +endif +COMPONENTS += MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit @@ -99,11 +105,36 @@ endif find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; -libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Data/PostgreSQL-libexec MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec -tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Data/PostgreSQL-tests MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests -samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples MongoDB-samples Zip-samples PageCompiler-samples PDF-samples -cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean Data/PostgreSQL-clean MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean +# ------------------------------------------------------------------------------------------------------------------------------------- +libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec +libexecs += Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec +ifneq ($(OSNAME), Cygwin) +libexecs += Data/PostgreSQL-libexec +endif +libexecs += MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec +# ------------------------------------------------------------------------------------------------------------------------------------- +tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests +tests += Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests +ifneq ($(OSNAME), Cygwin) +tests += Data/PostgreSQL-tests +endif +tests += MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests + +# ------------------------------------------------------------------------------------------------------------------------------------- +samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples +samples += Data-samples +samples += MongoDB-samples Zip-samples PageCompiler-samples PDF-samples + +# ------------------------------------------------------------------------------------------------------------------------------------- +cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean +cleans += Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean +ifneq ($(OSNAME), Cygwin) +cleans += Data/PostgreSQL-clean +endif +cleans += MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean + +# ------------------------------------------------------------------------------------------------------------------------------------- .PHONY: $(libexecs) .PHONY: $(tests) .PHONY: $(samples) From 26232dfce51098ccafcad59494773d6be414740b Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 5 Mar 2016 17:57:11 +0100 Subject: [PATCH 029/131] AppVeyor fixes Signed-off-by: FrancisANDRE --- Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj | 2 +- appveyor.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj index 5bef6df89..f69cebba5 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj @@ -103,7 +103,7 @@ bin\ obj\TestSuite\$(Configuration)\ true - C:\Progra~2\PostgreSQL\9.5\bin;$(ExecutablePath) + $(ExecutablePath) bin\ diff --git a/appveyor.yml b/appveyor.yml index da63465f8..7a9580fb4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -364,12 +364,12 @@ test_script: if ($env:platform -eq "Win32") { $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = ''; - $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Data/PostgreSQL', 'Redis', 'PDF') + $excluded = @('Data/MySQL', 'Data/ODBC','Data/PostgreSQL', 'Redis', 'PDF') } if ($env:platform -eq "x64") { $env:PATH = "$env:POCO_BASE\bin64;" + $env:PATH;$suffix = 64; - $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Redis', 'PDF') + $excluded = @('Data/MySQL', 'Data/ODBC','Redis', 'PDF') } Write-Host -ForegroundColor Yellow '>>> current directory is ' $(get-location).Path; From 472ae783c47c05a5959d25bf038195306cb5eaf1 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 5 Mar 2016 18:25:10 +0100 Subject: [PATCH 030/131] Use lib64 on x86 platform --- cmake/FindPostgreSQL.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/FindPostgreSQL.cmake b/cmake/FindPostgreSQL.cmake index efa995943..7ca0608ab 100644 --- a/cmake/FindPostgreSQL.cmake +++ b/cmake/FindPostgreSQL.cmake @@ -28,7 +28,7 @@ FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h /usr/postgresql/include ) -SET(PGSQL_NAMES pq libpq) +SET(PGSQL_NAMES pq libpq libpg.so.5.7) SET(PGSQL_SEARCH_LIB_PATHS ${PGSQL_SEARCH_LIB_PATHS} $ENV{ProgramFiles}/PostgreSQL/*/lib @@ -36,8 +36,11 @@ SET(PGSQL_SEARCH_LIB_PATHS $ENV{SystemDrive}/PostgreSQL/*/lib $ENV{SystemDrive}/PostgreSQL/*/*/lib /usr/local/pgsql/lib + /usr/local/pgsql/lib64 /usr/local/lib + /usr/local/lib64 /usr/lib + /usr/lib64 ) FIND_LIBRARY(PGSQL_LIBRARY NAMES ${PGSQL_NAMES} @@ -67,4 +70,4 @@ MARK_AS_ADVANCED( PGSQL_LIBRARY PGSQL_INCLUDE_DIR ) -ENDMACRO(FIND_PGSQL) \ No newline at end of file +ENDMACRO(FIND_PGSQL) From 1c714d9abe161f8ab186687c3cf4ba9c63d24156 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sun, 6 Mar 2016 08:20:33 +0100 Subject: [PATCH 031/131] Reexclude Data testsuite. To be tracked. Signed-off-by: FrancisANDRE --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7a9580fb4..da63465f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -364,12 +364,12 @@ test_script: if ($env:platform -eq "Win32") { $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = ''; - $excluded = @('Data/MySQL', 'Data/ODBC','Data/PostgreSQL', 'Redis', 'PDF') + $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Data/PostgreSQL', 'Redis', 'PDF') } if ($env:platform -eq "x64") { $env:PATH = "$env:POCO_BASE\bin64;" + $env:PATH;$suffix = 64; - $excluded = @('Data/MySQL', 'Data/ODBC','Redis', 'PDF') + $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Redis', 'PDF') } Write-Host -ForegroundColor Yellow '>>> current directory is ' $(get-location).Path; From 3a759171d70fd7ff366e4b14066c55c9d684aca6 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 6 Mar 2016 11:25:50 +0100 Subject: [PATCH 032/131] don't be too eager setting POCO_PREFIX to /usr/local; add --no-prefix option to configure to NOT set POCO_PREFIX; output POCO_LIB_INSTALLDIR if POCO_VERBOSE --- Makefile | 22 +++++++++++++++------- build/rules/global | 29 ++++++++++++++++++++++++++++- configure | 18 ++++++++++++++++-- release/script/mkdoc | 2 +- release/script/mkrelease | 33 +++++++++++++++++++++------------ 5 files changed, 81 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 515378df7..1020972f8 100644 --- a/Makefile +++ b/Makefile @@ -11,14 +11,16 @@ ifndef POCO_BASE $(warning WARNING: POCO_BASE is not defined. Assuming current directory.) export POCO_BASE=$(shell pwd) endif - -ifndef POCO_PREFIX -export POCO_PREFIX=/usr/local +ifdef POCO_VERBOSE +$(info POCO_BASE = $(POCO_BASE)) endif ifndef POCO_BUILD export POCO_BUILD=$(POCO_BASE) endif +ifdef POCO_VERBOSE +$(info POCO_BUILD = $(POCO_BUILD)) +endif # # Determine OS @@ -39,7 +41,9 @@ POCO_HOST_OSARCH ?= $(subst /,-,$(shell uname -m | tr ' ' _)) ifndef POCO_CONFIG POCO_CONFIG = $(POCO_HOST_OSNAME) endif -#$(info POCO_CONFIG = $(POCO_CONFIG)) +ifdef POCO_VERBOSE +$(info POCO_CONFIG = $(POCO_CONFIG)) +endif # # Include System Specific Settings @@ -54,14 +58,18 @@ OSNAME := $(POCO_HOST_OSNAME) else OSNAME := $(POCO_TARGET_OSNAME) endif -#$(info OSNAME = $(OSNAME)) +ifdef POCO_VERBOSE +$(info OSNAME = $(OSNAME)) +endif ifndef POCO_TARGET_OSARCH OSARCH := $(POCO_HOST_OSARCH) else OSARCH := $(POCO_TARGET_OSARCH) endif -#$(info OSARCH = $(OSARCH)) +ifdef POCO_VERBOSE +$(info OSARCH = $(OSARCH)) +endif .PHONY: poco all libexecs cppunit tests samples cleans clean distclean install @@ -76,7 +84,7 @@ cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit CppUnit-clean: - \$(MAKE) -C \$(POCO_BASE)/CppUnit clean + $(MAKE) -C $(POCO_BASE)/CppUnit clean install: libexecs mkdir -p $(INSTALLDIR)/include/Poco diff --git a/build/rules/global b/build/rules/global index 50c0eb525..6319e7307 100644 --- a/build/rules/global +++ b/build/rules/global @@ -25,7 +25,7 @@ endif # # Include some optional make configuration # -sinclude $(POCO_BASE)/config.make +sinclude $(POCO_BASE)/config.build # # Check for PROJECT_BASE @@ -34,6 +34,9 @@ ifndef PROJECT_BASE PROJECT_BASE = $(POCO_BASE) endif export PROJECT_BASE +ifdef POCO_VERBOSE +$(info PROJECT_BASE = $(PROJECT_BASE)) +endif # # Check for POCO_BUILD @@ -42,6 +45,9 @@ ifndef POCO_BUILD POCO_BUILD = $(PROJECT_BASE) endif export POCO_BUILD +ifdef POCO_VERBOSE +$(info POCO_BUILD = $(POCO_BUILD)) +endif # # POCO_BASE/POCO_BUILD/cwd sanity checks @@ -77,7 +83,14 @@ endif ifeq ($(findstring MINGW,$(POCO_HOST_OSNAME)),MINGW) POCO_HOST_OSNAME = MinGW endif +ifdef POCO_VERBOSE +$(info POCO_HOST_OSNAME = $(POCO_HOST_OSNAME)) +endif + POCO_HOST_OSARCH ?= $(subst /,-,$(shell uname -m | tr ' ' _)) +ifdef POCO_VERBOSE +$(info POCO_HOST_OSARCH = $(POCO_HOST_OSARCH)) +endif # # Begin Sun platforms @@ -113,6 +126,9 @@ endif ifndef POCO_CONFIG POCO_CONFIG = $(POCO_HOST_OSNAME) endif +ifdef POCO_VERBOSE +$(info POCO_CONFIG = $(POCO_CONFIG)) +endif # # Include System Specific Settings @@ -127,11 +143,19 @@ OSNAME := $(POCO_HOST_OSNAME) else OSNAME := $(POCO_TARGET_OSNAME) endif +ifdef POCO_VERBOSE +$(info OSNAME = $(OSNAME)) +endif + ifndef POCO_TARGET_OSARCH OSARCH := $(subst /,-,$(shell uname -m | tr ' ' _)) else OSARCH := $(POCO_TARGET_OSARCH) endif +ifdef POCO_VERBOSE +$(info OSARCH = $(OSARCH)) +endif + HOSTNAME := $(shell hostname) # @@ -200,6 +224,9 @@ POCO_LIB_INSTALLDIR = $(POCO_PREFIX)/lib else POCO_LIB_INSTALLDIR = $(LIBPATH) endif +ifdef POCO_VERBOSE +$(info POCO_LIB_INSTALLDIR = $(POCO_LIB_INSTALLDIR)) +endif ifeq ($(POCO_BASE),$(PROJECT_BASE)) POCO_LIBRARY = diff --git a/configure b/configure index 582eedd1b..28992185d 100755 --- a/configure +++ b/configure @@ -29,6 +29,10 @@ Options: Use the given install directory for make install. Default is /usr/local. + --no-prefix + Do not use /usr/local as default install directory and do not + define POCO_PREFIX. + --stdcxx-base= If (and only if) the $base/build/config selected with --config uses the Apache stdcxx library, then apache_stdcxx_install_prefix @@ -134,6 +138,7 @@ cd $build tests=1 samples=1 +noprefix=0 flags="" includepath="" librarypath="" @@ -154,6 +159,9 @@ while [ $# -ge 1 ]; do --prefix=*) prefix="`echo ${1} | awk '{print substr($0,10)}'`" ;; + --no-prefix) + noprefix=1 ;; + --stdcxx-base=*) stdcxx_base="`echo ${1} | awk '{print substr($0,15)}'`" ;; @@ -259,8 +267,10 @@ if [ ! -f "$base/build/config/$config" ] ; then fi if [ -z "$prefix" ] ; then + if [ $noprefix -eq 0 ] ; then prefix=/usr/local fi +fi # check for patches if [ -d $base/patches/$config ] ; then @@ -287,8 +297,10 @@ echo '# config.make generated by configure script' >$build/config.make echo "POCO_CONFIG = $config" >>$build/config.make echo "POCO_BASE = $base" >>$build/config.make echo "POCO_BUILD = $build" >>$build/config.make -echo "POCO_PREFIX = $prefix" >>$build/config.make echo "POCO_FLAGS = $flags" >>$build/config.make +if [ -n "$prefix" ] ; then +echo "POCO_PREFIX = $prefix" >>$build/config.make +fi echo "OMIT = $omit" >>$build/config.make if [ -n "$stdcxx_base" ] ; then echo "STDCXX_BASE = $stdcxx_base" >>$build/config.make @@ -316,10 +328,12 @@ cat <<__EOF__ >>$build/config.make export POCO_CONFIG export POCO_BASE export POCO_BUILD -export POCO_PREFIX export POCO_FLAGS __EOF__ +if [ -n "$prefix" ] ; then + echo "export POCO_PREFIX" >>$build/config.make +fi if [ -n "$stdcxx_base" ] ; then echo "export STDCXX_BASE" >>$build/config.make fi diff --git a/release/script/mkdoc b/release/script/mkdoc index 218861354..361920ba3 100755 --- a/release/script/mkdoc +++ b/release/script/mkdoc @@ -91,7 +91,7 @@ mkdir -p $tools mkrelease -o $tools $version CppParser PocoDoc cd $tools -./configure --no-tests --no-samples +./configure --no-tests --no-samples --no-prefix make -s -j8 if [ $osname = "Cygwin" ] ; then diff --git a/release/script/mkrelease b/release/script/mkrelease index b55b4d8d0..89c827040 100755 --- a/release/script/mkrelease +++ b/release/script/mkrelease @@ -209,17 +209,16 @@ ifndef POCO_BASE $(warning WARNING: POCO_BASE is not defined. Assuming current directory.) export POCO_BASE=$(shell pwd) endif -#$(info POCO_BASE = $(POCO_BASE)) - -ifndef POCO_PREFIX -export POCO_PREFIX=/usr/local +ifdef POCO_VERBOSE +$(info POCO_BASE = $(POCO_BASE)) endif -#$(info POCO_PREFIX=$(POCO_PREFIX)) ifndef POCO_BUILD export POCO_BUILD=$(POCO_BASE) endif -#$(info POCO_BUILD = $(POCO_BUILD)) +ifdef POCO_VERBOSE +$(info POCO_BUILD = $(POCO_BUILD)) +endif # # Determine OS @@ -232,10 +231,14 @@ endif ifeq ($(findstring MINGW,$(POCO_HOST_OSNAME)),MINGW) POCO_HOST_OSNAME = MinGW endif -#$(info POCO_HOST_OSNAME= $(POCO_HOST_OSNAME)) +ifdef POCO_VERBOSE +$(info POCO_HOST_OSNAME = $(POCO_HOST_OSNAME)) +endif POCO_HOST_OSARCH ?= $(subst /,-,$(shell uname -m | tr ' ' _)) -#$(info POCO_HOST_OSARCH= $(POCO_HOST_OSARCH)) +ifdef POCO_VERBOSE +$(info POCO_HOST_OSARCH = $(POCO_HOST_OSARCH)) +endif # # If POCO_CONFIG is not set, use the OS name as configuration name @@ -243,7 +246,9 @@ POCO_HOST_OSARCH ?= $(subst /,-,$(shell uname -m | tr ' ' _)) ifndef POCO_CONFIG POCO_CONFIG = $(POCO_HOST_OSNAME) endif -#$(info POCO_CONFIG = $(POCO_CONFIG)) +ifdef POCO_VERBOSE +$(info POCO_CONFIG = $(POCO_CONFIG)) +endif # # Include System Specific Settings @@ -258,14 +263,18 @@ OSNAME := $(POCO_HOST_OSNAME) else OSNAME := $(POCO_TARGET_OSNAME) endif -#$(info OSNAME = $(OSNAME)) +ifdef POCO_VERBOSE +$(info OSNAME = $(OSNAME)) +endif ifndef POCO_TARGET_OSARCH OSARCH := $(POCO_HOST_OSARCH) else OSARCH := $(POCO_TARGET_OSARCH) endif -#$(info OSARCH = $(OSARCH)) +ifdef POCO_VERBOSE +$(info OSARCH = $(OSARCH)) +endif .PHONY: poco all libexecs cppunit tests samples cleans clean distclean install @@ -284,7 +293,7 @@ cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit CppUnit-clean: - \$(MAKE) -C \$(POCO_BASE)/CppUnit clean + $(MAKE) -C \$(POCO_BASE)/CppUnit clean install: libexecs mkdir -p $(INSTALLDIR)/include/Poco From 6376963bdaf78e71e53733cdb6e620f9370385bb Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 6 Mar 2016 16:22:17 +0100 Subject: [PATCH 033/131] add SET_LD_LIBRARY_PATH make variable --- build/rules/global | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/rules/global b/build/rules/global index 6319e7307..1e51d3d77 100644 --- a/build/rules/global +++ b/build/rules/global @@ -238,6 +238,12 @@ ifndef LIBPREFIX LIBPREFIX = lib endif +ifeq ($(POCO_HOST_OSNAME),Darwin) +SET_LD_LIBRARY_PATH = DYLD_LIBRARY_PATH=$(LIBPATH) +else +SET_LD_LIBRARY_PATH = LD_LIBRARY_PATH=$(LIBPATH) +endif + # # Build component list # From 00f1979f4f9576e8995b0c49ceb90717e0c21f85 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 6 Mar 2016 16:26:21 +0100 Subject: [PATCH 034/131] add before calling PageCompiler --- PageCompiler/samples/HTTPTimeServer/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PageCompiler/samples/HTTPTimeServer/Makefile b/PageCompiler/samples/HTTPTimeServer/Makefile index b88c5d900..253fbd218 100644 --- a/PageCompiler/samples/HTTPTimeServer/Makefile +++ b/PageCompiler/samples/HTTPTimeServer/Makefile @@ -31,4 +31,4 @@ endif # Rule for runnning PageCompiler src/%.cpp: src/%.cpsp @echo "** Compiling Page" $< - $(PAGECOMPILER) $< + $(SET_LD_LIBRARY_PATH) $(PAGECOMPILER) $< From a6aea22ab88fe6695b63aa8c946f41f98ffa59ab Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 6 Mar 2016 20:30:39 +0100 Subject: [PATCH 035/131] fix SET_LD_LIBRARY_PATH to include POCO_BASE/LIBDIR if different from LIBPATH --- build/rules/global | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build/rules/global b/build/rules/global index 1e51d3d77..4cd27ef3b 100644 --- a/build/rules/global +++ b/build/rules/global @@ -238,10 +238,15 @@ ifndef LIBPREFIX LIBPREFIX = lib endif -ifeq ($(POCO_HOST_OSNAME),Darwin) -SET_LD_LIBRARY_PATH = DYLD_LIBRARY_PATH=$(LIBPATH) +ifeq ($(LIBPATH),$(POCO_BASE)/$(LIBDIR)) +LD_LIBRARY_PATH = $(LIBPATH) else -SET_LD_LIBRARY_PATH = LD_LIBRARY_PATH=$(LIBPATH) +LD_LIBRARY_PATH = $(LIBPATH):$(POCO_BASE)/$(LIBDIR) +endif +ifeq ($(POCO_HOST_OSNAME),Darwin) +SET_LD_LIBRARY_PATH = DYLD_LIBRARY_PATH=$(LD_LIBRARY_PATH) +else +SET_LD_LIBRARY_PATH = LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) endif # From 92225086a443163785d8b2fa0fbf8f2a6f32d122 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Sun, 6 Mar 2016 20:54:26 -0800 Subject: [PATCH 036/131] generated CppUnit and testsuites VS projects --- CppUnit/CppUnit_CE_vs90.sln | 24 +- CppUnit/CppUnit_CE_vs90.vcproj | 553 ++--- CppUnit/CppUnit_WEC2013_vs110.sln | 25 +- CppUnit/CppUnit_WEC2013_vs110.vcxproj | 385 +--- CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters | 36 +- CppUnit/CppUnit_WEC2013_vs120.sln | 25 +- CppUnit/CppUnit_WEC2013_vs120.vcxproj | 386 +--- CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters | 37 +- CppUnit/CppUnit_vs100.sln | 42 +- CppUnit/CppUnit_vs100.vcxproj | 428 ++-- CppUnit/CppUnit_vs100.vcxproj.filters | 36 +- CppUnit/CppUnit_vs110.sln | 42 +- CppUnit/CppUnit_vs110.vcxproj | 439 ++-- CppUnit/CppUnit_vs110.vcxproj.filters | 36 +- CppUnit/CppUnit_vs120.sln | 25 +- CppUnit/CppUnit_vs120.vcxproj | 438 ++-- CppUnit/CppUnit_vs120.vcxproj.filters | 7 +- CppUnit/CppUnit_vs140.sln | 25 +- CppUnit/CppUnit_vs140.vcxproj | 428 ++-- CppUnit/CppUnit_vs140.vcxproj.filters | 37 +- CppUnit/CppUnit_vs90.sln | 41 +- CppUnit/CppUnit_vs90.vcproj | 725 +++---- CppUnit/CppUnit_x64_vs100.sln | 42 +- CppUnit/CppUnit_x64_vs100.vcxproj | 426 ++-- CppUnit/CppUnit_x64_vs100.vcxproj.filters | 36 +- CppUnit/CppUnit_x64_vs110.sln | 42 +- CppUnit/CppUnit_x64_vs110.vcxproj | 438 ++-- CppUnit/CppUnit_x64_vs110.vcxproj.filters | 36 +- CppUnit/CppUnit_x64_vs120.sln | 25 +- CppUnit/CppUnit_x64_vs120.vcxproj | 437 ++-- CppUnit/CppUnit_x64_vs120.vcxproj.filters | 37 +- CppUnit/CppUnit_x64_vs140.sln | 27 +- CppUnit/CppUnit_x64_vs140.vcxproj | 429 ++-- CppUnit/CppUnit_x64_vs140.vcxproj.filters | 37 +- CppUnit/CppUnit_x64_vs90.sln | 42 +- CppUnit/CppUnit_x64_vs90.vcproj | 730 +++---- CppUnit/include/Poco/CppUnit/CppUnit.h | 2 +- Crypto/testsuite/TestSuite_CE_VS90.vcproj | 12 +- Crypto/testsuite/TestSuite_VS90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 16 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_vs100.vcxproj | 12 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_vs110.vcxproj | 12 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_vs140.vcxproj | 12 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_x64_vs110.vcxproj | 12 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_x64_vs90.vcproj | 12 +- Foundation/testsuite/TestSuite_CE_vs90.vcproj | 1852 +++++----------- .../TestSuite_WEC2013_vs110.vcxproj.filters | 118 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 118 +- Foundation/testsuite/TestSuite_vs100.vcxproj | 14 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 118 +- Foundation/testsuite/TestSuite_vs110.vcxproj | 12 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 118 +- Foundation/testsuite/TestSuite_vs120.vcxproj | 604 +++--- .../testsuite/TestSuite_vs120.vcxproj.filters | 118 +- Foundation/testsuite/TestSuite_vs140.vcxproj | 620 +++--- .../testsuite/TestSuite_vs140.vcxproj.filters | 118 +- Foundation/testsuite/TestSuite_vs90.vcproj | 1892 ++++++---------- .../testsuite/TestSuite_x64_vs100.vcxproj | 14 +- .../TestSuite_x64_vs100.vcxproj.filters | 118 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 12 +- .../TestSuite_x64_vs110.vcxproj.filters | 118 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 606 +++--- .../TestSuite_x64_vs120.vcxproj.filters | 118 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 620 +++--- .../TestSuite_x64_vs140.vcxproj.filters | 118 +- .../testsuite/TestSuite_x64_vs90.vcproj | 1894 ++++++----------- JSON/testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 293 +-- .../TestSuite_WEC2013_vs110.vcxproj.filters | 4 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 293 +-- .../TestSuite_WEC2013_vs120.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs100.vcxproj | 12 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs110.vcxproj | 14 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs120.vcxproj | 4 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs140.vcxproj | 12 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs90.vcproj | 12 +- JSON/testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs110.vcxproj | 14 +- .../TestSuite_x64_vs110.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs120.vcxproj | 4 +- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs90.vcproj | 12 +- MongoDB/testsuite/TestSuite_vs100.vcxproj | 12 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_vs110.vcxproj | 12 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_vs140.vcxproj | 12 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_vs90.vcproj | 12 +- MongoDB/testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_x64_vs110.vcxproj | 12 +- .../TestSuite_x64_vs110.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_x64_vs120.vcxproj | 2 +- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_x64_vs90.vcproj | 12 +- Net/testsuite/TestSuite_CE_vs90.vcproj | 12 +- Net/testsuite/TestSuite_WEC2013_vs110.vcxproj | 329 +-- .../TestSuite_WEC2013_vs110.vcxproj.filters | 106 +- Net/testsuite/TestSuite_WEC2013_vs120.vcxproj | 493 +---- .../TestSuite_WEC2013_vs120.vcxproj.filters | 106 +- Net/testsuite/TestSuite_vs100.vcxproj | 12 +- Net/testsuite/TestSuite_vs100.vcxproj.filters | 106 +- Net/testsuite/TestSuite_vs110.vcxproj | 14 +- Net/testsuite/TestSuite_vs110.vcxproj.filters | 106 +- Net/testsuite/TestSuite_vs120.vcxproj | 172 +- Net/testsuite/TestSuite_vs120.vcxproj.filters | 106 +- Net/testsuite/TestSuite_vs140.vcxproj | 12 +- Net/testsuite/TestSuite_vs140.vcxproj.filters | 106 +- Net/testsuite/TestSuite_vs90.vcproj | 12 +- Net/testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 106 +- Net/testsuite/TestSuite_x64_vs110.vcxproj | 14 +- .../TestSuite_x64_vs110.vcxproj.filters | 106 +- Net/testsuite/TestSuite_x64_vs120.vcxproj | 172 +- .../TestSuite_x64_vs120.vcxproj.filters | 106 +- Net/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 106 +- Net/testsuite/TestSuite_x64_vs90.vcproj | 12 +- .../testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 40 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs100.vcxproj | 12 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs110.vcxproj | 12 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs140.vcxproj | 12 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs90.vcproj | 12 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 40 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 12 +- .../TestSuite_x64_vs110.vcxproj.filters | 40 +- .../TestSuite_x64_vs120.vcxproj.filters | 40 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 40 +- .../testsuite/TestSuite_x64_vs90.vcproj | 12 +- NetSSL_Win/testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 313 +-- .../TestSuite_WEC2013_vs110.vcxproj.filters | 55 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 325 +-- .../TestSuite_WEC2013_vs120.vcxproj.filters | 55 +- NetSSL_Win/testsuite/TestSuite_vs100.vcxproj | 20 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 55 +- NetSSL_Win/testsuite/TestSuite_vs110.vcxproj | 22 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 55 +- NetSSL_Win/testsuite/TestSuite_vs120.vcxproj | 94 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 52 +- NetSSL_Win/testsuite/TestSuite_vs140.vcxproj | 20 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 55 +- NetSSL_Win/testsuite/TestSuite_vs90.vcproj | 12 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 20 +- .../TestSuite_x64_vs100.vcxproj.filters | 55 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 22 +- .../TestSuite_x64_vs110.vcxproj.filters | 55 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 94 +- .../TestSuite_x64_vs120.vcxproj.filters | 50 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 20 +- .../TestSuite_x64_vs140.vcxproj.filters | 55 +- .../testsuite/TestSuite_x64_vs90.vcproj | 12 +- PDF/testsuite/TestSuite_vs100.vcxproj | 12 +- PDF/testsuite/TestSuite_vs100.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs110.vcxproj | 14 +- PDF/testsuite/TestSuite_vs110.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs120.vcxproj | 4 +- PDF/testsuite/TestSuite_vs120.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs140.vcxproj | 12 +- PDF/testsuite/TestSuite_vs140.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs90.vcproj | 12 +- PDF/testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs110.vcxproj | 14 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs120.vcxproj | 4 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs90.vcproj | 12 +- Redis/Redis.progen | 2 +- Redis/Redis_x64_vs90.sln | 40 +- Redis/Redis_x64_vs90.vcproj | 408 ++-- Redis/testsuite/TestSuite.progen | 2 +- Redis/testsuite/TestSuite_x64_vs90.vcproj | 12 +- Util/testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 329 +-- .../TestSuite_WEC2013_vs110.vcxproj.filters | 40 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 353 +-- .../TestSuite_WEC2013_vs120.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs100.vcxproj | 12 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs110.vcxproj | 14 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs120.vcxproj | 32 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs140.vcxproj | 12 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs90.vcproj | 12 +- Util/testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs110.vcxproj | 14 +- .../TestSuite_x64_vs110.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs120.vcxproj | 32 +- .../TestSuite_x64_vs120.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs90.vcproj | 12 +- XML/testsuite/TestSuite_CE_vs90.vcproj | 12 +- XML/testsuite/TestSuite_WEC2013_vs110.vcxproj | 329 +-- .../TestSuite_WEC2013_vs110.vcxproj.filters | 28 +- XML/testsuite/TestSuite_WEC2013_vs120.vcxproj | 345 +-- .../TestSuite_WEC2013_vs120.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs100.vcxproj | 12 +- XML/testsuite/TestSuite_vs100.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs110.vcxproj | 14 +- XML/testsuite/TestSuite_vs110.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs120.vcxproj | 32 +- XML/testsuite/TestSuite_vs120.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs140.vcxproj | 12 +- XML/testsuite/TestSuite_vs140.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs90.vcproj | 12 +- XML/testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs110.vcxproj | 14 +- .../TestSuite_x64_vs110.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs120.vcxproj | 32 +- .../TestSuite_x64_vs120.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs90.vcproj | 12 +- Zip/testsuite/TestSuite_CE_vs90.vcproj | 12 +- Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj | 295 +-- .../TestSuite_WEC2013_vs110.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj | 297 +-- .../TestSuite_WEC2013_vs120.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs100.vcxproj | 12 +- Zip/testsuite/TestSuite_vs100.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs110.vcxproj | 14 +- Zip/testsuite/TestSuite_vs110.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs120.vcxproj | 4 +- Zip/testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs140.vcxproj | 12 +- Zip/testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs90.vcproj | 12 +- Zip/testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs110.vcxproj | 14 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs120.vcxproj | 4 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs90.vcproj | 12 +- 274 files changed, 9073 insertions(+), 16731 deletions(-) diff --git a/CppUnit/CppUnit_CE_vs90.sln b/CppUnit/CppUnit_CE_vs90.sln index 095aaba46..5b98dfe80 100644 --- a/CppUnit/CppUnit_CE_vs90.sln +++ b/CppUnit/CppUnit_CE_vs90.sln @@ -5,31 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) - debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) - debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) - release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) + debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) + debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) + release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_CE_vs90.vcproj b/CppUnit/CppUnit_CE_vs90.vcproj index 02c7dd3a6..075669201 100644 --- a/CppUnit/CppUnit_CE_vs90.vcproj +++ b/CppUnit/CppUnit_CE_vs90.vcproj @@ -1,51 +1,40 @@ + Keyword="Win32Proj"> + Name="Digi JumpStart (ARMV4I)"/> - - + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"/> + Name="VCPreLinkEventTool"/> + ImportLibrary="..\lib\$(PlatformName)\PocoCppUnitd.lib" + TargetMachine="0"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"/> + Name="VCPreLinkEventTool"/> + ImportLibrary="..\lib\$(PlatformName)\PocoCppUnit.lib" + TargetMachine="0"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoCppUnitmtd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoCppUnitmt.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoCppUnitmdd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoCppUnitmd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + - - + + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - - - - - - - - - - - - - - - - - - - + RelativePath=".\src\CppUnitException.cpp"/> - + RelativePath="src\TestCase.cpp"/> - + RelativePath="src\TestDecorator.cpp"/> - + RelativePath="src\TestFailure.cpp"/> - + RelativePath="src\TestResult.cpp"/> - + RelativePath=".\src\TestRunner.cpp"/> - + RelativePath="src\TestSuite.cpp"/> - + RelativePath="src\TextTestResult.cpp"/> + Filter="*.h"> - + RelativePath=".\include\Poco\CppUnit\$(TargetName).h"/> - + RelativePath=".\include\Poco\CppUnit\CppUnitException.h"/> - + RelativePath=".\include\Poco\CppUnit\estring.h"/> - + RelativePath=".\include\Poco\CppUnit\Guards.h"/> - + RelativePath=".\include\Poco\CppUnit\Orthodox.h"/> - + RelativePath=".\include\Poco\CppUnit\RepeatedTest.h"/> - + RelativePath=".\include\Poco\CppUnit\Test.h"/> - + RelativePath=".\include\Poco\CppUnit\TestCaller.h"/> - + RelativePath=".\include\Poco\CppUnit\TestCase.h"/> - + RelativePath=".\include\Poco\CppUnit\TestDecorator.h"/> - + RelativePath=".\include\Poco\CppUnit\TestFailure.h"/> - + RelativePath=".\include\Poco\CppUnit\TestResult.h"/> - + RelativePath=".\include\Poco\CppUnit\TestRunner.h"/> - + RelativePath=".\include\Poco\CppUnit\TestSetup.h"/> - + RelativePath=".\include\Poco\CppUnit\TestSuite.h"/> - + RelativePath=".\include\Poco\CppUnit\TextTestResult.h"/> - - + diff --git a/CppUnit/CppUnit_WEC2013_vs110.sln b/CppUnit/CppUnit_WEC2013_vs110.sln index 9baef8709..a6ea6828f 100644 --- a/CppUnit/CppUnit_WEC2013_vs110.sln +++ b/CppUnit/CppUnit_WEC2013_vs110.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_WEC2013_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" @@ -6,25 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|SDK_AM335X_SK_WEC2013_V300 = debug_shared|SDK_AM335X_SK_WEC2013_V300 - debug_static_md|SDK_AM335X_SK_WEC2013_V300 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 - debug_static_mt|SDK_AM335X_SK_WEC2013_V300 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 release_shared|SDK_AM335X_SK_WEC2013_V300 = release_shared|SDK_AM335X_SK_WEC2013_V300 - release_static_md|SDK_AM335X_SK_WEC2013_V300 = release_static_md|SDK_AM335X_SK_WEC2013_V300 + debug_static_mt|SDK_AM335X_SK_WEC2013_V300 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 release_static_mt|SDK_AM335X_SK_WEC2013_V300 = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + debug_static_md|SDK_AM335X_SK_WEC2013_V300 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + release_static_md|SDK_AM335X_SK_WEC2013_V300 = release_static_md|SDK_AM335X_SK_WEC2013_V300 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V300 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V300 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V300 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V300 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V300 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V300 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_WEC2013_vs110.vcxproj b/CppUnit/CppUnit_WEC2013_vs110.vcxproj index d6fcb7322..c96623fe8 100644 --- a/CppUnit/CppUnit_WEC2013_vs110.vcxproj +++ b/CppUnit/CppUnit_WEC2013_vs110.vcxproj @@ -1,361 +1,56 @@ - + - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - + + + + + + + + CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - CppUnit en-US 11.0 true SDK_AM335X_SK_WEC2013_V300 CE800 - - - StaticLibrary - false - MultiByte - CE800 - - - StaticLibrary - false - MultiByte - CE800 - - - StaticLibrary - false - MultiByte - CE800 - - - StaticLibrary - false - MultiByte - CE800 - - - DynamicLibrary - false - MultiByte - CE800 - - - DynamicLibrary - false - MultiByte - CE800 - - - - - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - ..\bin\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - true - ..\bin\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - false - ..\lib\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + <_ProjectFileVersion>11.0.50727.1 + PocoCppUnitd + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit + PocoCppUnitmd + PocoCppUnitmt - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc80.pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - NotSet - ..\bin\$(Platform)\$(TargetName).dll - true - %(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\$(TargetName).pdb - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - NDEBUG;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\bin\$(Platform)\$(TargetName).dll - true - %(AdditionalLibraryDirectories) - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib\$(Platform)\$(TargetName).pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\lib\$(Platform)\$(TargetName).pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\$(TargetName).lib - - + - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters b/CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters index 6ad984e0c..351f50cbd 100644 --- a/CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters @@ -2,11 +2,11 @@ - {ce2987f4-05b4-4816-8402-83d6e2f8f80c} + {918c939f-7434-47b7-b9ff-bb5ebbda3916} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {7c3a94cf-cfae-4dbe-8baf-b8a5a61faf48} + {b67e6c97-71f9-428b-9c47-eb5ac77fc516} *.h @@ -37,52 +37,52 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files diff --git a/CppUnit/CppUnit_WEC2013_vs120.sln b/CppUnit/CppUnit_WEC2013_vs120.sln index a481cb08b..8612f9c6b 100644 --- a/CppUnit/CppUnit_WEC2013_vs120.sln +++ b/CppUnit/CppUnit_WEC2013_vs120.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_WEC2013_vs120.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" @@ -6,25 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|SDK_AM335X_SK_WEC2013_V310 = debug_shared|SDK_AM335X_SK_WEC2013_V310 - debug_static_md|SDK_AM335X_SK_WEC2013_V310 = debug_static_md|SDK_AM335X_SK_WEC2013_V310 - debug_static_mt|SDK_AM335X_SK_WEC2013_V310 = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 release_shared|SDK_AM335X_SK_WEC2013_V310 = release_shared|SDK_AM335X_SK_WEC2013_V310 - release_static_md|SDK_AM335X_SK_WEC2013_V310 = release_static_md|SDK_AM335X_SK_WEC2013_V310 + debug_static_mt|SDK_AM335X_SK_WEC2013_V310 = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 release_static_mt|SDK_AM335X_SK_WEC2013_V310 = release_static_mt|SDK_AM335X_SK_WEC2013_V310 + debug_static_md|SDK_AM335X_SK_WEC2013_V310 = debug_static_md|SDK_AM335X_SK_WEC2013_V310 + release_static_md|SDK_AM335X_SK_WEC2013_V310 = release_static_md|SDK_AM335X_SK_WEC2013_V310 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V310 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013_V310.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V310 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V310 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V310.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V310 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V310.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013_V310 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V310 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013_V310.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V310 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V310 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V310.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V310.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V310 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013_V310.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V310.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V310.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V310 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V310 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_WEC2013_vs120.vcxproj b/CppUnit/CppUnit_WEC2013_vs120.vcxproj index cfacfc879..9f9e6f1af 100644 --- a/CppUnit/CppUnit_WEC2013_vs120.vcxproj +++ b/CppUnit/CppUnit_WEC2013_vs120.vcxproj @@ -1,361 +1,55 @@ - - + + - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + + + + + CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - CppUnit en-US 11.0 true SDK_AM335X_SK_WEC2013_V310 CE800 - - - StaticLibrary - false - MultiByte - CE800 - - - StaticLibrary - false - MultiByte - CE800 - - - StaticLibrary - false - MultiByte - CE800 - - - StaticLibrary - false - MultiByte - CE800 - - - DynamicLibrary - false - MultiByte - CE800 - - - DynamicLibrary - false - MultiByte - CE800 - - - - - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - ..\bin\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - true - ..\bin\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - false - ..\lib\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - $(ProjectName)d - $(ProjectName) - $(ProjectName)mdd - $(ProjectName)mtd - $(ProjectName)md - $(ProjectName)mt + <_ProjectFileVersion>12.0.21005.1 + PocoCppUnitd + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit + PocoCppUnitmd + PocoCppUnitmt - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc80.pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - NotSet - ..\bin\$(Platform)\$(TargetName).dll - true - %(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\$(TargetName).pdb - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - NDEBUG;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\bin\$(Platform)\$(TargetName).dll - true - %(AdditionalLibraryDirectories) - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib\$(Platform)\$(TargetName).pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\lib\$(Platform)\$(TargetName).pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\$(TargetName).lib - - + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters b/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters index 6ad984e0c..c56d7a5ab 100644 --- a/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters @@ -2,11 +2,11 @@ - {ce2987f4-05b4-4816-8402-83d6e2f8f80c} + {dd19a7a5-de42-4164-a376-1c655ab26eb7} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {7c3a94cf-cfae-4dbe-8baf-b8a5a61faf48} + {6c98bdc8-f164-4050-87d9-549397c43814} *.h @@ -37,52 +37,49 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - - Include Files - - + Include Files diff --git a/CppUnit/CppUnit_vs100.sln b/CppUnit/CppUnit_vs100.sln index 1cf9421cb..313cea3d7 100644 --- a/CppUnit/CppUnit_vs100.sln +++ b/CppUnit/CppUnit_vs100.sln @@ -1,47 +1,35 @@ - Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs100.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs100.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs100.vcxproj b/CppUnit/CppUnit_vs100.vcxproj index ad2e9031a..3b529f719 100644 --- a/CppUnit/CppUnit_vs100.vcxproj +++ b/CppUnit/CppUnit_vs100.vcxproj @@ -1,4 +1,4 @@ - + @@ -29,381 +29,279 @@ CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte + CppUnit + Win32Proj + StaticLibrary - false MultiByte StaticLibrary - false + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary MultiByte DynamicLibrary - false MultiByte DynamicLibrary - false MultiByte - - - - - - - - - + + - + - + + + + + + + - + - + - + - <_ProjectFileVersion>10.0.30319.1 + <_ProjectFileVersion>10.0.40219.1 ..\bin\ - obj\$(Configuration)\ + obj\CppUnit\$(Configuration)\ true ..\bin\ - obj\$(Configuration)\ + obj\CppUnit\$(Configuration)\ false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ ..\lib\ - obj\$(Configuration)\ + obj\CppUnit\$(Configuration)\ ..\lib\ - obj\$(Configuration)\ - $(ProjectName)d - $(ProjectName) - $(ProjectName)mdd - $(ProjectName)mtd - $(ProjectName)md - $(ProjectName)mt + obj\CppUnit\$(Configuration)\ + ..\lib\ + obj\CppUnit\$(Configuration)\ + ..\lib\ + obj\CppUnit\$(Configuration)\ + PocoCppUnitd + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit + PocoCppUnitmd + PocoCppUnitmt - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebugDLL true true true true - - - - - $(IntDir) - $(IntDir)vc80.pdb + Level3 - true ProgramDatabase Default - false + %(DisableSpecificWarnings) + %(AdditionalOptions) - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - NotSet - ..\bin\$(TargetName).dll + %(AdditionalDependencies) + ..\bin\PocoCppUnitd.dll true - %(AdditionalLibraryDirectories) true - ..\bin\$(TargetName).pdb - ..\lib\$(TargetName).lib + ..\bin\PocoCppUnitd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppUnitd.lib MachineX86 + %(AdditionalOptions) - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\bin\$(TargetName).dll + %(AdditionalDependencies) + ..\bin\PocoCppUnit.dll true - %(AdditionalLibraryDirectories) - - - ..\lib\$(TargetName).lib + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppUnit.lib MachineX86 + %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib\$(TargetName).pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(TargetName).lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(TargetName).lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebug true true true true - - - - - $(IntDir) - ..\lib\$(TargetName).pdb + + ..\lib\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false + %(DisableSpecificWarnings) + %(AdditionalOptions) - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\$(TargetName).lib + ..\lib\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\$(TargetName).lib + ..\lib\PocoCppUnitmt.lib + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoCppUnitmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib\PocoCppUnitmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoCppUnitmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + %(AdditionalDependencies) + ..\lib\PocoCppUnitmd.lib - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_vs100.vcxproj.filters b/CppUnit/CppUnit_vs100.vcxproj.filters index 6ad984e0c..62aca6041 100644 --- a/CppUnit/CppUnit_vs100.vcxproj.filters +++ b/CppUnit/CppUnit_vs100.vcxproj.filters @@ -2,11 +2,11 @@ - {ce2987f4-05b4-4816-8402-83d6e2f8f80c} + {d70f4b5e-bac0-4504-8df9-98e52941ea85} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {7c3a94cf-cfae-4dbe-8baf-b8a5a61faf48} + {93211224-c798-4272-8604-ae0bb4291f77} *.h @@ -37,52 +37,52 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files diff --git a/CppUnit/CppUnit_vs110.sln b/CppUnit/CppUnit_vs110.sln index 5ae1ef9d7..2965505a2 100644 --- a/CppUnit/CppUnit_vs110.sln +++ b/CppUnit/CppUnit_vs110.sln @@ -1,47 +1,35 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs110.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs110.vcxproj b/CppUnit/CppUnit_vs110.vcxproj index d181547a4..c635e23b9 100644 --- a/CppUnit/CppUnit_vs110.vcxproj +++ b/CppUnit/CppUnit_vs110.vcxproj @@ -1,4 +1,4 @@ - + @@ -29,387 +29,280 @@ CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - v110 + CppUnit + Win32Proj + StaticLibrary - false MultiByte v110 StaticLibrary - false + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary MultiByte v110 DynamicLibrary - false MultiByte v110 DynamicLibrary - false MultiByte v110 - - - - - - - - - + + - + - + + + + + + + - + - + - + - <_ProjectFileVersion>10.0.30319.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - $(ProjectName)d - $(ProjectName) - $(ProjectName)mdd - $(ProjectName)mtd - $(ProjectName)md - $(ProjectName)mt + <_ProjectFileVersion>11.0.50727.1 + PocoCppUnitd + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit + PocoCppUnitmd + PocoCppUnitmt + + + ..\bin\ + obj\CppUnit\$(Configuration)\ + true + + + ..\bin\ + obj\CppUnit\$(Configuration)\ + false + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + + + ..\lib\ + obj\CppUnit\$(Configuration)\ - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebugDLL true true true true - - - - - $(IntDir) - $(IntDir)vc80.pdb + Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - NotSet - ..\bin\$(TargetName).dll + ..\bin\PocoCppUnitd.dll true - %(AdditionalLibraryDirectories) true - ..\bin\$(TargetName).pdb - ..\lib\$(TargetName).lib + ..\bin\PocoCppUnitd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppUnitd.lib MachineX86 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\bin\$(TargetName).dll + ..\bin\PocoCppUnit.dll true - %(AdditionalLibraryDirectories) - - - ..\lib\$(TargetName).lib + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppUnit.lib MachineX86 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib\$(TargetName).pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(TargetName).lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(TargetName).lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebug true true true true - - - - - $(IntDir) - ..\lib\$(TargetName).pdb + + ..\lib\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\$(TargetName).lib + ..\lib\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\$(TargetName).lib + ..\lib\PocoCppUnitmt.lib + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoCppUnitmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoCppUnitmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoCppUnitmd.pdb + Level3 + + Default + + + ..\lib\PocoCppUnitmd.lib - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_vs110.vcxproj.filters b/CppUnit/CppUnit_vs110.vcxproj.filters index 6ad984e0c..60229bbaa 100644 --- a/CppUnit/CppUnit_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_vs110.vcxproj.filters @@ -2,11 +2,11 @@ - {ce2987f4-05b4-4816-8402-83d6e2f8f80c} + {5ccab71a-e78f-49bb-a4e3-56d16af53b0d} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {7c3a94cf-cfae-4dbe-8baf-b8a5a61faf48} + {c31b21fd-711e-4540-9566-cc1f1f133da5} *.h @@ -37,52 +37,52 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files diff --git a/CppUnit/CppUnit_vs120.sln b/CppUnit/CppUnit_vs120.sln index b7fe7167d..47ec8aa03 100644 --- a/CppUnit/CppUnit_vs120.sln +++ b/CppUnit/CppUnit_vs120.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs120.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" @@ -6,25 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs120.vcxproj b/CppUnit/CppUnit_vs120.vcxproj index 8755a64a5..967c2d2bb 100644 --- a/CppUnit/CppUnit_vs120.vcxproj +++ b/CppUnit/CppUnit_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -29,387 +29,279 @@ CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 + CppUnit + Win32Proj + StaticLibrary - false MultiByte v120 StaticLibrary - false + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary MultiByte v120 DynamicLibrary - false MultiByte v120 DynamicLibrary - false MultiByte v120 - - - - - - - - - + + - + - + + + + + + + - + - + - + - <_ProjectFileVersion>10.0.30319.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - Poco$(ProjectName)d - Poco$(ProjectName) - Poco$(ProjectName)mdd - Poco$(ProjectName)mtd - Poco$(ProjectName)md - Poco$(ProjectName)mt + <_ProjectFileVersion>12.0.21005.1 + PocoCppUnitd + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit + PocoCppUnitmd + PocoCppUnitmt + + + ..\bin\ + obj\CppUnit\$(Configuration)\ + true + + + ..\bin\ + obj\CppUnit\$(Configuration)\ + false + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + + + ..\lib\ + obj\CppUnit\$(Configuration)\ - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebugDLL true true true true - - - - - $(IntDir) - $(IntDir)vc80.pdb + Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - NotSet - ..\bin\$(TargetName).dll + ..\bin\PocoCppUnitd.dll true - %(AdditionalLibraryDirectories) true - ..\bin\$(TargetName).pdb - ..\lib\$(TargetName).lib + ..\bin\PocoCppUnitd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppUnitd.lib MachineX86 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\bin\$(TargetName).dll + ..\bin\PocoCppUnit.dll true - %(AdditionalLibraryDirectories) - - - ..\lib\$(TargetName).lib + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppUnit.lib MachineX86 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib\$(TargetName).pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(TargetName).lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(TargetName).lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebug true true true true - - - - - $(IntDir) - ..\lib\$(TargetName).pdb + + ..\lib\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\$(TargetName).lib + ..\lib\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\$(TargetName).lib + ..\lib\PocoCppUnitmt.lib + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoCppUnitmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoCppUnitmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoCppUnitmd.pdb + Level3 + + Default + + + ..\lib\PocoCppUnitmd.lib - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_vs120.vcxproj.filters b/CppUnit/CppUnit_vs120.vcxproj.filters index c3f929a6a..183a8c159 100644 --- a/CppUnit/CppUnit_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_vs120.vcxproj.filters @@ -2,11 +2,11 @@ - {ce2987f4-05b4-4816-8402-83d6e2f8f80c} + {2b7322ca-e0bf-44b8-83f1-c112d841e371} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {7c3a94cf-cfae-4dbe-8baf-b8a5a61faf48} + {c935d957-0732-4e4e-a0b4-1616dae3ca45} *.h @@ -37,9 +37,6 @@ - - Include Files - Include Files diff --git a/CppUnit/CppUnit_vs140.sln b/CppUnit/CppUnit_vs140.sln index 487cf4346..2b747a676 100644 --- a/CppUnit/CppUnit_vs140.sln +++ b/CppUnit/CppUnit_vs140.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 14.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs140.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" @@ -6,25 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs140.vcxproj b/CppUnit/CppUnit_vs140.vcxproj index e1b94d3a4..a5b00756e 100644 --- a/CppUnit/CppUnit_vs140.vcxproj +++ b/CppUnit/CppUnit_vs140.vcxproj @@ -1,4 +1,4 @@ - + @@ -29,387 +29,279 @@ CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - v140 - - - StaticLibrary - false - MultiByte - v140 + CppUnit + Win32Proj + StaticLibrary - false MultiByte v140 StaticLibrary - false + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary MultiByte v140 DynamicLibrary - false MultiByte v140 DynamicLibrary - false MultiByte v140 - - - - - - - - - + + - + - + + + + + + + - + - + - + - <_ProjectFileVersion>10.0.30319.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ + <_ProjectFileVersion>14.0.23107.0 PocoCppUnitd - PocoCppUnit PocoCppUnitmdd PocoCppUnitmtd + PocoCppUnit PocoCppUnitmd PocoCppUnitmt + + ..\bin\ + obj\CppUnit\$(Configuration)\ + true + + + ..\bin\ + obj\CppUnit\$(Configuration)\ + false + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + + + ..\lib\ + obj\CppUnit\$(Configuration)\ + - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebugDLL true true true true - - - - - $(IntDir) - $(IntDir)vc80.pdb + Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - NotSet - ..\bin\$(TargetName).dll + ..\bin\PocoCppUnitd.dll true - %(AdditionalLibraryDirectories) true - ..\bin\$(TargetName).pdb - ..\lib\$(TargetName).lib + ..\bin\PocoCppUnitd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppUnitd.lib MachineX86 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\bin\$(TargetName).dll + ..\bin\PocoCppUnit.dll true - %(AdditionalLibraryDirectories) - - - ..\lib\$(TargetName).lib + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppUnit.lib MachineX86 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib\$(TargetName).pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(TargetName).lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(TargetName).lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebug true true true true - - - - - $(IntDir) - ..\lib\$(TargetName).pdb + + ..\lib\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\$(TargetName).lib + ..\lib\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\$(TargetName).lib + ..\lib\PocoCppUnitmt.lib + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoCppUnitmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoCppUnitmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoCppUnitmd.pdb + Level3 + + Default + + + ..\lib\PocoCppUnitmd.lib - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_vs140.vcxproj.filters b/CppUnit/CppUnit_vs140.vcxproj.filters index 6ad984e0c..21d0807bd 100644 --- a/CppUnit/CppUnit_vs140.vcxproj.filters +++ b/CppUnit/CppUnit_vs140.vcxproj.filters @@ -2,11 +2,11 @@ - {ce2987f4-05b4-4816-8402-83d6e2f8f80c} + {a8d27618-a198-4717-8c54-06f871c9bcae} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {7c3a94cf-cfae-4dbe-8baf-b8a5a61faf48} + {e1764315-6342-498e-b2ad-51da33cc65ed} *.h @@ -37,52 +37,49 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - - Include Files - - + Include Files diff --git a/CppUnit/CppUnit_vs90.sln b/CppUnit/CppUnit_vs90.sln index 4935dad02..b1717ae06 100644 --- a/CppUnit/CppUnit_vs90.sln +++ b/CppUnit/CppUnit_vs90.sln @@ -2,45 +2,34 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs90.vcproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs90.vcproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs90.vcproj b/CppUnit/CppUnit_vs90.vcproj index 3f871434b..cea9f0f52 100644 --- a/CppUnit/CppUnit_vs90.vcproj +++ b/CppUnit/CppUnit_vs90.vcproj @@ -1,150 +1,103 @@ + RootNamespace="CppUnit" + Keyword="Win32Proj"> + Name="Win32"/> - - + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoCppUnitmtd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoCppUnitmt.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - + RelativePath=".\src\CppUnitException.cpp"/> - + RelativePath="src\TestCase.cpp"/> - + RelativePath="src\TestDecorator.cpp"/> - + RelativePath="src\TestFailure.cpp"/> - + RelativePath="src\TestResult.cpp"/> - + RelativePath=".\src\TestRunner.cpp"/> - + RelativePath="src\TestSuite.cpp"/> - + RelativePath="src\TextTestResult.cpp"/> + Filter="*.h"> - + RelativePath=".\include\Poco\CppUnit\$(TargetName).h"/> - + RelativePath=".\include\Poco\CppUnit\CppUnitException.h"/> - + RelativePath=".\include\Poco\CppUnit\estring.h"/> - + RelativePath=".\include\Poco\CppUnit\Guards.h"/> - + RelativePath=".\include\Poco\CppUnit\Orthodox.h"/> - + RelativePath=".\include\Poco\CppUnit\RepeatedTest.h"/> - + RelativePath=".\include\Poco\CppUnit\Test.h"/> - + RelativePath=".\include\Poco\CppUnit\TestCaller.h"/> - + RelativePath=".\include\Poco\CppUnit\TestCase.h"/> - + RelativePath=".\include\Poco\CppUnit\TestDecorator.h"/> - + RelativePath=".\include\Poco\CppUnit\TestFailure.h"/> - + RelativePath=".\include\Poco\CppUnit\TestResult.h"/> - + RelativePath=".\include\Poco\CppUnit\TestRunner.h"/> - + RelativePath=".\include\Poco\CppUnit\TestSetup.h"/> - + RelativePath=".\include\Poco\CppUnit\TestSuite.h"/> - + RelativePath=".\include\Poco\CppUnit\TextTestResult.h"/> - - + diff --git a/CppUnit/CppUnit_x64_vs100.sln b/CppUnit/CppUnit_x64_vs100.sln index 892d1c6f9..594afaf68 100644 --- a/CppUnit/CppUnit_x64_vs100.sln +++ b/CppUnit/CppUnit_x64_vs100.sln @@ -1,47 +1,35 @@ - Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs100.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_x64_vs100.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Deploy.0 = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Deploy.0 = release_shared|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.Build.0 = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.ActiveCfg = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.Build.0 = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.Build.0 = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_x64_vs100.vcxproj b/CppUnit/CppUnit_x64_vs100.vcxproj index 2579f04cd..f3f367055 100644 --- a/CppUnit/CppUnit_x64_vs100.vcxproj +++ b/CppUnit/CppUnit_x64_vs100.vcxproj @@ -1,4 +1,4 @@ - + @@ -29,381 +29,277 @@ CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte + CppUnit + Win32Proj + StaticLibrary - false MultiByte StaticLibrary - false + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary MultiByte DynamicLibrary - false MultiByte DynamicLibrary - false MultiByte - - - - - - - - - + + - + - + + + + + + + - + - + - + - <_ProjectFileVersion>10.0.30319.1 + <_ProjectFileVersion>10.0.40219.1 ..\bin64\ - obj64\$(Configuration)\ + obj64\CppUnit\$(Configuration)\ true ..\bin64\ - obj64\$(Configuration)\ + obj64\CppUnit\$(Configuration)\ false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ ..\lib64\ - obj64\$(Configuration)\ + obj64\CppUnit\$(Configuration)\ ..\lib64\ - obj64\$(Configuration)\ - $(ProjectName)64d - $(ProjectName)mdd - $(ProjectName)mtd - $(ProjectName)64 - $(ProjectName)64md - $(ProjectName)64mt + obj64\CppUnit\$(Configuration)\ + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + PocoCppUnit64d + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit64 + PocoCppUnitmd + PocoCppUnitmt - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebugDLL true true true true - - - - - $(IntDir) - $(IntDir)vc80.pdb + Level3 - true ProgramDatabase Default - false + %(DisableSpecificWarnings) + %(AdditionalOptions) - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - NotSet - ..\bin64\$(TargetName).dll + %(AdditionalDependencies) + ..\bin64\PocoCppUnit64d.dll true - %(AdditionalLibraryDirectories) true - ..\bin64\$(TargetName).pdb - ..\lib64\$(TargetName).lib + ..\bin64\PocoCppUnit64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppUnitd.lib MachineX64 + %(AdditionalOptions) - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\bin64\$(TargetName).dll + %(AdditionalDependencies) + ..\bin64\PocoCppUnit64.dll true - %(AdditionalLibraryDirectories) - - - ..\lib64\$(TargetName).lib + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppUnit.lib MachineX64 + %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib64\$(TargetName).pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\$(TargetName).lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\$(TargetName).lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebug true true true true - - - - - $(IntDir) - ..\lib64\$(TargetName).pdb + + ..\lib64\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false + %(DisableSpecificWarnings) + %(AdditionalOptions) - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\$(TargetName).lib + ..\lib64\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\$(TargetName).lib + ..\lib64\PocoCppUnitmt.lib + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoCppUnitmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib64\PocoCppUnitmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib64\PocoCppUnitmd.lib - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_x64_vs100.vcxproj.filters b/CppUnit/CppUnit_x64_vs100.vcxproj.filters index e0ea945ff..167dd4270 100644 --- a/CppUnit/CppUnit_x64_vs100.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs100.vcxproj.filters @@ -2,11 +2,11 @@ - {d780d541-ae9b-4dc6-9c70-cc0e5498be41} + {3ba95f7b-09c7-4a66-a9ca-2461302b501d} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {102c5e2b-3268-48b6-a3da-c96949868573} + {85cbc74b-c127-4eff-9446-cb848da51b89} *.h @@ -37,52 +37,52 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files diff --git a/CppUnit/CppUnit_x64_vs110.sln b/CppUnit/CppUnit_x64_vs110.sln index 95dfac69c..9cb622c68 100644 --- a/CppUnit/CppUnit_x64_vs110.sln +++ b/CppUnit/CppUnit_x64_vs110.sln @@ -1,47 +1,35 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_x64_vs110.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Deploy.0 = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Deploy.0 = release_shared|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.Build.0 = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.ActiveCfg = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.Build.0 = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.Build.0 = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_x64_vs110.vcxproj b/CppUnit/CppUnit_x64_vs110.vcxproj index 236eb020a..e2ce04921 100644 --- a/CppUnit/CppUnit_x64_vs110.vcxproj +++ b/CppUnit/CppUnit_x64_vs110.vcxproj @@ -1,4 +1,4 @@ - + @@ -29,387 +29,279 @@ CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - v110 + CppUnit + Win32Proj + StaticLibrary - false MultiByte v110 StaticLibrary - false + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary MultiByte v110 DynamicLibrary - false MultiByte v110 DynamicLibrary - false MultiByte v110 - - - - - - - - - + + - + - + + + + + + + - + - + - + - <_ProjectFileVersion>10.0.30319.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - $(ProjectName)64d - $(ProjectName)mdd - $(ProjectName)mtd - $(ProjectName)64 - $(ProjectName)64md - $(ProjectName)64mt + <_ProjectFileVersion>11.0.50727.1 + PocoCppUnit64d + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit64 + PocoCppUnitmd + PocoCppUnitmt + + + ..\bin64\ + obj64\CppUnit\$(Configuration)\ + true + + + ..\bin64\ + obj64\CppUnit\$(Configuration)\ + false + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebugDLL true true true true - - - - - $(IntDir) - $(IntDir)vc80.pdb + Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - NotSet - ..\bin64\$(TargetName).dll + ..\bin64\PocoCppUnit64d.dll true - %(AdditionalLibraryDirectories) true - ..\bin64\$(TargetName).pdb - ..\lib64\$(TargetName).lib + ..\bin64\PocoCppUnit64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppUnitd.lib MachineX64 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\bin64\$(TargetName).dll + ..\bin64\PocoCppUnit64.dll true - %(AdditionalLibraryDirectories) - - - ..\lib64\$(TargetName).lib + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppUnit.lib MachineX64 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib64\$(TargetName).pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\$(TargetName).lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\$(TargetName).lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebug true true true true - - - - - $(IntDir) - ..\lib64\$(TargetName).pdb + + ..\lib64\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\$(TargetName).lib + ..\lib64\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\$(TargetName).lib + ..\lib64\PocoCppUnitmt.lib + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoCppUnitmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoCppUnitmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoCppUnitmd.lib - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_x64_vs110.vcxproj.filters b/CppUnit/CppUnit_x64_vs110.vcxproj.filters index e0ea945ff..fbe5657eb 100644 --- a/CppUnit/CppUnit_x64_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs110.vcxproj.filters @@ -2,11 +2,11 @@ - {d780d541-ae9b-4dc6-9c70-cc0e5498be41} + {22f82343-64bf-4134-a23f-ea35526211e4} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {102c5e2b-3268-48b6-a3da-c96949868573} + {3e732daf-f9ae-4ee2-8e1b-fb4e62ac24f2} *.h @@ -37,52 +37,52 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files diff --git a/CppUnit/CppUnit_x64_vs120.sln b/CppUnit/CppUnit_x64_vs120.sln index f8cde6f6c..3599dbf7c 100644 --- a/CppUnit/CppUnit_x64_vs120.sln +++ b/CppUnit/CppUnit_x64_vs120.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs120.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" @@ -6,25 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Deploy.0 = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Deploy.0 = release_shared|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_x64_vs120.vcxproj b/CppUnit/CppUnit_x64_vs120.vcxproj index d62c1a5a1..94453b0cf 100644 --- a/CppUnit/CppUnit_x64_vs120.vcxproj +++ b/CppUnit/CppUnit_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -29,387 +29,278 @@ CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 + CppUnit + Win32Proj + StaticLibrary - false MultiByte v120 StaticLibrary - false + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary MultiByte v120 DynamicLibrary - false MultiByte v120 DynamicLibrary - false MultiByte v120 - - - - - - - - - + + - + - + + + + + + + - + - + - + - <_ProjectFileVersion>10.0.30319.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - Poco$(ProjectName)64d - Poco$(ProjectName)mdd - Poco$(ProjectName)mtd - Poco$(ProjectName)64 - Poco$(ProjectName)md - Poco$(ProjectName)mt + <_ProjectFileVersion>12.0.21005.1 + PocoCppUnit64d + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit64 + PocoCppUnitmd + PocoCppUnitmt + + + ..\bin64\ + obj64\CppUnit\$(Configuration)\ + true + + + ..\bin64\ + obj64\CppUnit\$(Configuration)\ + false + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebugDLL true true true true - - - - - $(IntDir) - $(IntDir)vc80.pdb + Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - NotSet - ..\bin64\$(TargetName).dll + ..\bin64\PocoCppUnit64d.dll true - %(AdditionalLibraryDirectories) true - ..\bin64\$(TargetName).pdb - ..\lib64\Poco$(ProjectName)d.lib + ..\bin64\PocoCppUnit64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppUnitd.lib MachineX64 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\bin64\$(TargetName).dll + ..\bin64\PocoCppUnit64.dll true - %(AdditionalLibraryDirectories) - - - ..\lib64\Poco$(ProjectName).lib + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppUnit.lib MachineX64 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib64\$(TargetName).pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\$(TargetName).lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\$(TargetName).lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebug true true true true - - - - - $(IntDir) - ..\lib64\$(TargetName).pdb + + ..\lib64\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\$(TargetName).lib + ..\lib64\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\$(TargetName).lib + ..\lib64\PocoCppUnitmt.lib + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoCppUnitmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoCppUnitmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoCppUnitmd.lib - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_x64_vs120.vcxproj.filters b/CppUnit/CppUnit_x64_vs120.vcxproj.filters index e0ea945ff..02da53c17 100644 --- a/CppUnit/CppUnit_x64_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs120.vcxproj.filters @@ -2,11 +2,11 @@ - {d780d541-ae9b-4dc6-9c70-cc0e5498be41} + {147d84e6-78a3-4fea-ba76-6214c6e687b9} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {102c5e2b-3268-48b6-a3da-c96949868573} + {1beeb94e-c80f-4e8a-8c21-c69b2585bcaf} *.h @@ -37,52 +37,49 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - - Include Files - - + Include Files diff --git a/CppUnit/CppUnit_x64_vs140.sln b/CppUnit/CppUnit_x64_vs140.sln index 9174e6e62..9db045a80 100644 --- a/CppUnit/CppUnit_x64_vs140.sln +++ b/CppUnit/CppUnit_x64_vs140.sln @@ -1,30 +1,35 @@ - Microsoft Visual Studio Solution File, Format Version 14.00 -# Visual Studio 2014 +# Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs140.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Deploy.0 = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Deploy.0 = release_shared|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_x64_vs140.vcxproj b/CppUnit/CppUnit_x64_vs140.vcxproj index 9c6f83f72..02a462e7c 100644 --- a/CppUnit/CppUnit_x64_vs140.vcxproj +++ b/CppUnit/CppUnit_x64_vs140.vcxproj @@ -1,4 +1,4 @@ - + @@ -29,387 +29,278 @@ CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - v140 - - - StaticLibrary - false - MultiByte - v140 + CppUnit + Win32Proj + StaticLibrary - false MultiByte v140 StaticLibrary - false + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary MultiByte v140 DynamicLibrary - false MultiByte v140 DynamicLibrary - false MultiByte v140 - - - - - - - - - + + - + - + + + + + + + - + - + - + - <_ProjectFileVersion>10.0.30319.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ + <_ProjectFileVersion>14.0.23107.0 PocoCppUnit64d PocoCppUnitmdd PocoCppUnitmtd PocoCppUnit64 - PocoCppUnit64md - PocoCppUnit64mt + PocoCppUnitmd + PocoCppUnitmt + + + ..\bin64\ + obj64\CppUnit\$(Configuration)\ + true + + + ..\bin64\ + obj64\CppUnit\$(Configuration)\ + false + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + + + ..\lib64\ + obj64\CppUnit\$(Configuration)\ - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebugDLL true true true true - - - - - $(IntDir) - $(IntDir)vc80.pdb + Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - NotSet - ..\bin64\$(TargetName).dll + ..\bin64\PocoCppUnit64d.dll true - %(AdditionalLibraryDirectories) true - ..\bin64\$(TargetName).pdb - ..\lib64\PocoCppUnit64d.lib + ..\bin64\PocoCppUnit64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppUnitd.lib MachineX64 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\bin64\$(TargetName).dll + ..\bin64\PocoCppUnit64.dll true - %(AdditionalLibraryDirectories) - - - ..\lib64\PocoCppUnit64.lib + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppUnit.lib MachineX64 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib64\$(TargetName).pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\$(TargetName).lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\$(TargetName).lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true + true EnableFastChecks MultiThreadedDebug true true true true - - - - - $(IntDir) - ..\lib64\$(TargetName).pdb + + ..\lib64\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\$(TargetName).lib + ..\lib64\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\$(TargetName).tlb - - - MaxSpeed OnlyExplicitInline true Speed true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false true true true - - - - - $(IntDir) - $(IntDir)vc70.pdb + Level3 - true + Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\$(TargetName).lib + ..\lib64\PocoCppUnitmt.lib + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoCppUnitmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoCppUnitmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoCppUnitmd.lib - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_x64_vs140.vcxproj.filters b/CppUnit/CppUnit_x64_vs140.vcxproj.filters index e0ea945ff..70980c693 100644 --- a/CppUnit/CppUnit_x64_vs140.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs140.vcxproj.filters @@ -2,11 +2,11 @@ - {d780d541-ae9b-4dc6-9c70-cc0e5498be41} + {b5ba0264-5e62-4d68-9a03-b01f9c9820dc} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {102c5e2b-3268-48b6-a3da-c96949868573} + {f57dad78-1006-43ce-a732-bf1967e7d756} *.h @@ -37,52 +37,49 @@ - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - + Include Files - - Include Files - - + Include Files diff --git a/CppUnit/CppUnit_x64_vs90.sln b/CppUnit/CppUnit_x64_vs90.sln index a34a3ce4b..e3e631ad1 100644 --- a/CppUnit/CppUnit_x64_vs90.sln +++ b/CppUnit/CppUnit_x64_vs90.sln @@ -1,47 +1,35 @@ - Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs90.vcproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_x64_vs90.vcproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Deploy.0 = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Deploy.0 = release_shared|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.Build.0 = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.ActiveCfg = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.Build.0 = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.Build.0 = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_x64_vs90.vcproj b/CppUnit/CppUnit_x64_vs90.vcproj index 9167c334a..5f39eb236 100644 --- a/CppUnit/CppUnit_x64_vs90.vcproj +++ b/CppUnit/CppUnit_x64_vs90.vcproj @@ -1,150 +1,103 @@ + RootNamespace="CppUnit" + Keyword="Win32Proj"> + Name="x64"/> - - + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib64\PocoCppUnitmtd.lib" + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib64\PocoCppUnitmt.lib" + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - + RelativePath=".\src\CppUnitException.cpp"/> - + RelativePath="src\TestCase.cpp"/> - + RelativePath="src\TestDecorator.cpp"/> - + RelativePath="src\TestFailure.cpp"/> - + RelativePath="src\TestResult.cpp"/> - + RelativePath=".\src\TestRunner.cpp"/> - + RelativePath="src\TestSuite.cpp"/> - + RelativePath="src\TextTestResult.cpp"/> + Filter="*.h"> - + RelativePath=".\include\Poco\CppUnit\$(TargetName).h"/> - + RelativePath=".\include\Poco\CppUnit\CppUnitException.h"/> - + RelativePath=".\include\Poco\CppUnit\estring.h"/> - + RelativePath=".\include\Poco\CppUnit\Guards.h"/> - + RelativePath=".\include\Poco\CppUnit\Orthodox.h"/> - + RelativePath=".\include\Poco\CppUnit\RepeatedTest.h"/> - + RelativePath=".\include\Poco\CppUnit\Test.h"/> - + RelativePath=".\include\Poco\CppUnit\TestCaller.h"/> - + RelativePath=".\include\Poco\CppUnit\TestCase.h"/> - + RelativePath=".\include\Poco\CppUnit\TestDecorator.h"/> - + RelativePath=".\include\Poco\CppUnit\TestFailure.h"/> - + RelativePath=".\include\Poco\CppUnit\TestResult.h"/> - + RelativePath=".\include\Poco\CppUnit\TestRunner.h"/> - + RelativePath=".\include\Poco\CppUnit\TestSetup.h"/> - + RelativePath=".\include\Poco\CppUnit\TestSuite.h"/> - + RelativePath=".\include\Poco\CppUnit\TextTestResult.h"/> - - + diff --git a/CppUnit/include/Poco/CppUnit/CppUnit.h b/CppUnit/include/Poco/CppUnit/CppUnit.h index 6729a903d..5cb67d461 100644 --- a/CppUnit/include/Poco/CppUnit/CppUnit.h +++ b/CppUnit/include/Poco/CppUnit/CppUnit.h @@ -45,7 +45,7 @@ #endif // -// Automatically link Foundation library. +// Automatically link CppUnit library. // #if defined(_MSC_VER) #if defined(POCO_DLL) diff --git a/Crypto/testsuite/TestSuite_CE_VS90.vcproj b/Crypto/testsuite/TestSuite_CE_VS90.vcproj index 986ee6e45..d7e928fca 100644 --- a/Crypto/testsuite/TestSuite_CE_VS90.vcproj +++ b/Crypto/testsuite/TestSuite_CE_VS90.vcproj @@ -57,7 +57,7 @@ - {ec6e9d25-9bac-46ee-ac54-5003dceec81b} + {f38c4d80-8d15-48cf-8f5e-9efaf41e0e3f} - {4cb3eb8b-c950-473c-a32a-ea9571ca131e} + {ecf8d763-ff7e-4c18-a206-c5439e61f337} - {41148145-7376-4a02-b9f7-521eb3bd465d} + {c64a532e-81da-4303-9ee2-9a4836e89104} - {6bb097ca-d4a2-465e-88b7-c3ca51bdfc90} + {1f7af2d6-12d9-4961-b96d-0cfa9a70e9da} - {d68b8bc4-838f-435a-83f0-fc9580c46e8a} + {3e587d6c-8f39-49d0-ad0e-252d43c19770} - {1225e6d5-f8c3-4cd5-be53-9be47a6effd1} + {2416774a-2d5c-4821-b412-22c0c655af13} - {4a2e6020-aedf-41ca-8e14-6fa5467a3695} + {7743e9b4-bfb8-4cfe-8661-f1525ac2596a} - {41e81ce7-8a98-4408-83de-d8ca5d81f43c} + {5446f743-c844-4ec9-88be-0f939cfbfc94} diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 64af8fc80..088a5b3bf 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {05d26f2b-fed9-4a98-bda1-bbd3ed8868ce} + {b9f6485c-8531-43c1-be98-4e5436ae3354} - {009ff1a8-138d-4fe9-b1ee-27863c60e6e3} + {ca904d89-4850-4951-a3f2-201709e7028d} - {7c47770d-8181-4ca5-bee6-623f224cf643} + {9cfe241f-41a7-42af-b45c-0d00be109b72} - {a137c0cc-6e0d-4ef2-a0e3-3b99518f7acc} + {89b2cd7e-1d98-40f5-86bd-273696cfcd25} - {9421865c-44b4-47d3-9150-87166f870fb9} + {84874be9-b11b-46fc-adb8-a2ed62be7263} - {6f749809-1464-4247-b145-08fc882d4686} + {548e4824-d089-42b2-b398-1105005d08ff} - {f354cc3d-2df1-4dbc-8680-e2dce5d92557} + {38369b72-9489-4426-8c96-b1787dfd8952} - {57bbc897-7c0a-44ec-8aba-cfd9947c8b1c} + {e1c1f287-7007-4ad0-9b8f-db70ff9aab24} diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj b/Crypto/testsuite/TestSuite_vs100.vcxproj index 32b205756..5f6127c83 100644 --- a/Crypto/testsuite/TestSuite_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters index bbb7f9872..6b097f475 100644 --- a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {10345e64-a102-46ee-893f-02d8c1d40d0d} + {d5026f73-5c6e-498d-905e-7cc3a490983e} - {a0ec9a52-6055-4f1c-ad2f-fd3f4673ad65} + {d7fa2312-a775-41e7-87e5-0ee90a192315} - {6598da39-59d4-4cd1-8766-f40f59aaf8dd} + {5c62bd1c-2d08-49b6-9058-7c7b38144f1d} - {ab7d2e6f-06ff-4fef-8e84-b8eb17aced6a} + {2f61a9d2-5894-44b6-b849-4039507eb505} - {75aa6ddb-b870-41dd-b5b2-63cef9b436fa} + {42c7228a-1ad3-4cec-8d09-b52b67f6ea31} - {6d079a4d-0eff-48e5-8cc4-040a154cf302} + {cc492a54-72fb-4c17-9d11-b01268f3f724} - {c3c9a8c2-a52a-4d9d-a597-30604b390f87} + {258d1337-24f0-4d62-bf57-d8fdf6097cbb} - {99e9e155-cd15-4775-bd50-1583d5f50de1} + {8688473b-9805-44c2-80b1-38fcb09a0cce} diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj b/Crypto/testsuite/TestSuite_vs110.vcxproj index 3ada2a310..03cc99d38 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters index d0bff0b03..4bd0b3b5d 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {c660689d-6b88-4580-a98d-a853f561fd79} + {5f65c04f-0087-4ab5-adde-8acbe36d6320} - {d5abea59-1b97-496c-b955-c276cc4729ad} + {e058d4b1-09c9-443e-9918-031c8e48a9f9} - {830c7e2e-ed07-4554-b5b0-3889ae0d41c4} + {901de8f2-a736-4091-ac4f-b85aec43c478} - {146a9d76-3754-44fc-b8bd-ba5d3bf20918} + {7690cfcc-987b-4920-b961-235906ea2851} - {213fa8e9-8866-47a2-9fa9-151871fe0125} + {de1c0e1d-2dea-4004-84b0-68e241ea71c9} - {51aadb87-922c-4847-8a58-729430f2e9cf} + {5fe8722f-362e-4fd7-8c32-e101daeddfc1} - {5d05c314-5d3d-4288-b0a9-9050aff7e0e4} + {db175432-9e10-4413-938c-d3e003e8084c} - {a0d7ff3f-9deb-460b-b421-e70397c46479} + {922f78d6-ca4b-4546-ab3d-c6de47e1e7d3} diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters index 12f090f35..d5baca4fe 100644 --- a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {c96de5e1-f7f3-4115-8bd2-a15c02c6f6a0} + {3d13ca42-cde0-4231-98a9-f68241746df7} - {36d01f0f-b489-48a7-8251-563566dfbd8f} + {e6d16d5e-1631-48d1-8c66-7b483b2c244d} - {c1e74085-d770-4c62-bd5d-f2bb60e638ba} + {d9cb6553-dcd0-425b-b139-d82c0d53a9a0} - {59855949-2202-4a21-9a97-b6fe1ceed2b5} + {4d90952d-13a3-4c69-9ff1-40ba7dc35de3} - {fd1cf788-b87f-416a-9409-f78a818eda09} + {2b2539e5-5a00-4173-9075-8fc2510d1ebb} - {b070c8f2-d841-407a-b36c-502d1e254157} + {66096dd5-c8f3-4ea1-9399-ca25c970e508} - {729b3317-38b8-438c-a1bf-ad261801e47d} + {6d8ccc23-41c7-41f6-ba91-668e8b20a461} - {f50f744a-d557-4991-ba41-d7d1a6bded60} + {2a9fea34-f2f7-4a7f-b37a-f425cbfa0b7c} diff --git a/Crypto/testsuite/TestSuite_vs140.vcxproj b/Crypto/testsuite/TestSuite_vs140.vcxproj index 310eb0fab..eb3f08e7b 100644 --- a/Crypto/testsuite/TestSuite_vs140.vcxproj +++ b/Crypto/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_vs140.vcxproj.filters b/Crypto/testsuite/TestSuite_vs140.vcxproj.filters index 36f2f05be..83d92417e 100644 --- a/Crypto/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {c69f1cd9-ad17-4c39-a85d-b9a6fa207632} + {72d07a3a-5a55-40ba-beef-e01e3adc4809} - {550ac2fa-b7cd-47d5-8c05-a4286e148bc2} + {718dc6ed-3044-4fee-9f82-4feba66bd1af} - {44b8b932-76d3-47c3-8b6e-6ff02c0c5fcb} + {3ea4c9b3-89c1-4ec5-a8d4-95089a9db1ec} - {4f7b6782-fe2d-4ee5-bae3-501cb9a1b9af} + {525a739d-41aa-4b51-a396-5904f7b8f2fe} - {b5ec4f30-bae1-4c1f-989e-b4bbf27dba71} + {cfa723eb-1beb-4ac7-bd5a-07dc29aed1cb} - {db6ddfd4-743f-4b06-8dc8-751c7d9145ee} + {8a3c2b9a-ed96-42d7-b170-10aca8bacbb5} - {64ce5068-c1b3-4ce9-a4a1-b53e9e039b2a} + {a9b0539e-4174-479e-af67-e66acd9cf307} - {e58dca0d-37c5-4c6b-a727-fd417e2cd626} + {71338c2e-326a-4d20-8247-2a7a676cc5df} diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj index 8e9b59f1f..b5f672ab6 100644 --- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters index 6118df987..3a15803dd 100644 --- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {43790194-c058-44d8-a34c-2532fba71246} + {a0cd1e22-f8f1-4e40-8adc-f3a17455bf49} - {3c8cd458-940c-49e4-9156-b7aaf474fc98} + {c1ada087-12ab-4e5b-8cab-223a92d74f9f} - {a2d8edbe-348d-4463-9b6b-f0d496761377} + {c744cb2c-d11f-468c-9590-30e34363988c} - {2f8952be-77d1-4e56-87c4-78259191dcd8} + {6a0fa120-d587-475d-a9e2-cfec1dfef332} - {9d92cb75-80e0-44bf-8707-4e5beee54660} + {ee16ea9f-ea5f-4887-aa97-f9c642e2c249} - {42adf19a-42ed-4a4d-8503-351be425e207} + {ba419381-11ed-44de-b597-d2029074dfcd} - {d01e705a-2c9b-4faf-83e7-ddc57e583954} + {65666235-5baa-4af6-96b7-1b57845010ac} - {5bdd48f9-3ca6-4a89-97e8-7575c18288e0} + {aea7036e-2198-4b68-b3c3-5a682619e78d} diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj index daa95b05c..86e61d7f7 100644 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters index 0f5041175..6856d993c 100644 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {870073f1-9ea7-453e-9f12-9d28a8362936} + {c8b908b0-753f-4d5a-bc42-c1588381514b} - {49d76379-fd4c-4ad3-a30c-494c057fb6fe} + {8cb25265-a0c2-4f5d-a97b-fa20a096e88d} - {7b4c189d-6cb2-49ba-8a57-bdd8d72dc28e} + {05ed8f3b-076f-4d83-9492-d00267804617} - {9bb1c39c-0880-4161-85a0-c9a77c3b720c} + {65f885e2-7baa-4286-be88-7cecf67ddc32} - {4dbc0904-2492-4827-8d00-fe05dfc183ae} + {52be9886-55f7-4fa9-8f5c-26d47f27ad6c} - {37ea7063-55a3-4b9e-81f5-6d73a4fec855} + {97e49c6d-ad30-46bf-add0-1ba89d9ad403} - {cf66f569-b314-4b03-ba23-6cac186d927b} + {adac2034-a417-4e71-afd3-d36c0c5cdd0b} - {ffff5e4e-fb1b-442d-9f65-ef34be895ab8} + {b0cd9783-913e-454e-b7e9-a2e074b2e9b3} diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters index 879937fad..aff52c446 100644 --- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {617ea011-8a20-46d5-b4fd-65ade15416ca} + {b4792b77-3575-4fa1-8c28-3f8a165486ff} - {eed49e8d-f3b5-44cf-a383-6bbc74efc482} + {a9542757-76c2-4d8e-9def-612e6d7c90cd} - {ad66c38e-64a3-42d5-b681-2ef36401a076} + {bd7354a4-022d-4bc6-94f2-a803bdcd5d16} - {5addeae8-71cb-4dc9-93ef-0f2a3a024b93} + {1a795147-2681-416e-8cb5-d88f79d3d3cc} - {9645886a-b50f-4945-8594-f6f50183f004} + {e5bbf21f-6e2c-4daa-87d4-8107cc1c1643} - {39a83be9-893f-4ed3-bb9f-41738c136069} + {88950089-cdc6-4b82-8a8f-f01078abfe90} - {59d3ae88-61ed-48bb-8755-c680c069ce43} + {c3670366-b783-4c8a-a649-677abdafa183} - {03410792-d63c-4837-b611-4abff423a304} + {5f03211e-06bd-451a-b47d-1ef8755f2e1e} diff --git a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj index 11d20818b..9429b1dde 100644 --- a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters index a190f6419..6d55b4f44 100644 --- a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {8c1bd5bb-1104-49eb-a9ed-633f20bb4cd8} + {0d243529-62fc-49fa-bf49-6b20be35d758} - {00b7f6dc-32cc-4b2d-82fa-4dc8436942b5} + {d59dd2ed-e29b-4069-bd09-288dfdc189dd} - {239e400b-ac97-47c5-bae5-49fe36536089} + {290b4b3f-ad50-44e5-947d-d5de0caefcb7} - {234e6b20-9313-4b98-b1b6-f9dbace9af9d} + {fb6480ec-c0c2-4f06-9539-766b4ac38a00} - {5faa2eab-6ece-4f7a-9a98-7c6f4e9a8f53} + {4b600911-d0cc-41bc-8881-37620c43dfb7} - {82d2f8a4-65a7-4f47-ac93-8f1f8d832696} + {40f47d6d-82b2-4506-a9b6-139ea9d6ba22} - {52e7dbc5-979e-40a5-a2e9-a13b032fe2e3} + {953fdd66-dc5a-496e-8d14-794ce8038864} - {a3249427-a585-4ee0-945d-803b487930f4} + {be96f14c-522b-4ac6-b0d5-b2dd3942b698} diff --git a/Crypto/testsuite/TestSuite_x64_vs90.vcproj b/Crypto/testsuite/TestSuite_x64_vs90.vcproj index 0e08a05f4..6e68d789c 100644 --- a/Crypto/testsuite/TestSuite_x64_vs90.vcproj +++ b/Crypto/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> + Keyword="Win32Proj"> + Name="Digi JumpStart (ARMV4I)"/> - - + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="0"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="0"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + + + + + + + + + + + + + + + + + + + + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="0"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - - - - - - - - - - - - - - - - - - - - - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="0"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="0"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + - - + + Name="Core"> + Name="Source Files"> - + RelativePath=".\src\AnyTest.cpp"/> - + RelativePath=".\src\ArrayTest.cpp"/> - + RelativePath=".\src\AutoPtrTest.cpp"/> - + RelativePath=".\src\AutoReleasePoolTest.cpp"/> - + RelativePath=".\src\ByteOrderTest.cpp"/> - + RelativePath=".\src\CoreTest.cpp"/> - + RelativePath=".\src\CoreTestSuite.cpp"/> - + RelativePath=".\src\DirectoryIteratorsTest.cpp"/> - + RelativePath=".\src\DynamicFactoryTest.cpp"/> - + RelativePath=".\src\FIFOBufferTest.cpp"/> - + RelativePath=".\src\FIFOBufferTestSuite.cpp"/> - + RelativePath=".\src\FormatTest.cpp"/> - + RelativePath=".\src\FPETest.cpp"/> - + RelativePath=".\src\ListMapTest.cpp"/> - + RelativePath=".\src\MemoryPoolTest.cpp"/> - + RelativePath=".\src\NamedTuplesTest.cpp"/> - + RelativePath=".\src\NDCTest.cpp"/> - + RelativePath=".\src\NumberFormatterTest.cpp"/> - + RelativePath=".\src\NumberParserTest.cpp"/> - + RelativePath=".\src\ObjectPoolTest.cpp"/> - + RelativePath=".\src\RegularExpressionTest.cpp"/> - + RelativePath=".\src\SharedPtrTest.cpp"/> - + RelativePath=".\src\StringTest.cpp"/> - + RelativePath=".\src\StringTokenizerTest.cpp"/> - + RelativePath=".\src\TuplesTest.cpp"/> - + RelativePath=".\src\TypeListTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\AnyTest.h"/> - + RelativePath=".\src\ArrayTest.h"/> - + RelativePath=".\src\AutoPtrTest.h"/> - + RelativePath=".\src\AutoReleasePoolTest.h"/> - + RelativePath=".\src\ByteOrderTest.h"/> - + RelativePath=".\src\CoreTest.h"/> - + RelativePath=".\src\CoreTestSuite.h"/> - + RelativePath=".\src\DirectoryIteratorsTest.h"/> - + RelativePath=".\src\DynamicAnyTest.h"/> - + RelativePath=".\src\DynamicFactoryTest.h"/> - + RelativePath=".\src\FIFOBufferTest.h"/> - + RelativePath=".\src\FIFOBufferTestSuite.h"/> - + RelativePath=".\src\FormatTest.h"/> - + RelativePath=".\src\FPETest.h"/> - + RelativePath=".\src\ListMapTest.h"/> - + RelativePath=".\src\MemoryPoolTest.h"/> - + RelativePath=".\src\NamedTuplesTest.h"/> - + RelativePath=".\src\NDCTest.h"/> - + RelativePath=".\src\NumberFormatterTest.h"/> - + RelativePath=".\src\NumberParserTest.h"/> - + RelativePath=".\src\ObjectPoolTest.h"/> - + RelativePath=".\src\RegularExpressionTest.h"/> - + RelativePath=".\src\SharedPtrTest.h"/> - + RelativePath=".\src\StringTest.h"/> + + + + Name="Streams"> + Name="Source Files"> - + RelativePath=".\src\Base32Test.cpp"/> - + RelativePath=".\src\Base64Test.cpp"/> - + RelativePath=".\src\BinaryReaderWriterTest.cpp"/> - + RelativePath=".\src\CountingStreamTest.cpp"/> - + RelativePath=".\src\FIFOBufferStreamTest.cpp"/> - + RelativePath=".\src\FileStreamTest.cpp"/> - + RelativePath=".\src\HexBinaryTest.cpp"/> - + RelativePath=".\src\LineEndingConverterTest.cpp"/> - + RelativePath=".\src\MemoryStreamTest.cpp"/> - + RelativePath=".\src\NullStreamTest.cpp"/> - + RelativePath=".\src\StreamCopierTest.cpp"/> - + RelativePath=".\src\StreamsTestSuite.cpp"/> - + RelativePath=".\src\StreamTokenizerTest.cpp"/> - + RelativePath=".\src\TeeStreamTest.cpp"/> - + RelativePath=".\src\ZLibTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\Base32Test.h"/> - + RelativePath=".\src\Base64Test.h"/> - + RelativePath=".\src\BinaryReaderWriterTest.h"/> - + RelativePath=".\src\CountingStreamTest.h"/> - + RelativePath=".\src\FIFOBufferStreamTest.h"/> - + RelativePath=".\src\FileStreamTest.h"/> - + RelativePath=".\src\HexBinaryTest.h"/> - + RelativePath=".\src\LineEndingConverterTest.h"/> - + RelativePath=".\src\MemoryStreamTest.h"/> - + RelativePath=".\src\NullStreamTest.h"/> - + RelativePath=".\src\StreamCopierTest.h"/> - + RelativePath=".\src\StreamsTestSuite.h"/> - + RelativePath=".\src\StreamTokenizerTest.h"/> - + RelativePath=".\src\TeeStreamTest.h"/> - + RelativePath=".\src\ZLibTest.h"/> + Name="Crypt"> + Name="Source Files"> - + RelativePath=".\src\CryptTestSuite.cpp"/> - + RelativePath=".\src\DigestStreamTest.cpp"/> - + RelativePath=".\src\HMACEngineTest.cpp"/> - + RelativePath=".\src\MD4EngineTest.cpp"/> - + RelativePath=".\src\MD5EngineTest.cpp"/> - + RelativePath=".\src\PBKDF2EngineTest.cpp"/> - + RelativePath=".\src\RandomStreamTest.cpp"/> - + RelativePath=".\src\RandomTest.cpp"/> - + RelativePath=".\src\SHA1EngineTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\CryptTestSuite.h"/> - + RelativePath=".\src\DigestStreamTest.h"/> - + RelativePath=".\src\HMACEngineTest.h"/> - + RelativePath=".\src\MD4EngineTest.h"/> - + RelativePath=".\src\MD5EngineTest.h"/> - + RelativePath=".\src\PBKDF2EngineTest.h"/> - + RelativePath=".\src\RandomStreamTest.h"/> - + RelativePath=".\src\RandomTest.h"/> - + RelativePath=".\src\SHA1EngineTest.h"/> + Name="Notifications"> + Name="Source Files"> - + RelativePath=".\src\NotificationCenterTest.cpp"/> - + RelativePath=".\src\NotificationQueueTest.cpp"/> - + RelativePath=".\src\NotificationsTestSuite.cpp"/> - + RelativePath=".\src\PriorityNotificationQueueTest.cpp"/> - + RelativePath=".\src\TimedNotificationQueueTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\NotificationCenterTest.h"/> - + RelativePath=".\src\NotificationQueueTest.h"/> - + RelativePath=".\src\NotificationsTestSuite.h"/> - + RelativePath=".\src\PriorityNotificationQueueTest.h"/> - + RelativePath=".\src\TimedNotificationQueueTest.h"/> + Name="Threading"> + Name="Source Files"> - + RelativePath=".\src\ActiveDispatcherTest.cpp"/> - + RelativePath=".\src\ActiveMethodTest.cpp"/> - + RelativePath=".\src\ActivityTest.cpp"/> - + RelativePath=".\src\ConditionTest.cpp"/> - + RelativePath=".\src\MutexTest.cpp"/> - + RelativePath=".\src\RWLockTest.cpp"/> - + RelativePath=".\src\SemaphoreTest.cpp"/> - + RelativePath=".\src\ThreadingTestSuite.cpp"/> - + RelativePath=".\src\ThreadLocalTest.cpp"/> - + RelativePath=".\src\ThreadPoolTest.cpp"/> - + RelativePath=".\src\ThreadTest.cpp"/> - + RelativePath=".\src\TimerTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ActiveDispatcherTest.h"/> - + RelativePath=".\src\ActiveMethodTest.h"/> - + RelativePath=".\src\ActivityTest.h"/> - + RelativePath=".\src\ConditionTest.h"/> - + RelativePath=".\src\MutexTest.h"/> - + RelativePath=".\src\RWLockTest.h"/> - + RelativePath=".\src\SemaphoreTest.h"/> - + RelativePath=".\src\ThreadingTestSuite.h"/> - + RelativePath=".\src\ThreadLocalTest.h"/> - + RelativePath=".\src\ThreadPoolTest.h"/> - + RelativePath=".\src\ThreadTest.h"/> - + RelativePath=".\src\TimerTest.h"/> + Name="SharedLibrary"> + Name="Source Files"> - + RelativePath=".\src\ClassLoaderTest.cpp"/> - + RelativePath=".\src\ManifestTest.cpp"/> - + RelativePath=".\src\SharedLibraryTest.cpp"/> - + RelativePath=".\src\SharedLibraryTestSuite.cpp"/> - + RelativePath=".\src\TestPlugin.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ClassLoaderTest.h"/> - + RelativePath=".\src\ManifestTest.h"/> - + RelativePath=".\src\SharedLibraryTest.h"/> - + RelativePath=".\src\SharedLibraryTestSuite.h"/> - + RelativePath=".\src\TestPlugin.h"/> + Name="Logging"> + Name="Source Files"> - + RelativePath=".\src\ChannelTest.cpp"/> - + RelativePath=".\src\FileChannelTest.cpp"/> - + RelativePath=".\src\LoggerTest.cpp"/> - + RelativePath=".\src\LoggingFactoryTest.cpp"/> - + RelativePath=".\src\LoggingRegistryTest.cpp"/> - + RelativePath=".\src\LoggingTestSuite.cpp"/> - + RelativePath=".\src\LogStreamTest.cpp"/> - + RelativePath=".\src\PatternFormatterTest.cpp"/> - + RelativePath=".\src\SimpleFileChannelTest.cpp"/> - + RelativePath=".\src\TestChannel.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ChannelTest.h"/> - + RelativePath=".\src\FileChannelTest.h"/> - + RelativePath=".\src\LoggerTest.h"/> - + RelativePath=".\src\LoggingFactoryTest.h"/> - + RelativePath=".\src\LoggingRegistryTest.h"/> - + RelativePath=".\src\LoggingTestSuite.h"/> - + RelativePath=".\src\LogStreamTest.h"/> - + RelativePath=".\src\PatternFormatterTest.h"/> - + RelativePath=".\src\SimpleFileChannelTest.h"/> - + RelativePath=".\src\TestChannel.h"/> + Name="Filesystem"> + Name="Source Files"> - + RelativePath=".\src\DirectoryWatcherTest.cpp"/> - + RelativePath=".\src\FilesystemTestSuite.cpp"/> - + RelativePath=".\src\FileTest.cpp"/> - + RelativePath=".\src\GlobTest.cpp"/> - + RelativePath=".\src\PathTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\DirectoryWatcherTest.h"/> - + RelativePath=".\src\FilesystemTestSuite.h"/> - + RelativePath=".\src\FileTest.h"/> - + RelativePath=".\src\GlobTest.h"/> - + RelativePath=".\src\PathTest.h"/> + Name="UUID"> + Name="Source Files"> - + RelativePath=".\src\UUIDGeneratorTest.cpp"/> - + RelativePath=".\src\UUIDTest.cpp"/> - + RelativePath=".\src\UUIDTestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\UUIDGeneratorTest.h"/> - + RelativePath=".\src\UUIDTest.h"/> - + RelativePath=".\src\UUIDTestSuite.h"/> + Name="DateTime"> + Name="Source Files"> - + RelativePath=".\src\ClockTest.cpp"/> - + RelativePath=".\src\DateTimeFormatterTest.cpp"/> - + RelativePath=".\src\DateTimeParserTest.cpp"/> - + RelativePath=".\src\DateTimeTest.cpp"/> - + RelativePath=".\src\DateTimeTestSuite.cpp"/> - + RelativePath=".\src\LocalDateTimeTest.cpp"/> - + RelativePath=".\src\StopwatchTest.cpp"/> - + RelativePath=".\src\TimespanTest.cpp"/> - + RelativePath=".\src\TimestampTest.cpp"/> - + RelativePath=".\src\TimezoneTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ClockTest.h"/> - + RelativePath=".\src\DateTimeFormatterTest.h"/> - + RelativePath=".\src\DateTimeParserTest.h"/> - + RelativePath=".\src\DateTimeTest.h"/> - + RelativePath=".\src\DateTimeTestSuite.h"/> - + RelativePath=".\src\LocalDateTimeTest.h"/> - + RelativePath=".\src\StopwatchTest.h"/> - + RelativePath=".\src\TimespanTest.h"/> - + RelativePath=".\src\TimestampTest.h"/> - + RelativePath=".\src\TimezoneTest.h"/> + Name="Text"> + Name="Source Files"> - + RelativePath=".\src\StreamConverterTest.cpp"/> - + RelativePath=".\src\TextBufferIteratorTest.cpp"/> - + RelativePath=".\src\TextConverterTest.cpp"/> - + RelativePath=".\src\TextEncodingTest.cpp"/> - + RelativePath=".\src\TextIteratorTest.cpp"/> - + RelativePath=".\src\TextTestSuite.cpp"/> - + RelativePath=".\src\UnicodeConverterTest.cpp"/> - + RelativePath=".\src\UTF8StringTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\StreamConverterTest.h"/> - + RelativePath=".\src\TextBufferIteratorTest.h"/> - + RelativePath=".\src\TextConverterTest.h"/> - + RelativePath=".\src\TextEncodingTest.h"/> - + RelativePath=".\src\TextIteratorTest.h"/> - + RelativePath=".\src\TextTestSuite.h"/> - + RelativePath=".\src\UnicodeConverterTest.h"/> - + RelativePath=".\src\UTF8StringTest.h"/> + Name="URI"> + Name="Source Files"> - + RelativePath=".\src\URIStreamOpenerTest.cpp"/> - + RelativePath=".\src\URITest.cpp"/> - + RelativePath=".\src\URITestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\URIStreamOpenerTest.h"/> - + RelativePath=".\src\URITest.h"/> - + RelativePath=".\src\URITestSuite.h"/> + Name="_Suite"> + Name="Source Files"> - + RelativePath=".\src\FoundationTestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\FoundationTestSuite.h"/> + Name="_Driver"> + Name="Source Files"> - - - + RelativePath=".\src\WinCEDriver.cpp"/> + Name="Processes"> + Name="Source Files"> - + RelativePath=".\src\NamedEventTest.cpp"/> - + RelativePath=".\src\NamedMutexTest.cpp"/> - + RelativePath=".\src\ProcessesTestSuite.cpp"/> - + RelativePath=".\src\ProcessTest.cpp"/> - + RelativePath=".\src\SharedMemoryTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\NamedEventTest.h"/> - + RelativePath=".\src\NamedMutexTest.h"/> - + RelativePath=".\src\ProcessesTestSuite.h"/> - + RelativePath=".\src\ProcessTest.h"/> - + RelativePath=".\src\SharedMemoryTest.h"/> + Name="Tasks"> + Name="Source Files"> - + RelativePath=".\src\TaskManagerTest.cpp"/> - + RelativePath=".\src\TaskTest.cpp"/> - + RelativePath=".\src\TaskTestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\TaskManagerTest.h"/> - + RelativePath=".\src\TaskTest.h"/> - + RelativePath=".\src\TaskTestSuite.h"/> + Name="Event"> + Name="Header Files"> - + RelativePath=".\src\BasicEventTest.h"/> - + RelativePath=".\src\DummyDelegate.h"/> - + RelativePath=".\src\EventTestSuite.h"/> - + RelativePath=".\src\FIFOEventTest.h"/> - + RelativePath=".\src\PriorityEventTest.h"/> + Name="Source Files"> - + RelativePath=".\src\BasicEventTest.cpp"/> - + RelativePath=".\src\DummyDelegate.cpp"/> - + RelativePath=".\src\EventTestSuite.cpp"/> - + RelativePath=".\src\FIFOEventTest.cpp"/> - + RelativePath=".\src\PriorityEventTest.cpp"/> + Name="Cache"> + Name="Header Files"> - + RelativePath=".\src\CacheTestSuite.h"/> - + RelativePath=".\src\ExpireCacheTest.h"/> - + RelativePath=".\src\ExpireLRUCacheTest.h"/> - + RelativePath=".\src\LRUCacheTest.h"/> - + RelativePath=".\src\UniqueExpireCacheTest.h"/> - + RelativePath=".\src\UniqueExpireLRUCacheTest.h"/> + Name="Source Files"> - + RelativePath=".\src\CacheTestSuite.cpp"/> - + RelativePath=".\src\ExpireCacheTest.cpp"/> - + RelativePath=".\src\ExpireLRUCacheTest.cpp"/> - + RelativePath=".\src\LRUCacheTest.cpp"/> - + RelativePath=".\src\UniqueExpireCacheTest.cpp"/> - + RelativePath=".\src\UniqueExpireLRUCacheTest.cpp"/> + Name="Hashing"> + Name="Header Files"> - + RelativePath=".\src\HashingTestSuite.h"/> - + RelativePath=".\src\HashMapTest.h"/> - + RelativePath=".\src\HashSetTest.h"/> - + RelativePath=".\src\HashTableTest.h"/> - + RelativePath=".\src\LinearHashTableTest.h"/> - + RelativePath=".\src\SimpleHashTableTest.h"/> + Name="Source Files"> - + RelativePath=".\src\HashingTestSuite.cpp"/> - + RelativePath=".\src\HashMapTest.cpp"/> - + RelativePath=".\src\HashSetTest.cpp"/> - + RelativePath=".\src\HashTableTest.cpp"/> - + RelativePath=".\src\LinearHashTableTest.cpp"/> - + RelativePath=".\src\SimpleHashTableTest.cpp"/> + Name="Dynamic"> + Name="Source Files"> - - - + RelativePath=".\src\VarTest.cpp"/> + Name="Header Files"> - - - + RelativePath=".\src\VarTest.h"/> - - + diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index fe6413b05..7402366dd 100644 --- a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,181 +2,181 @@ - {ad3fa692-aa08-49df-aa12-4a46a3489f2d} + {43bf5a82-87d9-46bf-9445-044a9b2af5a0} - {8e280af8-468a-436d-8b1d-61f01209971d} + {a71ee7f0-c6e2-4377-96c0-183ee74d0998} - {558daa29-4c98-4850-a20e-0e35998fda2b} + {2db6216e-7489-40ae-abae-d475c64d8e7d} - {3b898d46-269b-4b3e-a944-d83308474322} + {b075e103-4923-4e6a-8e31-14525434d2ae} - {f60abb18-6670-4ad8-ac53-af60d4922e98} + {7b59aa5b-fdb1-48a5-9509-3a9478213c07} - {cb196216-ac67-4166-8370-9fafb1afafd8} + {d5f8b8fb-8a9c-4862-bfc9-1f3d06d17ab4} - {2e88ca0b-24ef-4f77-8243-587f9dbf6f33} + {b536362e-5d6d-446e-8d04-fbb034a66ba1} - {e7869ed3-cfca-4f76-8fcf-70157512e3f3} + {38ccba31-ffd6-4207-84aa-4a182908c513} - {ea547ba3-0bb2-43fb-8aca-09d7cda5015b} + {9372b2ba-bc2d-4d49-a46b-73bfe7e2a191} - {e118d9b3-2963-465c-91f9-4e29ae2d65fd} + {1f52fdef-d25c-4820-96d1-711a8aa368a6} - {6787a8ac-3f45-461a-a875-78357abe612e} + {ba2f7da2-8d92-4e3c-a030-9e58eaf8f9f8} - {02519f68-8872-4fd1-aec5-ea0062e5b076} + {ed76bd3e-2bd2-4fa4-99ca-cca4fab84c44} - {7b935510-a78d-446d-9d61-fe5bdea316e2} + {60a7b8ca-bae0-4fe4-8d8a-580abdee4293} - {8b0452dc-6335-4d8b-b65d-444583bd1310} + {fb6a641f-e1ea-4d4e-8135-4c8c9eccd2de} - {50f5d4f2-b5ca-4fe0-9c06-0734a0d608b4} + {d93c163b-cf2a-46f9-9aa5-23a0749b33b6} - {7fd4f336-ae9c-4287-ad87-5e6368e6cc53} + {0a110c99-4638-40de-b12e-7f36a13e6100} - {757ab29d-5ae9-4afa-8f43-9779a4389dfd} + {8d252df1-8cee-48ab-9eb5-39292d80478d} - {0619415d-48e9-4024-8231-1ecac9205c53} + {fc0ec39d-7bb6-4427-8f95-da2b35a33f27} - {49989c6a-d634-4eed-9982-1049937bb905} + {16bf42bf-3600-430f-bc26-030f78a70444} - {69596f83-3610-4342-8bd8-fc19dd9c44ee} + {24b73527-6799-49f6-9ef8-9307d6f9b1bc} - {5841de48-b4a5-4201-abcb-5b60a3fab990} + {fe8fbcc9-6022-45fb-a8b6-079a09dc3c1c} - {2dd1fcfa-ce03-468c-a1c6-6e5d8359c1c7} + {f3c1a805-1799-43bb-a643-35e4f7459fa3} - {2cce132b-d44b-47e0-a795-02717889af52} + {84fdef44-3614-4a44-becf-2fe0f3769af2} - {837521ff-c655-4c62-aa4b-7d09390f7c17} + {a1214dfe-f95d-468e-b475-5e2fb665a4c7} - {d9d5a6de-223e-4ecc-ace8-465e17e38184} + {f9f14d41-6f3f-4538-ac9e-e9a7b1759c75} - {ebea41c6-89fc-4e8d-a2d2-2b01fe4dcc3a} + {921657d4-0075-4565-937f-d3dabdb654a4} - {d3a149e3-f80e-4dda-8307-81cc452c5c18} + {86a6e410-b8d9-4830-87e6-718930ac5995} - {4c3e74c9-2e4f-4fb0-bd14-a51b1015bb4b} + {70345cfa-7a18-40bd-8f76-9a6b3fc52181} - {ef1cc576-a6d8-48d7-98bc-2c51b1f928c3} + {2d501996-090e-4d62-9c7a-9265505207e2} - {1aa9253c-0fac-48b5-a72c-796fa2377f20} + {6ee9f74f-683f-4bf9-b1c7-924266fea6cb} - {b0cd7115-52c5-466e-9a49-eff35769c915} + {6335bf3d-e351-4997-8b3b-6f1741e1964f} - {7cb1dce8-6078-4fb6-b65e-8f238255ec6a} + {54a7d74d-4ab6-4631-b980-f5169363e365} - {a8297161-4054-4685-b7f4-7458d1efe93c} + {12991b6b-8cbf-4d95-b66a-9eaeb080455c} - {af4a27e2-4e4b-4e67-9832-e998a1132ea3} + {86dbedbc-ecf8-43e9-ac1d-562550c326d6} - {33aed133-318b-43f0-9541-3f767e9f2311} + {2445f620-5a2d-4834-ac16-86d9d0ca63e0} - {e3ec148b-78f7-4fd1-9737-29eaa538290d} + {a33a7b24-4a6e-4a94-9938-d2d8a65a66e6} - {c46a9c1a-8bec-440d-89dc-10cac661b654} + {15fd5053-399f-4b08-b61d-cd8099fd11a3} - {4033db98-c3cc-4522-8bf1-5c005c96d693} + {785f10e2-ae48-4bf5-96f4-4046b9b0cbe4} - {d5b9d054-aa37-493c-b143-97c3b09adb97} + {96e5a6a9-eb07-4335-9a60-a8bdac40c5d6} - {b00b127e-2dd9-481f-a618-bf9a5cb124d0} + {02e61717-d8ee-43cd-bca6-9732fccc4c26} - {6d5708ea-3a03-47f0-a516-3469c28c0188} + {94621bcf-f6fe-45a6-91c3-514763930490} - {a65ce1a0-aef4-4556-9b33-5015bb9ce54e} + {fcf6aec7-c2d4-4536-b50c-1b8889572368} - {dcc43100-d286-40d5-ba3e-8d243fad9c39} + {d3e5abdd-ef56-4e5b-a7ae-ee616f61e5ea} - {f36187d8-4767-4399-bda4-a36436e17689} + {0794579f-8997-43a4-8c4c-1e8cd6ba83a3} - {2163f24c-97a7-4e4a-883b-1ce58794e115} + {b08786aa-efe5-4287-90ff-f4583666e38c} - {c97618b5-6b0e-4353-b998-34583fb5cb35} + {02fbd1cd-502b-4556-b79f-26500657286f} - {a0eb4b2c-b5a0-4962-aaba-816b9a6cfb05} + {55c80e94-3645-4acb-b487-8cb36d1806d1} - {99f3bda6-64f6-49c5-a1b6-a2fb23d2aeda} + {8d342799-302c-4e9a-814a-af4b15ca0524} - {08189ba1-b245-4475-baa4-a64761675163} + {9250dedc-863e-49b7-8531-a1eaa2b1804c} - {1afa29e9-7bbb-45b0-9a14-3054fa1bfc08} + {9e2b1f1d-eb5a-43b9-8515-61f37f70c5fd} - {98aa512c-edcc-4c0b-9b08-5ed2c343d237} + {bebe2f8a-e1e6-49d4-9cc8-8709fac6be3a} - {f9f5432b-7de3-4236-a9ce-da4e5a7d82a8} + {595bde90-e7fb-451f-bd98-ae46081e5066} - {04110352-c74e-4c30-87ac-c5c217fd7d6e} + {a707b72f-b47d-4911-9e71-c90cb0963f34} - {08a88e75-d03d-449d-b8a3-fc976a3f2338} + {3279b26e-2356-4394-b9cb-67df4c8cadda} - {c107a40e-99cd-4c1b-8ce7-5f0e9fff95c5} + {22c32fb7-ee22-4927-a480-46c4fdf63cce} - {e6762433-4c66-460c-bf49-39999288447d} + {8db3e1bb-d39e-4dc3-a195-b68fb3880c05} - {98938304-7d9c-4d63-b725-ddb2ada57d99} + {2da5539c-16af-490b-9c5c-5e38d3ce7cde} - {c79ab636-4733-4c32-b42c-67fc9ab93ba9} + {01e751a4-1113-44d0-ab63-5ad9cea9b64c} - {8790a2d9-495b-4493-bb96-4a5cc05c6b50} + {cc08fd00-96aa-4e8d-9d87-23ce941939ac} diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index cba552d6b..9832d0392 100644 --- a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,181 +2,181 @@ - {6a64ab69-1020-4cb0-ad6d-6833ccad0f7d} + {f3c9125d-3127-4a35-aad4-bd3e0036fb74} - {089027dd-1886-4e6c-acc6-07d8c1a4bae3} + {fd54df35-8ab5-4d2d-85a6-b244cd47fed3} - {75a356d5-5333-4450-8db2-8cd59fd630c1} + {dd223fe4-606f-465c-a0f1-945564d2e6d4} - {e60c4fc2-58dc-4dfc-b2de-b59b9277c095} + {92ec0366-de27-451b-8eb3-131fd38784ec} - {ba47d8f9-edce-493e-8f98-f8550db204ce} + {b71d2559-cc5e-4f98-8480-a6ff7a88b9f7} - {d460ae5d-9205-4596-bbce-eb47f1c82d37} + {53f81ae1-2c49-456b-a7a0-1e0eea746cb1} - {cf750907-3d20-4e5e-8951-70c08964cbf1} + {0d4ee579-9e79-45a2-99fb-d632a8348ced} - {4e50fcc3-ff39-40a0-9b16-9ed5d548c727} + {7ef7eaf1-741c-4a25-a526-a80e95aaf05b} - {3d384c8c-5398-4cf5-b972-4dd1d1fa46d9} + {f4976245-8257-4394-93f5-027ebfc805de} - {8e3c00ab-fe87-4c44-ae91-8d1da0508117} + {f44e47b1-8096-4802-a702-8a55a522e01f} - {13fd5a69-a8c3-47fb-bbb3-07be018eb0e2} + {5d51282e-7ee6-4bd9-bff3-e5131d5a695b} - {be4082af-c2a0-41b4-afd4-3b8492bf7104} + {bb8fc04c-a271-45ca-adbc-cdbae5f1088b} - {d0eccd7b-b005-4d58-b02e-f83e5872246c} + {c80d9bb5-2e34-45f1-a644-4eb098488660} - {d32111db-7076-43ea-9731-13f74283969d} + {0c1fa94b-0de5-418c-8488-f89447640daf} - {e6541009-7aa5-432b-a279-2ea22797d3ad} + {6c840e81-2060-45f2-a553-4aee12cff333} - {19ecf7de-7438-4eb6-9b30-80d864408d87} + {814cad07-32e4-41cd-b415-fc061bbe2a5d} - {57d155e7-3ae4-4bd5-8627-86caa409d35a} + {8a9aa776-c5a5-4684-abe3-6562a58b89d6} - {57db46af-7859-40c3-8b04-118c5a4e997b} + {33ee2c0b-9141-460d-94e2-2e9bd4408f2b} - {17037897-b729-4020-bc47-828ab6f1b426} + {bf41ef8e-8de2-4466-93b6-cf05d109de99} - {d679fbdf-5e85-4d8b-8954-aa73e9de0f8a} + {05866e82-d729-461d-b3b0-2e3c5cc0c360} - {3db0f9bc-15eb-4027-b2aa-7b4c3fcc2046} + {588699e9-6cdc-426d-a9a0-4e5a89d97f2b} - {456be418-cce3-4cd1-9f59-38e4232f8f3b} + {a680589a-883a-4c3b-b08d-9730d692fe0f} - {bdb2b793-89d0-474c-ba3b-484c9b50a52f} + {33a1bf69-03c6-41e1-b082-824aa56d69ed} - {15943c33-0109-44a6-a241-71e98b0413cf} + {e49aaaa9-0a2d-40f1-8b4f-8f4557049646} - {2f5b68d3-c2f9-4275-ae8c-cffc2b1acb88} + {3bf8b598-5e18-4b7c-a433-b6691afc0edb} - {259eade8-fd85-4d9d-be27-6aee8aa660b6} + {ada6fa7b-bd0b-4d02-ab6f-74e8e0a139c9} - {a9bfb092-b2b3-4dea-9c33-08e53d09ce2a} + {2104989e-373d-4b31-bc03-4ac48dcaf4db} - {17e685df-5ae3-41b4-9309-c88c314e727e} + {7ea1ba65-fe2b-481d-9802-a7663162b2ab} - {251c8bc7-72d0-4ee0-a3af-b879b496fb3d} + {7f5348b2-0e57-4410-ae33-12bc13cb8e49} - {6c441101-30fa-40a4-aca5-7ec25de69ca2} + {b99c1bfa-c13f-44e3-b271-ca4b34352146} - {a447f3cb-51a1-44b6-b79a-c07103b10549} + {dc4bde90-5e02-44c0-b61a-7810ff872dcf} - {408d8f0d-646b-423b-a1fb-0005618d868b} + {b1a27968-c41f-49f3-a175-5e865abc3392} - {3cf10492-faa7-4d08-9462-5d73b944277f} + {56c7e810-6209-48f5-9098-3f5d06cd0a63} - {01644098-e376-4f03-8733-e9a911c3371e} + {07423f1f-c1b6-407e-9398-c604edd9c175} - {0afa7602-c5ce-4546-9620-3d8857ae041a} + {8845e6f3-22d4-4517-b163-cd97007c04a4} - {dc5a10cc-4119-4a2a-9250-4f2f4891a3b1} + {257c6754-5fd0-4025-aee2-ef5963acc0d7} - {5192bf29-1698-435d-b62f-77a87436804a} + {cd2cdb93-4ab8-444e-a7cd-6fc65ed1ecea} - {31df517a-4a5c-4716-a786-06b7f74842e9} + {fceced60-e554-477b-b63f-10cb625c92c7} - {b0a9869a-c6f8-46b3-9577-030e5c52286f} + {c4cd07f9-9714-4713-b388-100f2889c799} - {ca54ceaf-2bd2-4d71-9a1a-4b7ed7e78af4} + {0b9c2b9a-080b-4dcd-9708-a67d7462ddfa} - {8d500257-a065-4b1f-b6c8-af49eab0aabe} + {dafcc240-e8f9-4ea0-bdc8-d48a9ee53761} - {d0a8f449-a1e1-420f-83ca-05cbd2e30108} + {407b3246-485a-4c2c-bfb9-5cda401fa0e8} - {b4c6e4d1-ec4a-4b51-b27f-23520f526a37} + {07aa9425-fff4-49ba-8206-7344c7a4f5c7} - {7d761efc-6ffe-44b0-98ec-7cc6eddb41a7} + {5810494f-0163-4247-ba09-d3f800861402} - {f9c95e83-daa1-4185-aa52-a24d6db2d78f} + {5fbe3d38-ad82-40d9-a1b0-8b167013a3f7} - {ffcf718a-218a-489e-a866-bc8a4e879a6a} + {8a6cf096-9c4d-47f8-8e0e-d4f56c84ff5d} - {82a77e51-ebbd-4d47-bc91-489e08e498cb} + {2df9fd25-1ce0-4922-a9b1-a96c4447e2b6} - {47a9fc0f-0fc8-4bbc-be48-68a710d32d40} + {0ceaeff3-2601-4ca6-a31a-cbba21790684} - {00cff79b-c501-4104-8249-5ce10c97e41b} + {20fd1739-02cc-40ee-84c8-59f8480b5c8e} - {7e65a6df-de2b-458d-bb2f-0767fe62976f} + {e9ef3f9a-af79-4c07-ae38-90f487511321} - {372dc43f-0f40-4803-b0e1-0503ab0584a7} + {bf9c202d-c608-40f6-9553-3bacccc57b59} - {7ed96d10-3934-45b9-9211-b3b040d9a1b0} + {a1d9d03c-3092-4475-b505-7095180b4c25} - {4fdd94af-ed69-4c74-9991-f29517086d51} + {f76bcfe3-b25d-47fb-8cc3-63f4aac76d6c} - {53c52b74-bc22-49e6-b139-f3869e4024ff} + {d02ef4d5-246b-459c-8d27-0f61ff07e389} - {ba898181-5c19-45fc-9d51-832f31e642db} + {403c393f-a686-41d0-b31c-f00aaa91a3bb} - {925c63ff-cdcd-44fb-a94f-9e3be9e5e4cd} + {ed7143bf-d3bb-4019-90a7-86f1f62d88b0} - {1b7da4c6-05f0-493a-ba3b-b1504861ae90} + {5e183433-3a77-40e6-b495-f2b74d303dc9} - {148a3b8d-4707-4a51-985b-24fa7910aa49} + {2c86c42c-29c4-4dda-9fdb-4d6f46bb748e} - {e9b1d626-3232-436f-873e-22b1aadb7529} + {ff7b3f30-6863-4511-8012-a76b5252e951} diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj b/Foundation/testsuite/TestSuite_vs100.vcxproj index fbca104a0..520996a5c 100644 --- a/Foundation/testsuite/TestSuite_vs100.vcxproj +++ b/Foundation/testsuite/TestSuite_vs100.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>10.0.30319.1 + <_ProjectFileVersion>10.0.40219.1 bin\ obj\TestSuite\$(Configuration)\ true @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters index 4fd1a926b..1a3b49bf5 100644 --- a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,181 +2,181 @@ - {2e7b5c2c-a621-4c3f-8665-d018433a47be} + {0a10e66f-d16d-4f04-85c2-0bbbc5f6b100} - {aa2a4c51-3250-474c-9fd7-b4c02d627c23} + {3b1dfdbf-6bf7-4058-8895-33d848c1e499} - {e3000b27-8e98-43b9-8676-0e2bc552ed96} + {517f4a78-0b5b-4337-8c72-556157003530} - {9b02fdf4-330d-4ea1-9b50-756ea1e9cbad} + {77bb270c-e511-4ae2-85f9-38971bd7856d} - {e01a48ab-4deb-461c-ac9b-da93d753bce6} + {e42fa3dd-f754-488c-826b-8e0f99fc5835} - {783f30ef-30f9-4653-ae14-b5e174b7f78b} + {4894f5af-a38a-4b25-83ee-20384b750a6f} - {a42da995-bcd7-4537-8252-d5e53d0f1d0e} + {8b2ed54b-0326-43ea-96e2-780b282e469d} - {adbec94e-84f6-4a73-b8ad-56460f915735} + {cb3baffe-fb99-4d41-8d67-1850d7e8fef9} - {d68eb360-09da-436b-ba93-930e42eb3765} + {b35df9de-7f5f-4e73-9920-658b7f6e0e6f} - {9a8db21b-da0d-4166-87df-cb3b5fdad9cc} + {02bfeb90-5b31-4f0e-adf4-ea0141198fef} - {db95736d-423e-477f-9b96-b69270d92db3} + {78a0e06a-afb6-4636-8b1c-ba67215f64fb} - {30ff01a7-c8de-488d-8825-18ecea307edb} + {36da004b-1ef9-4fa8-b0cc-cd076dfd70d5} - {53539527-99a1-4611-973f-eafbc885d7fb} + {eae5cd1a-62aa-49fe-aa7c-cba6dca63866} - {8670cfea-46c1-4f9c-b627-7394a23afc23} + {02234446-0887-4b3c-be9a-a8f1a2849564} - {3444554f-0e39-4caa-938a-6eb00f5bd6a1} + {6adbfa79-b5aa-41a0-bfff-41224af1d2de} - {c4c27564-f218-40d0-8e56-e8e3ed2d7f19} + {53bdf98a-f40c-4162-9333-66f0e6207ead} - {cd2a3ab0-fb71-43e4-ace0-bb0e9d7a8af8} + {073dd942-5c92-4d88-842b-ef2c98de0287} - {e35bb723-46b3-46e3-8cbf-d28df355ea53} + {284bd1ea-f2a4-4cfd-87ee-2cadb3b1f79b} - {ab9eff64-9534-4e0c-a933-ee6de3a209a9} + {4dae86f6-33ff-41fb-bb82-44c187910fd7} - {ac884684-43da-4dd8-a44e-24802a812393} + {8690237e-1bf3-4a81-9b25-21e320a31ba0} - {68c296ac-f7e0-425a-bd33-360f5698a8de} + {25d5fce5-2798-4b91-b636-becb99db93c2} - {6a4b4b6e-4809-4b7f-8833-2fc2994ce1f5} + {6f38d425-35e6-462f-89b0-f98fcbb29cfa} - {e3509278-8ef5-408f-9542-c91dcdd28760} + {fbb86df4-53fa-40e3-bb96-0692148cf898} - {ae7e489e-8a98-42b8-a5d2-480524ea5760} + {72533150-5de3-4854-9973-0ed705239e81} - {032a30c0-9065-4eb4-9a32-a91ba8f27ffa} + {a03d6a18-8d40-4d94-b9df-440bc5d271c8} - {38db7f11-625e-4e2d-a419-13bb4df3ecff} + {d36679b7-db39-477a-947c-2476aa08058f} - {6f42cc0b-94c6-4f02-8db5-3e5856631d36} + {a5b745d1-94a4-4961-bfa8-a4a127f862bc} - {190d3222-f479-4dce-822a-144d2940f669} + {e4cf7848-3fad-420b-b0dd-88364cdf7323} - {2948a228-c54d-4488-bdb3-793e2822c6fc} + {8b2cd060-ab38-4899-9eab-420d79bd149e} - {864eba35-a78b-46cb-9452-8dd975e12c55} + {92a08762-9d81-4d9f-8aa7-8875450e7535} - {bdfbe601-57c5-4d93-8535-c95905f85e82} + {ff2bf192-bb67-4ccd-8fc1-ff615a9a266d} - {73238f2c-5261-4833-bad2-9eb2eea57641} + {b7c93468-498d-45a5-827c-55422d56b819} - {0acd48c0-20ad-4d45-8809-7c674bf9c736} + {a8dbb0c3-a110-4417-8e17-0d33b6807c62} - {b5548d39-c978-479d-af41-fe2bf341c3a8} + {2b0f2938-63a6-4c5c-acb8-9f575f9763d9} - {5638c842-e362-43b8-841d-8acf34046360} + {1b1e4d4c-7a5f-44dd-90d7-c88e30994957} - {e0a682c7-b8dd-431b-8724-8744937ea56a} + {5f737a98-172e-4de7-9c41-5c81cefe47d4} - {f9caf92a-e9c5-4811-b922-2c5918a5a145} + {27fdfa8a-7c81-4dd1-8766-8d421554914f} - {f94b9cc9-0c68-4faf-becb-f7c814a38bcb} + {52b90b29-a61a-41ce-b3e4-8fb4b970aab9} - {b38b3c7e-c36c-41fd-8eeb-935f0954feea} + {d3c3465e-8e45-4ab4-a7d3-a418fc437923} - {22b55fe2-d459-40df-9aa8-421c48d4e3f1} + {c4f191cc-ce78-4134-ab38-6cf38e54a279} - {67cfbc8e-be95-4328-9961-84aea3161f0d} + {33b4397b-abbb-4bc7-a999-5ad810a7ce11} - {57b90d56-ee70-4bc9-88f0-f61ac9124546} + {745527f6-d74c-4c1d-9dd2-6a2ef2af785f} - {04e74a33-b66b-4d43-935c-ef209d0394d6} + {0b77aad6-57ce-47b4-8afe-755404055c8b} - {d2ff90bb-27ff-4fb9-b4e5-02d14a525cd0} + {5c67676b-e044-4381-aac8-4be33726f50f} - {2d9b1448-bd2e-4468-9117-dac1836d52d6} + {ce5897f0-2e1a-4b5c-bbcb-c9d78e9c9169} - {acc352d9-b343-42a0-bfe6-c3aa959cfe75} + {3e1f620e-017f-4534-9532-cee574799be9} - {4b815550-33a7-452e-b510-d3e26a879f2f} + {d390bbb2-8b92-4a73-8a5e-a976bd1e3cd8} - {d64eb426-d57b-4e5d-952a-d671064ac367} + {2e2f8ecf-6444-465d-9211-dabc8f2f8047} - {fecbd0f0-c4d9-4ee7-be5b-0bc3464e7d7f} + {bd792886-e5b0-45d1-8ae8-ec974cba9958} - {8996c7c5-1d8b-4182-9e9f-5a924b80a92a} + {2a5232f9-ecc6-4f8f-be4e-bdd6a15881e5} - {d60e8f1c-5e41-42ce-88e7-170a1382e0b6} + {17d66619-5601-4070-8d62-5387513a283a} - {f183c589-cf68-42c3-8d3b-f8e3ee2d67b1} + {7274862c-7910-4605-a99e-1f43d7b0c975} - {1a8b37ee-b017-4814-a4f8-ef319ba74652} + {7dbe576c-26a6-44ae-ba2b-19262cd1b7e2} - {7295aed4-2f1e-4ded-96ad-fa5671e2dd64} + {ce1f10a2-2826-45a0-9a28-279240939450} - {085ff2ee-d571-442e-bf7c-dc4eb5ac15ac} + {d35d2894-191b-4023-96c7-c342cc7857ca} - {938c575d-a642-448c-aa32-083eec204572} + {3e09c6ae-ba1e-4e0f-b99f-baeb3dec5aa2} - {0027b55b-96f2-463d-a33a-5b059aada030} + {7fe030a1-1bf4-4c98-8bda-3155649fb4d1} - {f9e85b6e-3b17-499c-b7a1-3bedcebd4a74} + {352c817f-3d04-4d6d-b137-2c38c91847f3} - {f69c020d-4aac-4862-b2ba-b14c91d39546} + {b59df823-2d98-4d36-ac53-3c9713dcc2e1} diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj b/Foundation/testsuite/TestSuite_vs110.vcxproj index 30ab81808..2293199b7 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters index 4ea12e091..98c2054a9 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,181 +2,181 @@ - {d297e34c-2985-47e1-aaa8-1c29fece30e9} + {1baac30c-5677-42dd-9cbf-969d86a560f1} - {01f4c751-d7bf-4af3-bab7-d88cdeefda7d} + {d8b30a20-aebb-407c-9a27-a63d045ca906} - {e09bb43f-fb04-4ae3-a75c-ca9ffa7b2736} + {bc9fa8c2-8d06-45be-89b7-c3a952eab8f9} - {f5aedd92-08e7-405f-8f77-708e7304e73e} + {c85d1e6a-3274-405e-ab62-4157548909b7} - {bcee2561-5484-44d1-b4be-0935a48a73b3} + {093e02c3-cfcd-4bc7-9c48-63d78444648d} - {3ec33223-f3c6-4fac-b5e6-5080f6bf4097} + {84ce5061-e17a-4dcb-ac5a-903fb7885ddd} - {03192d75-cabe-4eaf-97e9-8175dfea2f8f} + {a6b20a53-1f5d-45e2-8e7f-61084309a7a3} - {84cdee18-aa8d-4bb2-b3ff-67498256dcb5} + {9298e976-d518-4cf2-b54a-83a3b3b83efc} - {6259e2b1-5f9b-478b-aed2-f003a94a0899} + {210bc81d-5c85-41fc-870b-cecd00c4b23d} - {566b4bdc-13f1-4a68-8257-480245ec92f6} + {65026cfc-17e1-4c39-9c37-19355b6ffa6e} - {850bfc6a-fa17-434c-baad-e7ca2ca16bf3} + {8b5dd4e7-f4c6-4410-9b19-d47f91be9c41} - {ea7df419-5d19-4a4f-bf36-df333777378c} + {0034343e-1e59-4343-bafb-7626e9a3ff6c} - {a4eda950-abda-4bd5-b410-a8a118451cea} + {7ee65ef4-4bae-46a5-a8c8-5410f0af424a} - {f52cea45-5653-4ee3-b6d7-7f1f34182ee1} + {790e9aae-90be-4274-ae71-ac9227baff03} - {721382b6-4f4b-4f33-a707-2bd40896989e} + {196371ae-0d5c-4d96-a20f-7fe67a96ca11} - {4fe886ec-e680-4b30-9ed1-965bc7a7b03e} + {01d7fd8d-ec4c-4178-993d-faedd5084bde} - {9e86a919-b844-47b9-bfb3-474b4f4d2e89} + {f944fc42-73a1-4a0a-83e2-4e170821afdc} - {952c3f74-8ee2-4fca-a2d4-79e4bf266e5e} + {844ec75c-5f5c-4d68-9271-c2e6768e4202} - {d673a8e0-53bc-4354-bad9-b6f6a73b1943} + {76ca3e89-a304-4152-9898-a487e0e2d896} - {ff4ac443-599e-4c42-b6ed-089bfca49c3f} + {1ce5eea3-bc4f-412e-841a-0a025ffc9874} - {5f1c7746-01b0-4571-8257-ac11ca835be7} + {02910e69-913b-4b45-9f71-3d8c2881a1c6} - {ea0a837c-e888-48d5-903d-980117475c91} + {b09b5a3c-55d8-4037-843d-c61894f3d5a9} - {7ee8c50d-8ee8-4bae-9238-7d584acb4335} + {332784dd-9591-4b67-b230-f1da6c909e09} - {8cbfcc1b-586e-424c-a79a-fd75518ebaf7} + {ee08c65a-cf75-4c44-a649-213ccf9b1766} - {dc93c68e-2229-4734-9961-9e42b8381add} + {fdb39ffa-7393-461c-ab71-d936d892e41f} - {cc56e9bf-60d6-4657-9833-690a349b5553} + {7c1b3d66-c1e9-4b32-bb6f-0c533cf6eba0} - {fa4a167b-b462-43f6-9f24-9b7e44f02633} + {66f5740b-fed3-45f1-a9de-64ca84dbfca0} - {855f67c6-419c-4c66-bc07-0adc6f38eb86} + {efdfb19c-b01f-435a-88c1-59ca53cb6a58} - {cb1a778a-c650-4cd8-8bd6-e1a0599a42de} + {5e42b10f-e265-4a40-8c07-f98e8a10082b} - {7c349214-0088-4b17-91e3-a298fe67d64d} + {08c8499c-280a-4c22-886d-a3b13896c030} - {0d06253c-7104-42d8-a054-7eee84ec5b74} + {99297d47-b23f-4cb8-8df5-fc1d29282424} - {213e3747-7417-462c-85f9-f98e3ceee171} + {863e7c0f-b6a8-4773-ac6b-07813b8ddd4c} - {1e144b32-55e7-4b6d-84bb-bfd16ce29106} + {b6b102a8-c790-4b67-9edb-3c8cf9838e06} - {671d323f-a97c-400e-b2fa-a7cae0f042a0} + {19f7a43f-ff35-488b-a02d-e238cdbeec17} - {67527e86-272c-4a16-8a34-c935200fed3d} + {52f013f4-bdd0-468d-921d-f4522b03c13f} - {925d13c9-9eef-4075-a8d3-bcc07d4eefb4} + {8b305fd1-2668-44dd-a3c3-268e89b0befd} - {4dda2086-201c-4116-858f-fce2e1e96b18} + {c7ab749d-3dc4-4441-b5a9-ca47b3579362} - {9d524bfc-dee0-4b33-96b5-fc7a94e5f4a6} + {4d7ed9d1-3bdf-429a-9fef-863fd5c2f7b0} - {56fb7df4-da70-43ed-bb72-7df97d884ab1} + {2cb942be-58b3-44b8-8022-0f75cd394633} - {b4806b34-ebfc-4c45-8dd7-71a088af8ca4} + {816650a7-369a-4698-9cdc-5713481a1501} - {9446adea-83d8-41b0-a071-c0181881d5d0} + {5d9351e5-5e9e-4867-a217-d57ec58a7bf7} - {4e0de2f7-eaf9-4382-8ab5-5155c2a9890d} + {d2f1a0c7-e875-4c30-aa1b-027a218ad5e8} - {1d517128-7e63-40de-ad8a-0114df32858d} + {1db27353-7d18-43c0-b965-cb801677e560} - {4760a4ef-7850-467a-870d-6da7b1d9e12a} + {b584187a-7fd8-47a4-8e88-34a8e064c36f} - {0e76fb2d-4080-488b-bd9d-7e81550be636} + {a11db51d-8bc3-4b2d-810e-da4bacd89079} - {2c006f9b-0bdc-4593-9f1a-2c456069ea09} + {a5528069-ecb8-4a20-a675-109aab44c29a} - {c3f0bdfe-b7d2-4919-ad74-ff948c959538} + {e18dce29-fc72-4ee9-9f35-8cd7a270e06d} - {8aea9a60-70cc-4282-a5a8-32f510c80425} + {ddacf061-2718-4050-8f57-fadac5a212dd} - {06a81f6e-caa3-4aca-9000-0827fd088cdd} + {ffba0e75-5a5e-40e8-9307-a72c7e90c8ef} - {0856bf31-6eb2-43de-892e-011753e595f2} + {fce1fcfa-b8e6-4490-a453-4eaa228c8b23} - {6ea1b891-6ae2-4ec5-a079-2e4016e0cc84} + {31464427-606f-403b-baca-1eea75bbddd8} - {68dd59f4-afaa-44a5-bcb4-8064e6563bfd} + {dca5c7f4-717e-4ad4-9744-11bf5ee2319e} - {e8039fba-0978-4867-904b-54967f1ad843} + {8c03fce9-9e34-4ad5-9ceb-1577874d1b3d} - {ba4cb939-d3ac-4dbc-b7db-a5df8b38c1bd} + {37c3f1b8-c697-45b9-8cde-062cfaff01fb} - {810518c2-4d33-4a9b-832a-93247f9bc4a1} + {c2732cf6-ef76-44b0-8f55-94226de7e02c} - {99c2c167-251d-487b-ac29-a902d75a4a25} + {afa8f74c-2c4c-48e5-a3c4-8db4e13f80c8} - {3caff064-062e-4da7-9005-3114ebc4dd46} + {3af201ba-da2c-48c9-b8a4-5c4bc453b682} - {4f77ebd6-e6c3-44eb-ad1f-fd936eb3a9fe} + {2546486b-8278-430c-b514-fcde91360734} - {56d77113-7d30-4778-a250-4251375f4ec9} + {1ed1a3d6-8b82-4835-be09-be38d2b62adc} diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj b/Foundation/testsuite/TestSuite_vs120.vcxproj index efcf6554e..62543a457 100644 --- a/Foundation/testsuite/TestSuite_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,7 +136,7 @@ true true true - + Level3 ProgramDatabase Default @@ -167,9 +167,9 @@ true true true - + Level3 - + Default @@ -196,7 +196,7 @@ true true true - + Level3 ProgramDatabase Default @@ -227,9 +227,9 @@ true true true - + Level3 - + Default @@ -256,7 +256,7 @@ true true true - + Level3 ProgramDatabase Default @@ -287,9 +287,9 @@ true true true - + Level3 - + Default @@ -304,289 +304,287 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters index 789031b43..b90f3c365 100644 --- a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,181 +2,181 @@ - {85000ad2-279a-48b2-adbe-9ee7ecb9c460} + {ff4d5ff0-c873-489b-9a24-b669255b0219} - {c88c387d-6e4c-44c7-b1f1-f94a29e73e7a} + {8034ff49-3690-4ccd-a80f-32e74bb46e4f} - {eb612b41-bd3c-4f9c-8546-42295c25a3e4} + {63eb7887-bde5-490d-9ba3-d8e0a309968f} - {06a96c64-5df5-40a0-92a4-113fe2c55ad1} + {2bd8eabb-9ce9-41d2-afce-5e3201477480} - {57346538-fa49-43b5-961b-b5912bd70506} + {86cf9372-01b9-4270-b279-b3857da9cfd8} - {799e8e82-fa89-4960-a600-a8c34cdc5d62} + {3ed465d1-551f-4bfb-81dc-ead68e6c6108} - {1c5ff335-eadc-4e99-b845-6488da756516} + {cde3ab15-75b2-4c39-ab2c-2f8c4dcf5e4e} - {2e16fd63-7429-4566-a0af-9557ab2a3ba0} + {187ce494-b282-4e94-ac3a-9298a25ad67d} - {f5d0a863-3f91-47aa-b93c-4629e9b72e88} + {673bf490-23b8-47b5-b885-b435c61c1438} - {46abc804-1dd2-4356-88a1-12796a9dd05b} + {ecbfb0a5-eeb2-475f-a35f-dad192836315} - {502b1f5d-d4c7-4f44-b68a-d2ed6f63fa68} + {b10af663-f5d6-40a6-b6a6-22a6a9815e82} - {3e3b5463-313c-43e1-abf9-6f73bee102de} + {7f19243e-e2b4-426b-bdc7-f63177ae8930} - {a6f11014-f0c2-401b-a181-be64ac1fbe09} + {a780cc91-15d3-4996-ae7c-e1c83633a8c7} - {eff5511b-8c79-4651-b0da-a58fdf308c91} + {b9ef69cc-6acc-488c-ad33-84b5f2920fc2} - {44db368f-ab85-4172-a3e7-b555116f3fe1} + {6af92f0e-68a1-427c-a055-cb5780d046c1} - {c58da7b4-4b29-421b-8a7c-9bdfeeb0899f} + {1814ee1e-e49a-49a9-b7ab-89cf8627159d} - {4efb56dc-e543-44d5-a78e-e41dd69fef45} + {94e8d646-56d6-4c91-9a1a-15b4c71ef612} - {c0b3a9eb-1bf6-46b5-ab82-248b9812bc3a} + {85f81963-04a6-4e88-8658-dc451c0bce71} - {0071d41a-dc08-4850-a362-eec80137c913} + {d89e9106-5660-4ec4-8c55-242c1e922583} - {6e1d3a14-42a2-4bb0-9e46-d42023915796} + {735c61fb-6da0-41b4-b944-b6fdbce433fb} - {14afe118-dcfe-443f-abe7-e941e94bf01b} + {111e2824-2341-4ba3-b22c-fe37421d4984} - {f29dfd51-53a6-48d6-9d21-6b2c057f56ab} + {5d02b2fc-f635-4d2c-92eb-24caceddab56} - {e88efcfa-04bc-4d6d-854e-32d0c74d11e9} + {47db4ff9-0e42-4891-9135-e79290451ad1} - {594d6d92-0612-4775-8fb0-f0f633dc0a15} + {238ebe11-5676-487f-a2c3-749d21edcb82} - {d7fa8712-bfbd-402b-90a8-a0dce78477ba} + {6b1e57b3-cbcd-45d3-a6e2-3250a223ec09} - {e75accbd-181d-45bf-b604-5d1fea94441f} + {beb638b4-315f-4dfc-885f-b8ffd9998324} - {52c71d79-9636-4e9c-979a-3c47d315431c} + {9fbe55e4-0715-457b-89c9-ef84996fb2c5} - {da4030a1-ae92-4c23-9fdc-3ae6d7437844} + {07b962e2-ac7e-4041-b675-cb923280de50} - {6ea95469-61d4-466d-ba62-c349b37c8455} + {c1f61723-f651-4619-b755-061c277fe562} - {a41dcd0f-c972-4cdc-8591-999c04cea72b} + {80287079-ad4b-4100-8f38-611e21dc0eb9} - {417e21bc-eb4d-480d-b28c-123426a15ba6} + {f684de20-770e-41c6-a1bb-e41b1dd77267} - {e8e3d2ce-642f-4d58-89af-5492d47e6074} + {7f27a5d4-a517-492a-aa4a-335b7567d0ac} - {6a2d4106-2705-46e2-92a3-901457e09797} + {4fdd2b94-c3e3-428d-9597-a35dbe8947e1} - {1d1d4d66-8586-4b4e-966f-431783f73ac8} + {fddfd04d-d023-429f-a34e-4b07a2da4d8b} - {f93bbb17-ebce-43e7-a370-99d052f7dc5e} + {260a76f1-05b7-41c7-ac3e-eba52d6d6765} - {eb079304-e834-482d-8e47-dc574a9c5190} + {4354b932-8a87-4aeb-a178-b07b72a4fce0} - {d2db1ee1-d19d-4a38-96a3-0f0b0ddaaf4d} + {c2526656-0734-48f5-9c1e-ac8dd7db8502} - {7ffac473-3923-4b7b-b735-4bede954ce7f} + {d1ec5838-6b37-4410-88b2-f6d9ee3fa59b} - {8f56117c-19cd-463e-84ef-dcecf62bbbe0} + {8efdd3c9-b1b4-4e88-9d13-9af37cb66828} - {a96cd528-3372-437d-bebc-14c3ee67f1eb} + {0043deef-2625-47a9-9ab5-5589e7c99200} - {cca2740a-df03-40b8-a98f-da7dbac89ac6} + {b5193f0d-85f8-4cdd-afc1-97a5b98da7b7} - {475e533d-7bb8-43f2-9652-3a9813330f66} + {12271e77-8609-4782-84d1-7d6c683e842f} - {732a8fdc-3c05-4a68-9441-89bcf4ab1693} + {9b758549-f6e1-4e46-8dd5-47ab9149c00b} - {72759a7b-a0a9-4cd2-9bf4-973ac2178ab1} + {75e20a8f-ae70-4fc2-b123-9a814e17dc70} - {7d79c1e2-1c5e-49ba-8432-286a6f09aed0} + {c0cb35dd-abc7-40dd-a58c-f33a01865c99} - {5516c81c-3822-4f9a-a64e-0a845b6ee693} + {132a9cde-2d35-4610-b25f-e6c04eee7b85} - {99149ab0-d450-4281-9969-23e777770cda} + {c1ed9261-1b63-4b28-b469-284cc86b32d5} - {db0f635c-7569-4913-b6d0-c0d34195c574} + {7e0680de-09e7-4856-b02d-e35f9140d807} - {fd306bc3-78de-48f2-a605-5d22217afdb9} + {df2cefe6-ce77-4933-af63-29703e790de5} - {4f157861-9345-4f75-abeb-6c25175f6e3b} + {63837e6b-0ea1-413e-8cd4-e539ce64893e} - {77072a9e-eb3e-436f-8458-8f904bd0bb2e} + {e73a99da-9eed-4361-a11d-6a50696743d9} - {bb7483b2-1e34-4a5b-8173-35d25f0d086f} + {3535aa02-9346-4005-a44a-251b20fd794c} - {f7825b15-d767-4977-a5be-eb9186e691b0} + {8b7ace49-cdb4-4e2a-826a-dcab227335f1} - {9dc6a5e7-3bb4-40cc-b417-0438b1a5e681} + {61f6d4e2-7dc7-4609-9ae7-0b0d7883dc59} - {26ca8a82-a4d3-4c66-bb69-258497b10ca2} + {89f3cadd-96f7-4692-adaa-fe53af3c8f6a} - {890b96ed-4921-460a-ab09-ec42f511a51d} + {7a53d390-23f1-4153-99bb-e0be529f2ede} - {d8f65461-08f8-46bf-a5fd-e4488d965b26} + {90df759c-59cb-468d-a6fd-45237da0dd5f} - {51b7fbd1-e881-4302-b132-8edcb1985055} + {186e4811-5617-4519-acaf-5aa01a808d9d} - {7574ea6a-81ae-4cd8-ae6d-74f890c8b11d} + {3d8ead8b-383e-4dea-b0e5-9c8aff3fee9b} diff --git a/Foundation/testsuite/TestSuite_vs140.vcxproj b/Foundation/testsuite/TestSuite_vs140.vcxproj index 557112fda..6a514742a 100644 --- a/Foundation/testsuite/TestSuite_vs140.vcxproj +++ b/Foundation/testsuite/TestSuite_vs140.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v140 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>14.0.23107.0 TestSuited @@ -136,13 +136,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -154,7 +154,7 @@ - Custom + MaxSpeed OnlyExplicitInline true Speed @@ -167,13 +167,13 @@ true true true - + Level3 - + Default - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -214,7 +214,7 @@ - Custom + MaxSpeed OnlyExplicitInline true Speed @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -274,7 +274,7 @@ - Custom + MaxSpeed OnlyExplicitInline true Speed @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -304,287 +304,287 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Foundation/testsuite/TestSuite_vs140.vcxproj.filters b/Foundation/testsuite/TestSuite_vs140.vcxproj.filters index a62c7a09a..3740ef6aa 100644 --- a/Foundation/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,181 +2,181 @@ - {37a822ba-2ee6-40ca-b4e2-0316816d0835} + {317cd432-503b-4083-b727-f8a6faccf0bc} - {4fddaaec-69a0-4cf5-99c0-0925ad04f322} + {8a3b0ea2-7ea9-4d54-a77b-68b727622e7b} - {33aa511f-78c8-4d9c-863b-5e3d2b7cc835} + {f4a18ae7-6aad-47a9-b5bd-6dcaa4c2dbdb} - {8dc1f651-023a-4b65-8c27-7a56bbb35395} + {331b35f9-5d06-4fc4-b887-7571ac4eefbe} - {29bd87e0-eefd-4bcd-8d10-4a5391d9e9e1} + {88026b92-3281-41f7-a2db-5d480d61e7e4} - {7f8a4355-2f3b-4d1c-b17a-3ef0866c17b3} + {81bcc1e0-8b6c-4cb6-929f-234a40560443} - {bdefe0c5-0ed4-4c3a-ba66-aa69257ac2d8} + {ebe77a46-89a2-4ee8-9fc7-d0055af1e567} - {8f56a7f6-1b22-4641-8d1b-1f214a81f526} + {633acd9a-2075-4e77-a67c-2adc24f94773} - {a5c7bc96-c8d6-4afd-b82d-e41bab6d0334} + {2d8d3908-24b4-47b4-a193-2a82918cb523} - {f861c634-7252-45fb-b4c2-8f710bd4e616} + {938311f1-1836-4063-866f-824915d0add7} - {a0209ddb-1c8e-4dac-b5ba-521c63abb2eb} + {7fc01902-2611-473e-8be7-215845deb3d2} - {17defab4-0ba2-43b3-bb56-3aaec654f1a7} + {a7b2786f-8e6a-4845-b308-224afaba8070} - {e33f8fbc-5860-4426-a256-0fa73b1b81a8} + {1697f386-d7b7-4b41-9242-62ec5bb4cc53} - {c363893e-e9bc-47f5-9af4-07e8c197cc34} + {7cfb837b-4bf8-4a80-8d20-3b41dbb1f3a7} - {8c729187-c9d0-469c-9257-de17ed3b4ade} + {0862fb2f-4efd-4499-9952-75014fc96a49} - {d1837ec4-b370-4c0d-ac66-59b3f371df87} + {a8f9e5f7-66e7-49d6-ba69-6901cc49c68b} - {fc883008-423f-4bea-b770-8f35d33b1752} + {cbf63784-00ef-4267-9132-c70380ad6b69} - {078841d0-f1ba-4136-aaa5-5d243ad41b0b} + {c5be4808-bdf2-4f75-ab05-047fdf9567b2} - {6c8bed27-8c91-4423-910a-daee263415fb} + {22e990b4-cd0a-4947-b0cb-38940c387896} - {a6c509a6-180a-4e1c-997b-ffbe2099bd50} + {9cfb88f2-7810-4a46-b9dd-d7eb0074a686} - {bf2458bd-865f-47fd-9ad5-e2604a9ec5be} + {d0ca1a12-7b1b-425e-9105-65f8b898ceda} - {ba9c7b18-7fd8-4183-9b4b-a1dfcbce1b3b} + {7d0a64ee-f55c-43eb-bbb5-0c6cbf5f56f3} - {2d619731-d44f-4e95-9778-01847ee807af} + {83a0b73f-874b-4dc4-88a9-501b9726b0a0} - {9ebf61ac-0902-41bf-80b6-d74833e3e622} + {a2c75df8-e02d-4d25-9624-5d8c1af35034} - {c7ba0ea7-7296-41e8-ab7a-9558e240616b} + {c94889e7-64cd-4bac-b131-588e1c53a69d} - {b5441e48-9ee2-4a1a-bf8d-67026822b071} + {bbe49f02-ccab-4c01-88f5-4f80a7e7b1b3} - {6a997a7c-55f3-4a07-b263-46540395ecf1} + {49cbd9f3-b0b6-48ff-9710-d300667d7ca5} - {94d5d7b3-b15c-46a6-863e-afa0f4a2762b} + {1460c9f1-6890-404d-8d46-948abcfadbf5} - {83d61baf-5504-40cb-81e9-84c23df9427c} + {cebb133c-db8b-4e07-9fa1-ce443cf573b5} - {c3a9502b-3d3f-40d0-9b7c-8f9d03642b4f} + {3b4d94a6-deae-4dfd-8734-364bf64f141e} - {7285f8df-8046-4cd8-8c21-216d4d48f958} + {648e3f20-ca62-4b0b-ae2e-1a49756726ac} - {37765e48-c942-48f1-aa3c-d899259e5923} + {af6eb48e-9a8d-4e6f-8ddd-11d29360a566} - {29101d51-c7b8-4dc7-982e-5e42f949356e} + {fe01f863-06af-4879-87da-2b75ff508821} - {f0359494-92da-4d22-8e22-30e071092992} + {3a9f223b-29cc-4db2-a90c-693866c30ee7} - {fedaa7d1-c6e9-4593-8055-b941b0bad228} + {4c2aee44-5c5c-4120-84c9-2214edb8d82a} - {f863493c-0089-446a-9b7e-cd8e62d4a89e} + {83c8ecd5-63fc-428f-ae46-ec26832f577b} - {61440cc3-02c6-4bde-9fb6-00824bd9193d} + {073e825a-2f39-4005-8a1a-2c348567cddb} - {8c6eda6c-f282-49d6-9fd5-8f79b80cea34} + {7b787774-921c-4ff4-bdd3-2c34565496e0} - {7be5c65d-0883-46af-9d9b-1e1333fe94ee} + {0962fd77-062e-4d9c-8bbd-6779dc8aa58d} - {e54a9269-822f-4c5a-9c0c-c19095dc4ec6} + {ff056437-bb1e-4773-8113-08705b6921d8} - {8f228dfc-3d7a-4b00-ba54-901e4bcd66ac} + {d72f2438-5a3a-4962-987a-af6d0ad70bbb} - {1ac76e04-8f10-4a74-b8ba-7261f039de77} + {a456bb72-2ded-4975-8eaf-911c716b6289} - {9d31d87a-901f-4c0d-bedc-8fb62b0ab58b} + {8d0543ce-bae3-4f06-a1a0-265a7db0c064} - {aea813b2-7e3e-431f-90f0-e8ad42d4cf5f} + {6c9412a8-6bf9-42f7-98d3-8139d912334f} - {8aeca45e-6fb1-44ab-9194-14f60f02a6f9} + {c3ac04a9-0127-41d4-a8f4-9b03355d769e} - {851f38bd-4998-4971-9f48-17d818cc9402} + {e9e32a1e-fbe1-4a3f-a56a-0870916cb916} - {f087c99d-05fe-40bc-b3f6-6aec791d513d} + {b2da5e1f-42cf-439e-8afb-3074fc55573d} - {5542a826-85b5-45a8-91b2-07c1112096c2} + {b9fe2425-bc3f-41a0-9e52-706bf7b340e9} - {6a1fc15c-b0b7-44f1-b090-610f498e6468} + {9ba01e50-ae0d-4511-b7bf-00fba401419d} - {ae4b317e-24ce-4a73-9ce4-acce5148719c} + {378d70e7-291e-4f95-85c1-f5cf52ba9067} - {1cbd3244-4a3b-4ad1-b688-b087286b5b1c} + {f5f22e3f-80f3-4baa-95da-ad791a14feae} - {91ae7d9f-a563-47e2-b931-3d3440be185a} + {cf22731f-83e4-47f7-8661-b1262765cb29} - {db2dd7f4-8f88-48f9-9d87-2c471d80460b} + {677a2088-510f-4a4c-b155-26887e29a2d2} - {a49c2686-af5d-4bab-ad9e-7056b1fa297f} + {32339adf-8fac-4b7c-b0a4-4c687ae59728} - {94ee88e8-0501-42b1-8c03-612cfb7d848b} + {634ab396-383e-4e19-b6e3-0b317aaed9db} - {b006b664-747b-4293-9b94-5fceeac1fe06} + {85b0ed65-cc8f-41a0-b6bd-2e10dd901120} - {63e8233c-a98d-495f-a445-89bfb839dfc0} + {648db942-234e-4071-98fe-49e024b36e8e} - {bf9f3124-ae60-4476-bbcd-d98f90042c6e} + {a5300938-8935-4f86-a23b-937522aa3535} - {bf2dd437-ce4e-4ea0-8760-c7558d8af3d1} + {4a379190-4bc6-46ea-a7f6-cbb8e3de3965} diff --git a/Foundation/testsuite/TestSuite_vs90.vcproj b/Foundation/testsuite/TestSuite_vs90.vcproj index 05e5ec371..eed6d78c1 100644 --- a/Foundation/testsuite/TestSuite_vs90.vcproj +++ b/Foundation/testsuite/TestSuite_vs90.vcproj @@ -1,48 +1,40 @@ + Version="9.00" + ProjectType="Visual C++" + ProjectGUID="{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}" + RootNamespace="TestSuite" + Keyword="Win32Proj"> + Name="Win32"/> - - + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Name="Core"> + Name="Source Files"> - + RelativePath=".\src\AnyTest.cpp"/> - + RelativePath=".\src\ArrayTest.cpp"/> - + RelativePath=".\src\AutoPtrTest.cpp"/> - + RelativePath=".\src\AutoReleasePoolTest.cpp"/> - + RelativePath=".\src\ByteOrderTest.cpp"/> - + RelativePath=".\src\CoreTest.cpp"/> - + RelativePath=".\src\CoreTestSuite.cpp"/> - + RelativePath=".\src\DirectoryIteratorsTest.cpp"/> - + RelativePath=".\src\DynamicFactoryTest.cpp"/> - + RelativePath=".\src\FIFOBufferTest.cpp"/> - + RelativePath=".\src\FIFOBufferTestSuite.cpp"/> - + RelativePath=".\src\FormatTest.cpp"/> - + RelativePath=".\src\FPETest.cpp"/> - + RelativePath=".\src\ListMapTest.cpp"/> - + RelativePath=".\src\MemoryPoolTest.cpp"/> - + RelativePath=".\src\NamedTuplesTest.cpp"/> - + RelativePath=".\src\NDCTest.cpp"/> - + RelativePath=".\src\NumberFormatterTest.cpp"/> - + RelativePath=".\src\NumberParserTest.cpp"/> - + RelativePath=".\src\ObjectPoolTest.cpp"/> - + RelativePath=".\src\RegularExpressionTest.cpp"/> - + RelativePath=".\src\SharedPtrTest.cpp"/> - + RelativePath=".\src\StringTest.cpp"/> - + RelativePath=".\src\StringTokenizerTest.cpp"/> - + RelativePath=".\src\TuplesTest.cpp"/> - + RelativePath=".\src\TypeListTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\AnyTest.h"/> - + RelativePath=".\src\ArrayTest.h"/> - + RelativePath=".\src\AutoPtrTest.h"/> - + RelativePath=".\src\AutoReleasePoolTest.h"/> - + RelativePath=".\src\ByteOrderTest.h"/> - + RelativePath=".\src\CoreTest.h"/> - + RelativePath=".\src\CoreTestSuite.h"/> - + RelativePath=".\src\DirectoryIteratorsTest.h"/> - + RelativePath=".\src\DynamicAnyTest.h"/> - + RelativePath=".\src\DynamicFactoryTest.h"/> - + RelativePath=".\src\FIFOBufferTest.h"/> - + RelativePath=".\src\FIFOBufferTestSuite.h"/> - + RelativePath=".\src\FormatTest.h"/> - + RelativePath=".\src\FPETest.h"/> - + RelativePath=".\src\ListMapTest.h"/> - + RelativePath=".\src\MemoryPoolTest.h"/> - + RelativePath=".\src\NamedTuplesTest.h"/> - + RelativePath=".\src\NDCTest.h"/> - + RelativePath=".\src\NumberFormatterTest.h"/> - + RelativePath=".\src\NumberParserTest.h"/> - + RelativePath=".\src\ObjectPoolTest.h"/> - + RelativePath=".\src\RegularExpressionTest.h"/> - + RelativePath=".\src\SharedPtrTest.h"/> - + RelativePath=".\src\StringTest.h"/> - + RelativePath=".\src\StringTokenizerTest.h"/> - + RelativePath=".\src\TuplesTest.h"/> - + RelativePath=".\src\TypeListTest.h"/> + Name="Streams"> + Name="Source Files"> - + RelativePath=".\src\Base32Test.cpp"/> - + RelativePath=".\src\Base64Test.cpp"/> - + RelativePath=".\src\BinaryReaderWriterTest.cpp"/> - + RelativePath=".\src\CountingStreamTest.cpp"/> - + RelativePath=".\src\FIFOBufferStreamTest.cpp"/> - + RelativePath=".\src\FileStreamTest.cpp"/> - + RelativePath=".\src\HexBinaryTest.cpp"/> - + RelativePath=".\src\LineEndingConverterTest.cpp"/> - + RelativePath=".\src\MemoryStreamTest.cpp"/> - + RelativePath=".\src\NullStreamTest.cpp"/> - + RelativePath=".\src\StreamCopierTest.cpp"/> - + RelativePath=".\src\StreamsTestSuite.cpp"/> - + RelativePath=".\src\StreamTokenizerTest.cpp"/> - + RelativePath=".\src\TeeStreamTest.cpp"/> - + RelativePath=".\src\ZLibTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\Base32Test.h"/> - + RelativePath=".\src\Base64Test.h"/> - + RelativePath=".\src\BinaryReaderWriterTest.h"/> - + RelativePath=".\src\CountingStreamTest.h"/> - + RelativePath=".\src\FIFOBufferStreamTest.h"/> - + RelativePath=".\src\FileStreamTest.h"/> - + RelativePath=".\src\HexBinaryTest.h"/> - + RelativePath=".\src\LineEndingConverterTest.h"/> - + RelativePath=".\src\MemoryStreamTest.h"/> - + RelativePath=".\src\NullStreamTest.h"/> - + RelativePath=".\src\StreamCopierTest.h"/> - + RelativePath=".\src\StreamsTestSuite.h"/> - + RelativePath=".\src\StreamTokenizerTest.h"/> - + RelativePath=".\src\TeeStreamTest.h"/> - + RelativePath=".\src\ZLibTest.h"/> + Name="Crypt"> + Name="Source Files"> - + RelativePath=".\src\CryptTestSuite.cpp"/> - + RelativePath=".\src\DigestStreamTest.cpp"/> - + RelativePath=".\src\HMACEngineTest.cpp"/> - + RelativePath=".\src\MD4EngineTest.cpp"/> - + RelativePath=".\src\MD5EngineTest.cpp"/> - + RelativePath=".\src\PBKDF2EngineTest.cpp"/> - + RelativePath=".\src\RandomStreamTest.cpp"/> - + RelativePath=".\src\RandomTest.cpp"/> - + RelativePath=".\src\SHA1EngineTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\CryptTestSuite.h"/> - + RelativePath=".\src\DigestStreamTest.h"/> - + RelativePath=".\src\HMACEngineTest.h"/> - + RelativePath=".\src\MD4EngineTest.h"/> - + RelativePath=".\src\MD5EngineTest.h"/> - + RelativePath=".\src\PBKDF2EngineTest.h"/> - + RelativePath=".\src\RandomStreamTest.h"/> - + RelativePath=".\src\RandomTest.h"/> - + RelativePath=".\src\SHA1EngineTest.h"/> + Name="Notifications"> + Name="Source Files"> - + RelativePath=".\src\NotificationCenterTest.cpp"/> - + RelativePath=".\src\NotificationQueueTest.cpp"/> - + RelativePath=".\src\NotificationsTestSuite.cpp"/> - + RelativePath=".\src\PriorityNotificationQueueTest.cpp"/> - + RelativePath=".\src\TimedNotificationQueueTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\NotificationCenterTest.h"/> - + RelativePath=".\src\NotificationQueueTest.h"/> - + RelativePath=".\src\NotificationsTestSuite.h"/> - + RelativePath=".\src\PriorityNotificationQueueTest.h"/> - + RelativePath=".\src\TimedNotificationQueueTest.h"/> + Name="Threading"> + Name="Source Files"> - + RelativePath=".\src\ActiveDispatcherTest.cpp"/> - + RelativePath=".\src\ActiveMethodTest.cpp"/> - + RelativePath=".\src\ActivityTest.cpp"/> - + RelativePath=".\src\ConditionTest.cpp"/> - + RelativePath=".\src\MutexTest.cpp"/> - + RelativePath=".\src\RWLockTest.cpp"/> - + RelativePath=".\src\SemaphoreTest.cpp"/> - + RelativePath=".\src\ThreadingTestSuite.cpp"/> - + RelativePath=".\src\ThreadLocalTest.cpp"/> - + RelativePath=".\src\ThreadPoolTest.cpp"/> - + RelativePath=".\src\ThreadTest.cpp"/> - + RelativePath=".\src\TimerTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ActiveDispatcherTest.h"/> - + RelativePath=".\src\ActiveMethodTest.h"/> - + RelativePath=".\src\ActivityTest.h"/> - + RelativePath=".\src\ConditionTest.h"/> - + RelativePath=".\src\MutexTest.h"/> - + RelativePath=".\src\RWLockTest.h"/> - + RelativePath=".\src\SemaphoreTest.h"/> - + RelativePath=".\src\ThreadingTestSuite.h"/> - + RelativePath=".\src\ThreadLocalTest.h"/> - + RelativePath=".\src\ThreadPoolTest.h"/> - + RelativePath=".\src\ThreadTest.h"/> - + RelativePath=".\src\TimerTest.h"/> + Name="SharedLibrary"> + Name="Source Files"> - + RelativePath=".\src\ClassLoaderTest.cpp"/> - + RelativePath=".\src\ManifestTest.cpp"/> - + RelativePath=".\src\SharedLibraryTest.cpp"/> - + RelativePath=".\src\SharedLibraryTestSuite.cpp"/> - + RelativePath=".\src\TestPlugin.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ClassLoaderTest.h"/> - + RelativePath=".\src\ManifestTest.h"/> - + RelativePath=".\src\SharedLibraryTest.h"/> - + RelativePath=".\src\SharedLibraryTestSuite.h"/> - + RelativePath=".\src\TestPlugin.h"/> + Name="Logging"> + Name="Source Files"> - + RelativePath=".\src\ChannelTest.cpp"/> - + RelativePath=".\src\FileChannelTest.cpp"/> - + RelativePath=".\src\LoggerTest.cpp"/> - + RelativePath=".\src\LoggingFactoryTest.cpp"/> - + RelativePath=".\src\LoggingRegistryTest.cpp"/> - + RelativePath=".\src\LoggingTestSuite.cpp"/> - + RelativePath=".\src\LogStreamTest.cpp"/> - + RelativePath=".\src\PatternFormatterTest.cpp"/> - + RelativePath=".\src\SimpleFileChannelTest.cpp"/> - + RelativePath=".\src\TestChannel.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ChannelTest.h"/> - + RelativePath=".\src\FileChannelTest.h"/> - + RelativePath=".\src\LoggerTest.h"/> - + RelativePath=".\src\LoggingFactoryTest.h"/> - + RelativePath=".\src\LoggingRegistryTest.h"/> - + RelativePath=".\src\LoggingTestSuite.h"/> - + RelativePath=".\src\LogStreamTest.h"/> - + RelativePath=".\src\PatternFormatterTest.h"/> - + RelativePath=".\src\SimpleFileChannelTest.h"/> - + RelativePath=".\src\TestChannel.h"/> + Name="Filesystem"> + Name="Source Files"> - + RelativePath=".\src\DirectoryWatcherTest.cpp"/> - + RelativePath=".\src\FilesystemTestSuite.cpp"/> - + RelativePath=".\src\FileTest.cpp"/> - + RelativePath=".\src\GlobTest.cpp"/> - + RelativePath=".\src\PathTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\DirectoryWatcherTest.h"/> - + RelativePath=".\src\FilesystemTestSuite.h"/> - + RelativePath=".\src\FileTest.h"/> - + RelativePath=".\src\GlobTest.h"/> - + RelativePath=".\src\PathTest.h"/> + Name="UUID"> + Name="Source Files"> - + RelativePath=".\src\UUIDGeneratorTest.cpp"/> - + RelativePath=".\src\UUIDTest.cpp"/> - + RelativePath=".\src\UUIDTestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\UUIDGeneratorTest.h"/> - + RelativePath=".\src\UUIDTest.h"/> - + RelativePath=".\src\UUIDTestSuite.h"/> + Name="DateTime"> + Name="Source Files"> - + RelativePath=".\src\ClockTest.cpp"/> - + RelativePath=".\src\DateTimeFormatterTest.cpp"/> - + RelativePath=".\src\DateTimeParserTest.cpp"/> - + RelativePath=".\src\DateTimeTest.cpp"/> - + RelativePath=".\src\DateTimeTestSuite.cpp"/> - + RelativePath=".\src\LocalDateTimeTest.cpp"/> - + RelativePath=".\src\StopwatchTest.cpp"/> - + RelativePath=".\src\TimespanTest.cpp"/> - + RelativePath=".\src\TimestampTest.cpp"/> - + RelativePath=".\src\TimezoneTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ClockTest.h"/> - + RelativePath=".\src\DateTimeFormatterTest.h"/> - + RelativePath=".\src\DateTimeParserTest.h"/> - + RelativePath=".\src\DateTimeTest.h"/> - + RelativePath=".\src\DateTimeTestSuite.h"/> - + RelativePath=".\src\LocalDateTimeTest.h"/> - + RelativePath=".\src\StopwatchTest.h"/> - + RelativePath=".\src\TimespanTest.h"/> - + RelativePath=".\src\TimestampTest.h"/> - + RelativePath=".\src\TimezoneTest.h"/> + Name="Text"> + Name="Source Files"> - + RelativePath=".\src\StreamConverterTest.cpp"/> - + RelativePath=".\src\TextBufferIteratorTest.cpp"/> - + RelativePath=".\src\TextConverterTest.cpp"/> - + RelativePath=".\src\TextEncodingTest.cpp"/> - + RelativePath=".\src\TextIteratorTest.cpp"/> - + RelativePath=".\src\TextTestSuite.cpp"/> - + RelativePath=".\src\UnicodeConverterTest.cpp"/> - + RelativePath=".\src\UTF8StringTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\StreamConverterTest.h"/> - + RelativePath=".\src\TextBufferIteratorTest.h"/> - + RelativePath=".\src\TextConverterTest.h"/> - + RelativePath=".\src\TextEncodingTest.h"/> - + RelativePath=".\src\TextIteratorTest.h"/> - + RelativePath=".\src\TextTestSuite.h"/> - + RelativePath=".\src\UnicodeConverterTest.h"/> - + RelativePath=".\src\UTF8StringTest.h"/> + Name="URI"> + Name="Source Files"> - + RelativePath=".\src\URIStreamOpenerTest.cpp"/> - + RelativePath=".\src\URITest.cpp"/> - + RelativePath=".\src\URITestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\URIStreamOpenerTest.h"/> - + RelativePath=".\src\URITest.h"/> - + RelativePath=".\src\URITestSuite.h"/> + Name="_Suite"> + Name="Source Files"> - + RelativePath=".\src\FoundationTestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\FoundationTestSuite.h"/> + Name="_Driver"> + Name="Source Files"> - + RelativePath=".\src\WinDriver.cpp"/> + Name="Processes"> + Name="Source Files"> - + RelativePath=".\src\NamedEventTest.cpp"/> - + RelativePath=".\src\NamedMutexTest.cpp"/> - + RelativePath=".\src\ProcessesTestSuite.cpp"/> - + RelativePath=".\src\ProcessTest.cpp"/> - + RelativePath=".\src\SharedMemoryTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\NamedEventTest.h"/> - + RelativePath=".\src\NamedMutexTest.h"/> - + RelativePath=".\src\ProcessesTestSuite.h"/> - + RelativePath=".\src\ProcessTest.h"/> - + RelativePath=".\src\SharedMemoryTest.h"/> + Name="Tasks"> + Name="Source Files"> - + RelativePath=".\src\TaskManagerTest.cpp"/> - + RelativePath=".\src\TaskTest.cpp"/> - + RelativePath=".\src\TaskTestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\TaskManagerTest.h"/> - + RelativePath=".\src\TaskTest.h"/> - + RelativePath=".\src\TaskTestSuite.h"/> + Name="Event"> + Name="Header Files"> - + RelativePath=".\src\BasicEventTest.h"/> - + RelativePath=".\src\DummyDelegate.h"/> - + RelativePath=".\src\EventTestSuite.h"/> - + RelativePath=".\src\FIFOEventTest.h"/> - + RelativePath=".\src\PriorityEventTest.h"/> + Name="Source Files"> - + RelativePath=".\src\BasicEventTest.cpp"/> - + RelativePath=".\src\DummyDelegate.cpp"/> - + RelativePath=".\src\EventTestSuite.cpp"/> - + RelativePath=".\src\FIFOEventTest.cpp"/> - + RelativePath=".\src\PriorityEventTest.cpp"/> + Name="Cache"> + Name="Header Files"> - + RelativePath=".\src\CacheTestSuite.h"/> - + RelativePath=".\src\ExpireCacheTest.h"/> - + RelativePath=".\src\ExpireLRUCacheTest.h"/> - + RelativePath=".\src\LRUCacheTest.h"/> - + RelativePath=".\src\UniqueExpireCacheTest.h"/> - + RelativePath=".\src\UniqueExpireLRUCacheTest.h"/> + Name="Source Files"> - + RelativePath=".\src\CacheTestSuite.cpp"/> - + RelativePath=".\src\ExpireCacheTest.cpp"/> - + RelativePath=".\src\ExpireLRUCacheTest.cpp"/> - + RelativePath=".\src\LRUCacheTest.cpp"/> - + RelativePath=".\src\UniqueExpireCacheTest.cpp"/> - + RelativePath=".\src\UniqueExpireLRUCacheTest.cpp"/> + Name="Hashing"> + Name="Header Files"> - + RelativePath=".\src\HashingTestSuite.h"/> - + RelativePath=".\src\HashMapTest.h"/> - + RelativePath=".\src\HashSetTest.h"/> - + RelativePath=".\src\HashTableTest.h"/> - + RelativePath=".\src\LinearHashTableTest.h"/> - + RelativePath=".\src\SimpleHashTableTest.h"/> + Name="Source Files"> - + RelativePath=".\src\HashingTestSuite.cpp"/> - + RelativePath=".\src\HashMapTest.cpp"/> - + RelativePath=".\src\HashSetTest.cpp"/> - + RelativePath=".\src\HashTableTest.cpp"/> - + RelativePath=".\src\LinearHashTableTest.cpp"/> - + RelativePath=".\src\SimpleHashTableTest.cpp"/> + Name="Dynamic"> + Name="Source Files"> - + RelativePath=".\src\VarTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\VarTest.h"/> - - + diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj index 5f7c68068..35a66edbb 100644 --- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>10.0.30319.1 + <_ProjectFileVersion>10.0.40219.1 bin64\ obj64\TestSuite\$(Configuration)\ true @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters index a77566568..f99164bba 100644 --- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,181 +2,181 @@ - {96ee468e-e90d-4f90-9076-fec9b36e5188} + {6bee031f-28c7-43a3-bf1b-f3cff89d7ae1} - {1a2c285c-71de-48bc-b047-5f491ba7fa95} + {34d8b2c4-f04d-413d-950e-c921443982e1} - {420d7b22-cfbe-467f-8a6e-7dbc385d86b0} + {9ca9a98a-dbb9-40c4-be62-087fb0b8c42c} - {c30ac33c-d4fb-4c31-8a22-9eaa9a4c0ee0} + {0ed928d7-cd62-41db-bece-d5d100c8d8ef} - {11d41afd-2c03-4efc-973c-1f558e9843e0} + {fe38ca2d-59fb-493a-9dff-ddc743592294} - {027573c4-61a9-4019-b9da-cd0fe240eaf0} + {2e3d7a6b-d3d3-42d9-80a0-921b59b130c1} - {9b3e4373-0b2c-4c10-afd9-a34cc9141309} + {2353051c-d6b2-4a7d-a78e-183aad299757} - {64eaf820-1fa3-4342-982d-0adebca55f87} + {8eb13ee1-2744-4cdf-9c1b-2ecd0330b41b} - {0e65e402-be03-4917-9df5-8bfacdbf6931} + {1aa801b3-fc2d-406e-a043-abef94a75a84} - {68912887-e76d-42da-9fca-561ac7c8204f} + {e2a923fc-eaca-422f-a012-89d10dcb4806} - {04666571-61c8-42fa-99ec-8f0fd0f1afb5} + {28268f9b-2d1d-4b7e-89ab-1febb1606ab6} - {50069107-7a36-4197-9b4d-a69d77f9bf55} + {dd970e5b-bcbf-4d3e-9d53-0fc41067e6b2} - {88217353-3d2b-4a58-ab10-5692d026d5e5} + {55873daf-49c5-4e2c-af5f-6f29819e6b59} - {d4a9304d-2d1d-47e3-9c19-aa64bea39afd} + {589bff2a-d4b2-4ba3-b9ce-837bac268b68} - {5efa62f9-bbd7-4ff3-a7cc-39b274e4bf09} + {82635316-697d-4c1a-90b4-8802fca4203b} - {253a932a-dcd1-4006-939b-babe5ed3d794} + {068c0409-56fa-43f7-aa95-b36b8798580e} - {a10d7680-8308-48fa-ae19-a1be74d57ac1} + {0deb5dee-defa-4f6f-8fb7-04aa2f18abb8} - {031b0dc8-1f8a-4a9f-ba4b-96b51563d428} + {22bc339c-f59e-4197-9f58-b07531bf2d33} - {a38f35a8-c64b-4612-af53-e12932272fdb} + {c006d2c2-4fbc-4858-9a3d-642ffb56fab1} - {817f0f04-60da-4430-bcf8-b0f14a96c1d7} + {e3afc2a8-8ece-4181-9fcf-3f637d37873c} - {799d41c9-75c1-4bea-ab1d-264c5ac6fa06} + {62b49801-fda0-4d07-81c3-3a985c35796f} - {05a9662e-b48f-421a-ae5b-04e21aefa512} + {b65f6745-0cf4-487a-8332-97316a1bd16e} - {5cea484d-10e7-4f27-821a-a190fd5ab775} + {cb32b956-475b-4e28-b285-bc5a78aac489} - {abf15315-1f0e-4487-824c-f38dad0cfcc2} + {bb0962f9-5256-479d-b9be-7db7cb387a2a} - {6f9cd567-8bb4-4622-ad04-2dc0de448897} + {b1e75f2d-f955-44bd-a92b-1579d4dd6242} - {08c30f8c-aaa8-4e65-aaf3-30789f6af14d} + {dcd80e83-ffa9-4606-8155-e802a767f1e9} - {8fa166a6-d916-46ec-b9f9-56ca297b02e5} + {29989de0-6176-4604-abda-581525da7c01} - {afb62a6c-0454-444a-ab92-47b9f1dcbefe} + {b75bd90b-4268-44c9-87b5-491b9680854a} - {28eef33b-67fd-461e-b36e-5deeaa270f8f} + {985c45cf-c95f-415d-b153-657830b5de5f} - {ead1d993-c071-434d-a2f4-614d7bf5b3b1} + {c2f61a6e-79ec-4d50-82b2-08b58d930a72} - {d19cb28d-e977-4d29-bcd7-6356755cad70} + {e7eafff0-12aa-4894-b38e-60d80568e3dd} - {5ead5f15-f3f2-454d-8e90-2b921ed2c38b} + {737133f2-9f78-4f96-8a1d-1c32f28443bb} - {58f81e2d-cd4f-4569-9536-c33240143e1a} + {b30de213-c0e6-48d8-9ab5-be5116c16af6} - {7086ba4e-245d-47d9-8d55-3588bdca1547} + {1e903fce-0ad3-4829-ae2a-56babc9fde07} - {d5169f76-8433-49b1-804c-b2a14dea06cf} + {6cd44ee6-dd92-4dbc-90bc-08be00f3f4d6} - {82ff8d8e-963f-424c-8120-514294ee5f5d} + {055b25bc-2b53-4eb9-a89f-756f8408f922} - {d4572597-8b72-4d42-a657-978540a9e671} + {8945752c-2ccf-4a40-b857-2eb093e1c5ea} - {41bbfd19-58d5-4532-a5f1-f8552ceea5e7} + {0f76a2f1-1925-4465-9c51-93bacc546fd0} - {98a31cdd-4f38-4c0b-b698-59932fd265cd} + {ade54d38-80c4-4cca-926d-64bf8dfb25f3} - {ff8cb779-ca64-4299-9a7a-9bc1e7dd3f75} + {5451bb87-42ee-4a38-bfe9-b4d1ac6517ea} - {a821cc9e-41b5-442b-9d3d-4b5e67aa9042} + {83ddc7c8-2519-482a-ab1b-894fe1c07b57} - {df5b7804-d8ec-4e53-b80d-a23f58c193b5} + {6dc8141e-1269-4e4f-8797-a36973bd3f70} - {784f3c45-f479-47dc-839e-0ea265593e60} + {0c55a1c4-e87c-4719-b41b-87dd6f2a0c79} - {c40edf10-544f-4009-8014-2af1728c2d5a} + {630c41cf-0dae-46c3-b0e3-a19c6d4091b7} - {fcefbadc-afdb-4df7-bf4b-750ed9376008} + {0a19c8ab-b348-4567-b6f4-4acbd697447b} - {2d743c21-d77c-4bce-a9a2-97cb50d297db} + {b03a9b75-cfa9-477e-9d8a-7b01e6f3b42c} - {818b1d43-27f4-44b5-985b-b4e985855871} + {0585c519-a8ca-440a-8f31-a3731e578774} - {7a5d6ed9-ff10-41e7-9379-aa5431d7cfdd} + {ecc2a585-c689-43bd-91b0-229c2c17c25a} - {4a60752e-22a1-443d-ba6f-328635bf5bc2} + {7c0a3323-6a72-486f-9cc8-d00ada4c0e06} - {ae846312-7b17-4f90-ab7a-9a13febf5dd6} + {e136496f-1631-44f3-a3f6-a69d8b7130fb} - {47f59d76-5f95-4732-893a-aa59513a5e3d} + {56ed33d5-bbd9-4a5e-b026-63a199d43f8a} - {eb64606a-0968-40cb-b83d-4c9991cba468} + {a8d7d1f9-42b5-45c5-a5cd-8f5c6a6ccacf} - {b46bb62d-d91d-4a89-9c39-950e43f14186} + {37c8db89-7e3f-4c22-898f-83bbea2c913c} - {b99d1bc4-0f25-4267-aa37-615253870109} + {939b6b92-b887-4c07-b156-a4af9cab2149} - {7cd977fe-e5f3-4a20-bbbd-a837886993ea} + {f079c788-33ec-4243-8f61-d6c0f442f32c} - {ef9601b2-59c5-48b7-8d68-7bbc6d1ce519} + {9edc61e1-a06e-43ec-9014-a97a0ba9d00a} - {b4740f6b-58b6-464f-9e05-d9caa2b3c8c3} + {b878268e-9e98-4f0b-96ed-6acb2399375d} - {2b86ca52-8f96-44e3-a4c1-f9af554535cc} + {222dbbac-49ca-46ae-9591-ff275f91742a} - {96cdae87-a733-4574-85d9-9c30611748ba} + {8909f52c-f6ea-45cd-9bf5-081497e606b9} diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj index 5675b2569..f6fd158d9 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters index de36f1c8c..98a1d793f 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,181 +2,181 @@ - {cecb56fa-511f-41ac-9973-59cf2c3f39d9} + {50318434-b48d-4868-8c0a-67e1a36d2e08} - {05617e0d-0336-4230-8de4-c9662986bb8a} + {05ace2fc-d67e-492e-bbff-16e3fe1fdc62} - {ae229fe4-d3a3-4b2a-903d-e687b020fb9a} + {704070a0-8a3f-4455-93d4-25e5e3137266} - {94f72017-f41f-4eea-94c9-98badef09362} + {c7e661f1-58fc-4a76-9584-c0b126adc8e5} - {4064bd2c-4e61-420a-90d6-922f49ed7897} + {56c08c52-7f80-4715-a891-167a6d8d3d41} - {300e564c-c43f-4c2d-a3f5-30189245807d} + {58854e5b-af9b-44dc-b9e2-eee5f2e5037d} - {776d6913-ace6-4d88-adc3-6881d3642dbb} + {c3bf1ef0-b745-4a2d-9584-9c655c5b1b07} - {e1d88438-c4c8-4443-a4f1-4f9302f285c1} + {3ac53451-0680-4a58-a499-216af76d994f} - {5e4444ff-e300-464f-bef2-ebcc349521fe} + {1da65d14-d3a7-4f41-8299-054df5062417} - {e0166080-a714-4b59-b99e-c5ce58227626} + {9e21977f-1082-46f4-9c27-cb734c6b605c} - {0f7377a2-9be5-45ad-918a-397247bb2d5c} + {99616313-71b4-4529-b2ef-8aa755e05748} - {76af6edb-56e1-48d1-a41c-d2e9a3304016} + {30d62f6b-b21c-44cd-a078-4e65b4563ba7} - {d5e174c3-8c4d-4086-b42c-9bc918ee05b6} + {d8d2e670-6348-439f-8072-de6113f18db4} - {17dbba6f-52e2-41e5-86fb-b6643ae37575} + {1a56cfc8-f125-46db-9428-fc4bbfefef1e} - {1e999464-22d5-48fb-a2a2-321da2d5a703} + {d147164f-a33b-4cf7-bd9d-a1df680b6176} - {19d9c7f6-519a-46dd-833f-c668df810771} + {1f477a58-055b-44d2-8fd2-4fda1ac66a11} - {340959f5-6cc7-4fa5-9ed6-91e0a5ce07f6} + {497235b6-b584-48cb-95ed-30c1ee52ce08} - {e436b959-b95a-4428-8511-bdbd61bc58ab} + {8051e187-7dc2-43d9-a6dc-bb3e6514d83d} - {4f462777-f7bd-4226-b56a-42009b7c71dd} + {fbfbae14-71af-4e8f-ab8b-fe226ee2cf99} - {0da8f594-4d59-4888-a642-6793861490b2} + {bcbf307f-bce1-495b-b25c-6dfe9556d994} - {b798347b-ac47-4d96-9dca-903641e08d03} + {d00f5be1-a100-46f0-96ec-3e811d56b49a} - {edf85b66-a551-4a94-becf-6f3ef970ffc9} + {8ccf7c1b-afff-459d-98fe-3cc2ffc29eb4} - {023c5f2b-f0e3-482f-b898-2ba02e25c04e} + {999297f9-1215-4359-af0d-183f63557772} - {ad7d24ad-7be6-4f2e-a470-b98abd24a447} + {0f72ca3d-669c-4040-bb4f-30caeba1538b} - {ad60da9e-eca4-4f73-97c1-27daf9a4301d} + {a974a499-8049-4966-8fa3-01c432fe7991} - {e0906163-64a5-4cc4-b57d-4e0b6ffe810c} + {07f2f549-b27c-40ff-bf61-0e1e1415d331} - {9057773b-1623-4748-93d0-a8598e731c35} + {ed71a6e2-85b6-47f8-9477-92e50103247f} - {ab518b40-6d9a-420e-91bf-d8173ca6ee6d} + {510f5081-0bc2-40ed-b4a2-d31f259eafe8} - {4d9d2d19-a655-4345-9349-8d57f3f81269} + {cca471d4-cdfb-4b3e-a89d-83859e0af7d8} - {7e7e9073-758c-42a9-beb1-e5bafce5013b} + {4121c0d9-b035-4cd8-93ab-7683016351f1} - {8bb6b30d-bf58-4307-b9ff-508534ec706c} + {1a7281ed-96a9-4625-a205-6c1044e050d5} - {b3606d4b-14a0-4aa0-ba91-1375bdb5b305} + {0a97f2de-1721-450c-8c22-3620078d3f82} - {4c89bfe7-282c-4651-a337-9ff8c125ff56} + {1d50184d-f160-46ee-9017-dece41251984} - {b54c51d7-5743-47ba-8bd6-e1f3fe6bdeb0} + {ff20f22c-86f1-4f30-9d34-e68a852978a4} - {95743e1b-e68e-469c-8413-2b493e12e58a} + {59ee734e-7739-475f-aea9-ef4401ebbf8d} - {3b42eda6-4378-40b0-8488-1c9c2ff8927e} + {de754c52-f7a7-40ba-b1ce-d6376a4be82c} - {0be90184-6d12-4297-8003-dd76ed9c6314} + {e44c3580-9f3e-4fe0-a1cc-508687798f7e} - {85dcd541-4d94-4631-a0d2-2cafdb44aea3} + {3be0f6e5-a69e-49a9-99fb-0c289bb6deb7} - {32bec252-ffd1-4e8b-b3ff-7b5eb1875ee5} + {9d68ff74-9787-40a6-a7a1-4b1b49519ab0} - {d87bb541-8cb3-4c5e-a521-b017e4b0344c} + {de1b1e0f-c439-428f-b928-41103f29cae1} - {58be13b5-55c8-4f12-867c-d1957aff2c0d} + {2190a195-21eb-4596-97ba-888189c72875} - {d0a2128c-7eca-40a0-8a32-5a39e75e1833} + {856f9ce2-8f20-46d2-9af7-733fab724346} - {540a8a02-ddee-4f7c-b4f2-2daa969b1061} + {1cc95420-eb03-4504-949f-dfa56482d6fd} - {913e84e8-d89f-4256-99c6-89d25d1fc804} + {697b21f1-f32f-45ee-804d-4fe63c0dca86} - {b16b0096-8608-42c7-adff-1e37fa39b315} + {d84e997e-1488-4fff-935a-48961369e7e9} - {016a5097-0560-4cc3-be8e-b58dcb0ef812} + {5a1a4fcb-98a2-4dbf-8df2-63cb86288090} - {6f422809-c68d-4481-9fe7-fb7b81043d1d} + {142935d2-5d1c-4ff4-bd85-fcda4c222442} - {57a8e134-53f8-428f-b400-c6e1ed6758fb} + {9438e2ca-62df-4dc3-af8e-165b489eefa1} - {954b89b3-3058-4d51-ad29-475115d3d35c} + {8aa55d11-4a3b-4770-a1b7-9aab9463abce} - {e7a7cad6-9384-41f9-b6ed-92125741ead9} + {4b54473c-adb0-4b81-9784-a09082c7b07a} - {c7887cd0-f2c2-4aee-82b1-6d55d68bc350} + {f27cd3c0-59b4-4e18-a40e-f4ee4c07606b} - {b4f07c2c-30f3-43e1-a9dc-839f5268dcb6} + {20d3744c-2555-4f97-9f29-0a673808ebe1} - {8076cd1c-8172-47a7-a0f3-1fb00cd5c750} + {e937fdb9-6392-4ab2-b91b-39bfd6a0c6da} - {799064a7-fb76-4c59-9373-5265da80326a} + {69975e39-04bb-49d2-95c5-9021f5620c0b} - {76ed377a-9849-4609-8f3a-4287d24c57d0} + {2aedddd6-e0f7-49ed-958a-f3752fef14b9} - {9e1fbabf-b2b3-49ff-a734-3ba0329c5efc} + {e4b933d1-8de3-49c4-b9b7-444f31fe5323} - {8366a632-1b32-4035-95f5-57184a393955} + {7d0f05bb-889e-4416-9d5d-c997c54d496e} - {e9ba73ed-4974-440c-987a-07e64ce2e60f} + {e62c9d11-d726-46bc-8c5a-933f2cede50e} - {d27cc925-c5b3-4924-8321-a5b2c5971ddc} + {1a1fbb6c-7cf8-4186-b99c-320453ac0699} diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj index 1204d85a6..5a8c6c0ae 100644 --- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,13 +136,13 @@ true true true - + Level3 ProgramDatabase Default - iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -167,13 +167,13 @@ true true true - + Level3 - + Default - iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -196,7 +196,7 @@ true true true - + Level3 ProgramDatabase Default @@ -227,9 +227,9 @@ true true true - + Level3 - + Default @@ -256,7 +256,7 @@ true true true - + Level3 ProgramDatabase Default @@ -287,9 +287,9 @@ true true true - + Level3 - + Default @@ -304,287 +304,287 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters index 18888b68a..6cb699597 100644 --- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,181 +2,181 @@ - {0e00b184-3b99-459c-9cc8-2808a90fa23c} + {627535b5-c281-4b1e-90a0-1cc1c0abd23e} - {15e5e4ff-7073-4237-9c5a-220ee8415122} + {dcf1b2fc-fd53-40a9-8ef0-4a4b65d0d67a} - {8c34e8a7-d612-4824-b0ea-9fc2a74e86f5} + {7bd14ac0-e350-4432-ac85-8975bc1031b2} - {3a1e209f-248a-4de5-8c78-5fcb3c800755} + {5a997e3a-1380-47c1-ac2d-6025d64766c6} - {7471f380-2621-4245-a3f2-7505438703be} + {91149b1c-688b-4c4b-b76f-750d433b190b} - {a2958c58-740f-4d4b-96b1-d731a5d162a2} + {46e82b53-116d-4a72-961a-2b89f67684c3} - {ea037f1d-456b-4f8a-8b2f-25bc75589c45} + {5e98c613-b925-4335-8f9f-13641046696c} - {ab286879-10cf-4c67-946a-b1c4c475d600} + {98533bb2-37aa-42f0-9744-8d1123f76913} - {37e39842-f9fc-4800-8344-204e29752615} + {774324a1-7b13-4652-a948-f52795daf60e} - {f31b7b6b-a922-45d3-b4dd-e5f2f7dc192b} + {ab2a3204-ab92-4ed1-aa20-840610edd849} - {80efda2e-8cab-4a61-9114-d6d395206396} + {c2d163f1-3183-43da-aba6-74ab5a48418e} - {4cb42974-fc70-44a0-a067-acbdccdcd315} + {e8054888-c53e-4269-bd61-9c2ff23899f1} - {96cda732-5fd4-47b0-907d-6fff177b91ab} + {7be9e0e5-f08a-41c8-a38c-e41bb239445e} - {b73b1c49-9c44-447a-b768-a3a7de9e1153} + {157db576-6519-4a4c-a881-305772bcfb48} - {c30e4b84-654f-4711-9cbd-2839a2fd9c10} + {7c56424f-6d89-447d-8eb7-9ab472f3f7eb} - {a269d791-ff4b-463d-a1b8-7e4326e9a005} + {c4e7638b-7d01-419d-a1e3-b6284a2cddbd} - {75dbb83b-bec3-42e2-95b3-e595bfbcbd74} + {4fed5178-eb5a-4d33-9c5a-42d34ddffaf7} - {565af9bc-8a7c-411c-a430-85f432062580} + {65e0591b-af3e-440b-84cc-b6f75f18414f} - {13050775-eb77-4cca-9609-64f0ac029c1d} + {fab21d4f-b13b-451e-b881-dc7ac4edcd2d} - {0c12be5c-44a7-44bb-a2c7-c3ce9cf70ebe} + {f6e04e29-2894-4495-8f5c-7f3a2d73fca1} - {0af95aea-3db1-43c9-a349-1595b4e147e4} + {866314c9-0bee-4a58-8599-88a87d066102} - {7249a21f-b876-42a4-95f1-7a8b78050717} + {5ec7dbaf-7ecf-45d2-a7e9-d4a2f9f0bafd} - {feb283a1-4e6c-4aaa-9a48-0848fc4c3526} + {457a18e2-9654-464c-989a-cfe6b537f819} - {21d484a4-e1c2-489d-93fe-04f08a916e06} + {91d33c9c-72ff-40c4-a451-3c2f57395dab} - {83ced0b7-47ba-4b75-9086-a040eca18a8c} + {2408f5f9-2f0e-421d-bd68-91a3da7c34c5} - {03a99443-0bd8-40f3-9c5e-349898fdb5f1} + {73e0390e-ce18-4016-94fe-9c97e9a59ed8} - {4efa7119-2c9a-46db-82db-85d3e91caa6a} + {1fd95c21-db98-4755-a4bd-5e27e9af9f88} - {80037cf5-ee02-4f27-91eb-0d25634e5eea} + {00f917d7-4116-4ffd-95ad-44b8d90b28c5} - {2f5d4342-ca65-42c2-b958-7778145e7000} + {bd205d3c-8619-4a51-83b5-bf2aa0b46223} - {8f1bfe3e-fb12-4696-942b-6aae01c4c0ef} + {feacf15b-dcda-45ca-899d-fbbd0e8fef56} - {c1a5615c-b30f-4258-a1e9-f81666168c2f} + {14d441eb-ab34-47df-aaec-5772b8b0705b} - {3793d9ae-e147-44f9-8a31-3b8104ad5d4e} + {7532e7d2-7120-4986-b8f5-cef894a5a6d6} - {5583ad7d-0871-4744-92f6-b082428f61f7} + {2b9e9162-20f4-49ab-81a6-6d24fe8104fd} - {849c603f-4b6d-4738-a688-48dd5bb58503} + {b8743dd1-c4f9-41c7-8798-ff816e2fbd01} - {765fee03-e62c-46e8-9344-73bed86484d8} + {0e9d8ff6-871d-4017-874b-4913e83ef5b5} - {b78bdeb9-0887-400c-bd50-858641f7b983} + {c7ada19d-6b5c-46b7-a39e-3dde70b200a0} - {f86c0d76-bac9-47ed-a907-984af5ca979c} + {88d70055-eb91-4527-9724-626826b73b89} - {b7655966-3ece-4556-963f-f928fd4b1c10} + {e3fa3bb1-d3ba-4f8a-b38c-92e5ea495273} - {a2f3660d-abb4-4f78-aa18-8e5b14ccde0b} + {80632b5a-e440-4366-83e4-ea0c8c2ffd16} - {5dba321d-681f-4c1f-ab7c-49c52d302e1b} + {14ee7343-e128-4d39-ac81-4b432c0ee4ec} - {51e89edd-69a3-4322-99b1-a1bd0cce3802} + {8bae326f-69fb-421b-bc4d-5fd6355b141b} - {e1859bc6-555f-4ed5-9c8d-251433dc57ab} + {918c0afe-903a-4997-a129-92609a3450f2} - {45d57438-0d8f-43a4-bfe5-853f16cb52f7} + {3b6b24e0-d9e4-4994-b1bc-271ee370737e} - {b33309ca-5291-400a-a788-9f7be34a99b2} + {d59171ef-27b2-41ae-b3a3-7c6c7c2eba4d} - {f186f299-f6ed-456b-9252-df7ecc22c46d} + {14273a80-9554-4aeb-b7b6-c1fe7f620e6b} - {85cb91f7-e9c0-4216-8155-a3a74cef1267} + {a38edada-5f02-43e8-8393-f8cfca0647a5} - {d3e99fb1-a414-4311-ad1b-c7f17362d209} + {2b29474e-688e-4269-9d84-84fb2cf7b958} - {74ad0b0c-1365-4c54-9140-6977869e56c4} + {58ca377a-80fa-4311-8093-698f2d5d503d} - {e566d884-f010-4f7b-b2b6-3eba2f946469} + {0042a4aa-dff8-4abe-b70f-209b9dfd0f40} - {d5275606-4d7f-4284-a89e-3e2d68dab44e} + {26142f95-800b-4051-b33b-e753f3425c38} - {d48b61af-3f99-4fdc-9520-b339cfb70e22} + {1012085e-3507-4aae-9702-b996391dfc2e} - {5347c37e-beef-4ea3-a548-dc767f3c3db3} + {9b8aa052-5c8f-4a48-b528-07a534e40bd5} - {40ee9cf3-2880-4fbc-9848-5ffe6c490677} + {efe39165-ef54-4273-82c9-2c139ed36ef1} - {d3d6ab72-a48b-4188-89b0-8ea68460901b} + {4959ef00-8fe2-464a-b970-cb3d98ff0b76} - {5d7f0494-3773-4353-9dd7-bff5529e81ae} + {a346dfa1-58a4-436f-b92b-4ea4e641d191} - {13ead250-20c5-4ceb-b46c-3de0b618896d} + {949fc82e-9be1-42d7-9110-4f14553ffe48} - {63544c87-245c-477c-a377-d714f1aa5f93} + {7a0df6a5-2d1c-4ff6-9bc6-c70e4fb6fefe} - {4f7ca775-acba-4c2d-83b6-2b785e99c6fe} + {94bd4839-d304-4220-8b71-9b319919da44} - {c95ce7bc-34a7-4ec7-b01a-a9dc31ce61f9} + {aecd0a11-df7f-4937-a72b-995ad86087b2} diff --git a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj index c76f7e06c..7e65121e2 100644 --- a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v140 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>14.0.23107.0 TestSuited @@ -136,13 +136,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -154,7 +154,7 @@ - Custom + MaxSpeed OnlyExplicitInline true Speed @@ -167,13 +167,13 @@ true true true - + Level3 - + Default - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -214,7 +214,7 @@ - Custom + MaxSpeed OnlyExplicitInline true Speed @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -274,7 +274,7 @@ - Custom + MaxSpeed OnlyExplicitInline true Speed @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -304,287 +304,287 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters index 7c508044f..ecac76d45 100644 --- a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,181 +2,181 @@ - {a2be2d01-14cb-4b4c-b13c-bddabff06e4b} + {aabbe209-4dd6-4b8b-9257-8947eb1fb7f2} - {3fc08dd6-f8a3-4708-8332-03772880b170} + {4b224ffd-7f02-424c-bc17-84303372b80e} - {a3b8bf51-ef85-434e-9837-77c5d640c2e6} + {12a7f36a-c969-4f0d-b79c-80b424e87949} - {aa822158-1f4b-4022-a5a6-b450c7c5655d} + {d19714eb-ece6-4911-a7c6-a40070487234} - {56c405c6-1cfd-4115-a2e2-5a49c9006aeb} + {1139f4ab-56d0-4550-bf8a-9dac92b6cc22} - {b8395904-9409-472f-a651-5fb02998ca2c} + {ab191da9-d661-4018-afe6-63283e250228} - {1b1bd7d7-5f9c-4bde-a12d-dfb518c73fa5} + {490bebbf-bd04-4ac8-96f4-9dc87a96b10a} - {e140b313-2823-479b-8023-82d852a283f0} + {36d9d86f-85a5-472b-a9f5-c0d6db636f0b} - {5c3df885-f1a9-40e7-9a98-64b5e6ee243a} + {d5a84f94-1fee-434a-9d27-0cc26c347ac9} - {d32a2a39-188d-49e2-9fba-b17037ccc5c9} + {72d0c024-e14e-43ac-a85e-bff1a4432851} - {8bbdd70c-b1ea-46a3-b562-f924f80e8cc6} + {cd2b7389-4719-48b1-863c-5d047189ac6d} - {c54aa8d9-50ed-480d-bfb1-7946dbef6f26} + {e0f591a0-c52f-4ce8-a503-007e80d74642} - {784522b5-74a3-42f2-bf6d-a686bf18f66f} + {5a04830a-caef-441a-a8fc-50252e1d2ffe} - {438ddab8-d9e2-4f39-85e4-b776c6524f06} + {d9d6fcd3-1a38-4d66-9a0d-492138827d4b} - {3882e539-1725-4519-a1c8-f39efa0aaab8} + {d22e6b43-6d27-40cd-bb54-81c99330dd7a} - {599473da-beb0-4ff4-bf67-7bc59615e036} + {111fc508-e313-4bdb-b810-a985df7455eb} - {e71345ba-f2e0-4403-aaed-3f77357db1aa} + {cd645b5c-f893-4a95-84c7-c3ce5d9a0df2} - {3f39ed44-d78e-4c0d-b8f7-7689c82618f9} + {664fc6a6-13e8-433f-a02f-4eb926a398df} - {2ca4d31a-8336-4347-a0de-09d4311c3dc6} + {c41d01f5-6a9b-4679-a5c8-fff18a874197} - {f0624872-6c0a-422d-84f6-a95f6107a78e} + {4120ca7a-3e11-46d6-8079-046d1830531b} - {d4481d8e-0681-4092-a852-aac2e2b0da7c} + {e0c97830-f2d8-48b2-bb74-d1ca30b72bfc} - {28d07cad-2bcf-4812-92b9-e20a5d899b3c} + {d7f38d8b-81e7-41ae-a017-7910a8c64e69} - {ce74e17c-d651-4ef0-90a7-ce6149e8f504} + {6fb5a7a2-5fc8-49fe-a31a-4f559a9295af} - {99f0ed3f-79f8-4f5c-842b-b68d8e2f3d6b} + {d4267fd7-8950-4c36-8797-82e26204092d} - {466ed5b0-0c54-48b9-a400-0dd66bf27ee1} + {c37219db-4852-4199-978a-0ab63efe8679} - {d9457b40-751d-4d98-a88f-3cf7274b28ff} + {da553501-f1fa-409c-a1d2-52eec864dbd8} - {04a684ef-b6ce-4d7f-9b1b-02eb05257604} + {3489b2da-adda-45db-8904-9aee9cb19795} - {07197093-68f4-4203-a849-98910a9e7685} + {2cfa17ad-b261-43f4-9abd-1e8ceb581322} - {fa4e7572-26eb-4943-a4c7-6e29403e1bae} + {4e511415-f631-4f2d-887c-78fa0d0425ba} - {f63d3efd-15b2-4939-85e6-6dd74818796a} + {d0ad829a-23d3-40ae-9365-e32cf8653201} - {8c94ad87-4cda-4513-9b1b-81ecf250ff6e} + {31c73ec5-a43b-4a44-a9c9-ff10153b6f2a} - {553a5adf-ea7d-4fd3-8c77-a944811d3796} + {443a8cb1-062a-4678-a259-fe2523724745} - {4458a2b9-6c0c-49fb-ac95-a85cdca01e4d} + {bd836814-5ed4-4cdd-bd80-f6551a0b4135} - {64bb7e29-ac61-4837-914a-c0a410b28b75} + {a29f9683-b87e-4251-a044-aab56478e37c} - {f151e236-ac2f-41a7-9172-15115398ea83} + {df460a46-184f-4155-8891-6d9338bb6674} - {97bc8e8a-ddbe-4532-85fa-7cc8aca714c2} + {f49e4d99-b83a-490a-9e78-ec6996098aa8} - {23c87837-41fa-4c30-9bd5-1746f432a236} + {5865a28b-c232-45b2-8ce3-4143e0af2634} - {032c5b5a-1692-466c-a198-5d78fd2d446c} + {1e9c2dde-43d7-4051-aa59-48f13b996077} - {e4d219fb-4d1d-4a7e-b541-e95bffe08f84} + {f52d1d1e-ea43-484c-9b17-60c9ebc43de0} - {626daa3d-dac3-462a-a45b-de84db425f8c} + {8551e6c3-6ccd-493e-93ca-14dc4326947d} - {010bb75f-a6d6-42dc-b0a4-640d463fdc07} + {98b74b6a-8565-4e04-acbf-139fd040d8ec} - {36f4027a-004f-4744-97a8-b642f5f834eb} + {2d572174-3c44-40ae-8905-77bdf9e73628} - {9a4681bc-f5e6-4342-8143-06cea9120bee} + {61ee65f1-89c8-4a3c-b374-1179a9fd071b} - {a30e1c0a-cc3a-4e5e-944d-89a4de060b1c} + {d424b54d-2169-415c-9d69-049a07a3052f} - {ec819b46-f34b-467d-8898-6505eac7cb17} + {b8687c05-47b3-4755-9ec1-a6fd108deb1d} - {c83030c0-2b66-409b-b04a-048954361f7e} + {3547873d-9134-4681-ada2-988e95bf5db1} - {5e647858-217e-43cf-843c-ef88e0a97275} + {0414a0f6-5ae8-4b69-b19e-59dee03ed1d9} - {4b3ddb24-8633-48c3-8ccc-17249e016d01} + {4415391c-94c8-4205-8472-b245dfd07765} - {413df3a8-b113-4de4-9e72-8d7b5b20dda8} + {f29ec0b5-5244-471c-b8d0-5931ff704eea} - {845ba55e-0686-4d2f-a356-56b3c65dd0fc} + {c27a5823-46b0-43fe-ac0c-10941ca05562} - {b49d2ce8-7abc-4430-ae25-9d42c8135a74} + {48b1e5a5-f7ec-41ca-a29a-f3a6385d0f51} - {6d83af6f-7a5d-425a-8d0c-3242ecee846f} + {c3948bb5-1bb1-4378-b96f-5e1c9c125228} - {25a9c488-c43b-4d93-bee6-8c5417d27986} + {0f9dd8aa-976f-4ac8-a56c-8bc8f8e4d385} - {4d530db5-c61d-4ded-92a0-3dadf3552f53} + {7e6df42e-ffe3-4667-97dc-75f6804c5762} - {8ff93c99-c1c8-4bd7-b21e-822407a1447a} + {f0e1e20d-1e81-4813-ac54-a15814f18947} - {d6d4836a-4b07-4113-889c-10199ca12b13} + {9cea9ff9-0311-477b-a522-1c91ba84e769} - {bf1c35e2-69eb-4e20-8991-91203f2afdea} + {079a5599-84e8-489a-83d8-361c65f559b6} - {37dd2c8d-0479-4990-ac7c-3bbbc8fc9760} + {5164d707-8870-4355-9717-f304200c0f52} - {39d1f322-bcbc-48cf-a9d7-c35f4003de26} + {6d1c6e1b-73a0-402b-8290-d43f27e37c3e} diff --git a/Foundation/testsuite/TestSuite_x64_vs90.vcproj b/Foundation/testsuite/TestSuite_x64_vs90.vcproj index 4424ee6b8..8c7e40e35 100644 --- a/Foundation/testsuite/TestSuite_x64_vs90.vcproj +++ b/Foundation/testsuite/TestSuite_x64_vs90.vcproj @@ -1,48 +1,40 @@ + Version="9.00" + ProjectType="Visual C++" + ProjectGUID="{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}" + RootNamespace="TestSuite" + Keyword="Win32Proj"> + Name="x64"/> - - + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings="" + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Name="Core"> + Name="Source Files"> - + RelativePath=".\src\AnyTest.cpp"/> - + RelativePath=".\src\ArrayTest.cpp"/> - + RelativePath=".\src\AutoPtrTest.cpp"/> - + RelativePath=".\src\AutoReleasePoolTest.cpp"/> - + RelativePath=".\src\ByteOrderTest.cpp"/> - + RelativePath=".\src\CoreTest.cpp"/> - + RelativePath=".\src\CoreTestSuite.cpp"/> - + RelativePath=".\src\DirectoryIteratorsTest.cpp"/> - + RelativePath=".\src\DynamicFactoryTest.cpp"/> - + RelativePath=".\src\FIFOBufferTest.cpp"/> - + RelativePath=".\src\FIFOBufferTestSuite.cpp"/> - + RelativePath=".\src\FormatTest.cpp"/> - + RelativePath=".\src\FPETest.cpp"/> - + RelativePath=".\src\ListMapTest.cpp"/> - + RelativePath=".\src\MemoryPoolTest.cpp"/> - + RelativePath=".\src\NamedTuplesTest.cpp"/> - + RelativePath=".\src\NDCTest.cpp"/> - + RelativePath=".\src\NumberFormatterTest.cpp"/> - + RelativePath=".\src\NumberParserTest.cpp"/> - + RelativePath=".\src\ObjectPoolTest.cpp"/> - + RelativePath=".\src\RegularExpressionTest.cpp"/> - + RelativePath=".\src\SharedPtrTest.cpp"/> - + RelativePath=".\src\StringTest.cpp"/> - + RelativePath=".\src\StringTokenizerTest.cpp"/> - + RelativePath=".\src\TuplesTest.cpp"/> - + RelativePath=".\src\TypeListTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\AnyTest.h"/> - + RelativePath=".\src\ArrayTest.h"/> - + RelativePath=".\src\AutoPtrTest.h"/> - + RelativePath=".\src\AutoReleasePoolTest.h"/> - + RelativePath=".\src\ByteOrderTest.h"/> - + RelativePath=".\src\CoreTest.h"/> - + RelativePath=".\src\CoreTestSuite.h"/> - + RelativePath=".\src\DirectoryIteratorsTest.h"/> - + RelativePath=".\src\DynamicAnyTest.h"/> - + RelativePath=".\src\DynamicFactoryTest.h"/> - + RelativePath=".\src\FIFOBufferTest.h"/> - + RelativePath=".\src\FIFOBufferTestSuite.h"/> - + RelativePath=".\src\FormatTest.h"/> - + RelativePath=".\src\FPETest.h"/> - + RelativePath=".\src\ListMapTest.h"/> - + RelativePath=".\src\MemoryPoolTest.h"/> - + RelativePath=".\src\NamedTuplesTest.h"/> - + RelativePath=".\src\NDCTest.h"/> - + RelativePath=".\src\NumberFormatterTest.h"/> - + RelativePath=".\src\NumberParserTest.h"/> - + RelativePath=".\src\ObjectPoolTest.h"/> - + RelativePath=".\src\RegularExpressionTest.h"/> - + RelativePath=".\src\SharedPtrTest.h"/> - + RelativePath=".\src\StringTest.h"/> - + RelativePath=".\src\StringTokenizerTest.h"/> - + RelativePath=".\src\TuplesTest.h"/> - + RelativePath=".\src\TypeListTest.h"/> + Name="Streams"> + Name="Source Files"> - + RelativePath=".\src\Base32Test.cpp"/> - + RelativePath=".\src\Base64Test.cpp"/> - + RelativePath=".\src\BinaryReaderWriterTest.cpp"/> - + RelativePath=".\src\CountingStreamTest.cpp"/> - + RelativePath=".\src\FIFOBufferStreamTest.cpp"/> - + RelativePath=".\src\FileStreamTest.cpp"/> - + RelativePath=".\src\HexBinaryTest.cpp"/> - + RelativePath=".\src\LineEndingConverterTest.cpp"/> - + RelativePath=".\src\MemoryStreamTest.cpp"/> - + RelativePath=".\src\NullStreamTest.cpp"/> - + RelativePath=".\src\StreamCopierTest.cpp"/> - + RelativePath=".\src\StreamsTestSuite.cpp"/> - + RelativePath=".\src\StreamTokenizerTest.cpp"/> - + RelativePath=".\src\TeeStreamTest.cpp"/> - + RelativePath=".\src\ZLibTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\Base32Test.h"/> - + RelativePath=".\src\Base64Test.h"/> - + RelativePath=".\src\BinaryReaderWriterTest.h"/> - + RelativePath=".\src\CountingStreamTest.h"/> - + RelativePath=".\src\FIFOBufferStreamTest.h"/> - + RelativePath=".\src\FileStreamTest.h"/> - + RelativePath=".\src\HexBinaryTest.h"/> - + RelativePath=".\src\LineEndingConverterTest.h"/> - + RelativePath=".\src\MemoryStreamTest.h"/> - + RelativePath=".\src\NullStreamTest.h"/> - + RelativePath=".\src\StreamCopierTest.h"/> - + RelativePath=".\src\StreamsTestSuite.h"/> - + RelativePath=".\src\StreamTokenizerTest.h"/> - + RelativePath=".\src\TeeStreamTest.h"/> - + RelativePath=".\src\ZLibTest.h"/> + Name="Crypt"> + Name="Source Files"> - + RelativePath=".\src\CryptTestSuite.cpp"/> - + RelativePath=".\src\DigestStreamTest.cpp"/> - + RelativePath=".\src\HMACEngineTest.cpp"/> - + RelativePath=".\src\MD4EngineTest.cpp"/> - + RelativePath=".\src\MD5EngineTest.cpp"/> - + RelativePath=".\src\PBKDF2EngineTest.cpp"/> - + RelativePath=".\src\RandomStreamTest.cpp"/> - + RelativePath=".\src\RandomTest.cpp"/> - + RelativePath=".\src\SHA1EngineTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\CryptTestSuite.h"/> - + RelativePath=".\src\DigestStreamTest.h"/> - + RelativePath=".\src\HMACEngineTest.h"/> - + RelativePath=".\src\MD4EngineTest.h"/> - + RelativePath=".\src\MD5EngineTest.h"/> - + RelativePath=".\src\PBKDF2EngineTest.h"/> - + RelativePath=".\src\RandomStreamTest.h"/> - + RelativePath=".\src\RandomTest.h"/> - + RelativePath=".\src\SHA1EngineTest.h"/> + Name="Notifications"> + Name="Source Files"> - + RelativePath=".\src\NotificationCenterTest.cpp"/> - + RelativePath=".\src\NotificationQueueTest.cpp"/> - + RelativePath=".\src\NotificationsTestSuite.cpp"/> - + RelativePath=".\src\PriorityNotificationQueueTest.cpp"/> - + RelativePath=".\src\TimedNotificationQueueTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\NotificationCenterTest.h"/> - + RelativePath=".\src\NotificationQueueTest.h"/> - + RelativePath=".\src\NotificationsTestSuite.h"/> - + RelativePath=".\src\PriorityNotificationQueueTest.h"/> - + RelativePath=".\src\TimedNotificationQueueTest.h"/> + Name="Threading"> + Name="Source Files"> - + RelativePath=".\src\ActiveDispatcherTest.cpp"/> - + RelativePath=".\src\ActiveMethodTest.cpp"/> - + RelativePath=".\src\ActivityTest.cpp"/> - + RelativePath=".\src\ConditionTest.cpp"/> - + RelativePath=".\src\MutexTest.cpp"/> - + RelativePath=".\src\RWLockTest.cpp"/> - + RelativePath=".\src\SemaphoreTest.cpp"/> - + RelativePath=".\src\ThreadingTestSuite.cpp"/> - + RelativePath=".\src\ThreadLocalTest.cpp"/> - + RelativePath=".\src\ThreadPoolTest.cpp"/> - + RelativePath=".\src\ThreadTest.cpp"/> - + RelativePath=".\src\TimerTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ActiveDispatcherTest.h"/> - + RelativePath=".\src\ActiveMethodTest.h"/> - + RelativePath=".\src\ActivityTest.h"/> - + RelativePath=".\src\ConditionTest.h"/> - + RelativePath=".\src\MutexTest.h"/> - + RelativePath=".\src\RWLockTest.h"/> - + RelativePath=".\src\SemaphoreTest.h"/> - + RelativePath=".\src\ThreadingTestSuite.h"/> - + RelativePath=".\src\ThreadLocalTest.h"/> - + RelativePath=".\src\ThreadPoolTest.h"/> - + RelativePath=".\src\ThreadTest.h"/> - + RelativePath=".\src\TimerTest.h"/> + Name="SharedLibrary"> + Name="Source Files"> - + RelativePath=".\src\ClassLoaderTest.cpp"/> - + RelativePath=".\src\ManifestTest.cpp"/> - + RelativePath=".\src\SharedLibraryTest.cpp"/> - + RelativePath=".\src\SharedLibraryTestSuite.cpp"/> - + RelativePath=".\src\TestPlugin.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ClassLoaderTest.h"/> - + RelativePath=".\src\ManifestTest.h"/> - + RelativePath=".\src\SharedLibraryTest.h"/> - + RelativePath=".\src\SharedLibraryTestSuite.h"/> - + RelativePath=".\src\TestPlugin.h"/> + Name="Logging"> + Name="Source Files"> - + RelativePath=".\src\ChannelTest.cpp"/> - + RelativePath=".\src\FileChannelTest.cpp"/> - + RelativePath=".\src\LoggerTest.cpp"/> - + RelativePath=".\src\LoggingFactoryTest.cpp"/> - + RelativePath=".\src\LoggingRegistryTest.cpp"/> - + RelativePath=".\src\LoggingTestSuite.cpp"/> - + RelativePath=".\src\LogStreamTest.cpp"/> - + RelativePath=".\src\PatternFormatterTest.cpp"/> - + RelativePath=".\src\SimpleFileChannelTest.cpp"/> - + RelativePath=".\src\TestChannel.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ChannelTest.h"/> - + RelativePath=".\src\FileChannelTest.h"/> - + RelativePath=".\src\LoggerTest.h"/> - + RelativePath=".\src\LoggingFactoryTest.h"/> - + RelativePath=".\src\LoggingRegistryTest.h"/> - + RelativePath=".\src\LoggingTestSuite.h"/> - + RelativePath=".\src\LogStreamTest.h"/> - + RelativePath=".\src\PatternFormatterTest.h"/> - + RelativePath=".\src\SimpleFileChannelTest.h"/> - + RelativePath=".\src\TestChannel.h"/> + Name="Filesystem"> + Name="Source Files"> - + RelativePath=".\src\DirectoryWatcherTest.cpp"/> - + RelativePath=".\src\FilesystemTestSuite.cpp"/> - + RelativePath=".\src\FileTest.cpp"/> - + RelativePath=".\src\GlobTest.cpp"/> - + RelativePath=".\src\PathTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\DirectoryWatcherTest.h"/> - + RelativePath=".\src\FilesystemTestSuite.h"/> - + RelativePath=".\src\FileTest.h"/> - + RelativePath=".\src\GlobTest.h"/> - + RelativePath=".\src\PathTest.h"/> + Name="UUID"> + Name="Source Files"> - + RelativePath=".\src\UUIDGeneratorTest.cpp"/> - + RelativePath=".\src\UUIDTest.cpp"/> - + RelativePath=".\src\UUIDTestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\UUIDGeneratorTest.h"/> - + RelativePath=".\src\UUIDTest.h"/> - + RelativePath=".\src\UUIDTestSuite.h"/> + Name="DateTime"> + Name="Source Files"> - + RelativePath=".\src\ClockTest.cpp"/> - + RelativePath=".\src\DateTimeFormatterTest.cpp"/> - + RelativePath=".\src\DateTimeParserTest.cpp"/> - + RelativePath=".\src\DateTimeTest.cpp"/> - + RelativePath=".\src\DateTimeTestSuite.cpp"/> - + RelativePath=".\src\LocalDateTimeTest.cpp"/> - + RelativePath=".\src\StopwatchTest.cpp"/> - + RelativePath=".\src\TimespanTest.cpp"/> - + RelativePath=".\src\TimestampTest.cpp"/> - + RelativePath=".\src\TimezoneTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\ClockTest.h"/> - + RelativePath=".\src\DateTimeFormatterTest.h"/> - + RelativePath=".\src\DateTimeParserTest.h"/> - + RelativePath=".\src\DateTimeTest.h"/> - + RelativePath=".\src\DateTimeTestSuite.h"/> - + RelativePath=".\src\LocalDateTimeTest.h"/> - + RelativePath=".\src\StopwatchTest.h"/> - + RelativePath=".\src\TimespanTest.h"/> - + RelativePath=".\src\TimestampTest.h"/> - + RelativePath=".\src\TimezoneTest.h"/> + Name="Text"> + Name="Source Files"> - + RelativePath=".\src\StreamConverterTest.cpp"/> - + RelativePath=".\src\TextBufferIteratorTest.cpp"/> - + RelativePath=".\src\TextConverterTest.cpp"/> - + RelativePath=".\src\TextEncodingTest.cpp"/> - + RelativePath=".\src\TextIteratorTest.cpp"/> - + RelativePath=".\src\TextTestSuite.cpp"/> - + RelativePath=".\src\UnicodeConverterTest.cpp"/> - + RelativePath=".\src\UTF8StringTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\StreamConverterTest.h"/> - + RelativePath=".\src\TextBufferIteratorTest.h"/> - + RelativePath=".\src\TextConverterTest.h"/> - + RelativePath=".\src\TextEncodingTest.h"/> - + RelativePath=".\src\TextIteratorTest.h"/> - + RelativePath=".\src\TextTestSuite.h"/> - + RelativePath=".\src\UnicodeConverterTest.h"/> - + RelativePath=".\src\UTF8StringTest.h"/> + Name="URI"> + Name="Source Files"> - + RelativePath=".\src\URIStreamOpenerTest.cpp"/> - + RelativePath=".\src\URITest.cpp"/> - + RelativePath=".\src\URITestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\URIStreamOpenerTest.h"/> - + RelativePath=".\src\URITest.h"/> - + RelativePath=".\src\URITestSuite.h"/> + Name="_Suite"> + Name="Source Files"> - + RelativePath=".\src\FoundationTestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\FoundationTestSuite.h"/> + Name="_Driver"> + Name="Source Files"> - + RelativePath=".\src\WinDriver.cpp"/> + Name="Processes"> + Name="Source Files"> - + RelativePath=".\src\NamedEventTest.cpp"/> - + RelativePath=".\src\NamedMutexTest.cpp"/> - + RelativePath=".\src\ProcessesTestSuite.cpp"/> - + RelativePath=".\src\ProcessTest.cpp"/> - + RelativePath=".\src\SharedMemoryTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\NamedEventTest.h"/> - + RelativePath=".\src\NamedMutexTest.h"/> - + RelativePath=".\src\ProcessesTestSuite.h"/> - + RelativePath=".\src\ProcessTest.h"/> - + RelativePath=".\src\SharedMemoryTest.h"/> + Name="Tasks"> + Name="Source Files"> - + RelativePath=".\src\TaskManagerTest.cpp"/> - + RelativePath=".\src\TaskTest.cpp"/> - + RelativePath=".\src\TaskTestSuite.cpp"/> + Name="Header Files"> - + RelativePath=".\src\TaskManagerTest.h"/> - + RelativePath=".\src\TaskTest.h"/> - + RelativePath=".\src\TaskTestSuite.h"/> + Name="Event"> + Name="Header Files"> - + RelativePath=".\src\BasicEventTest.h"/> - + RelativePath=".\src\DummyDelegate.h"/> - + RelativePath=".\src\EventTestSuite.h"/> - + RelativePath=".\src\FIFOEventTest.h"/> - + RelativePath=".\src\PriorityEventTest.h"/> + Name="Source Files"> - + RelativePath=".\src\BasicEventTest.cpp"/> - + RelativePath=".\src\DummyDelegate.cpp"/> - + RelativePath=".\src\EventTestSuite.cpp"/> - + RelativePath=".\src\FIFOEventTest.cpp"/> - + RelativePath=".\src\PriorityEventTest.cpp"/> + Name="Cache"> + Name="Header Files"> - + RelativePath=".\src\CacheTestSuite.h"/> - + RelativePath=".\src\ExpireCacheTest.h"/> - + RelativePath=".\src\ExpireLRUCacheTest.h"/> - + RelativePath=".\src\LRUCacheTest.h"/> - + RelativePath=".\src\UniqueExpireCacheTest.h"/> - + RelativePath=".\src\UniqueExpireLRUCacheTest.h"/> + Name="Source Files"> - + RelativePath=".\src\CacheTestSuite.cpp"/> - + RelativePath=".\src\ExpireCacheTest.cpp"/> - + RelativePath=".\src\ExpireLRUCacheTest.cpp"/> - + RelativePath=".\src\LRUCacheTest.cpp"/> - + RelativePath=".\src\UniqueExpireCacheTest.cpp"/> - + RelativePath=".\src\UniqueExpireLRUCacheTest.cpp"/> + Name="Hashing"> + Name="Header Files"> - + RelativePath=".\src\HashingTestSuite.h"/> - + RelativePath=".\src\HashMapTest.h"/> - + RelativePath=".\src\HashSetTest.h"/> - + RelativePath=".\src\HashTableTest.h"/> - + RelativePath=".\src\LinearHashTableTest.h"/> - + RelativePath=".\src\SimpleHashTableTest.h"/> + Name="Source Files"> - + RelativePath=".\src\HashingTestSuite.cpp"/> - + RelativePath=".\src\HashMapTest.cpp"/> - + RelativePath=".\src\HashSetTest.cpp"/> - + RelativePath=".\src\HashTableTest.cpp"/> - + RelativePath=".\src\LinearHashTableTest.cpp"/> - + RelativePath=".\src\SimpleHashTableTest.cpp"/> + Name="Dynamic"> + Name="Source Files"> - + RelativePath=".\src\VarTest.cpp"/> + Name="Header Files"> - + RelativePath=".\src\VarTest.h"/> - - + diff --git a/JSON/testsuite/TestSuite_CE_vs90.vcproj b/JSON/testsuite/TestSuite_CE_vs90.vcproj index 3eb4b736b..4cd00d0b5 100644 --- a/JSON/testsuite/TestSuite_CE_vs90.vcproj +++ b/JSON/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - + + + TestSuite @@ -36,59 +15,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -96,221 +27,7 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - - - + diff --git a/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 79a7bcc53..51d61ad83 100644 --- a/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {a83e15dc-18ae-409c-84e9-76bbd04ba1ac} + {925cbb6a-3582-4752-a1c3-be5a0b69afe5} - {9bfa099c-b8a8-4e72-8a68-785e746be9db} + {08ad214c-bac6-452e-9da2-627941080dd1} diff --git a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj index 4d7f6e06c..59a9797ed 100644 --- a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -1,30 +1,9 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + TestSuite @@ -36,59 +15,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -96,221 +27,7 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - - - + diff --git a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 810d900fd..2089391fa 100644 --- a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {a4c5f775-184a-4aa3-9ac0-d99b9f86afae} + {eb155b8d-e533-474a-9689-dec45957d8e9} - {50a2d661-46b3-493f-a9a9-44e534c3b5ca} + {d7bbf7e0-178f-4c78-8e3c-eb714e5c5c7f} diff --git a/JSON/testsuite/TestSuite_vs100.vcxproj b/JSON/testsuite/TestSuite_vs100.vcxproj index 0a4763ac4..5bc0f1bab 100644 --- a/JSON/testsuite/TestSuite_vs100.vcxproj +++ b/JSON/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs100.vcxproj.filters b/JSON/testsuite/TestSuite_vs100.vcxproj.filters index 6d80408e7..c872eb633 100644 --- a/JSON/testsuite/TestSuite_vs100.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {859a8bdf-227d-4c1a-82e8-4ff0940a8465} + {c5906ce5-c60e-4e71-9ff1-57efed82b3a7} - {ad2e3d10-dae7-494a-b13d-0f85f6820631} + {417ee021-37ad-4b67-aa6b-fb8c33177b13} diff --git a/JSON/testsuite/TestSuite_vs110.vcxproj b/JSON/testsuite/TestSuite_vs110.vcxproj index b0f12269f..3bedad49d 100644 --- a/JSON/testsuite/TestSuite_vs110.vcxproj +++ b/JSON/testsuite/TestSuite_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_vs110.vcxproj.filters index 81ead159e..c8f7afcb1 100644 --- a/JSON/testsuite/TestSuite_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {66a23c65-2f12-4ae2-a943-0324a209f471} + {0e279c34-7879-41d9-8701-f92317f63c3b} - {7b1e424b-e6b5-401e-b054-772f293187fd} + {10b4f11c-7712-4d2d-a7a7-d56230eee98a} diff --git a/JSON/testsuite/TestSuite_vs120.vcxproj b/JSON/testsuite/TestSuite_vs120.vcxproj index 4e92483f9..fd263b12e 100644 --- a/JSON/testsuite/TestSuite_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -304,9 +304,9 @@ - + diff --git a/JSON/testsuite/TestSuite_vs120.vcxproj.filters b/JSON/testsuite/TestSuite_vs120.vcxproj.filters index fe6516ba1..26d5dac83 100644 --- a/JSON/testsuite/TestSuite_vs120.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {5ae5f806-9bb2-464f-97d9-466e78822e9b} + {70ce49be-3015-4c43-a64d-5eb2747df2d6} - {893206ec-4cc3-47b0-9936-0640cac5e950} + {5893f733-da56-46c7-a83c-1a28281490f8} diff --git a/JSON/testsuite/TestSuite_vs140.vcxproj b/JSON/testsuite/TestSuite_vs140.vcxproj index 3c68e8bff..32046dd33 100644 --- a/JSON/testsuite/TestSuite_vs140.vcxproj +++ b/JSON/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs140.vcxproj.filters b/JSON/testsuite/TestSuite_vs140.vcxproj.filters index b9eb3308b..4649b855a 100644 --- a/JSON/testsuite/TestSuite_vs140.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {99a1cbc3-0fef-4ccc-b8b4-24f530141b40} + {7cac93f1-a0b9-400c-9d70-c1044b6312a8} - {c21a2def-afc5-4b13-83a5-8cec50c40962} + {8f43e33a-bc07-4a37-95d3-814478628fea} diff --git a/JSON/testsuite/TestSuite_vs90.vcproj b/JSON/testsuite/TestSuite_vs90.vcproj index 018d45bfb..58b314c30 100644 --- a/JSON/testsuite/TestSuite_vs90.vcproj +++ b/JSON/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters index c9dabfa0e..b9f8d01f1 100644 --- a/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {f6f65a7f-40c1-481e-afe6-5513592b1479} + {4756e1be-f5aa-44ba-9ed3-82ce1e281ccd} - {86150262-27e1-42bf-bf02-906901bfbadc} + {92208001-e3b6-4f9b-b610-a5a981170d74} diff --git a/JSON/testsuite/TestSuite_x64_vs110.vcxproj b/JSON/testsuite/TestSuite_x64_vs110.vcxproj index 0a7532853..8d6daeee4 100644 --- a/JSON/testsuite/TestSuite_x64_vs110.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters index 971f97cb1..aaeb06496 100644 --- a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {fedff2a6-05a9-4bfb-ae71-988ac77fb74d} + {7bdd04a2-8395-4e6f-b2fa-26bd791aabd4} - {9a15b5a5-f10d-4cfc-b315-0d27383db6f2} + {67e67fdd-6479-4280-ad3e-4861b3a0620a} diff --git a/JSON/testsuite/TestSuite_x64_vs120.vcxproj b/JSON/testsuite/TestSuite_x64_vs120.vcxproj index d792a33fb..bdd3a6161 100644 --- a/JSON/testsuite/TestSuite_x64_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -304,9 +304,9 @@ - + diff --git a/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters index 403619d95..932ddf008 100644 --- a/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {b4154b0a-ff92-4d84-9105-efa35e6ce6da} + {b783fb61-e6ce-471c-bb9b-26139e1c7761} - {c9dfeb51-9f60-4884-807b-6ab391cf8f6e} + {9adae9c5-9fe6-40ac-8324-2568ef080a36} diff --git a/JSON/testsuite/TestSuite_x64_vs140.vcxproj b/JSON/testsuite/TestSuite_x64_vs140.vcxproj index fb6d4efce..4017afdc2 100644 --- a/JSON/testsuite/TestSuite_x64_vs140.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters index 6b1213c7f..2618b20d2 100644 --- a/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {f282e5cf-1b26-4bf6-955b-287b02c8c52f} + {14f400a9-5994-4886-ad31-bcd51f0ff144} - {d18d2f2a-3c27-41dd-8288-ac84e726e25c} + {6cb4eab6-4033-4c6f-bd3f-bd513bb69cb1} diff --git a/JSON/testsuite/TestSuite_x64_vs90.vcproj b/JSON/testsuite/TestSuite_x64_vs90.vcproj index a9aa66077..f3048d65e 100644 --- a/JSON/testsuite/TestSuite_x64_vs90.vcproj +++ b/JSON/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters index da94a67ff..5c8e2d84f 100644 --- a/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {e0011fce-4702-4e6b-bc54-00b3bea08e0b} + {2aefd389-3405-468e-bcaf-4c44a8a1d834} - {b6e99013-b71e-47af-b880-88dfc0fc40f0} + {882e2298-8173-4a1b-99b0-1bd794ff08ca} diff --git a/MongoDB/testsuite/TestSuite_vs110.vcxproj b/MongoDB/testsuite/TestSuite_vs110.vcxproj index 9ce12a748..fd90330a5 100644 --- a/MongoDB/testsuite/TestSuite_vs110.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters index 541ad41d9..911c9b74c 100644 --- a/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {96121fbc-01ad-44f7-b515-26c3b13b44eb} + {e453101f-3398-4125-b47d-63936c19cec3} - {7ee4ec76-a546-4eed-b566-906fd50e0177} + {f1b25097-78d5-4479-8ad9-a642feeb1b26} diff --git a/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters index 41e7821ac..4b3050b8c 100644 --- a/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {23649e4d-79ef-409f-9b82-02b280f8e5ed} + {a3a292f8-7e4d-4b0c-aca8-723c911359ad} - {e79dc1bb-6d41-40f8-89a4-6ed43e5193f4} + {d982f57f-b501-4392-877b-b4d15ae76911} diff --git a/MongoDB/testsuite/TestSuite_vs140.vcxproj b/MongoDB/testsuite/TestSuite_vs140.vcxproj index 15e462ec7..85d44cc6b 100644 --- a/MongoDB/testsuite/TestSuite_vs140.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters index 9754244ea..42cdf4c6f 100644 --- a/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {aefb99db-b634-4ac8-96a0-c0dac622d83d} + {2b049f8f-cc3b-4f43-ad0a-dfa2323a9673} - {3a2ff6bc-c251-405e-b3c0-a2f412292b22} + {4513b5a5-cd70-41cd-b5e2-8f18c7098fc2} diff --git a/MongoDB/testsuite/TestSuite_vs90.vcproj b/MongoDB/testsuite/TestSuite_vs90.vcproj index 32c240638..24f6d1829 100644 --- a/MongoDB/testsuite/TestSuite_vs90.vcproj +++ b/MongoDB/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters index d1585916b..90ea20549 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {92c7320b-b212-4d12-b288-dc74a4438d1c} + {f04b1ab3-18ce-4ab9-b680-c42ea32368a9} - {b4cd003f-6ba7-4bb0-9c56-6c51df62a10b} + {907cd13f-8387-4f21-95d6-efe6388667d5} diff --git a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj index 5e331c05d..f733804a1 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters index 0b13eba64..5ade9f6c5 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {5808f628-1628-4781-bc13-7634dda1a482} + {d6902e38-ba8f-4c00-a8c6-fb31b49e97cb} - {affc22a2-bf5d-47c4-a8e6-8e8016bcb878} + {1f9d5790-5ffa-4a00-9364-1e2d2d47361a} diff --git a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj index 0d26b83f3..ebf68a014 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters index cb685f8f1..4ac162548 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {14237c52-8513-49ec-a162-80a2723f31e4} + {cc5b5475-6275-490f-a24c-e0eae05f0173} - {9da086ee-3c3a-4984-a129-90333957c757} + {d5b688ef-2bde-4b38-9af8-e57db1fac2a0} diff --git a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj index d64eb3b15..d6c23474b 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters index 2b65d0f54..262822beb 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {1fd1d53b-dbae-4ce5-b817-e0dccbe990eb} + {16f62e7d-d598-4e47-9428-234314fa3675} - {5c70c361-3154-4468-aa9b-fd79e5dd0018} + {b7b0de74-ff79-4890-afd3-486bc7d4533d} diff --git a/MongoDB/testsuite/TestSuite_x64_vs90.vcproj b/MongoDB/testsuite/TestSuite_x64_vs90.vcproj index df730d44b..5744379ea 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs90.vcproj +++ b/MongoDB/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - TestSuite - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - @@ -368,6 +62,29 @@ + + TestSuite + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + diff --git a/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index cfe49dfcf..d549c4f14 100644 --- a/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,163 +2,163 @@ - {3b1867dc-388c-4962-b424-100d28f729b3} + {cf03bc07-52fe-4569-90ab-33207e9e3011} - {2e4734b9-3277-4970-85ca-3df4f9509d09} + {44a3d01e-2e58-4d40-8449-8f4e3a3adf63} - {65da88e4-1422-4cbf-bfcb-5a9516ce282f} + {a3abec36-253f-48b3-9bb6-16ee0a5c8625} - {d70040ba-49ae-477f-a5c4-e603eda21cce} + {ed8cfeaf-34c7-47c4-be7a-c0c17a7db834} - {b8a612af-dd9b-458f-9f21-fb2267061267} + {5b384be9-b6ea-453c-aee8-a5113ea8ad9e} - {9ac8526e-ec0a-4b69-9596-76ee0e813ceb} + {27dede74-43f0-4022-a4f8-8efdf04e917e} - {b67227b8-40dd-4393-bb56-ba0d0650ce2f} + {958f1bb9-a5da-44cc-97f1-ff3d8e2cd4e1} - {9cb99f15-d7ea-4dc6-bc22-b38d6bcd2447} + {83fe52b2-1548-46b1-8704-b64ac06867a4} - {31fdd8b9-ccc9-4a4a-97bc-613cc73b2839} + {db7a3e37-9e7b-490a-8360-458ec81a5f11} - {027dba76-545d-4aac-9e7f-10ef25a7f649} + {49e0630f-8cb3-4f6a-bb6c-b2feb5919c65} - {16469ea7-703b-4021-bb3a-74b2bfbb556e} + {9d9f38a0-1015-4b68-8fc8-e809fab59a6b} - {c70fe35d-a5a0-44b7-affd-2d1cc1d3f38c} + {4585bd7b-006a-4750-b79d-720ebad98431} - {dcc67a5f-b024-4382-8163-0888347c2299} + {90f9206d-21e4-4330-af8b-bcbf2ddb1cda} - {7becd069-c54c-4cd7-8797-beba7e05142a} + {8a6ebd7c-e61b-4dde-8025-f52f2c229deb} - {29ce4c5c-79bb-46c1-9ff2-c0f1279f213f} + {e6da22e6-5456-4877-99e7-e8e36cc8c173} - {b1201ce3-484b-4e27-98d2-dab3c8a306d1} + {195cd726-3129-456c-be8d-3600ddcc7382} - {9b46fdf4-a64e-4b00-974e-247023f1aea9} + {2fcdd9e5-ed78-42cd-bd09-177d1a2745b2} - {51f29fed-e9f9-427e-8697-b6348665f859} + {e0da7176-8647-42b7-bf4f-aee09572b914} - {63b77ca3-1974-48a2-affd-dded55872a78} + {c1bb3ff8-cb54-4148-8890-0277ae4623ec} - {8fcc4932-7cbb-4d6f-a968-e036d6a4fc4d} + {0698dd5e-7e6f-45a1-967d-bc8876e249cf} - {c51ed5cf-e583-4f53-af88-45b4f17577b1} + {2a47877b-5d9e-4607-8a59-243dbf5525d5} - {d65736b9-6598-4f0e-8322-60821ed538e0} + {5018d969-2241-4618-82d7-ce4500ed3a9e} - {2d376c80-425d-4425-803c-7cfab85b6584} + {a3bac305-8360-411b-89fb-878a56776bc0} - {e01bfea3-aee6-4413-8689-efdf54f35617} + {4ee9e343-5ea7-4c9a-a1e6-6883a3885282} - {43022576-9aa8-4f5c-a877-a67ff244ebbc} + {b88a1452-e32b-443f-bf3e-3127a30ccb07} - {cd305ab6-c6fd-4403-8ab6-4e9ae9cdde2c} + {6194dd3b-15dc-4763-a056-eca2fb37e7b8} - {6bbe0981-6588-45ef-b2d5-f31f6d9a0ad4} + {7c717ef9-54aa-457b-a346-c53a4e2969f9} - {b754788e-170e-45fc-9d15-18a9c5a67be2} + {55f49d0e-3241-4f2a-a792-da09919252d4} - {18180d3b-f0ac-4dbc-bf94-b6455e228856} + {b61a9df7-852c-4197-8b6e-7418b351c2ac} - {e22a8929-5c6a-4e60-8f88-53e21a32955c} + {45da3f66-2b8a-4aaa-bf87-81488160d974} - {aebfca23-3875-4aac-856e-11d9c731c732} + {eb4e734c-01be-4f45-8436-1a49980c1cda} - {d62a8752-01d9-4859-8e9b-d8867d4ce54f} + {4cc638c6-6bed-41b6-94c8-10e2f256668f} - {10b9c952-06cd-4598-93eb-590aedb0744c} + {2dafcbf6-5a55-4ecf-93e9-23cc1cb0f21f} - {6b2508dc-d4ee-4678-b6fa-7d176c4085f0} + {aa5e40aa-2bf5-47b4-9375-c9cb533e2a44} - {ecc36e90-e784-470b-984b-a42cff4c6570} + {a26778c5-82aa-4f18-acba-6816fc389be9} - {671c08c1-5cdf-4ecf-b90c-e1c004d007ce} + {80e7601d-571f-4406-89b1-15a0c9c8ea82} - {09a4bfdb-72b1-48a6-8f3d-f9d1a015d56e} + {32963fd4-ba50-4101-babf-9cc0998b1ff7} - {d4f3e960-3617-4a54-8fdb-40b5346c7b2b} + {c83ebffd-7ab0-4626-be22-5aebef6b8dca} - {7d2c8496-e309-4cfb-a5b2-596da6a9c824} + {98c8afce-dd1c-4c3c-a76c-b87fe4ec3697} - {36d570f4-f6fe-4233-8444-dce2073907b5} + {c0021e31-fa7c-4c28-be10-aff857c460e5} - {0dd1898f-f726-453a-b974-cb0c9e765c82} + {18195b10-5d4e-4508-a56f-df0caca1f0c2} - {6f21ec8e-cee3-40b6-bd79-77526be65028} + {9bda6733-a6b7-435d-95f4-f309b5ba57ee} - {2e6236aa-f7ac-4059-a134-7378572b3232} + {a705d402-4c76-407f-b222-977218481584} - {47b7833f-3598-4e40-a76e-d20b73bdef7d} + {6a151084-58c4-4188-be91-997ab6a085de} - {6246df50-c571-4c54-b0ef-74aae73b1fdf} + {f0bd9f50-5730-4519-ba54-d26a3899b3e2} - {76439ec6-84b4-4ce6-9aae-35d2c533b1f9} + {c6f71a30-7a20-42bc-a82e-52ce60a34254} - {fc012dc7-e602-4fc7-851b-c415c3022d5b} + {d17fb579-49be-4791-9f3e-83ec43d943ec} - {cd481aec-08cb-49f5-b465-8c895217ce5b} + {a4d7f169-e3cd-43b0-a6b8-ad6417f523cb} - {6204ce74-d619-4a38-9ec5-297237ec0596} + {842c1fba-218e-47c9-9689-c04e7000adaf} - {b5f909c2-2135-43f2-b861-0647decc64bf} + {0d69f857-90f9-4f32-917e-7e7e2f5158db} - {b0c8d754-6a0e-47e3-adfb-b0e3724ea202} + {c500338a-cff2-4b6d-bca9-5e15352a9b90} - {53876248-ba1b-49be-80c5-a84b395422c1} + {58614ee2-fd40-4b53-86b7-1d590663577b} - {8133b9f4-8fb7-4ed1-b07d-019355f78c1b} + {2732db3f-a116-470d-9e25-1a8a5ff20097} diff --git a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj index 588721537..b4e4450ab 100644 --- a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -1,30 +1,66 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TestSuite @@ -36,59 +72,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -96,340 +84,69 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - diff --git a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index af1d1e645..970785b9e 100644 --- a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,163 +2,163 @@ - {54ed1aab-e393-4ccd-9778-035feb782991} + {49e69c19-ebea-4272-b1ba-01721b0294e9} - {95037cc5-6b01-4528-b77e-9cdd24168425} + {d82276c8-8be7-4801-b7a7-da97b0d1fa50} - {a654938d-7e50-465b-8c6f-7716f85788dd} + {3775dec6-0f54-4a7e-9696-765027e833b4} - {910d48ec-8c3c-4c53-b350-3d0e35d2f764} + {48e1cb60-a347-4d4f-bdfa-c626ff35e25e} - {9eaebb11-8704-4837-a554-9175d196308c} + {901e1cdd-2d4f-48d6-af3a-5ef331cd7f4f} - {780e9262-c996-42ca-af38-271156894902} + {67d1c18f-6771-4071-802f-07c7f31a6465} - {29e0f7d4-6b8b-45ad-9d11-ed2ea003e0e5} + {f9ffdf36-0e4c-4d95-803a-b4913d131095} - {682f9f0e-3e70-4c82-8b45-318f17866cfc} + {94c55e2d-8710-40a1-91bd-42c1ec8c366c} - {e4805201-de06-45e9-a7c4-53834ee063f1} + {47d8ec32-2e24-491d-b880-16a7f1dcb8d2} - {f5e6e585-024f-4f90-90d8-9587913ceb5f} + {37c4d744-b1b0-44bd-b8b2-7b0d943bf945} - {484f859b-8027-4935-b608-bd618698d85b} + {946d727c-5d12-4e9f-9b1c-06229fc747eb} - {a8e7177c-3354-4796-bd9d-4cd95abcecfc} + {4e7fced8-674b-4240-9acb-94a234a0288c} - {628a6321-d38c-4bcb-b4ae-99c124003a45} + {8375fd03-8a11-48d4-a6e3-6953a5551d34} - {0fb696b6-6987-4968-bada-0eace4c8ccfd} + {e0eea630-e187-4a22-ab49-8431563395b7} - {e530065d-1896-40e7-9e2d-68dc808877e2} + {0b23c5c3-7cf6-4ad1-9b71-7ec8a9b0dee6} - {3b473d75-e76e-4d0b-b017-d504e6e12250} + {39bd367a-c8b6-49ee-8cb9-ec9b0df2e060} - {d672d4a4-8e25-4490-b2f5-0a2aa6ccc8dd} + {00784543-7107-4178-bc2f-24a2890e9dee} - {d5589198-25b8-4232-ae2e-96b2d56f05b4} + {a0bd24ed-8fb8-4bd4-ad96-3dca3eecd8d2} - {d5373d67-9382-4683-b3d8-f7f44091d5d0} + {470380ae-5b7b-41b6-ab55-0037d66fdc7f} - {3934f1e0-2b27-453a-b685-589082c078a3} + {9e5a12df-5c99-4493-ac64-1467a86e6117} - {7e6b93a9-6642-4216-a2a5-399d87fc706a} + {5f26c270-69eb-40ca-ab0c-85ff7fc7fbc5} - {082bfd79-ad9b-476e-a377-7fb3d8d4fd26} + {10a22ff0-8940-4e06-9385-41849da6259d} - {3441bc34-4691-4697-bf40-fabfd5985639} + {7db25fe8-ff10-44f0-812b-9948d8e7d6f4} - {6d0e102f-a786-422e-b07a-7712a90e66f0} + {e2b54563-f356-4e9a-bb2d-6054d9450890} - {c506ff77-06e9-4ee3-89da-b0154e50814f} + {7ac57b1a-e3a7-4183-b3e8-d849c3b8cef8} - {aa1db272-3b94-4697-8b4d-3c652ba1b6ce} + {d98580be-79a5-4e93-8936-b47554267464} - {431ebad8-6097-4ae6-9bf7-2b2c80a8580d} + {adf89f81-0d59-498a-a16f-8737f05ec45a} - {a0ddcf41-ef2d-4adc-83f1-0eefe4da2716} + {409e3253-12f6-42ac-9e55-7e4fb73e76d3} - {662d829e-c300-42d0-977e-d1a5e645e02a} + {8268217f-db37-4a17-ba35-a1f0da50367f} - {7a6b122e-9b41-415c-8256-020c077b8356} + {ae77ea3c-a7c0-423d-8d74-add408f6abd1} - {3d39aeec-a535-44fc-9f52-d002b3f8b55a} + {ffcc9173-6986-4707-b9b3-95388ab76899} - {1e88ef75-b7b2-4b98-bdfd-47caa6e461dd} + {07ecaa2d-8201-40d1-ac53-1bcb576baff9} - {2fc4aef0-8a7b-4c64-9292-21469bcf3bcd} + {04f1515a-a1b9-410c-b462-b3642582520f} - {dd87f61b-e5af-4ba3-be9e-2b1cda6b823b} + {4caf6731-f6f7-4dcc-9bba-53c1b46e0e3e} - {d5687a10-0558-46e6-a814-78433bb62360} + {14fdc627-0942-48f5-aac3-fd69785ae178} - {a985b6b7-5d87-4dbe-86a0-ef7d1c1f9706} + {ee57b60d-f347-4c7c-af88-7e457e863a2b} - {3d67cd12-8833-4321-97f6-811cd462e293} + {70d28f65-4cfc-4b0b-bd95-721a77a75a49} - {62c6c3ba-4e5e-4fb6-bbb7-e8a91584d858} + {9ddbd18c-25a5-467c-a904-0fafb02f056d} - {c78ee20f-22a6-48ac-b545-b9156f7eae63} + {742c2d46-f65a-44fc-b26c-9469af9c7b1c} - {004db812-cb2e-4260-9ded-ccfc45765378} + {72aff4d7-3e30-4c7b-8a13-c64791f9252d} - {f9da6f89-6d6b-4057-8e28-23079661b4d1} + {e1d07c50-7fe6-41be-98cf-3ab08491e50f} - {b0548cbb-3338-46ce-8ddc-a178c8bb935e} + {b5a99628-b1a4-4b32-b1ff-27f1491d51f9} - {7de96ec1-0c45-4373-8eec-bf644476afe6} + {4321f410-c0d3-4d14-a1f1-b16cdaf90212} - {d7f4e81e-98ed-48c5-8c82-cb27d5ec361f} + {0c847777-381d-46f1-ad64-73bef7f89c14} - {a2f25ac5-1bc5-4062-b233-5819164684f9} + {dd2653e1-98df-4960-b9e0-a844a8343c34} - {04c48d80-cdf9-41fb-8479-864eff53e462} + {4b402910-b92d-44ab-8264-dd227e3069f4} - {72848a87-e8a2-48f9-92a1-968f2e0a0ecc} + {f66c826c-a9da-4a69-8cde-b243eb0708cb} - {ab135e1d-c9f1-46c5-a0d6-1cfc8758cfb5} + {f9bc50c9-2d06-41f3-9d42-8577afdb3405} - {84261851-1dfb-490e-a80a-8148012d126b} + {896fb8b0-7c2f-49ba-a089-acc117b25c54} - {c3a081c3-22a0-4519-b0ff-268bc5b2e079} + {48a824e4-6648-4473-a239-4f044cb18625} - {49308afc-b3f6-47d5-ba78-44795241742e} + {9672f427-a7ca-435a-a9b0-98394f99627c} - {8cfef2a5-9fea-4c2b-bc22-1fe6a9e5aa82} + {28f34753-bd67-439e-b658-edded9656c87} - {f123291f-2523-44ce-a58a-dceb5aa28014} + {49d11b66-a72b-4192-aad9-6370f7705abe} diff --git a/Net/testsuite/TestSuite_vs100.vcxproj b/Net/testsuite/TestSuite_vs100.vcxproj index e4d68a2ee..5a92781a1 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj +++ b/Net/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs100.vcxproj.filters b/Net/testsuite/TestSuite_vs100.vcxproj.filters index 607ec2124..386d410e8 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,163 +2,163 @@ - {386487a8-6153-4cf7-9355-63e54c6af75c} + {06611658-b76c-4981-abd2-e2ee26dc1000} - {c8926986-1978-459e-8e38-8e659d975868} + {a1cf231f-feaa-431d-8945-e4ef4dc3167c} - {e83a05eb-afd9-4d74-9d00-bcc4d5a945de} + {bd460dc8-09a1-49b7-91ee-43f2a3191bf9} - {ce94d78c-81d0-4447-9e63-cd1daebcb4fb} + {c66aa2d5-0328-4d0d-9d69-da8d4bdaca4c} - {b0e40056-3a5c-4dcb-a6e2-faa6209f4954} + {3a56fea0-fd22-4218-8a26-195f119aaf46} - {547c67b4-e960-4d1f-b270-ca5ed6474871} + {89a13f4e-b316-484c-b665-156660f67480} - {fbe371e5-d461-4e27-bc48-51e503d9e8f1} + {44d27c33-7d0c-462c-9aaf-c06bbbd1198f} - {faa24a3c-8f63-43d1-8eff-a60028036ffa} + {e4bedbfa-dbef-4b47-8f14-bdbfba596319} - {045ed3f5-d83f-4fd1-857b-151f5efd737e} + {69ac3097-03ce-49df-b0a4-0b96d7079aca} - {7a499b35-6159-434b-b5a4-4fe9646edef2} + {b18428df-db1c-471b-aa18-45f0659d8b52} - {c11bb535-c73d-4d11-967b-eb37901bda87} + {3336a6b0-9553-4112-ae8a-030f002bad92} - {103de623-2412-4ea9-b535-156dcf2cf4bf} + {532c0f73-c33d-4f62-988c-70689d4c401d} - {0e71fab8-9b36-497d-a2a5-7fffd5e21e48} + {6872a3d9-6857-4bcd-9d45-c04cf0aa3d65} - {a8760273-7101-44e5-bd71-9d1f81e2a775} + {0bce7a4b-163b-4008-942b-196b2f6062eb} - {d5a8b90b-dc3e-419b-992c-1e1830183c89} + {8231545a-699a-451d-bd7c-08d3901b9ccc} - {d6cf1a06-b5c8-4c22-8868-5b9a6219e56e} + {77e5ff06-5f6b-47d2-8a1e-24a45102ec00} - {8aef8a3c-ed43-4124-90b6-0cce7afffaac} + {c69e5aab-862d-41db-805d-18c735da5656} - {af162d17-c803-42a8-a454-6146f6c5162e} + {6a536fcc-000d-4d4e-bba3-b29c600fd077} - {95e15739-146a-4a39-8f5a-33cf1b1223e1} + {d4e97885-a98e-4e25-a992-4c5b56c62d29} - {3cea4d71-0e5b-46d6-a67e-04f2c9372275} + {96b52dd9-cfe4-49f5-a5fc-75e406a8ea9e} - {7d3c23bf-76c6-4a6e-acb1-5c8f0ac70d65} + {abac624f-6dd0-4650-8911-4e2fd32740dc} - {dab194de-f132-4c47-8587-1eb1616361b0} + {8a5071f3-c1a6-4f54-bca9-3ef2efd93dd1} - {c959df55-6404-4ea8-b40e-e45a5f671f10} + {c2bd0fdd-7c97-4937-aaf1-7c8ba9c78004} - {4be57bb5-523b-438d-a9c7-83f7b3d3a3a2} + {6fb262ee-be4d-408e-9a61-34816ea5363a} - {220b5efb-7e3f-4c5b-89d0-05c5bdbddc74} + {8c223765-91c6-4ef4-851c-f8527e2471c8} - {3fb52268-2a31-4b02-bcfc-9688de4a68b4} + {5435ec8f-1a0c-4ec0-9cbd-4ef6c4194a47} - {69907235-3794-4f82-8182-afbcb3302368} + {a1e4430c-74c0-4b83-8420-5c15b74c96c6} - {7f394771-b789-48f5-b836-8bc93cf2458d} + {44a647bc-f725-46f4-bd04-c93599a3b25f} - {62c8a8ed-3f6b-44d6-85d3-3bba79d1c205} + {737da887-0e8b-4a9a-9fb4-7d2a99c63225} - {4f7a3182-826e-4d3a-a293-8de274902a6e} + {c7a52ed2-5eaa-4683-8e26-d071368a3cd6} - {2174f82c-f016-41a4-906a-4b8c74dddc28} + {d212e239-14bf-410a-bc25-69583ba86981} - {4c391231-4d8d-42a1-8434-4694d4826783} + {a4ce5440-61d9-4a53-bc2e-36648cef7ff7} - {fb1f1b7e-ca60-4071-8757-29f00c9eb295} + {662db8a5-37fd-4a64-bb68-e93991457f5f} - {e30d96be-962e-4b28-8a79-25d639b59433} + {ac5793ba-b790-43cf-ad78-3fb81dec25a5} - {17442825-ae0b-410b-8eae-50731b4a9800} + {29083985-b7f9-4e12-975b-da2257e9577c} - {22eab704-de3b-4b44-8602-0909f3aa51dc} + {cd2c0c7e-980b-4181-a96b-e4247303cd3e} - {c44e0138-e2e1-4cbb-990f-7d62b889cf25} + {ab398c6c-619d-4b51-ae12-1be68478e8d0} - {86f42403-6128-4e76-b92e-af94c82f4e32} + {97a18937-1b35-4ed3-9414-b590c873b5fa} - {9cc21a92-1390-4a54-841e-bb694bf794ee} + {0f26e900-3417-4b86-9d07-22ad6956754d} - {080cffcb-c2cc-4225-baac-6bac79e5c80f} + {2143506f-7dc6-4adb-a18b-aa6267f4b76f} - {cbb3f682-d1f7-4f45-a3ee-8eb9983f41e0} + {420b5e95-46c6-4da0-8122-567d21d4d40b} - {27487871-c6c4-4160-b3ff-07352a7a0fc9} + {d3b21f77-a86b-4c70-9cd6-df6a384c2245} - {665a44c4-d4aa-4954-9b6a-4d407b7b5d4d} + {1f50d11a-2636-4536-a597-f2097d659db6} - {98004c3b-c070-482c-8f53-6b9bd606fd49} + {0a7bf257-3432-4c22-8e7a-a9a0c1ffcba8} - {4ba6b70f-0740-4550-9beb-0d774f5a8d5d} + {e9f45f79-e7d1-4d45-9785-98d2a13a7c98} - {462bae06-e5e6-4e88-bb39-511c10d3950f} + {89413dd0-08f9-4bc3-a998-2fe6dc6021fa} - {2581730a-7708-4d21-99cc-90d5c052a33d} + {ecdf0dc6-5993-4145-aa87-a126ff393861} - {dbb522db-cfcd-4b3a-a391-da5c3079c339} + {a88d7c56-f090-4a94-832d-f90dec9473f9} - {3eabc2a4-8777-4e5e-b82f-9a8d1983a4fa} + {322c8725-f197-49cd-b52c-3fbdcbce9f25} - {c86642ef-f38f-4cd3-883b-4ae3cdbf6758} + {d1cfa57a-2f17-4b0c-9ded-5a347fb7e62b} - {c782caaf-6d46-44e0-81b0-94f6fcd4b737} + {4915a398-5ac9-4f2d-923d-291bf064a95e} - {72b4da46-9306-4da0-a6db-7d1c427f94f9} + {8e2ed425-eb22-4fcd-8cb4-182ef87b0209} - {4ac9cd9f-b051-428c-85ed-e506ba730bdc} + {0259f406-701b-41d2-9de5-19974bc0bf6c} diff --git a/Net/testsuite/TestSuite_vs110.vcxproj b/Net/testsuite/TestSuite_vs110.vcxproj index 8fc98e94b..b06f33f49 100644 --- a/Net/testsuite/TestSuite_vs110.vcxproj +++ b/Net/testsuite/TestSuite_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs110.vcxproj.filters b/Net/testsuite/TestSuite_vs110.vcxproj.filters index f7625213b..f9a7fc7a0 100644 --- a/Net/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,163 +2,163 @@ - {e6aad03a-bc56-44f5-8944-2fead0935ac2} + {815575f7-8948-48b3-b70c-ff1a80da036a} - {a6c69e1d-6669-4948-8163-7f38814d8256} + {6b44b545-f476-4561-8abe-ab83535836c6} - {dd30b6ff-b34a-45b6-8c14-67189f7c67c1} + {8cef3562-7848-4d6a-b7e3-971f83891a0e} - {d3f6e1b9-f998-41aa-b56c-8ba78c80ef57} + {e585a1f1-eba6-4c91-b341-349fa510bb2d} - {47e7384c-5bf3-476d-b1c4-f1c429477464} + {d2ae5bb6-2d96-4a27-b13a-37a8bac2c447} - {526fa304-d21b-4967-9a7b-c5c5f791eb6b} + {8de8e20f-f6d1-4e8f-bd49-451445d4fea4} - {af813f2a-f7a2-46eb-a14d-b1aa6d62e4d3} + {bce24bc6-b395-43a4-b6fe-097740ed82a8} - {f858cf1f-dbfb-4efc-bd36-90b6ada3cdb9} + {a766e604-3028-4ed0-a314-5e122a3b58b0} - {6981147b-f3fb-4925-961c-0a20366dc858} + {c5abdc50-2624-40a7-b647-560f8a352f38} - {fe6c8deb-5554-4783-8481-f25bc227a070} + {65660127-768c-4813-9c82-1e6405432771} - {7691fe6c-6333-459a-ab18-000335986582} + {b547c10c-264d-43d2-9ee1-dbf0152efd2c} - {e62352cd-0d6b-4861-b0f4-c29a2faea981} + {cc229e79-2af8-4721-ba64-a5cedd651f98} - {eb811d5c-2cf7-41dc-b028-a55dbaf0f7bf} + {f5477211-3d76-488b-bde9-0ceab7c8906e} - {261a2e8a-9169-4d45-a8dd-fba6777f02ad} + {2901febc-e6e0-42d9-a535-83da02f8a49d} - {7791c1dc-d74b-49ac-a6b9-c60ea5a553d2} + {8d16775d-ee82-4737-90ee-69ca99528896} - {926c627e-1043-479a-b240-45dfced23683} + {b8caf98b-eeec-46e9-8cc1-d599a092ba40} - {df35ecf6-26fd-4f82-b980-ca1d3df74aba} + {70327651-3b4c-4c77-9c00-2010161a4cd3} - {e730864b-5279-4b46-8140-b562dc200c93} + {f3deb8f3-6f0b-4e70-ae53-db0171523ed6} - {5242df23-3eec-40e1-9af6-08e1b27d4302} + {93ea5bfe-dec3-4e7e-8fa1-ef4048d3bdb1} - {1e18c3df-b5bf-434c-8577-6bdfc3a18b6c} + {92d4b8b0-9fb5-4692-80ca-87e54b86efcb} - {da7451d9-ac2a-4d80-846a-0fa4dd3de48d} + {91d8a700-cfbd-4008-8769-1d2e5c9558c4} - {90d80e25-6abf-4be9-a5f5-a0442f96203e} + {ff1f5688-07b3-4bb6-9c7c-da2f5d9ebbc6} - {efd92462-ffb5-4ebb-8530-ead74dce37e4} + {ab4894bf-bbd2-47d3-bcf4-bcb6dfebfac8} - {e76b68bf-e6cf-4efc-a38b-0733514e4fd2} + {be8dfced-d753-4883-b64d-414ec23980a8} - {6d3095f9-53e3-434a-85b5-79f47e8733b3} + {8d213bc2-023c-4dc2-8863-c76c6c073b4a} - {fee44a5b-21b6-4589-b632-42ff6c7cfa3b} + {7507b834-16fe-4ca6-a5eb-3b8ee0b51a74} - {33f64883-387f-4ab8-8d12-7e1ddcc67c7d} + {7e60deb4-8307-4689-b9b4-75c7be7d35bf} - {5d30a287-873b-4194-a608-062270ae6bc1} + {23fa02bd-d201-490d-879d-eb53a76be34f} - {5a130bd9-4903-4f02-a506-ae8a8752c02d} + {7cd1fdd0-e01a-4ad6-94d6-a724b4d4cd75} - {44d92719-6b8f-4b08-bae0-cfa6528bb421} + {917f6011-901d-4a3f-a033-9e00bb4a3ae3} - {7b893d44-e842-4ec4-921e-40cc22c6dcee} + {1d0bb7d1-4e9a-45ce-9d9e-403f27eaf944} - {84c4ebe3-3a5a-4ce7-9b9b-bac6011ef53e} + {6bd6e88c-98eb-4507-b732-c2e29b66fffc} - {016fefca-fc54-408c-98db-ae09618c71c9} + {fc32bb9a-4721-4c2f-b5e3-a4f298d58b04} - {ee15d01a-5366-4c99-9c4c-598430effa1b} + {ac461d74-12b2-4f73-90d0-b5e1df43e36f} - {1cf10455-a7cf-43eb-8347-063751e41ba3} + {b35a5961-eaa4-4db2-9740-b53d19bd7b58} - {32b06ead-2d33-42d8-b2a5-488d61b62447} + {08e1d123-442f-4496-85d0-439cb4873b10} - {2865452f-07b8-422e-8852-b6321d721358} + {09b29113-215c-4998-96c1-ae2aba116676} - {24119791-8918-4424-b3ab-345bb2f9dcd9} + {b4f775b5-aeca-4228-8237-0c9560ce1a7b} - {4e9e44a8-0620-4e59-ba02-81706e56a792} + {f56f1cea-0832-459d-ada1-06a09e61ba0a} - {f3fad274-bf40-4985-ae59-28ae2ee07980} + {6a7c63ac-d8e8-4d3d-aa2f-44ccd75c0a13} - {55304426-4522-4f39-916e-2c2402e94271} + {02f98f51-303e-4060-b3c8-5a336cb4ed1a} - {838816fd-365b-485b-bcbf-0176c95d05a3} + {a9853ef1-ea8f-4eab-b5fb-37f6e1569183} - {58e9c588-a79f-4633-a9c1-4f788090cb5e} + {67aed072-fd68-4938-a25b-1b71fabda067} - {4e31987e-35e7-4cc1-b7b3-70df8a6e853b} + {acae33c9-f82a-40c2-9f3c-82fdaac2eb0b} - {b2fc5fb3-32d6-4613-a1c5-a170dfc8d1f9} + {cd201ef9-47f8-42ee-9719-e5e885922c1a} - {43482703-c1b8-4404-84ff-5806a7ca9093} + {7fa7bcb1-e113-4dc6-94bd-ad19036d818e} - {02f5677a-29db-4d5c-92b1-c39b7af29223} + {f83d7ecd-e1e1-4608-a131-f35c58c2b17b} - {7d6788c1-d3d6-4045-8738-57c3523479e1} + {347a3e80-1819-4145-8209-f4c695dd0efa} - {94d81a50-2782-47f3-aaa0-761713697f37} + {65776f56-f73c-489f-9b2b-6d592041fa68} - {40109ac1-0b05-47fe-9f9f-7a70d5611fa3} + {6fa34377-f0b0-486c-ba5e-4350674123bc} - {39100595-4a62-4155-820e-4413ca65b835} + {f46e92ac-55a7-4221-9f2b-f51268a41906} - {c57119a0-50b6-4d3d-a997-dd0ce1e037fa} + {fbe33804-e359-4036-a066-ee415592bb1f} - {3f41dc72-ce98-4878-9c46-0690240a3f3b} + {8fa3478d-22bd-4f32-aa24-f881eff445a6} diff --git a/Net/testsuite/TestSuite_vs120.vcxproj b/Net/testsuite/TestSuite_vs120.vcxproj index 3725063ec..d60b64955 100644 --- a/Net/testsuite/TestSuite_vs120.vcxproj +++ b/Net/testsuite/TestSuite_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -304,129 +304,129 @@ + + + + + + - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - diff --git a/Net/testsuite/TestSuite_vs120.vcxproj.filters b/Net/testsuite/TestSuite_vs120.vcxproj.filters index f4d33d108..0fdb6516c 100644 --- a/Net/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,163 +2,163 @@ - {b6988bac-0846-4d9f-9c8f-61c26969f725} + {1eee0e2d-ed24-4990-a3fe-27a708428ab4} - {6996c901-4c5e-4ba8-821b-3125090e8df4} + {bf04a4e7-02ab-496d-857d-afb543879036} - {d66c9a3c-f113-4aea-8e75-16cc856af333} + {172e89ee-6cd8-42bb-a84d-bcca7b72c906} - {277e5690-a3c0-45ee-831c-56065cf2174a} + {264a97c8-a20f-46d1-b7d1-9601e88ac10b} - {e05ed1b2-2e25-424e-8eb2-cb134a604999} + {84b9d4f2-ece0-464d-ad57-27666c84a72e} - {b69a33f6-53d5-431a-85b9-b8309aabbe04} + {5a1af5b4-ebe6-437d-aa63-eeefbc50c3d9} - {ccc32200-e004-48c5-bdf4-1cd7fa8cbb6c} + {4a0aa1b2-4ed7-43a8-8f52-94af0c371af5} - {38f83870-191c-4dd3-9c54-1210e2eb9519} + {65c64f78-4bf5-475c-b61b-545276d35c18} - {78ea10d2-0766-481b-a4ae-857036ea0abc} + {5c9bd6ae-cf2b-482b-8576-58199daac212} - {ce87c91c-103a-4de9-a660-5c149547c90f} + {9cb2d689-5c48-453e-8bbd-ce74dd58c1bd} - {24163ad9-dc46-4620-bb29-f37734215d45} + {547c9540-455f-4eee-bbb9-859dab9f465e} - {42f989cc-5a80-41fd-afc9-fae866f271ef} + {2a14094c-60f0-4c9f-80c7-a254551ce76c} - {e1a28a99-4c46-4db3-816d-fdd20946efe5} + {e1e12744-04d2-4a64-9eb0-47dca82d6351} - {bde7183a-4642-4cae-aa7c-053089c8ee71} + {a9e63010-5d36-42f5-bfdc-19fb8e773006} - {c819d391-0a3d-47b5-abc7-2a08c9ce4374} + {9d30de4d-f1b8-4a54-948b-88c516c731f3} - {335a5eea-7011-4902-8049-253ffa437453} + {c10b52f8-b663-4691-872f-ea52349a5cd9} - {1de7709f-b75d-4d4f-84a4-2192f7dc3130} + {f3fd3ba0-7343-4307-8aff-ddd9a4bf2738} - {089412c6-0d5a-4740-9ea1-493c5898dd0d} + {cf4e10ec-6213-479d-975c-60d90f4f05a9} - {2ef593c2-b52d-469b-9166-048b1580a494} + {ef7fcdd2-89c5-472c-8714-c99b9a14a357} - {e36bb74b-1644-40cb-9bfa-7c27adf4e37e} + {3a4e2928-1c04-4e5a-bb5d-e783d2ea7c82} - {ec51ca9c-a226-433e-a555-3cfcfb9e7b8e} + {a91a2c61-3326-4c98-9def-3f0b5688ccb8} - {9cdbae14-47ee-4017-840b-06aa7773db40} + {1e54f305-5d90-4de5-a8f7-7bd7ee25d85f} - {c68f59bf-9582-461a-be4b-ee225dd3d709} + {696adf3d-9fe0-425a-be05-229c96004b06} - {045e8010-99c6-4884-af60-35ac99b8b64f} + {68fbd9b1-ae77-467d-ba14-edecbd75ea7c} - {8decca03-9752-453e-8e4d-0ddc1c79cba0} + {ba29afdc-0b38-4b48-a20e-ab14727e2994} - {2033c7ff-6c9d-4f47-ab1c-d3897e46dded} + {61484811-903c-4472-9fe0-e32a5bbf4a67} - {0dabfc70-f107-4b9f-9292-1243f18258d4} + {6d13c059-197a-42ca-9bb6-ff9de20784b4} - {bb1afed9-49ad-43f5-80c9-7eadd62aa32a} + {823a3db9-eec8-40c1-bed2-32de33e0fab2} - {b75d6853-3af3-4485-90a7-282ba7af0a4a} + {27f2e7d0-8c27-4ba2-a5ac-eac9b41ef99b} - {46493f24-8d22-43f5-9076-29f5a75abce7} + {3fb5098d-0cac-4a6f-8af1-95ea314fb6cf} - {a449e4fc-ab4e-4e13-b2dc-4f46300130dd} + {0bc63c5d-7df2-4547-b6fd-31c67559d82b} - {b08a950f-20b5-4c09-b608-ad6467d05304} + {866c68e6-bdbd-4a9a-b9fd-5aa0ee9750f3} - {029faa34-6f21-40f9-9e2f-385a13a1761a} + {add6ea55-8506-44f1-8044-e0009b4a3b8e} - {3690c148-0882-4b78-b77f-e4fb3ca09cdd} + {eccb6c61-60d3-4fa5-837f-92186007fdf0} - {5e123a69-73b3-4423-b34a-06a83deae130} + {448c663d-bfb2-4954-9cae-563d77e25a8d} - {8079cc32-36f6-44a9-8563-2f82e5b2f946} + {725139b6-88ed-4851-850d-ac8546140f6f} - {86851715-e562-45d1-ad33-b64a8f953b31} + {c1b9b736-f77e-42d6-ab6b-d83855860ae3} - {4733f36f-253a-4e7c-87ec-17e5b5c8bf8f} + {7a01c762-1f13-4017-99f1-7cf2d0d61724} - {fe1d74e0-2938-4258-8a64-e2da84e08c41} + {84b0894f-36c8-4c42-90a8-63b698367a29} - {6b1aa5b4-f9c0-4b3e-bd1f-56bef604635e} + {bb6eabb9-d834-48ee-9c2d-53bf19b2aa04} - {e7de318d-bb87-4335-b923-6d6679029af8} + {5209e777-609c-4ff3-8582-d016bb99d6ac} - {2007aa2c-3b03-4042-af24-d47656eff3b0} + {1ff2a336-a590-4650-9966-b18154c9a199} - {1038636c-ede7-4c0b-9670-1eb1d668b8a8} + {77099231-beb5-483a-86bd-90032e798758} - {2865bfb7-826f-426b-a465-2628df3d63bd} + {8be74ef8-1dd5-480b-820d-c751aef7f48b} - {7abc1d63-8bed-4b02-a8fc-658d5feedf57} + {161628dd-146a-4c30-aea6-fde9e50b3126} - {da4548f7-a8e7-46dc-a645-c825687befcf} + {988a2ec2-8622-4202-8780-031c4a4dacc9} - {4bc566cb-d1a6-4984-af43-4bc203c811eb} + {5bb6f405-a7df-4ff8-94fe-075a4dee3bd2} - {2b592d85-edff-442a-bc2a-f52effe2dd3d} + {c1c0d77f-f596-4e0b-8571-b1cecf0acff9} - {2c54dbd1-13ea-4dda-8618-334173bcdd29} + {097dff5f-6a65-4985-a57d-9eb916a50290} - {7be4bc23-2ab2-45ea-aa31-c18b94518778} + {af0d1e47-1d56-4157-a9d2-e2d507fe4249} - {afc7b4e9-777d-43d4-b3fd-7738a3526409} + {40827da4-529d-4a7e-b313-7dbae810e794} - {a35ae97c-7d26-40ed-b509-5e59090bc0f6} + {a2b9b3fa-21ad-4017-8832-6990965ef5ab} - {9f780c4d-ca76-46ea-ac20-6168523aa94a} + {d40ae78b-ae8d-4530-94c3-2945898564a9} diff --git a/Net/testsuite/TestSuite_vs140.vcxproj b/Net/testsuite/TestSuite_vs140.vcxproj index 13862529c..abc3d5910 100644 --- a/Net/testsuite/TestSuite_vs140.vcxproj +++ b/Net/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs140.vcxproj.filters b/Net/testsuite/TestSuite_vs140.vcxproj.filters index 806d68b47..70a0379ec 100644 --- a/Net/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,163 +2,163 @@ - {9076c3e7-2caa-4af1-824b-6f32b2fc1937} + {5e1e1f88-22c0-4484-a36a-1f8a2525bc7c} - {83c70bf6-3708-4482-b9fb-ae62c63541fe} + {94dd84a6-84bb-45b6-8e6d-cb10aef163a4} - {2fd3468c-39ad-4712-92a6-15c18f25ad7c} + {c7265eb0-37c9-4f92-b839-f6c19c318f23} - {04d83ae4-17f6-4d3e-8fde-94bfa2d500d9} + {82593b9c-4a42-4a10-b007-ecbdbe9c3d32} - {d0d9722f-88be-4d35-ada9-39285df10bbb} + {eef6d2c2-736d-46a5-aacf-ba7d4cf01f35} - {203e4d45-0931-4224-8439-d888c89943c0} + {52ceb4a1-3040-4a62-910b-ee6dc8deb339} - {65af1f4b-4466-4fcc-ae94-2520c216564e} + {6df84e0a-4799-49d9-a216-d10e80f6c9e8} - {db66594d-6b74-4692-a7ed-c3ef0473782b} + {c1b49088-3758-49df-8952-0d26869d69df} - {2aaac24a-fded-4fdd-bc04-e1438ab5a73b} + {bef15d71-e5e2-498c-aa44-0696d3cdac7d} - {0d50df15-787d-4593-9210-6cd8f14c6e95} + {2f1c42ac-9db7-4678-9c00-ef4bb191988d} - {8fbed83c-4dfc-4794-912a-902771d85c48} + {c9539010-a2a9-4362-adb1-17d4e9221952} - {745f6051-f0d2-40dc-b485-841a3207ad1a} + {508317ba-1ed6-41ba-b208-e1d49ff83c9e} - {b1990178-4217-4cef-bb62-1956ebc32e7b} + {8391eb5c-ba64-449e-a028-d6ae63e5a4bc} - {750c4369-df81-46c3-8698-37db8d614c96} + {e3068f1e-4c00-49c9-94e0-9ada9c57e1a5} - {7b1641ab-e717-45e2-9bc0-cd6bcef6215a} + {26d83142-9d7f-416f-97e3-9a4942681919} - {9c39caa5-a09a-4789-9d8c-66335653adce} + {241a2d3b-f616-4e8f-bfa8-8be331296ccd} - {6fb0e1ff-d1c2-4ec5-812e-f1a529bf95e4} + {3c82f0f9-aa12-41a6-b2cb-87b9c78d7eba} - {66498a7f-b386-43de-ba7d-8f3470446df0} + {565e354b-b9f1-4113-bbcd-5d77b180d59d} - {694a2111-f8b4-4564-8ff6-d41f3b14d5fd} + {ab211a4a-59f7-4b44-845f-0f70855913e0} - {d4010137-73ea-4c66-b42a-f4cd5e63a506} + {1c0c2ca7-3b87-43c1-80f5-185cc4490bd1} - {e0915499-311f-47ee-90eb-db934a13be93} + {b076bac7-7b9e-465e-8841-0fc30d546e72} - {1a273fc5-a5bb-4f0b-8f9c-e45fc70d0f4c} + {de5b725d-c623-42ad-87ef-8f65c3d7c772} - {df527658-787b-4484-81f3-69bb6cb4629a} + {6d61d66a-14c2-467d-94ab-c68c98507bfc} - {56c9b2c2-7ef6-4f0c-be92-a4a20301fc5e} + {45dafc49-4458-44f9-a1f1-fa3d0c15b7be} - {0019f19e-067d-40a6-8e61-930b91a4b56e} + {82cc4709-8e03-46f2-9f37-6faf394064f9} - {d83410a6-9edb-4e29-bd85-5703fdd46d58} + {d633e0da-c96e-4d9a-b397-ca592bbe1436} - {5fe796c6-9b58-4313-8586-2e7d2c0309f3} + {0a6cafcd-313d-43d9-8acb-6b502839ece1} - {f699cc5a-578b-412f-9af0-0d0a1234251b} + {b38bc3b6-45e3-46de-ae83-cc9e21d50082} - {092d4d8d-a561-45c1-a2b2-a7c98b1d821a} + {b3d5de8d-6793-4df7-bd4f-6b4a21c96bea} - {220f913c-ace8-49b1-afe6-29d466d3ae4b} + {d01c2ec5-b57b-49dc-8cbb-0b6c2414000d} - {6fcee230-e61d-47b7-82a7-a7ba2a181f69} + {7132225e-f5c9-41de-b9ac-0bd51d6f993b} - {4c8826b5-b418-4d83-a7dd-2b6a6b1b6d7e} + {2efea61a-70d7-498c-ad9b-776636c73b8b} - {c0a7d8c4-6433-4d32-86ee-1de42e993f1c} + {d313baf1-a67a-4c5a-a53e-3b8ceeeda871} - {c8a24ed6-f9bf-435b-8b3d-00e1578f5c9b} + {fc3c5b0a-afda-4394-8326-68a512bd2aaa} - {461b3744-f2b4-47fe-afeb-7c955c1df1d0} + {9e8ec8f5-3fbc-46be-9e3f-e4911587687e} - {b6f60b13-e195-4804-b7a9-36054bc86688} + {5da89b25-bfc0-4b6a-8dea-68669475c215} - {c3e690a3-4407-4cb9-b821-666fd5aa00a6} + {96458fd1-d9dc-4add-8cca-4c4864f0bdce} - {74a6bb1b-1dff-49e6-a904-ecd86deedf65} + {2cb5c2e9-03af-480e-b623-ddd8e0569cf4} - {8c65d768-d3ae-4adf-902b-3caca79e2ff5} + {6094eedd-5529-4a0a-a0be-28117c20f08d} - {717dabd6-5f70-451f-aadd-a8d0e2e7e1aa} + {84646ba0-8e9d-4234-9048-2197a8271a8a} - {414ac696-b6ed-4373-8f5d-de51a710f530} + {79d5e6dc-db38-4e2e-b620-2c78d80b3e64} - {371a73a5-4b4b-47ba-8b5f-4d092e7f7e1c} + {27310a66-5b33-4887-992b-75251d79873d} - {5ecaabf2-740e-4f0a-aa35-b5b5cf1b6d3c} + {0f94d408-7cf1-4ee1-b903-de8ab6d17410} - {41238a2a-bb89-407c-9f2c-e45c1a09d1f4} + {7c2edba9-aabf-41d8-bdb4-f4363dec8428} - {367c1eef-5ab5-408a-8378-e9032179442a} + {10758494-d098-4681-bb6f-32137498ed3d} - {f06e1a6a-6063-4033-b907-796ba115405c} + {16635dd8-b44d-4ad5-8340-9b9a22451c1c} - {cddc3f6a-ca66-4424-b478-496678fa4250} + {1d0a9a24-f19e-49e1-991c-5a13c17e8797} - {a76321f4-4e08-418d-ae48-6d61cb39a697} + {90a187fe-7787-429e-8877-7cdeb04c4445} - {a9861d42-54c6-4249-a547-0f368f2beaa9} + {d5d5f4cd-c59d-497e-a27e-981f7cb25306} - {1b2cae5e-08fa-42d5-993a-159533f08fb4} + {0f90f0cf-9a13-4055-90f2-5c8b80aba249} - {380e46c4-c544-4df6-bb8b-53c4f0d69d91} + {6797b6a3-b9dd-425e-ae58-45b576ab97d3} - {618db010-13cb-45d5-8d19-1c9c7aa840b8} + {bffddf0a-4a1c-4eae-a480-07d13ace43f5} - {9490261d-6d8c-4dae-b573-b44dad8eb912} + {da0c5b8c-7b26-41a5-b675-68f350009ff3} diff --git a/Net/testsuite/TestSuite_vs90.vcproj b/Net/testsuite/TestSuite_vs90.vcproj index 8788d3b45..f0b87cb08 100644 --- a/Net/testsuite/TestSuite_vs90.vcproj +++ b/Net/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters index 3150b4bb0..dd159d20b 100644 --- a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,163 +2,163 @@ - {b58e8df9-1847-4cb1-9eee-555cc0f1dc6b} + {53f37f7d-06ae-4010-9b61-4646634083db} - {cc16d41d-f1f8-40cd-9006-5f71437fda12} + {f03a79c4-4b8a-4da2-80dd-d97e2ebf7530} - {2e1dcacc-c2dc-4f17-b052-2c53bc5fc894} + {a8b00ed8-9db6-4584-abf8-a066eb46415b} - {e1961b63-39df-45ff-b117-4cf310f0fc92} + {960d07de-801f-4ef9-95da-398a57f65c1f} - {0c3fa836-28fb-4849-8bd7-896bf7387881} + {9aef7ad2-03d7-439d-837f-01454eb2395d} - {e79a0fe9-fd8f-4d72-ad41-bdc59f348e66} + {62f52f1f-e1d1-40fe-90f2-30d16e921f3b} - {8f847108-2f62-450b-bae8-ab7652cc39c1} + {bc456c21-2bba-4e05-959b-65ff34f32632} - {db18bf1b-fa9c-4ec6-80ca-4a0133c8cc34} + {1d2d4a76-ce3d-4e47-a14b-b7ef9300a108} - {c012ad93-6fb5-45b7-ae61-46848568667a} + {695ccd5e-e4d6-4a64-99a2-39a9e2e9361b} - {418205f1-3b36-4fbd-9e04-d72deb45f978} + {db4e83d0-55c9-457e-8a75-b7efb9cc19b4} - {111f12e2-d7f4-424e-a029-c6ce8f26d807} + {a5f5c609-bca8-47ac-80b3-821f82bc8375} - {b3e8882c-2f85-4f8a-8dd8-a2bfdcafb855} + {45c3b741-6756-42a0-a61d-aad4ed33ab69} - {787bd1ed-33df-457c-a32b-5bd2456e8797} + {baa73b6e-dd93-4f37-98ec-ffca42da863f} - {f2c50e9a-edfb-4aca-a611-a55819d9c8c9} + {00766be1-dfb4-4b69-9538-e5ca5d8cb5fc} - {758bdcee-121c-464e-8511-cea258dec0e9} + {328c89da-0881-447f-b401-c2b064eb353a} - {4cbdeadd-1b5e-4f4e-a614-c0eefb08038f} + {fa2305b4-0109-4408-ab1b-f7b343a7f9e2} - {b49cf201-d0e1-45b7-b0bb-836e908ca267} + {b577df5c-b695-414c-9930-2d7b32efa138} - {df9c6389-1868-4f09-8dff-ea98bb8949ac} + {de356d77-e710-4481-8a58-762edead3f8e} - {6731ff30-1c95-463a-98f7-9e7d3acd680e} + {aca7947c-2963-403c-9ff8-748b671c4673} - {a2b0cb4d-af1a-4799-ba7a-5ba9c58d2029} + {66226971-b37f-4c3f-a33a-504c5fec30ee} - {fc497636-7aec-40f4-832d-de44a2609441} + {dc6cb533-4f0f-41fd-8b61-f442505793c3} - {c415753e-75ea-4a3b-b5c7-fddc9a08f1a3} + {318a8111-775d-47bb-b81a-5d921922f7eb} - {8a0bd179-fbfc-4ac6-9bb9-f21e283b02dc} + {1cab40ac-0fd4-4544-93cb-d6396b37f045} - {1e644f78-c491-443a-be2f-a8cf94f59f80} + {573e298c-89b6-444e-9e33-b20ae1348710} - {a5e20a31-ec2f-4e10-b55e-facf8285aca5} + {47819602-13e3-4c21-971f-be7db7bf34ad} - {6c36f789-4eb5-4df3-ae87-8f842826103a} + {33ba50a1-ed0d-4499-86c2-75448f6d3ba7} - {4d1e4e35-01c1-478f-bf03-7f851f98b939} + {5901dd53-8c87-4618-aaa1-e7111740f240} - {ac3e4c08-1d47-4991-ab09-4246fa8bf0ff} + {7862d690-8a04-46e0-ba7a-05ba2f6673ac} - {dc7f368b-4b65-4bb4-8147-bc9907ed36c5} + {71c5f2ad-6fc0-45bb-a7ed-6f6cabbb22d3} - {a87f7b49-3185-4c69-8bd8-4d6b1ad84728} + {74766877-85e5-4959-9c07-8b65c89f2a2f} - {b3a4d220-e681-431f-ac4f-c06c1b764e21} + {1f4a308e-4ff2-4fbe-986d-4db82ceea794} - {81899ecd-0094-445d-a594-3298368c8e67} + {b2b84279-042e-4833-b180-074fff806fec} - {d11dd586-4558-4b84-9361-ba2fbfd91ed6} + {f8aa3d9f-a276-40f5-a789-bead4ff2bb4f} - {cf6e9299-e3e1-451b-bd7a-0d521ab1c1a6} + {2eeac373-7f79-4b81-99f9-38986fc5e48c} - {7289c730-e352-4783-8164-323b75bb283c} + {cf127ffa-4c4d-42b6-a5fa-9eb392a74e47} - {fd9a7c46-7a80-4534-908a-ef024c768b45} + {11fabb96-68f0-4282-857e-212b3945a00f} - {c378e465-d505-44a0-885d-47f58a5b8d6e} + {89c3c1d2-2340-419a-ae94-549d44e13e75} - {7815e2b5-a040-4a8d-ba42-5a5a99624047} + {684d0caa-6265-4eda-ac98-5baa3dcab02c} - {24847cae-3cdd-4bc7-a20f-5b03ece9593c} + {13698492-4562-43d6-8aaa-1566b5061528} - {2b29a7b1-94ff-44cd-8809-914f4311475d} + {271ea45b-7c95-486a-895a-0e9943d34d6e} - {604370a9-bced-4970-8e42-146f8393d9a4} + {97ced8de-2b7c-44c1-bbe6-b2aea8c04bf6} - {454eef02-5837-40a7-809c-d480f081776a} + {c8f31fd6-0677-4739-b9f1-515e4191ae8a} - {625be554-59f7-474a-9944-54298148fb09} + {99d39bbe-d409-4729-be60-fd0e4916537f} - {f82bd61c-c507-498f-b676-566fa708b3f2} + {b5f6cffc-db60-404d-b8d9-e4baf7ffa513} - {45936a12-454a-4e96-b01a-89783d6fea2b} + {328e5f17-e532-43ca-a902-ac3d63e69d0c} - {043c6c68-afef-4bc0-adac-850793e3192f} + {9f148088-3458-47fd-b375-1d082b606fa2} - {74e8e62d-698f-4eaa-b1a6-97b5b7721dd5} + {2d161c6b-d9ef-4be3-a263-8a08e917a5f6} - {6af07483-31cd-4b5c-b2b3-3209cf5141a1} + {7e3e837b-7f5a-4f64-b708-a6e2920d6107} - {6d583da0-daa4-49e3-ba1b-4ff6479cc590} + {58180100-56db-46f1-92a5-09ad76f1d5d6} - {70550bf1-3b3f-4647-a8f4-521be991700b} + {c42a5eb1-1d0d-45ad-b70b-77df564d22d2} - {32adb3db-4ca6-47be-9571-7b5a4f9765c9} + {6074124d-b34f-4a1d-87da-fb374a5e3a81} - {a0f631a6-1e70-4a31-84d3-c7c2037dfa35} + {13649632-5f0b-4d63-bba8-167585c5f766} - {b5deb2a3-a14c-40f1-b4a7-6fb9d31a8ad1} + {0f587932-acc1-49c0-9f2b-8cb5be083ea0} diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj b/Net/testsuite/TestSuite_x64_vs110.vcxproj index debe4ebd7..8dbcb2a8d 100644 --- a/Net/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters index be17e2413..4183df0a9 100644 --- a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,163 +2,163 @@ - {9de43012-0a2e-431e-8e9d-867991ef1fd6} + {2259740a-c2fa-44c2-9e3c-aba4440d6ac8} - {dcaf222a-3331-4a74-820a-d42f8a23116e} + {62d77d36-9bab-4d56-87e7-bd1e287d989f} - {467c7ad0-cedc-4516-9250-af69c6e038ef} + {500991d9-475e-4e41-9154-eff33c7e6ba6} - {c3c4d284-2ff9-4484-990a-7a751414b553} + {0dc6d048-9a62-4143-80ee-23aef4e0f7c3} - {7ef05c26-50ea-48c1-81e3-ea0981e54fd6} + {53bcf581-bca9-44b6-a4dd-3fe07597bcdc} - {aac7d8d7-b880-4210-a72c-f0533141d668} + {b51d95fe-fa04-4f31-9b5a-0c70ecc03c58} - {8a851033-3587-4356-a1a3-99bb57336281} + {4fb0e96b-e233-4954-9958-4fcf7a1fe225} - {d8aa8f55-cdc2-4811-8c65-29660e776a24} + {cd3f7eea-3615-4336-977e-81f731d49967} - {f4da0513-8a98-4b45-a03c-d1021e153918} + {039815dd-c6bb-40e3-bfbf-089d6d778e10} - {b17c7775-25a5-4a0b-879b-3631a23fa80d} + {a30c62e2-ccbe-4c76-b5fe-ba28c2682357} - {5d4887d8-d255-470c-9a6b-1e34dc9118e7} + {90a57ce2-fd2e-409b-91c1-34b69f6ff4b1} - {9c3272c6-0b82-49ba-93a3-c35ebb85eee6} + {89c4cb55-4268-4fe7-9da2-86b4be414feb} - {fcc62ab4-cf6e-4d5e-aeb0-c33b3abffb22} + {a4036bb2-e73d-4a54-8af2-c8c5fcef6702} - {d02d7e34-3418-4605-ace0-4f74804981ac} + {3d541be2-9966-49b5-a8fc-5ee9a8c95d35} - {9d68825c-e701-4460-b43d-753e7e279909} + {4e775b98-c667-40f5-bdb9-237d19ef0c48} - {08ee0515-b85d-433c-b5d6-8f4c32b727f6} + {9f8b41b9-ccbd-4205-b3bd-bccea0c19487} - {4da4eafd-11d2-4f20-9839-b25972c042e5} + {f9832b8c-9a42-4d5c-967e-9ff965b05a01} - {16155b1b-2f48-4b6b-a3e9-67696d059a39} + {1204efce-88f4-402d-b1fc-04e0c426b34f} - {1724fd97-1c0f-4b5d-a7be-e3a2233a8574} + {d370e827-dd72-492b-aa3a-014107e13d23} - {dabe547f-1f49-488c-9138-e32c8dbee7e8} + {c2d77cae-7102-4e1f-bc6b-78c09550ac2b} - {17db1e16-a677-4194-8e96-ddda1f0f8128} + {565e41b3-36a9-4738-b200-da0219f4434e} - {2f16d603-bf8a-4309-9841-5dacd1c97957} + {76ab178c-4498-4607-8916-70a6f1a65026} - {21a0b153-bdbd-4a42-a369-ffa8911d331a} + {bbff1c1b-a96b-4497-8348-0319d7b9c53a} - {c15e8ad6-dd6a-43dc-b572-403dc4127d65} + {5f07285d-ece5-445a-8ffe-4a6db1648773} - {8f294aed-e42f-4f74-9d40-2fd536e047bb} + {bcd97d5a-4518-452c-b12f-1ce01dcc289d} - {6c6ca417-5f8a-4c71-8c74-662c9dbc8193} + {6716ed73-cd5e-4087-be23-f00e4b674031} - {c56ebef4-21fe-4d91-b3d9-932afa920919} + {d97fa4e8-9645-4225-ab4d-a3f7e7693624} - {ccfe48a8-f471-4829-8945-dad6850ddb2b} + {5330547b-0e9c-4dfa-a721-ea7073552139} - {0767feb6-4706-4585-838d-7007922fd313} + {37435254-ecf5-498c-90b0-94b2668cb377} - {188d6fbe-8e7c-4ebd-a2a2-d2d27ac75286} + {92c09ce3-c940-44c7-b656-0ce2dc6a9c68} - {5b757ccf-badf-49d0-99d9-2b2741e06800} + {e4f55faf-b444-45f4-b5da-f82a75adba6f} - {9eb50122-b230-4025-a2ff-c69cc8e09482} + {0baf1b53-f9af-4f42-bd71-865a71c8ab24} - {fd2ac43e-2dff-4067-a6d5-8e83b159d19b} + {25a280bf-0dc3-47f5-8b3e-62fdbcae7862} - {df0ab2ba-deea-4e64-8a7b-1c16a2cdb81c} + {2dee90e1-5837-47ca-8a70-dca882bcd325} - {88739083-2d78-4cdb-8f2a-457422516ca4} + {549be2a2-2081-4c36-92be-4842de60c7c8} - {81c18633-ada3-413b-9975-cce8f140f1bb} + {184b6bcb-fef2-499f-ab90-303b275b102b} - {602bc76a-5526-428c-bf33-324ed991fa5d} + {a541ce53-5123-4a7c-ad01-f719096c2ed4} - {33f75198-a5f9-4274-909b-fb4f420db18c} + {8eaf6d63-972e-43f3-b624-9573f6276209} - {8031a573-632a-43bd-af78-46b6f06e9b83} + {de4fc724-ea74-48a2-9965-d5a13f007030} - {b09600c5-f695-4290-b8e2-7efc244f92ae} + {997460c0-9462-48e4-9e51-831d3a709e4f} - {e1593da7-9689-4423-a93c-ba40253eb2be} + {d0c6c109-5f55-4c94-8f79-0a4188b89213} - {3d67e6db-7e63-4882-b29e-6591cc0a3ad5} + {b255cdea-5deb-49ed-b7b1-5ca2b6427fed} - {ab75d4e6-4080-45c3-a6c6-080501766551} + {2b56b804-ec08-40da-b35a-7fd3b75746c6} - {b5a44a12-4c12-4a6e-865f-fc240fd8e59f} + {5058e853-905f-459d-933c-321e4a718730} - {b88ed89d-287c-4d82-a4f7-245f2ff83d68} + {71cba58c-b18b-482f-aebc-5fe250ebb456} - {d9122e3b-b834-49c3-b77e-f0e077c8beb2} + {53938c85-f1fd-426e-91a5-30c9d1daa591} - {6aadc769-917b-4531-9f18-0db777375019} + {f172badb-3fb1-4d80-ac31-0ae7c55562ef} - {e7f4ff33-22c4-44cd-8201-c49848854ae1} + {ba4640ea-179c-4fc0-a28b-25a4598cf9cf} - {0d639f49-b0cd-4867-b4e5-12de905e3fe5} + {cd58627c-23df-464e-9dca-589116e295ec} - {ce65cb82-2f84-4d38-9140-34b0d9a1b821} + {06e20ae5-2c66-44a8-a747-ed12cb7c84f4} - {b8ef3766-ddeb-4dd4-8d75-6637d03f3450} + {ea7fd914-0ccd-4549-938f-0ab284f43731} - {14cdc4dc-5c52-49e8-94bb-93de7354ddae} + {4c8d4d50-eb3e-443d-97db-c550bc58a885} - {dbab1a90-ef91-4aba-bc3f-5c79a1a9137a} + {9e4a53fc-b140-4da3-8a3c-45351ea65101} diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj b/Net/testsuite/TestSuite_x64_vs120.vcxproj index ad65cc320..ea5ac4e03 100644 --- a/Net/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -304,129 +304,129 @@ + + + + + + - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters index 37b7abc5b..2a9e57e22 100644 --- a/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,163 +2,163 @@ - {70f8c84f-d93c-4df2-8164-bfe33cd36284} + {569007a2-3536-49d2-8c67-243cba7877e4} - {724bef02-c528-4985-b556-0066167631ff} + {07bd3dd5-8df6-45ea-a76b-50a5de8c09e9} - {86612bec-96ab-41c4-9a62-b6caf01806d7} + {97523399-b5c1-4b56-98da-5bd18eb030bb} - {586e3110-d1e6-4cf4-94a8-143a4681112b} + {b9f891e5-12d5-4c3f-93bf-738defed4e97} - {9f06ae3e-937a-49ff-87d6-aa60af865a49} + {3825d0d6-100d-468a-a92c-481566a250e1} - {8bf8abc4-ed30-40f8-bdc7-ee244333c2a0} + {c4a58761-a2b8-4b9b-8603-8ef11b996019} - {de6c35fb-188e-4eb9-8c06-485db435d6d4} + {531e1b70-456c-4f5a-8b29-10d4995606da} - {650823ca-9849-4251-aff2-bd2bc1d35245} + {76146036-2f81-4454-9c00-94770d226fd6} - {76820c64-eecb-4135-a8b7-b8f16480363f} + {a4f9bd78-5b9c-4631-96a1-b07ce1298d18} - {5d21b954-beee-4e52-8d1f-5f2b7a2bf3e6} + {65106fde-566b-405d-8648-3062fb6a3805} - {7fda16d0-ecd8-44e3-934f-176cddaa2f5a} + {6239dc34-2352-46a3-b92d-df980ac4691e} - {8f0f4682-a50f-4ce9-8d85-ee0dded697c0} + {9d9201e9-5940-4051-9e4f-2b581bc6ff0e} - {77afa50d-b455-43ca-bf35-9bd352bb2532} + {57764ae7-9002-4619-beca-84ca8efb9c08} - {a04e70a7-3a3d-48e3-a936-e0d8d7b29eaf} + {76ff67dc-23f6-4381-b1df-bc4d6077cfd4} - {45f222b7-b342-47fb-b7b3-de319a6deecf} + {b390cdad-09a5-46fe-ab85-d3309037f538} - {e393707b-5a46-4767-a560-00f6c175bbe8} + {08a5b169-5149-4e07-945a-4e72e264c198} - {25887c00-0df1-438d-aa45-b3c9bb1bfeba} + {d492c5bf-52ee-43d2-aa0c-2c670d940d01} - {fd00172e-35d6-45bb-943d-48934e7ad757} + {0f3581c7-ce92-4509-8df8-ebaa5b5fc28f} - {525a8095-efdd-4a35-b969-abe22ba8803a} + {4997bece-8689-4a6f-9e85-a1cd8bcbaf52} - {d475c106-490a-4e02-9e1f-7470b9787190} + {1ce00d67-a66a-4606-bbd0-ff452b3706f8} - {4f1ab3f6-5e35-420c-aac1-d909ca2cb3c4} + {c453f451-3876-4b2a-b0bc-d7db2e3e4d02} - {26edf7d1-f3b1-4b89-ab8a-9516d37fea7d} + {87dabda9-2bf7-4a81-a09a-fdc18b791262} - {ce7f78e0-aef6-4f1c-a393-ece387fee057} + {d8a7bc6c-6ded-449a-994e-ef29af93c58c} - {a652b185-3ffa-4ee5-8961-06d73fad009a} + {fe686d10-a0d6-49b4-9c8b-3b86fc9cd482} - {f8d60461-0d8c-415b-a077-20e799c30092} + {e9ae0b58-558b-4d63-932a-02c741c76cb7} - {a3c456ac-d750-4077-bc9f-a8a348307d77} + {28779550-4faf-44a5-86f1-b2d48896ab09} - {2080f1ad-7c2e-46bb-8b1c-26dabf1bfa89} + {7a9c5604-f461-499a-bea7-c0c50fe59709} - {d6d5ec47-f1b9-42aa-ae6e-25f5f159368c} + {b2999e9a-4406-49fe-a087-088c0ca36f2d} - {ad3c1694-c426-4711-9492-f08b2c097806} + {3c8da242-9c6d-483a-ab2f-7a9b0861770f} - {636e37c7-e2ae-4a9b-9472-9c4b350d11df} + {46065f68-5067-4f8b-846d-954699fc1731} - {186eccae-a6e6-4f95-9543-418621e46206} + {55434e71-8953-4d81-87d4-96ac0d498589} - {a7017f44-3473-48de-87f5-2ac578e8f930} + {d64be683-b49d-4db7-9026-3c56354b8c6c} - {b4325409-ce1d-4e76-a87d-63db7c4007ab} + {f2f92bd8-3c85-4963-980f-6962cf852bbe} - {74a6b005-507d-46b7-9fb4-b509a075a46e} + {d4b57cee-042b-4ebb-90e9-26ace9be5604} - {4982c5cc-262d-46b5-a669-3a5cc4a8f26e} + {1f997dc0-a875-4bce-bfb4-b9c3a8b252f4} - {00753d4c-9248-43fb-a940-5fb7d72e8837} + {5265eb38-2af3-4398-8cc7-eafe1832aa74} - {9711273e-df92-44d5-9310-bdfbf5dc3a84} + {da39f1b9-b9ee-4160-807b-3128c48140d8} - {0277e632-f989-4b1b-bde9-43f94b70db6c} + {93bb5546-330d-4833-b93b-2a273b4f65ff} - {6364ba4e-004e-437e-8f0a-d51678f9dc58} + {3f38c68d-aef5-4f13-8fae-bba411845991} - {f873a356-e5b2-4d23-9bb4-6ab697574ca7} + {604e8d30-6cf7-4c83-ac7e-2c80a1f00bd0} - {ebba8f94-a6d8-45d2-a56f-904c1c5020ec} + {79831d89-522d-4b9c-8a08-199d3dc453e1} - {68793544-a7bc-4ccb-9a60-d8c9b4843468} + {f4fa3272-35f9-49f4-9ae5-364b3a18472f} - {2c0f9390-3743-4a7c-9107-7608a39f0dcb} + {9f7e61c3-5599-4fe0-8f34-7940eba1504c} - {ef1d44a3-d731-48ef-94b3-f62a481736ce} + {d19001a6-023b-4e23-bb4c-6f4565964350} - {44391a8d-5c1a-4b48-ae0f-b18a49a541f0} + {cb8a67b9-138c-4e4a-a966-1b9bf64374f0} - {83a431ac-a7e9-47b7-8d2e-d5435a8cad64} + {6b02fa99-68d8-416f-9095-fd0be2c88d57} - {7bfda056-3d93-44fe-b3e9-592d6f876ad3} + {b5010593-c85c-498c-99ce-356e334d0b7e} - {9f9cddd3-e69d-48fd-af0e-96f71ab3e57a} + {4177ea3c-8d56-4ba4-8456-5f29c19a15dd} - {dba4af87-113c-469c-8ed9-f514317a05ed} + {e293b9db-b939-4e01-850c-2e384658f8d5} - {8923a480-f35b-4e2f-9951-7ef95fb06c38} + {48088f5b-4326-4672-93b7-47f9395c83ee} - {e19c8529-9fa3-47a8-ba37-cb0032f421d6} + {56a43dc3-fe60-46a6-97cb-eb20d64ccca2} - {e0ac3e84-6a8b-402d-8ce9-34606d4ac017} + {652a7dcd-6b84-47b6-94cd-a38775fc7efd} - {f250d653-284d-4b34-99de-3fb1a2748ee8} + {541d3254-eed4-452f-a4ee-3bc1fa376323} diff --git a/Net/testsuite/TestSuite_x64_vs140.vcxproj b/Net/testsuite/TestSuite_x64_vs140.vcxproj index f9159999b..17175c194 100644 --- a/Net/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters index 9131de470..1d334a4d8 100644 --- a/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,163 +2,163 @@ - {8f3a6cd2-3ca4-4bf6-8cb2-d5d26bd9d89c} + {74e55975-a430-4831-a3f5-ec1b052722c4} - {bf18512c-ec41-4b94-9885-213ea04bf7dd} + {c081390a-025b-40f9-bd39-943c7f6e7be9} - {9cd92ec9-ebde-4842-b45b-e3ec5d25dd95} + {d9643d5d-eeb5-4767-96d9-52440fd10ade} - {d0fa4da8-c67a-4408-937c-9eb42e8353fb} + {253c2113-6c93-43be-b0fa-f8969325bb9f} - {e115bf91-6901-4ad0-96ac-f72d50989e7d} + {1c56d6e1-57a2-47fb-bfb4-0e64aab2a9f1} - {249271b8-4e41-4468-8382-b5a4fbbdb997} + {de668730-e7a0-4f26-a7c0-3e2c66699c7d} - {c3f9ba30-c795-46ae-b680-4c3fa8a8464a} + {59344a30-7ab7-4d0d-b792-57d05eb1f234} - {7690ee9e-5a61-49d6-a728-b4e9fc18516f} + {8fddb821-09b2-4311-82de-c58285d2bcbb} - {251ba482-0b40-4455-8018-a490b8c69e7d} + {ed711444-a43d-467d-9563-e0cf47a76fc2} - {4efa333a-6115-483b-963f-d9e5a18fd657} + {68899859-b457-413f-9e39-6fb019197d20} - {80604b4d-885a-4ff6-8ad8-84cd367214c8} + {9f60862a-5f4b-4f5e-b42d-474416159ac1} - {d0f31c0d-6dc8-44cd-8156-ffbe3e33ae4f} + {d13066bc-dac9-4526-8dd5-e4fd9da24334} - {227e0ae7-63c1-4f69-93df-b551d11962b4} + {da4deda8-6557-4ddc-8d6b-46b893b34ede} - {8f79a9f1-69c7-4f0c-8c68-e7dc01d339de} + {ae9968a1-4672-451b-8077-4096b542487a} - {6400ea0a-d30f-46a5-9e7e-1e09a001e16f} + {f515d2c1-1864-41cd-95f0-5acfd844f502} - {f3bf08fb-1b96-42ad-ba18-5067ca9ae70a} + {583dc145-7b2b-484e-9cca-919680852570} - {3e6e3116-fd27-4bb1-a1c8-1a73b731142b} + {ad1edc7c-9c8c-443b-8a39-32cb452645c0} - {cd302dfa-0cfa-4a05-9f1c-a0d1c7da8fd4} + {1d6aaa2f-20e4-4509-bfd2-a37b2f9a214a} - {dc9ccd28-33b8-43cc-a19b-d73d17fbf6ad} + {319d1bf8-6bd1-4e80-a503-8c8d819d8d68} - {b82d34da-2330-46ec-bacd-ca4cc5fc22f5} + {e18ea023-659c-4eee-9e52-3cd0628c9943} - {478742d4-d0ac-4c05-afda-66dcde5c616d} + {602a7149-ed31-48ec-b089-5b7cacad0c8e} - {d0bb14d5-bee3-4927-84b9-3cc34b6c05d5} + {e093b1ac-5b5a-4530-a1a9-4d06ddc3c0ff} - {9c3e46d5-20df-4e56-9a8b-73e91b46e3f1} + {da530da3-c917-43f8-ba9c-7586541718a5} - {d1a085d7-b142-41d9-b66e-8b81f41027bd} + {86c98578-a343-46a6-9f78-24b6ecc28320} - {78c9c1e5-7cba-45e4-b558-d4688ef15c72} + {6bbf0cfe-32ec-4cb4-920b-717a9850d285} - {f44b0b0a-540f-4684-a3eb-873362913343} + {877cce42-f360-4fe7-baf3-8d42bdf24391} - {261ac7d5-3618-4ba5-a300-03f60bdc495d} + {9b2599b3-689c-462b-9a1e-cc270f255e14} - {0c497e94-5e3b-4bf5-9f79-023af0676920} + {4c04d903-5771-473a-a4d9-2f5e8a3ca8d9} - {2f49f68c-752c-414b-b17d-8c2ed6c9a421} + {2caf2d8c-7d64-47c6-9db5-aafc699d782b} - {603f624a-4346-4b09-8bf0-5fa5325c7ee6} + {31b76e5d-72be-4f8e-8dfb-642cfaa3c70a} - {f599ff95-10a4-41d2-9c50-a694cc775b53} + {ef7b84f1-7eb1-470b-b44b-eb6c417b7935} - {07046157-ad2b-42dd-bd90-0f4744253750} + {4b7b2b7f-6884-452a-802e-5f6bdb4f7672} - {84bb0abb-9a9a-4fad-bdfe-6d85b069d072} + {39b67696-8034-42bf-b095-4f5964337ac2} - {fe433600-b417-40c6-9a6d-e006bde96b80} + {76bd39b4-e947-4e08-b037-62ccd1da8188} - {3c426d6a-c04a-4420-8c32-464534a0b874} + {3ff56b68-aa03-43f6-8a89-7990029bc039} - {1d68d569-1d7d-4f42-a5e0-2d3b71b6b228} + {91b7d25a-07c5-4f46-9160-6ecbd9e624d3} - {de1865f3-f3fd-4ce1-8aad-409bf09272fe} + {dfc11434-14e0-4390-b661-90e21a05c312} - {e933bc1e-999d-4969-8a36-30a300b23661} + {6cd3333e-7f91-40f5-ab64-a8b2124f118b} - {9fbdbf40-dac1-48d4-9a78-230428c7a01a} + {3c5eeb24-439e-4e67-8d5f-2f1cff4b7c86} - {b23a0821-3001-4926-b473-dcf22563db22} + {1696d8af-b89f-4734-b567-21995334b0ac} - {2fe95022-01ac-424f-8ad3-0b2b719a7af4} + {8ea9e35c-7e19-4435-ac90-cfdde453fca8} - {b0c618a3-4c1d-4418-bccb-a749d1d4c44b} + {8e97486c-af9b-4221-b58c-4d7fc9693a97} - {b4de36c9-0b7d-48b2-ab00-bab87ee84107} + {901ccc5e-aa74-4b35-9ee9-d1752310e00b} - {87afc7b5-7684-4a57-9f5c-90cb2e9dedec} + {b4b7d724-a2ac-4930-8bed-64bd36a2b347} - {18047a40-5dbf-44f5-86f1-2fc96655016f} + {d9f1d9b6-b91e-4a9e-b35c-f64e7ab9cbe4} - {d3d7c501-1fd7-4e54-ae64-0572bdb0eb70} + {37558d91-9de6-4da4-b9e6-edbf3eda84e0} - {eba1de22-2f4b-4f23-bd87-3947c8099c3e} + {f1278e83-8147-4004-98cb-c857be320727} - {1bb4b4a6-812c-4a2a-9aad-47db2cacc12f} + {1388e695-c60d-4e71-814c-70f2ccf9e41c} - {06765186-dfd7-435a-b2a7-9690cd97fae1} + {c798d662-3d24-48d8-88e7-e62ea21a0fa4} - {15706d0e-ec0b-4b7c-baac-6dda0e55e376} + {f42c8dac-e2fb-4f3b-b9e2-a6e1d93f723f} - {8f4d34ae-fdee-4199-baea-4c7e5c997cb2} + {1ce43a2a-9423-48bb-be89-08810cb2aaad} - {1f7043a4-1bdf-4fe3-844d-cd192798b819} + {e454df27-757d-4e08-b41f-4258c32faeb6} - {4c3099c7-ee2f-48cc-b1ab-60260a9b6b1f} + {032611ac-383f-4b79-b79f-77d1bef9e801} diff --git a/Net/testsuite/TestSuite_x64_vs90.vcproj b/Net/testsuite/TestSuite_x64_vs90.vcproj index 35577d7d4..55e80f97a 100644 --- a/Net/testsuite/TestSuite_x64_vs90.vcproj +++ b/Net/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> - {94946147-1f7b-48c8-8614-42ffb7494af4} + {3f99d261-7ea2-4fe5-9044-c49d5984823e} - {0f0a542e-e8a7-4d3c-9e98-78fa17786f78} + {8f7bcc34-1ea5-40bd-9414-f90d64c59958} - {15f0fa60-8fe7-45fd-ab65-bc8757f0bc0d} + {105c84ce-2fb4-4a3e-bca1-e10994b4baed} - {f493bd5d-517c-407d-b30a-c5e6b4a45878} + {afc42879-fec7-4fe8-97aa-28bd38dfe4a4} - {f24b88ab-d510-4580-a61d-758e60a7ca34} + {2de3a0fc-421b-449c-a8fb-576da5688a62} - {db4f0027-38df-452a-ac1b-ecaa2c811acb} + {3ee33ad0-85b7-4958-8884-1106c62d2d28} - {6834eba5-b2fc-47ab-a685-f910f8987a9e} + {c2e210cf-d662-4d93-9178-364646301ec3} - {b72b7dd3-4c50-4b5f-b463-bf9c5b913b52} + {229de78b-e2a2-440a-94bb-1ad4504b1f03} - {106580e7-e7e4-4329-93a1-3c77ddf669d6} + {35bf79b7-5478-4236-974f-7ddf213fd070} - {11dd617e-b521-489a-8594-57334dc56723} + {16cd2969-1bbf-4e72-ad77-4831efe9265e} - {ded925d1-a558-42b1-950f-b1c787dea69e} + {97ae4d96-b67f-4244-88a0-f9e642d98456} - {1f7a2ac6-7ea1-4503-a3dc-2127eb436cab} + {838cb194-9a60-40bf-b8c0-0951d687f182} - {544a37c6-cf0b-4d99-b350-a515ef20e555} + {7d4c9103-a0f2-482f-aa60-fc465b31d088} - {6d3b3e86-ffd4-4132-8cb8-dff481219bc3} + {9443097e-5d0d-4cc0-aeb5-f8209fafaa67} - {0ad2ec08-5bc4-455d-bf12-178ea25e2285} + {b97bc148-ef50-463c-8b78-ffb9905e0cab} - {898350f4-b9b5-4622-82ab-007490229be0} + {d28a7445-058f-4588-8a78-62058dd855a5} - {8166b271-1ca0-498c-b9fd-681a03b89263} + {3253f778-fe8a-4108-a63d-db9c50ee45a7} - {13e89d27-9471-4031-8bd5-ae758e4dac2f} + {5b5b8041-ec75-426a-83a2-0011d14288b9} - {710cc5e6-518e-4149-8c0f-39af6a6b543e} + {5e5738ad-3cc0-46f5-863e-56a1af541365} - {f77c3b92-b3dd-4d14-88ae-00622c289456} + {a57d9066-6181-4e53-bc44-1b1c22d70930} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index b2a975a90..935941a20 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {79de96cc-c442-436c-8514-39bb0ab649b8} + {7b9b5e0c-cac5-4a01-b5de-37b93cdba599} - {5d1a3d42-9b3e-4347-9f8c-94d8d2ac73ca} + {37cd161f-ca63-4d1c-863f-56e6ad23e5d0} - {9b7150e7-8ed4-4bfd-bdc6-a829f9667acd} + {5451491e-eb48-418f-9bc4-7050792f4360} - {f6514f9a-f91b-4b47-afe9-584c24ad1216} + {ef5d7fe5-afaf-432d-9755-502733e9aa50} - {beef7192-bdd5-442e-90b9-70efdd6d88b9} + {77618a27-2430-4455-8897-78a75efd9317} - {0e0f087f-7b12-4d8c-bf44-1b25b0336614} + {8ecfb237-4cc5-414f-b89b-2fa2cfb1ef62} - {fb60be2a-c192-4e52-9b42-8fa5c0cd76c0} + {7b1e6b63-df4b-4d86-aba4-b19cff2f55d1} - {02b38b43-5393-472a-af5b-65234f1c1c0f} + {dd7a86b0-a888-42aa-9814-bf02462a4d2c} - {46ac27cd-c07b-4802-adae-059af4b095ab} + {0fde6220-bc35-4eab-a185-87ef622cb76b} - {c5e0c29b-96db-4b7f-9573-07a218ed1811} + {b1b80b32-885c-4de6-91e7-986a3b9cca57} - {fbf121e4-a934-4a57-8701-5a1916969e0d} + {0a7a3763-3c01-45af-bb72-a8e505ad67a8} - {93ab5d82-8174-40de-8f65-0a06fdb0d310} + {c55e0622-8553-4e94-a57e-a07770b7ed52} - {ab59643f-5cef-415d-bac5-d365e2ea2392} + {de5f410c-49ae-4415-95fb-2775810ecb09} - {b46ec765-f44d-42fd-a321-5d0f6e68d4df} + {f3fd9178-da23-4786-8756-90745b43c958} - {28819565-29fe-481a-8690-30c9b88a9fe7} + {8bea4dc3-7897-47f0-902b-b5b469b4eea1} - {e5218aa0-fd21-44fa-9570-246bec7454cc} + {157bf9fc-ec6e-4c1f-9d08-efe714b2f748} - {836b06e6-6a15-40a9-be6b-9bf76969d859} + {2fd44379-0207-402c-902a-8879f0d08c1b} - {534b9dc1-2d38-44fc-bfb1-5704c424c9d8} + {ab5da1d0-16d0-47d0-9dc3-912246898d0f} - {6aae2504-4175-4dcf-b5cd-3050a94dbdd8} + {8d5d86b9-63f5-46fb-8198-44e62f4194db} - {d3ce853c-c7f3-43ac-88f5-cc8bb052b36f} + {e94c146d-f540-4b14-bf90-880e6520522d} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj index 07d895ccc..79ff3a0f7 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters index 9f64f4c42..975ca823a 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {3a2c71fc-2e8e-4f16-aff6-9bbdc0904827} + {ebb7154c-3f9a-413c-9cba-0decb73ec580} - {6cda5846-d37b-40c8-9463-885c65e56813} + {f01d2a6c-a28b-4957-ad95-285feaae469b} - {83762f25-3ce7-4c58-83c8-4c7a413ec31f} + {c924647c-fbac-410b-9677-6e57cfe74b0e} - {51b4eba0-0e42-4e25-908a-cc3109cd40b4} + {f0e03be4-d6a2-4150-ba83-82324438203a} - {c08c7fe3-56bf-4034-9c34-048ef45c8731} + {df36c689-a9d7-4f00-926d-3ff1b1298a56} - {30aebe4b-3da5-4015-ae42-4de10d49cd39} + {8d2a48fa-7bf1-4c62-850c-aff05582a58f} - {ae8b70ee-b0b0-4302-a138-9c13e693ce71} + {b3a41999-714a-4b7b-be95-b5f180c8e120} - {0ae3e7ad-acb6-409e-a326-b74ac3d0d817} + {681de622-a022-490d-b195-1ace514f598b} - {2ea541c2-ecdf-4bdd-a662-6b2dfffb3b8d} + {aa6fcc6b-38f8-4ca8-81c0-f711dfc2c85a} - {d7fc4787-e19b-46cb-9add-5e1b1ad30d0a} + {32c3cf32-3102-4ad3-9d0c-8ee68e36e412} - {bd0328d1-bea1-435c-8468-b0999290b245} + {eccf39f3-65aa-41e2-82bd-6673d1e631fa} - {cc18d801-61b9-4025-8615-4ba75b3b4e4f} + {2bf6671a-00f6-4684-a69e-1fa4eaea483c} - {5590d9bf-70be-4c3d-bf7b-2e57c6c5a737} + {bcf588c0-bf46-42cc-bd12-4cf0e7a97de6} - {d8a6f2f1-5ed9-4cf7-aae3-74b3c80d12fe} + {94599262-7def-4bb1-a483-5a4cd7c402a8} - {0fe8c547-89ab-41ae-94c7-1ddd8f71c739} + {50ee5ded-2aa1-4e28-9596-07912fc4ab3d} - {a3d8337f-ad69-4caf-80f8-7557e14073b4} + {00ef5d96-2819-4018-8ca4-8be4c03f25b5} - {774d9f22-7578-42df-8b73-1137f51fb9d6} + {a458f8c8-e23c-488a-88e8-af1f385dcc34} - {7f6c2360-51a5-4a91-adf8-b245b222800f} + {59c34d64-8d85-4290-8836-54220652bb2c} - {eb0d9173-59dd-4fe7-bec5-b0ff731d21d0} + {bb99a258-3372-494f-a2d1-466d39ebe3be} - {05af9e53-94e6-473c-a77f-0c70e9e5c15d} + {6cf002c3-41de-4fdc-9e42-79a8082befa2} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj index 299068bdb..3ca11c30d 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters index f4ca8a307..414030e5c 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {b273dbe8-fde8-44dc-ae8f-ef1db856eaad} + {f09e5405-79e7-41a8-8fc2-5be975167b42} - {2e951057-9e60-4fc7-b1dd-e8bf7a01cb54} + {71c3d9c1-b16f-4224-bcd8-efbd5946b876} - {7dae2405-d7b3-4add-bb35-6cfb8c4b3171} + {a17fdad8-42a8-40c8-aaa4-11daa147cde2} - {75e21e3a-ac5e-42af-be43-b0ba3321edd6} + {5660e861-d55c-4575-be17-3b9ecaa5b71e} - {a1f9f42f-1597-4335-b434-a362c1664b0d} + {6f5dc17c-0ab2-4bb8-80dd-03510fae4e37} - {056ea0fa-e540-49c2-8b3f-72d8b712213e} + {34041a9e-db58-465c-b58a-7a50dbc4b4f7} - {83ac9a72-517a-4437-8f7d-30ddf90ed4b1} + {5c76d28c-43ab-4192-9a08-e8b915f5c1ae} - {6d14b059-0e48-47d5-8e31-3f9dd64a770f} + {6f899822-d48f-4651-9922-7b6a567d7c9c} - {9aa49d1a-1e8e-45a6-b3e5-13e2edea649e} + {2f4a4c03-484b-4fd5-9a43-0ab8ada10b4b} - {cfb489b4-508d-47fe-88b6-7b6847e505b4} + {3de88b1b-6183-48c1-bff9-614ff2240de3} - {e942cb9a-d552-435b-be81-aa2f59496eca} + {7936df74-6244-4f2c-9eca-3524f172bea0} - {b2c06111-74e6-47c7-9113-7cf138ecfbb2} + {185e6512-31b3-40a6-aa8b-1ba3df4ec650} - {d098095a-c2ef-44a8-8664-29a36ef5aba8} + {398c0084-bfc6-4676-b11b-a9a60aea3b0b} - {d4629c64-5347-4c76-a14d-a6535335008e} + {1178c4e1-6a4c-43a2-a08e-0a16107cd5c5} - {82fd824c-d995-4851-a2da-7ef09410be98} + {61cf47ce-2e9a-45c0-add8-5888a089eaee} - {c35b16c9-4a9f-4b0d-b43d-b18ea844e333} + {e97c3efd-1bbe-43ba-8f7c-6150aa09e61e} - {88f0e255-aef6-4155-b441-1d9f68ee7b92} + {37e12a5d-7c21-4feb-a70a-49feabbd2572} - {4b6c6d25-187d-4b4e-9b65-b1dd9fa16936} + {c0c76e30-9404-415a-9f36-fba7a8acfc0d} - {dd2e2116-ee76-4feb-b6ed-e4e51795cd4e} + {b6f13ad0-b069-483a-a62c-3a47036ac426} - {44eb1c64-ec99-410a-bd96-7a721ae2d899} + {f4dd1d4d-80b4-4392-8075-2525d574d167} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters index 41c309cda..9f2117811 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {0964363c-cf69-4f7f-9c75-331c18a25c72} + {ec5d56e8-cdfe-4eea-9811-b8141614561c} - {f5e220db-a1bc-40ee-bdf7-f754981d0151} + {f849338c-5c18-481d-9b5f-1e827ad482ef} - {2893a2f0-e633-4de1-ba37-64b2f326aea0} + {dd170cc0-58b7-46ca-9c8a-15f638518624} - {f7739db8-11f9-468e-906c-3bdcccdcd139} + {577d75fd-30a0-4069-b956-56b485d326e2} - {a4cba775-ac86-4cb4-a2dd-106d1ace412f} + {f7d052da-ae29-4ffb-8fce-e8886a3db129} - {ad3c0a6d-e2aa-432f-841d-23be5fd4a2bf} + {9005be30-627d-4d7b-a0d8-740e9b98878b} - {ad7d9be6-1358-4e1c-9cfb-071f64c5811d} + {302f8472-a90f-43f5-b6e7-c86aedbade0e} - {e40acc04-bfa7-4e06-8256-c3ea145b053c} + {af249c27-b794-4a2d-9bed-cdf70448e6fa} - {48c7e775-fd36-4516-8cfa-bffbce6d5fd8} + {9c4faeb9-7cf6-4d83-a71c-d03190888643} - {307632c9-373c-45d8-ade7-9f80762f1bff} + {a531a96a-c2a7-43ba-b6b8-f19154215045} - {5bf5049a-d10c-4d63-b381-52ed9b3ee677} + {188d960b-a79c-4089-bc18-8b4865216f55} - {6ff240b1-b9f0-4fb9-be6c-1ce8bb6badb5} + {ec4acf06-e0a4-45b9-a1d1-0cfb7582b255} - {ca11138f-945c-4e86-9673-1718f72a186b} + {26f91909-c057-48cb-a10a-e3263a57bc20} - {02b4e1bc-f7e0-4060-aba4-cf8a993ccdd4} + {fedb5484-379f-4a59-8bcb-c3f3aa3c2799} - {6b2f8781-b195-43c7-8a02-e56f11a14c14} + {f0c9a09b-3dc4-45a7-85b4-223787ef9c2c} - {d50969eb-29d3-4c70-9c4c-a54b1a65170b} + {4b0e2bbc-04a6-418e-b89f-ba3aeb1e4c9d} - {a0e14d5b-6b14-4be9-ada9-ce77c530dcb3} + {f176fbf1-a109-4848-aa2b-c76403324c74} - {d81f401d-bfba-41b1-919d-8cc9970a4748} + {9d280672-2731-4e67-a545-ea3f726ca2b1} - {8c0fc1a4-1a93-420a-92e1-6b1f863b5ba0} + {686c6a8f-aeb0-491a-8947-1fe13040f66f} - {62f99e41-1b36-4dd1-847f-8edb7acf0a73} + {f9f789d7-0c50-4acc-a1fc-43c73dfc337b} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj index 603d636a7..420387a5e 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters index ce49d28d8..7be438b0e 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {3a1563a7-6e6d-4695-8294-5dfbde422ab7} + {795a4c06-5e0d-4609-9ce5-e60a1fac2008} - {6c98e890-98e4-4ca0-b8c2-f5ea77fb4a52} + {ae434379-61b5-4977-9c12-91ba875ff1fd} - {cb60779b-5add-45fc-8431-eae45edb4ac1} + {95a68c75-f4b1-463f-b1e3-f8595ef8ae6c} - {86e26a59-8a3d-4507-be78-8aae539ab128} + {735544de-3ca9-445c-9d21-06547468a896} - {c20bdeda-d515-44d0-b1bd-7f3b5ad51b81} + {da94c822-38a8-4480-8ad4-793b2b40f7de} - {736a0b70-126f-4115-97a3-1e56fc4d1d60} + {c8eca619-dfc8-4913-bc19-65e5a0666b0c} - {2682b370-dde6-489d-9035-9efb788fd386} + {9e970348-81ba-4143-ab0e-45a19270aacf} - {80d637a0-c72f-4ded-8576-05fc624ef84d} + {68535ded-f6fc-46f2-8f83-3d7604f6e4bf} - {376b8f45-611e-46c1-b112-a35656954857} + {a69ad2f0-1d1c-411c-8e81-78fe10ddd111} - {9487e5ad-b214-43c7-a9d3-ddbe1b030fc5} + {ed2deeed-7293-4619-903b-78a7cb99eeb3} - {32a24d1f-dfaa-46d2-a249-002fbf0978fb} + {b000a5ff-2999-4780-a7dc-2f0606d6aa64} - {acd49475-2951-46ff-9251-d7b63a0134d4} + {891e8e87-7129-4b7e-86b2-ccd65267d73c} - {90e09e0a-382c-4836-927a-821839e7ea60} + {07b18bc1-6d8c-4c09-8bf5-2ba7020286a0} - {d9fca753-6bcb-4ecd-8084-0d8505c213b3} + {980fa41c-a442-4058-be8b-b271b31b656d} - {9f47e0dd-5e18-4ce9-9b89-4c214716c773} + {68191cec-41b7-4b7a-a058-d6d119ed8179} - {c2e6daaa-d666-459f-95a5-f78a2730d2f5} + {319f1716-f4c0-4df4-8c60-95aa609d49a9} - {1d0afd05-5f06-4d53-b503-06046459bdd9} + {eb3ca089-293b-4116-875c-fd021cb168e2} - {d107c30d-0bf0-4be8-8de1-8c3a1c833242} + {7cd73152-edae-44da-9f08-b29c66c846c1} - {868ddaca-eb45-4325-9abd-e5a1f43dc7ed} + {a213b931-a70f-43ba-80e4-cbcae906306f} - {b380003a-163e-44fd-9bef-9ea47a981afc} + {0b09c7ce-5036-4bb6-a3cd-fa80199fc035} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj index 1c2270c81..8eaca4859 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters index 787cf3802..0c0c54e8d 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {70f33ebe-323a-43d5-ac8a-b899f29ee550} + {2f3859dc-7bd0-4799-b2b8-647f0d2e1a77} - {7ba97af5-c606-4e61-9a63-33640754b3a9} + {373c6807-2144-4d6d-8eb7-676130534a46} - {952f4738-47ce-4672-891a-934ae590e6ab} + {57f161e2-0a00-407d-a262-f00ec568e79e} - {2603dd2a-d133-48a6-8967-dbd320c77f8a} + {7358d9eb-825e-4646-babe-ca0630bd1a9c} - {6f7bc2fc-9125-482d-9196-326eaa49d8c6} + {bd04ef9b-56f2-45a5-8248-8d672ac886fa} - {c5f8d03f-4889-4d27-977c-a35566647a34} + {e3f4bca6-7052-48f2-b68d-e5e5d8530101} - {1b053392-8a89-4a26-8af6-000cd023c808} + {e469d857-cb33-4c14-a35e-e117eeff5508} - {4e560274-91ba-4151-ac83-674f400307ba} + {c04a633c-b26d-4c4e-bcc2-e6cfd9883908} - {bf394581-3076-4c38-84e3-43d9a5786d16} + {e8b7f3c1-6838-41f2-93e8-db89ec3f1dad} - {e0020a89-6cec-4c39-b594-9198c1b935cb} + {61ca2ac1-5d78-44cb-aa18-1dfbee1ee9a1} - {51c9fcf8-a64f-4aa4-805c-c01703a33361} + {fc296a42-07bc-4210-b11f-2a3dc580fe4f} - {5f5acbb9-6520-4109-8184-c9c8ed2031cc} + {8f440013-6e68-4f94-85dd-2e40aace5a7b} - {2f19a401-f260-49e2-8f25-4f278960f089} + {46c64e49-85f3-4af4-a794-845fef02e3ef} - {bf615594-a102-44b1-8b6d-ffdd36f4a2e7} + {8061e9d3-7c95-43d7-88b8-e1b4770c4622} - {182adcd1-09ff-4379-807e-0a0fec22ae81} + {64dd384d-75d3-4986-9b47-2c23f66e7a0d} - {531727b3-fe93-487c-b240-43536fa87370} + {0757a0d7-9b0c-4602-b6db-6ab651ae2449} - {78192dbf-eaf6-4d7c-b3b6-c854adf62aae} + {d5ae6ae8-62b8-4c9c-a546-4a7b2881fcf8} - {317a8f28-5817-4cc7-839c-8f21b1af73c7} + {b36dc973-e1db-403d-92ec-3e21e48c646c} - {c1e52d0e-ce72-4558-87f5-0fa0c9d9436e} + {30f777cb-baea-400e-b5f0-0ddba69b7fd1} - {6de2063f-0183-4b81-9b51-86eed26eae15} + {d8cbf3fe-9c89-406d-9395-6b0d9039fcdd} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj index 11cf8a73e..b6b2a39e2 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters index c896f0e71..957325f5f 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {aad18061-78d9-449c-8303-270279526cd6} + {822f8491-542c-479b-ba7d-6444517d06de} - {0e8ce915-19f6-4a89-a955-4ed1ada258b0} + {3a57a870-4567-446b-bdda-af868650724c} - {d5c7b6e8-8940-461f-a3ec-eb096323b3c5} + {8b2095b0-1519-42e5-95a4-3e3cee4163f6} - {566537ed-1c70-4c08-b3ef-0b3b5b1fac04} + {b7aba224-4d1e-4acc-aefc-9adfe8b17310} - {bca51c29-f1c1-4492-a624-2d2a001294bb} + {a8b08d53-d21b-4d63-8235-22eb481fb027} - {1753159d-081d-434a-9462-9b0f8d48edb2} + {f9447f33-88bb-4af2-9a5e-f536f0b90210} - {6e69337c-12d4-47c1-89ac-6c52dd7ddee5} + {033a1564-ccab-44e0-a2c5-90bce978739a} - {d207c670-b6e7-48c7-a35d-d9e78cefecb3} + {df949750-c22f-4606-af70-b8bfb0300eff} - {e27644b2-f41e-4974-9a80-5d39da44565e} + {c0e87bbc-1b32-4074-90cb-37cbf1906763} - {5e8c20a1-1d08-40e3-8a90-e040466437b0} + {7c440b2b-3d19-4168-b19e-a846efcf389b} - {24737aea-0b54-4189-99c8-692bfe7febbd} + {9f721446-bb78-458a-9264-00fd3f419e86} - {3ec43c8f-7c0d-4937-bf2b-d04026ba6d4f} + {b367f47e-4c6b-4fd9-92ec-b56365d248f3} - {32d67029-5d22-4175-af93-150d21efdd0b} + {9077bff7-688e-4c67-8da9-52f999446914} - {011b898d-afba-4fd2-9812-6e5db099b153} + {466741d0-1aef-483d-ac86-0ac0fdb09232} - {81b6ba2b-a804-4955-b09a-2689aecb4a24} + {ec7e42f8-1920-4cc7-af83-ea44936fa10a} - {ffdcb224-553a-469e-bd7e-aa3100782c92} + {880a27a4-42b3-4847-8e51-206a11b76b5a} - {f8fd64c3-d8a0-4cf3-971d-df9215fa78e6} + {d8dba9de-031e-4aa5-bf76-c693c7864c83} - {8fb93a95-279c-471d-8cbc-47988f93debd} + {a9ff7d27-5d30-4523-8a31-b6c7d29617ea} - {0944a1d4-c30a-4d3d-87c6-8a28bed89c32} + {bbeb541f-ba4c-4f5b-9341-a5248e01e6a0} - {be557066-e16b-47d6-bcae-1f7409e21272} + {d89bf884-eaa4-49bc-84e3-e1699d8bc875} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters index c295b9e34..00eedee70 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {1c971281-9105-4e01-9aa5-b05da49a7796} + {254feb7a-9fa0-42b5-a6a1-e470e785eca3} - {1c7148e3-ec26-4bd3-ac8a-5391ac6d2cf9} + {45cfbd1a-e01f-4afb-844e-0cc05b663b02} - {d2c96485-8b08-48a0-bf83-5c9a797d190e} + {6e7e4de0-f071-46e4-868f-90c45a73cea5} - {6bb58a89-e886-4e4e-8d3d-4c8987b3fcbc} + {500e7167-8981-48b3-9f76-36de615c99bb} - {35baebf4-5b65-41d7-95d4-626904f39789} + {f3dff062-37a2-41cc-9716-ccfc51ddf0ce} - {88b93bcb-8367-4b97-beb7-a653f73f84b8} + {4b532d6a-b3e1-42b3-baa7-c7de21da3744} - {2fb70cc2-ba18-45e7-a293-b252531a9b46} + {8fcb431c-f698-4d01-a1c0-28f292a96881} - {f423afca-3789-4319-b2ec-2ad634707bfc} + {84cb7db5-a737-4e57-97fa-9adce992cd0b} - {99a42d3b-59ab-4cbd-beee-54c963b1b9b3} + {4c23942b-79cd-4a53-86ba-5686518e02f1} - {73cf4198-de2b-422e-acdb-8d160c33cd31} + {898181ae-3d28-41a0-b757-c65e902b270f} - {6de9adc0-d38b-4bfb-8209-5a24aaff6976} + {6d6fe1d0-df05-4eac-854f-71f51c43e6c7} - {5850f886-5c12-40e4-a061-d8228fcac9b4} + {ca7af43c-b09f-4a69-ae25-3ec70c7426de} - {2ee1754d-8b48-40f0-b07f-4875a488ad90} + {c138f274-b34e-44ef-8d79-450f2e50cf27} - {b3806436-48c5-43b1-8299-097bda8db007} + {4696f9d8-8d42-4613-bd09-5277b6564fda} - {718cbfaf-bef1-443c-a54e-62cc32f7de58} + {cbeaca78-4907-480c-a222-faa1e6f0fb6f} - {9d846b75-c144-43d6-8400-fb65dd1b3ceb} + {04fc038f-5c6c-435d-b230-5e1e2bc7609d} - {72aeb080-f83d-4e49-a6be-3e027bdaf94e} + {703a91cc-67e7-4863-9b21-a4a94deddbf9} - {13dfd9a4-6828-4497-8e4a-91e27e9538ed} + {30d72ce6-7bd2-4a02-9ca0-02f21a759f29} - {010399c7-49a1-4649-9b28-204729906ec6} + {334be6d4-695d-497a-a5eb-227c0beb2b45} - {ba2616ad-35b1-4dd1-a5bc-ad5bee06da39} + {c6065f75-0803-4e55-9975-4eb6ab22243b} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj index ff888b19e..435df5277 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters index ff9448b34..7e44c1397 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {542f84c1-c71d-4fe5-b44d-68ca8f35e9dd} + {dfafea20-4fd5-4b5c-8611-d19435908da9} - {bebffc00-ff29-4fad-a42f-5154c77b09c3} + {1dba01ca-6985-416b-9dca-e9918d998357} - {7af683b2-9c20-4ac2-b227-4c2472dd348b} + {9b4f2d71-8306-4277-90f0-f7d48dbe4e25} - {66850eae-131a-41b9-867e-a387950cf4bf} + {7e5405b0-cbcd-4ab1-9327-0f7ad5e3cd1e} - {cb6c2a7e-de60-4309-92d0-bb3d64718940} + {277ff02e-5164-4bf3-8895-f3c4c9b51af1} - {768037be-1316-477b-b998-db72731b71c7} + {a299061a-c424-4eca-a2c1-156de3730fde} - {00da04e1-befb-451c-ba51-640c5cfd4a0e} + {aac8771e-f0d3-4137-80eb-667110843ef6} - {0c3aabd6-dc9f-43bd-b003-25ba8e3bf52b} + {3802303d-c998-43b2-8965-85d6758fb5c4} - {57ad5834-f35b-4e65-85f2-7b9c15e274fe} + {f63a1f34-145f-48ac-afce-a9731b2c8397} - {1d27e7f3-f886-47d9-ade1-4ad20e1cd380} + {80a88167-7a4f-4035-868c-b410625854b3} - {78390884-f53f-492f-acdc-49728c6c272a} + {16d8251e-9bd0-426d-ba40-b75a9af2d634} - {f2075b9a-a10e-4f79-9710-9303b2364221} + {40fd3832-88a1-4065-a6f0-5b22f8469d2e} - {17d23713-39df-4c9b-b7c9-74af9dedf369} + {0844b02c-6171-475f-99a7-c3c7b7c02627} - {8d298193-5563-48b1-b1aa-7f6b6bbe5f8e} + {5fc387c4-5ce1-4104-b6b5-239cc4e2b5fa} - {e206afea-59ac-41fa-9336-d9bead9949ea} + {d521f476-f53e-41a4-9869-c3bb4857e9c6} - {ac962973-8650-4e8b-acf5-2650f3656b4e} + {760629b4-dd17-4cac-a9c5-abf4519716f4} - {a439e6ae-12b2-4814-b551-17d42dd2c80e} + {aa304803-3a13-45fe-b9b8-c810e2739a7a} - {5407f66d-da1b-4a24-b5ef-4265476af193} + {3cc49046-9d9a-4577-9161-0a945d89fd29} - {8b54dbdc-4a6e-4335-a90d-2dad31bdcbe9} + {62a54e98-b44e-4987-96db-d28556ea124e} - {5990b8b3-8ea6-4c3e-9bef-54fcc00b9291} + {9f52ca3f-265f-488e-8a7b-735eb0d5d425} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj index e8606c198..4efd743e9 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - + + + + + + + + + + + TestSuite @@ -36,59 +23,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -96,229 +35,7 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - - - - - - - - - - - + @@ -330,8 +47,8 @@ - - + + diff --git a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 0a8f8cf78..5faef5997 100644 --- a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,55 +2,64 @@ - {b578f933-c53c-44a7-9695-cf9b08b8f952} + {a5a27cf8-2ede-4627-b9c5-7f42107f391f} - {9f5cc0cd-69f2-4643-ab0d-3c7893e33eb9} + {bd3dcf49-b9c1-4bf3-b1e5-81c2ec9850e2} - {2f65b1a4-135f-435f-b2c0-3f5411e3c9b8} + {db8fe1b0-5a64-49b2-9ebe-52d87e8679b9} - {d6847db6-d565-405c-b06f-5e89d1711dcb} + {866871c7-5461-44bb-b9c2-0a78206418c1} - {2e08fbd6-4b00-4868-8a4c-02b1064867c1} + {b4d693f8-659b-48ab-aac4-bb073695253a} - {80f561d7-04dd-413a-ae88-f28fd9bf26d2} + {71456a46-4b1f-4035-ad20-2ca6d0643ad0} - {2920eac9-9513-4a89-be61-20b59cd2062b} + {6def86c8-4dc8-4354-84c8-f16bd93c1c18} - {c4c00e2b-a925-4cae-aac5-022a45cf8458} + {b781dc4f-5f4e-4db0-a06c-a56466cb72a2} - {bb60b044-aa26-4967-befb-dc04170be3d1} + {a541d207-bfd8-4c4a-9d62-65b0b67910d8} - {2ddfd7f6-bb07-4404-8fa5-0848ab8e8141} + {e369ec7f-0128-48e6-966d-ab374d19a2fb} - {64a386e3-1b48-4d62-b6fe-51da4bd2103d} + {ba44e00a-7711-415f-addd-b1f13467c70d} - {748f8828-a800-422a-80c6-7ae8d4c4adc6} + {e99dbc03-c921-4dbf-995a-4b2fc0c605a7} - {5f0f3776-abfc-4048-954f-1c9e4af7fb8a} + {dcac9a71-20a1-43ae-9083-b0be971821bb} - {6e90b024-28dc-4d58-b423-a8345674bc75} + {1701a3cb-ca5f-4e05-9292-e402c3da96f9} - {fe147bfd-c447-419b-9777-22ece9b64c3b} + {a639ec7f-2c4c-41a1-94b3-c3255628576f} - {07dad251-9bcd-4e96-a689-bcf1441a2fe8} + {54782f1b-de95-4782-9c51-6b941c42b2e1} - {b33f1d69-26d7-4604-9e92-a91910f61903} + {9b21a259-60eb-4f45-a9a8-9c541b18d6ee} + + + {2d8ea13f-4b7a-41db-a09c-d7355ae9d2f4} + + + {f5c5a992-d334-4a4f-a9c0-d31cf71ca3e0} + + + {de4fcbc9-f118-4b91-b8cc-ed28f1842200} @@ -81,6 +90,12 @@ HTTPSClient\Header Files + + WebSocket\Header Files + + + WebSocket\Header Files + @@ -113,5 +128,11 @@ HTTPSClient\Source Files + + WebSocket\Source Files + + + WebSocket\Source Files + \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj index 34fb61761..803a0da81 100644 --- a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -1,30 +1,17 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + + + + + + + + TestSuite @@ -36,59 +23,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -96,242 +35,20 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - + - - - - - - - - - - - - - - - - - - + - - - + + + + + + + diff --git a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 02d7f7f31..c170c3004 100644 --- a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,55 +2,64 @@ - {3f97ce13-ef58-4cff-aa8f-bb11d0b5716f} + {59a70342-5e66-4f4c-a009-c37ef75351cc} - {3a842c88-b58a-4e08-b499-2c75dbcf4edf} + {1043260e-b402-4805-81fd-f12fcf150d9d} - {d5ef9848-57b4-4659-b266-8bf91d245834} + {a951b9a6-2738-4875-bc8e-13b50bc65e54} - {e78520f9-2dce-45f1-87d7-0f826586626c} + {79d070af-0c16-4fa7-be3f-299c7f43e131} - {d58b957f-43d2-4df7-a4db-41ac604ef1cb} + {bd7ba119-fd5d-4706-8148-6bdf33398c43} - {3d48fe47-25cc-4f99-9681-ccf833e03a1a} + {c2062250-3d08-437f-a405-76a8b37c516b} - {0d0dfe41-00e2-4acf-bba5-67b9e3f46a8d} + {8d73e895-b27c-48ad-a7fa-528df42a446a} - {62f8d3dc-4df0-42aa-9e2d-bfc376f9669d} + {7ffde16c-6b6b-4a10-a408-c7e84659561e} - {c9e05651-36de-4147-ab78-d02f46d3603f} + {d66091f6-dad6-4fd5-b89c-0c688d810126} - {8d71dd80-bd16-4dfc-b39d-2839439abd43} + {9d94dcee-1f49-4ac6-8cec-54ad961b184e} - {9cc7eeae-e8f3-4974-894b-174677fe682b} + {fa096da0-065e-49d3-9752-6a596a2dffc9} - {1774e760-89df-414f-b65d-e0ad50f47054} + {61c8e42b-fbfb-4aaf-8263-3e64b5ecd8cd} - {a3e4bb0e-5364-459b-9714-ed2dee9e11b2} + {78cc85ac-453a-4883-97eb-12099ba8d473} - {ef56bf82-5a2d-4907-ba95-5b0574a95f64} + {567987c7-2906-41f2-8d60-92c923baa581} - {ff60c1d0-00cf-4c85-baac-2072bfc837bc} + {eb5b0e01-9817-49fa-81bd-304f1f43e89e} - {be8eda84-cfeb-4b73-a052-a9e712a1afc1} + {078e1ceb-5aa0-4723-b203-4e0cb06d0cb1} - {45c73d63-43d6-44f4-9015-5063da4a0691} + {07d05321-7853-4369-861c-780c1cb1de91} + + + {af61857a-ecb4-4cd1-9838-a4ba57d114de} + + + {cf3dcd18-0d6c-4ecf-8cfb-403747129aa6} + + + {bfeac7a8-b5b5-432b-847b-42d0c0a9dfb8} @@ -81,6 +90,12 @@ HTTPSClient\Header Files + + WebSocket\Header Files + + + WebSocket\Header Files + @@ -113,5 +128,11 @@ HTTPSClient\Source Files + + WebSocket\Source Files + + + WebSocket\Source Files + \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj index 70ae89f37..52aff6b4a 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -321,8 +321,8 @@ - - + + @@ -335,8 +335,8 @@ - - + + diff --git a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters index 2e733f0c1..669b26559 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,55 +2,64 @@ - {2f5426a4-6cb4-4545-920c-9d408fbb7e97} + {d6cc26ab-a06a-4021-a399-f8247404f3b6} - {696ffe14-ea24-4580-b7c9-e38b55e13646} + {598a47dd-75e5-4324-8f1c-f227a4208635} - {1d147f52-2784-45fe-a758-11f8ca879780} + {000ba09d-a188-4b2a-a531-ba46eb2fb6da} - {9826596b-14a6-48b2-bb07-2d9133500733} + {042d977d-000b-42ce-a016-e11726c50dbb} - {e1aa1e4e-d599-4a59-8252-3b21677729bc} + {7250d436-02a2-435e-80f6-4a4ae9da54f7} - {5b15448e-ec8b-45ce-99e2-a1152eb7d9f2} + {155bc8ec-5e39-4587-819c-e204c118ccff} - {f5adf0d5-bf61-4747-9e37-bf82e3c53ddb} + {2be86ca7-c3af-40dc-93f8-768bb1282e36} - {fad350da-ad9e-4d75-add9-7be5c67c40d7} + {fcacef25-7ba2-4e52-ada4-d3899fca91b3} - {d419ee93-0591-47d2-9c45-66262aa0a6a5} + {5dcc850e-7a24-4df4-96e3-5ea51294ade6} - {d56cbeb6-4839-4822-8c0d-bb125927fdd5} + {083e9933-0785-43c1-84d3-ba43fc2f3864} - {bb789632-406b-483f-9f02-6773f6b258b9} + {96ce966d-b677-4785-8cb9-2a60de0e0353} - {3495d6ca-4b27-452b-8c4c-d88f27888982} + {193df285-aef0-4a6f-96ad-5710f8fc5ccc} - {b8a30007-9e97-44a3-89d3-d5662be40f9f} + {335483e1-b353-4f93-b0d8-6c88b310bccc} - {11809fac-463e-4d80-9de8-f427f52ef63d} + {f7c94a7d-7a6e-45e2-ad7d-be9d70a629ba} - {56d691a5-25c9-4eac-bbf3-9f38d741e19e} + {572b1592-bf2c-43ca-b8a7-fdbbcbe4d55e} - {4bceec77-5688-455d-af57-1ae0e55e4124} + {2601c6c4-82f7-4605-8f8f-7896aadbc139} - {6bccafca-beeb-468a-abcb-4606d6533ca0} + {e7648ef2-fc8d-4295-8ddd-e9bf4bfd3c80} + + + {d2fb42a0-d817-48ff-ab96-f8eee286149f} + + + {a9fbe452-c226-4f7e-9065-77f6923fbbad} + + + {23d49b50-fd95-46e9-9736-ce8db7358b14} @@ -81,6 +90,12 @@ HTTPSClient\Header Files + + WebSocket\Header Files + + + WebSocket\Header Files + @@ -113,5 +128,11 @@ HTTPSClient\Source Files + + WebSocket\Source Files + + + WebSocket\Source Files + \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj index 5a3e63afa..2aae6084b 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -321,8 +321,8 @@ - - + + @@ -335,8 +335,8 @@ - - + + diff --git a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters index e7887a68b..97d16c4fc 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,55 +2,64 @@ - {73618b7f-6e8b-46cc-b835-64987f4b31aa} + {330c3574-bd02-4d3e-9318-b40c482575da} - {d4e544cc-f14a-4694-9638-bc7ed86f7ff3} + {458da5a5-e4b6-4608-b9aa-c5c9336d2592} - {ecb50651-f310-42c2-946e-2888d05bb5d1} + {fe45ae81-97ff-4f75-a973-13c65d1a7220} - {95eeb338-0630-41cd-b530-30a0150355ac} + {c5888bab-fa5b-4045-a441-5940ca0c19e9} - {d3def657-85a5-4bb0-b0e8-34a9a1ac8213} + {aa1b850a-cba7-4e8b-96c7-20fd5136d817} - {8650fedf-06da-4fd9-ac3f-b2321b8863cf} + {8c07cb98-5bfc-4e0a-91e0-de9b5027ddd2} - {d82f75b4-5532-4746-9325-d5346bbd6661} + {94d20387-2298-4182-addb-310b25247f9f} - {56ca0c4d-fcee-4682-a5b1-df0c205cb09f} + {964507fa-4dda-4554-868b-35d594974866} - {43949708-694c-40a6-9d87-314206fa326b} + {3bd506a5-1d76-4393-bd6c-269698b2e8c6} - {dbd85617-6056-4973-9691-2709eea45f71} + {1a991d44-2b63-40ba-a7cd-6a9732a421dc} - {c0d7b12d-a0f4-4f19-aa63-01a6ecf47fb5} + {a369cd34-02d3-4278-87bb-a94ab79c8834} - {d5c0f5f7-b4c7-4d8a-8c2b-1be3489b4110} + {dc66e00a-23d9-42dd-8fcb-e154ef7d9450} - {0d9a5aca-bc77-47d4-ad4f-6c7b75870adf} + {499bcbb9-97e4-4b17-822a-d6773d9c8d5a} - {7a4229f6-8d42-4775-9300-bcdbf027c003} + {7596fbd1-b9e3-4fe3-a57d-7a52d0d8863e} - {9a59c918-6d38-4b82-b213-270ae9c74851} + {67e329aa-ab90-4c78-8a10-e003017d7aea} - {5d9a0bb0-8586-47cb-96f5-8f30c464cc62} + {01cc5aba-6a8c-481f-a2a2-becf7af558bf} - {158fece0-6959-4022-8f26-c18b608b057d} + {84099b0f-80a7-493f-966a-e797e1d91993} + + + {eff05b0f-70a0-4efe-aed4-ad5e45e3fac0} + + + {db3b20b7-2276-470d-87d2-fea27740f6a7} + + + {3da97d1c-ab22-45a1-a202-62de75c82292} @@ -81,6 +90,12 @@ HTTPSClient\Header Files + + WebSocket\Header Files + + + WebSocket\Header Files + @@ -113,5 +128,11 @@ HTTPSClient\Source Files + + WebSocket\Source Files + + + WebSocket\Source Files + \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj index 547708afd..0eed95bf6 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,29 +63,29 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -136,7 +136,7 @@ true true true - + Level3 ProgramDatabase Default @@ -167,9 +167,9 @@ true true true - + Level3 - + Default @@ -196,7 +196,7 @@ true true true - + Level3 ProgramDatabase Default @@ -227,9 +227,9 @@ true true true - + Level3 - + Default @@ -256,7 +256,7 @@ true true true - + Level3 ProgramDatabase Default @@ -287,9 +287,9 @@ true true true - + Level3 - + Default @@ -304,32 +304,32 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters index 7e0c821b6..e91eb30a7 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,58 +2,64 @@ - {fa2f61e7-09ef-41b1-87f3-f04af60aadf4} + {f18d2823-9190-4de1-bbd6-e2a1e1f75104} - {79e0744c-36cb-4b0a-b178-cf03367a060e} + {40548676-d7d6-4cbd-9992-df282e6c3e62} - {ddcb107c-f814-4734-b1f0-441ecbc3c37e} + {beffa9dc-d6f5-42d6-8604-f2cf5050aace} - {c7264545-e00f-4bdf-942a-94aefd61048c} + {6ce561dd-3897-4b4d-a609-8677d9a8a5e1} - {a5033240-8237-4e84-9e65-e0b1b4e937fe} + {2794ecd8-63c2-4050-bf9d-c91ed5c53fcc} - {e8923323-8bd8-432b-8342-e897bd86b7e4} + {7ba7939c-4b5e-40e4-b051-40f9ab1a22d2} - {d88dec54-1371-4133-af6a-02969ea2720d} + {614437a7-59d1-4444-8333-a895dd34ea1f} - {bd9ae0ce-b8e6-4f6c-b772-3976de5b2e1e} + {5e84207b-6099-4798-8f5c-8bd9b2363a3e} - {3201d8b6-099b-4be5-85ed-aca318f14126} + {85b35422-dc6b-4b5d-9568-1ffd69023d54} - {de8ee736-0450-4d22-bd0d-b99ded457a4d} + {b0db487e-c1ed-40ce-adb1-3438bea6d3cb} - {675637db-a1f4-4c45-9f33-30972c05665e} + {e6a98e05-9680-4d9f-a117-5769fd2fc4e6} - {fe731cd1-0e9a-4f2a-a9cd-ec075a143fed} + {29e954e7-b5c2-43d8-8f68-f8ebe30871fc} - {710a3f35-5030-45e6-920a-49a8a37b4117} + {ba1e99c7-f519-41da-8f35-9d5650bae8c5} - {c103ff38-7ebb-443c-923c-9136f23904b4} + {d9f41400-9e45-4079-84cb-66e82e0bcc5f} - {01b90b2e-9323-42ff-a8a9-f568cfb704b6} + {9f93adad-17a8-4599-93a3-c986a52e0e32} - {f6912f7d-fa31-45ad-ba9d-9be20d423085} + {a2e52469-eebc-46b6-a1c9-145218e27b56} - {40e36c0c-5808-4c87-aa2e-04c0ffa6f35e} + {1839c323-37ca-48ae-9501-c949255eb97c} - - {9243a946-e87f-42f5-adba-efbb4823f93c} + + {5dbd22b7-a87f-4a2a-a633-959622531c90} + + + {361060ae-411c-4490-976b-3a7ee8d2ac1c} + + + {0f911325-ab8c-4398-acd0-44258502498c} @@ -85,10 +91,10 @@ HTTPSClient\Header Files - Websocket + WebSocket\Header Files - Websocket + WebSocket\Header Files @@ -123,10 +129,10 @@ HTTPSClient\Source Files - Websocket + WebSocket\Source Files - Websocket + WebSocket\Source Files \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj index 6b06655ae..4b2c1e411 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -313,8 +313,8 @@ - - + + @@ -327,8 +327,8 @@ - - + + diff --git a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters index 1783f552b..2bbf4e0c3 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,55 +2,64 @@ - {1786e3e1-2964-44ac-ae79-9f40625de4b4} + {588a518e-6ea2-42d5-a5e2-ce06545f9d40} - {8cc09a04-c4b4-4176-8e0b-18c9e44d4298} + {7d2a5f79-97dd-476e-9ba6-281ce3d491b4} - {9cb1080c-4a8e-4ce2-b6fc-6116f8ac2bbf} + {c98a8508-178a-456f-a7ed-409ed0214db4} - {20c8c759-3ae1-4c9f-ad72-c10a6ac57a76} + {704cf7d5-fc5c-4cb7-aac2-ee1219b82e1f} - {86a444b2-6dca-46ca-917f-37c6f43ae7fb} + {f724d850-7d4a-49f3-967f-58ef235ac13b} - {8696c001-7598-4b0e-bf74-6290e0755cdf} + {8383f622-1242-4505-bfce-fcda04024f17} - {eb58ebb6-57a0-41e5-acc2-0a81e2114088} + {064653b8-ef03-4d4c-8d11-01865eb97032} - {b1f9c557-71f6-4b36-b420-39e0ac3bd5a1} + {ab78b281-0ddb-4ed6-b08c-8aa9e1ab3b91} - {e1008b13-8e78-48a3-a106-20d10051635b} + {9e3dbc1b-52f0-4404-ba2e-89f3e941163b} - {ad33955e-e0c8-47c3-9c54-f12ea02bf8fb} + {3fdb57c1-e34e-4fba-b988-b7d6068c45dd} - {771e73aa-6444-4f2c-84e3-d70503c194bb} + {64a7c41c-dcd3-4955-828d-9d9ed153f3d1} - {409d3e47-b2a6-4b97-8b71-8fbec38360cc} + {beb33a43-4a6e-41f3-af1c-57f355157a0a} - {9c78742a-867e-43a7-81a1-183c1098eda1} + {6716ab16-b919-4fd8-ad07-3ded0b5b8a70} - {06a2ae28-67e9-4b32-b386-6e768a871b73} + {04226422-510a-4340-94de-feae96837094} - {4dd001b5-f47d-4e39-95ee-39c90a8ad3bc} + {facf500d-44a1-4d20-913b-f0b89c0bda14} - {9d629f28-eb99-4987-b396-d6fcb9214295} + {69a78b40-9037-47ef-a31b-12f8a8d07d2c} - {773a7729-dfe4-4a5f-9991-46babd12bee1} + {3eac58bb-aa2f-475c-abd9-35b60e02d33c} + + + {bdab82a5-cdce-4900-a648-e6b094cb2a59} + + + {8094a4d2-59a9-4574-aceb-c834ceafc603} + + + {3fd7ba5a-52b4-41ca-a07c-fa2cb89b61d3} @@ -81,6 +90,12 @@ HTTPSClient\Header Files + + WebSocket\Header Files + + + WebSocket\Header Files + @@ -113,5 +128,11 @@ HTTPSClient\Source Files + + WebSocket\Source Files + + + WebSocket\Source Files + \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_vs90.vcproj b/NetSSL_Win/testsuite/TestSuite_vs90.vcproj index 5f9a968d7..16d42a7ce 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs90.vcproj +++ b/NetSSL_Win/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -321,8 +321,8 @@ - - + + @@ -335,8 +335,8 @@ - - + + diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters index 6f2ba4330..7d8cdd755 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,55 +2,64 @@ - {2798d700-2a71-46d4-bf5e-b5ee96624cd8} + {beb06974-6c3b-4da5-9abd-034fb3046e34} - {f5e29128-cdc8-48bd-af6c-1697d47f1376} + {71307384-e1bc-4104-83ab-c93fe8f36697} - {b429f2cc-6033-4b21-8d94-251b062a33c3} + {af9c6f24-6202-4ef0-86ed-67ae6937273a} - {17da9fbd-fd36-4f75-b1de-2247d2fb356e} + {b881962c-b1a5-48ee-b61e-d94f885f94c4} - {a51c135b-3b95-421a-b8c7-bbded315a5be} + {be23704d-26aa-49be-9b3e-29af7ab1e13b} - {9de59d36-1f15-4f45-80f6-9d27f79ad62a} + {d0b219dc-2393-4d78-95c9-c34ef946c41b} - {edd15372-fd05-4fcd-8273-70047bc0919d} + {96f3793a-3aa4-4f6b-a42e-31c012ae51af} - {3f665fbe-506d-4a52-aca9-febfa02325bb} + {58d089cd-64fb-42e6-affb-c761dde207b0} - {bd69e566-c54f-46d7-993d-ce370cb70e96} + {8611f76c-120d-4e3a-bad0-a1660f371957} - {e231b117-3ccf-48ee-bd4e-8c7e409f2cd1} + {981bb0bc-704e-4d60-bd34-15ee968a9779} - {bb08fe46-5a6b-4acf-8e45-f204801e115f} + {69d91218-e937-41fa-83e5-08b63fab3deb} - {95e7cfdc-03d8-4967-8ee9-3a2acadfec77} + {fb4fde6c-6812-45e4-b112-88ddc10a342f} - {4e5c5b15-6f03-40cf-90fa-a09cf095e1e7} + {3e574f5e-5f29-4a57-a3db-82e780c6018c} - {ea7e068a-7d94-48f9-901b-8f7bea4fa067} + {6910ceb7-d1c5-4c44-a1bf-0d857f7cde78} - {e61bf5d6-0afc-4194-97de-db696c6557cf} + {d47a5815-ba84-4a7a-b389-2f7c7a4c992d} - {b3f55757-080d-41d5-9bbb-afce2aab1e9d} + {a0295c69-3663-434b-a7c6-5141a2caa3b4} - {42c232a8-8909-48a4-8713-f4814d17bc2c} + {55c06369-1263-4c8f-8e26-9da37e29ab5c} + + + {d55cb81d-3bfd-4f8c-88ed-7d00565b771d} + + + {3fb4bcb7-11a1-45c8-9762-8e4b76d30a88} + + + {cbd07bf4-8e06-4b4b-a4c7-c54e4dcb01ee} @@ -81,6 +90,12 @@ HTTPSClient\Header Files + + WebSocket\Header Files + + + WebSocket\Header Files + @@ -113,5 +128,11 @@ HTTPSClient\Source Files + + WebSocket\Source Files + + + WebSocket\Source Files + \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj index 29ccd2bd3..02c181338 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -321,8 +321,8 @@ - - + + @@ -335,8 +335,8 @@ - - + + diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters index 607d79493..c927a3a65 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,55 +2,64 @@ - {89464448-fcc5-49b9-85d3-3d9eb6dc34aa} + {44379dc7-8a09-4b89-9cc0-9bdd1ec25039} - {8efbc180-1c3a-4d91-a5cc-c72e203b5544} + {ac86deb3-d13d-4b27-b800-4a9a90edd85e} - {a4803d1a-011a-4dde-b9db-78b0b6ce6529} + {09c8d889-3d7a-4dd7-a256-b27d78f31db2} - {1ec50b01-6417-4dc6-a8db-49bcf042f874} + {6afaf54d-4ee5-4151-b940-4b44df76e695} - {02eb7f59-3f49-42aa-88a2-ede409bee072} + {80df9cf1-f034-41be-af55-d8e18f8897a8} - {3b253d53-d013-40ad-b7c9-1d765228fb54} + {bfe8af3f-f2f6-48be-b6df-503acc8cb636} - {7fd38452-3656-4bdd-8cb3-9a8d81ec6dd3} + {61e791cb-c7cb-4bf9-8f3e-3eb1e4f6b7c9} - {758c0b77-00d4-4596-aecb-5b9ec312e9b1} + {c1352406-c423-4546-ab02-9ae680f72629} - {c5ec6aac-bf87-47cb-9af0-80651350a581} + {dc8238b3-2c62-49a2-85db-61226b0d45d5} - {d5f90529-ff6b-45e9-8e29-1e88d0be2797} + {6a09e9e2-1658-450e-a3c4-31bf9fab67bf} - {49c6759f-554f-48b6-adde-e973be597edb} + {18cba76f-8c61-4344-a726-7964753f0961} - {d655ff51-a318-4763-98ff-02353c0d4fd5} + {01e50285-79ac-4f97-8d7c-4cada6f25d70} - {5f8d8891-20ee-4cf7-8a31-5021ac24a437} + {97057833-775a-4a1a-ada0-99285be2ae29} - {272e0ef9-f4c2-45cf-b647-107cac9f43de} + {5c3aeb16-5304-4a52-a89f-d29d3450a4c1} - {14897198-531e-4e1c-8df3-b27205b0b065} + {756f7c24-78ce-4199-a74c-7ccec74714bf} - {0f136d00-5972-4d1d-8095-d8f3033d8277} + {47e18918-afd9-4320-b9b6-d8a96653ba15} - {86d8624c-397a-4b93-84e1-b8452f870316} + {2c1c54be-16b8-4e90-83d6-72d59569e37f} + + + {b127c8b0-a578-4c9d-9651-c284c11e230a} + + + {6dcb3aed-28ad-4d57-80fe-5138ad65ea32} + + + {d1562935-b6a6-455e-8f20-30a660fc0740} @@ -81,6 +90,12 @@ HTTPSClient\Header Files + + WebSocket\Header Files + + + WebSocket\Header Files + @@ -113,5 +128,11 @@ HTTPSClient\Source Files + + WebSocket\Source Files + + + WebSocket\Source Files + \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj index f96f35d95..e5f3667a2 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,29 +63,29 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -136,7 +136,7 @@ true true true - + Level3 ProgramDatabase Default @@ -167,9 +167,9 @@ true true true - + Level3 - + Default @@ -196,7 +196,7 @@ true true true - + Level3 ProgramDatabase Default @@ -227,9 +227,9 @@ true true true - + Level3 - + Default @@ -256,7 +256,7 @@ true true true - + Level3 ProgramDatabase Default @@ -287,9 +287,9 @@ true true true - + Level3 - + Default @@ -304,32 +304,32 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters index 9de71608d..69c393f58 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,58 +2,64 @@ - {a500dfce-7d04-40a7-a9d1-eb549bef8ddc} + {44773732-23b4-43f4-b55a-e5decdb640a0} - {705e6bf6-c141-4466-957e-55606a0f7640} + {6aee6e7b-2314-4327-b070-fb73f16ca65d} - {43d1ad08-22ad-45fe-9470-bca20ccc7108} + {32d8a3fa-d373-404b-92ac-0c1878bb7ec0} - {3ad5e505-38d7-4279-a5aa-ed23358fca18} + {2c1e59fa-1b3e-4a23-b02b-7e9e6b5667fc} - {cee89a3b-d6c5-4321-832e-a3217bd823ac} + {ad20482d-62be-40a6-88c0-373ccb274c57} - {bdea739f-8353-4bd1-8408-abf8e26602b7} + {541217c5-1f95-4300-9139-75cd37a340e0} - {31c0623a-f6da-4a13-8f6c-d81ccd608933} + {c18a9ffd-d00f-4754-bc1d-eb8349e91c3a} - {9583c60a-df14-4654-be3e-2db889e6b7ca} + {d8ff54f8-4158-4166-b904-6c695fa625a7} - {0704de17-97a6-45cb-8508-3f11f4d411ee} + {0ab11195-124d-4fca-8b6a-d4424abdfa1a} - {2a29830e-fdfa-4685-b17e-347455804e16} + {a31b7417-44d7-40ff-bd8e-82c3fb395f12} - {61078e2a-5974-4630-b54b-12fcc8880fa7} + {7506a916-1942-4ac3-ab7c-2085bc785356} - {7b3e28ed-41f3-418b-846d-326af57e6822} + {5e957856-f917-419b-93a5-d9c0a5504fbb} - {896ba42e-a7c8-4077-9bbc-c4d0f7104f49} + {53b0dde9-6ae2-4dbd-ae89-ec43cf454c61} - {7b69d0c1-921b-41be-bbe4-247f60741ca7} + {ed61d67b-3420-4573-9e1e-30a6ab249110} - {cbaadc65-164a-4828-86ab-88bd0486f2a3} + {9ff24373-9978-46e7-a230-598c8e5abd90} - {1abfad23-5c95-4fe7-9f0f-2cf1c5cd25d2} + {9cf3dcb0-c700-41ec-92e4-e52798092434} - {363ebde9-9367-44b7-aa1b-dcb421bb759c} + {03220a7e-48c6-4099-bedd-c3361fdea99c} - {14c12fc4-d7e0-4311-a59e-f499f1993c3b} + {f1765064-b4a3-498f-89b7-d00dc92fb289} + + + {bef422c1-d194-4e8a-9fec-a351101e40b5} + + + {3c0537bb-ce7f-412a-8ea0-fa6e41dca7a4} @@ -85,10 +91,10 @@ HTTPSClient\Header Files - WebSocket + WebSocket\Header Files - WebSocket + WebSocket\Header Files @@ -123,10 +129,10 @@ HTTPSClient\Source Files - WebSocket + WebSocket\Source Files - WebSocket + WebSocket\Source Files \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj index 3d24283dc..694f267f0 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -313,8 +313,8 @@ - - + + @@ -327,8 +327,8 @@ - - + + diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters index 0f0d51ac2..c7d2855ff 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,55 +2,64 @@ - {d3b9d276-2d80-46b4-ba79-594dcae6e5f2} + {df74e993-995f-4021-a784-d92f6064e458} - {e05ff7c0-2d7a-4c1d-a3ec-384c94d244a8} + {f9cfbc16-b00a-42af-b867-76e439956fe5} - {a26feb44-8984-4d9c-84e1-79da4c0a0f6d} + {72d869e3-41f3-4d15-b077-222390a00ce7} - {426172b0-140d-4f95-933c-5f094e663046} + {b3732c0d-f9df-4267-95ae-16ad93defae5} - {84f0e7e6-0584-4942-970f-16458df9e51f} + {95300a20-1e3a-49ca-a355-695474cce90a} - {f2eb70ad-ded8-4a3b-a55c-c8b0eba44aab} + {72ab8b69-13e8-4de5-8ff0-6725bf889e02} - {c34ba3db-a785-4057-8dd6-9fbe0d2d8556} + {d7eacb6b-7dd3-402f-87da-dbc18d18300c} - {fbef26eb-bd88-42e0-9f5c-d2a7b0f9fd45} + {dc5b49bb-a2fe-42d3-8243-8d370b74df9a} - {3b9680e8-df0e-4049-ae7a-3c68a00cabd7} + {f80496d8-5e08-4567-97c8-086450b06889} - {fdd9c816-9621-4075-9003-5d9eb21846f8} + {3ad23fee-0b61-4265-996a-d646305ddca8} - {860c9d2d-10b1-4437-a418-6f1ce65e6fb5} + {028da373-403d-4b44-8970-c1ec7966fa36} - {4d7ad8a4-f19f-4d61-a87f-7370dc4b59c0} + {1d1537c7-69ad-40c3-b8a9-5b0f2c817e6d} - {b819af7f-b9ee-4dc5-b48b-85873b979dc7} + {3a194810-0367-4a29-8198-e2f91977413f} - {c966a1e5-f3e2-482b-a12a-07fa212e3f92} + {c81f6182-08d9-4093-bb98-ef20b0166dfe} - {787a872e-d519-444e-aa48-9d546708308c} + {2f3bc8f1-57af-4039-9f2e-9839a2f13395} - {d0965b44-681d-463a-b1a4-51f47331a4ec} + {e7ac4670-ad50-4dd7-bd60-6153d0ccab8c} - {3ad1139c-1164-44cc-914e-75d2efa46369} + {975033d3-bace-4895-89fb-4adb4a0a428a} + + + {fda5618e-9d85-463d-a8d3-907f367d080c} + + + {914feb69-9536-494e-b993-1351af35530a} + + + {66316bc5-88a8-4db6-97af-9077523fd851} @@ -81,6 +90,12 @@ HTTPSClient\Header Files + + WebSocket\Header Files + + + WebSocket\Header Files + @@ -113,5 +128,11 @@ HTTPSClient\Source Files + + WebSocket\Source Files + + + WebSocket\Source Files + \ No newline at end of file diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs90.vcproj b/NetSSL_Win/testsuite/TestSuite_x64_vs90.vcproj index 1698914ec..373c977ed 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs90.vcproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs100.vcxproj.filters b/PDF/testsuite/TestSuite_vs100.vcxproj.filters index 86860980e..5b012922e 100644 --- a/PDF/testsuite/TestSuite_vs100.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {49a9bd2a-4e89-4d3a-bcc0-276ebf31247a} + {59e5e3d2-1339-48fb-a2fa-dc51fca7fa66} - {257d9746-e0a4-4e32-a587-f742bda871e3} + {990b93b8-b7df-499c-8ba8-72b9ab992298} - {2bbd101a-8501-4d7a-910c-18f727e8c48d} + {bb034715-043a-4747-b792-862fef68f7df} - {69fdcef9-7a98-4ac1-ae53-d63203dfc995} + {269f029e-3027-40f7-9234-30d1c5539a94} - {f1640134-9179-44d0-b474-a8aa899af807} + {ff48714c-8110-4822-a117-11b5ae64cbbf} - {6d886c11-dcbd-417f-82d0-2d300deeb7a4} + {df958a54-0fa8-44f2-aba3-2f568a8ffdcf} - {7b86f987-4639-46e7-b2f0-63113f0860bf} + {b5bc4a15-55ba-4c29-aa8c-5d5f1dd3abac} - {573b1e7e-da88-48d8-ba2c-b165d1391a6a} + {faa12540-ff34-499d-b1ed-fe61f749d95f} diff --git a/PDF/testsuite/TestSuite_vs110.vcxproj b/PDF/testsuite/TestSuite_vs110.vcxproj index c7cc8cf8a..cf524071c 100644 --- a/PDF/testsuite/TestSuite_vs110.vcxproj +++ b/PDF/testsuite/TestSuite_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs110.vcxproj.filters b/PDF/testsuite/TestSuite_vs110.vcxproj.filters index d7522d6d8..4dc0b99d6 100644 --- a/PDF/testsuite/TestSuite_vs110.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {d3d35baf-8328-4b0c-b24b-56e4b98785e7} + {ec13cc45-0089-4bdc-a414-d9569968bc9b} - {12db0ffb-c1ab-46d8-a23d-fb2dc5d99e11} + {e5c3db67-bd57-4db5-9e7d-9759635803b2} - {858e30f9-4d9b-4fac-bcc5-1bb28aa95e00} + {1a83f2da-e76a-4d92-a58e-75a63ebe6608} - {b58998e7-569d-4add-afac-81cfaf450feb} + {9e3df5da-f2ef-4ce0-a0b6-3abe870afe14} - {7d1a53b7-94f7-4990-9b11-a2f62c68c10a} + {ebd4e1ce-4a3f-4751-9125-17e8587f6166} - {f2fa1203-a1ed-4d8e-91c9-d0d2c06c689b} + {c6ec738d-f13b-4b95-9ff4-4ba8f8037d26} - {5c5f1eaa-c181-4bde-90b7-bab1a1b5421a} + {e22734f8-e13a-4b18-9aa2-9588b537239f} - {6e61c3b8-d984-4f3f-b00a-ebe272c1ba10} + {2107d970-f5ea-4e8f-843d-43a39355b232} diff --git a/PDF/testsuite/TestSuite_vs120.vcxproj b/PDF/testsuite/TestSuite_vs120.vcxproj index b26d7762e..237b1df9d 100644 --- a/PDF/testsuite/TestSuite_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -308,9 +308,9 @@ - + diff --git a/PDF/testsuite/TestSuite_vs120.vcxproj.filters b/PDF/testsuite/TestSuite_vs120.vcxproj.filters index 691e9ba9c..a58f3256b 100644 --- a/PDF/testsuite/TestSuite_vs120.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {758c451b-d9f9-496a-ab4a-cdf453d7da29} + {d0a80e63-8246-42f4-b8bd-e58798e58b9e} - {310c4d2d-f088-4a75-b386-5fc986e2482b} + {4d1b1339-8704-4654-a2ec-b233e4a0ae0d} - {ae1f152f-f935-45c9-8d75-580ca06e8035} + {f7daad5d-4ebb-49e6-ac0c-d58f833e4b7d} - {a07977f7-0426-4498-8810-22e9a75ded6d} + {131fdaaa-6b84-4d77-92de-c1abbd024380} - {b610aa71-ea1b-4969-87fd-696c03f82ec7} + {5d5ee464-72e1-428e-8865-84f39465cc23} - {e5be0694-a5cc-41c3-bb4a-ee095f074c50} + {0f082eb6-2958-4f89-9834-7610a26349c4} - {9b396169-abe1-44e3-9242-31d137d1e98d} + {2f8cf794-8716-4863-9e07-6a1df65b00df} - {1c86a1c7-ce2b-4989-a25d-b8eb9d7f0efb} + {125a12e2-6c7e-403b-9ceb-9d463262c8aa} diff --git a/PDF/testsuite/TestSuite_vs140.vcxproj b/PDF/testsuite/TestSuite_vs140.vcxproj index e855fcaf6..35718961d 100644 --- a/PDF/testsuite/TestSuite_vs140.vcxproj +++ b/PDF/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs140.vcxproj.filters b/PDF/testsuite/TestSuite_vs140.vcxproj.filters index 32371eae3..9942bca40 100644 --- a/PDF/testsuite/TestSuite_vs140.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {e6831399-c7a7-4aad-af84-ebd8448399d6} + {25224422-bc70-4739-b840-3e08a99ec929} - {4d96e3d8-1c55-430c-9387-be1254cac458} + {e22606c8-c256-4d05-9968-d184c3399837} - {6dd95ae9-50e3-414d-99ac-3aeb3bd00fe2} + {1b7784a8-92b7-4ce7-b3c7-cef91500ae09} - {5e3f2346-5cc9-4390-86c7-b53685ac0439} + {138815ba-9e02-43f5-8843-1acf933ed81a} - {ea79e422-e2f6-4807-adcc-0688c3806bfa} + {bd0629a8-9245-4be4-8f90-ad22ffdb180f} - {78b72507-360b-4ffa-b620-fc7d9b7a11e7} + {e7e8908b-8c3b-4aa7-a4cf-84f183606941} - {d4e28b4a-ac5b-4203-9ea1-60f5525a25da} + {ee919c41-6966-4205-a6e2-1b5e31023006} - {695d75b3-56e8-4634-83f0-fd4c997cdd61} + {af3de670-5332-47d0-bbab-ed080d716ef4} diff --git a/PDF/testsuite/TestSuite_vs90.vcproj b/PDF/testsuite/TestSuite_vs90.vcproj index 8bd5d3a54..bf4186327 100644 --- a/PDF/testsuite/TestSuite_vs90.vcproj +++ b/PDF/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters index 499378042..8f8e6d3e7 100644 --- a/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {9bdc07f0-b1f7-4425-af8c-b632379cf1b3} + {8f03087a-ebe7-402e-8ffe-edb4157a3ced} - {776a15bc-a92f-4dc1-af9d-61c36ad5baa1} + {ed5d91cc-bed0-46df-ae97-b00907fe313b} - {39bea03e-f0ae-4283-8722-39bb3bd257c5} + {d8d9922d-5bc7-4219-a9e3-a5568734c551} - {c2802269-ad2e-4826-b03a-ea4a06681936} + {033969fb-c354-4b08-9dea-85a7bcd2425d} - {7402d42e-d2e2-4bab-bedf-dd7cad0e7a6a} + {6c4ee24f-1883-43bc-ac7d-e62cf5548083} - {63196a2f-c991-4135-afa4-4fd8de47d26c} + {2a9b2ed6-2533-4713-a261-eb303bfca2f6} - {40a52a2d-ca8d-46d8-a460-5a0567ee4661} + {3d0e0f80-e300-4515-904c-7ff8709e61b8} - {2977c569-3b24-41dd-8620-645c8f4a06f9} + {e7555743-67d9-49b6-b314-9f20b94ab5d1} diff --git a/PDF/testsuite/TestSuite_x64_vs110.vcxproj b/PDF/testsuite/TestSuite_x64_vs110.vcxproj index 15fe313dc..a7c15b4b3 100644 --- a/PDF/testsuite/TestSuite_x64_vs110.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters index 52c256482..14647f850 100644 --- a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {c25c7399-bc8b-4e7e-af75-a7a068ad654c} + {6e7de482-e22a-4697-91b0-74a1567c5f7b} - {addd9a0e-5810-437b-9d4f-c2575c3d3e64} + {9d4a8eea-5c26-4bfd-b5b3-9cdf1501bd11} - {805cd2c4-d2e5-4d4f-8047-fea45812028e} + {c0d911e9-6c7b-4f73-bf56-6c3dceddeb8c} - {feda6b86-d0a2-4637-b25d-bd7c1d5b9256} + {81034b3e-7139-4d49-95df-6c401ebf1918} - {33c143d9-9406-46eb-911f-6108929bd559} + {924557fa-90d4-4046-a344-dc3d06c59247} - {e07bdf67-1232-451d-b707-0924ca4f30b1} + {4110d3be-1c7f-44c0-b5b5-9a06ed90fa67} - {6f4dd1e2-8e7c-4d43-b405-22891087ae06} + {50b5defc-b908-4be8-a57d-0ccde2de54f5} - {ffa2b594-0648-4fd9-953b-b3e71a7dc6f7} + {1a1ef2e4-eeb1-48cf-8f5b-cd011637e456} diff --git a/PDF/testsuite/TestSuite_x64_vs120.vcxproj b/PDF/testsuite/TestSuite_x64_vs120.vcxproj index 85cc48da9..c0bde0f13 100644 --- a/PDF/testsuite/TestSuite_x64_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -308,9 +308,9 @@ - + diff --git a/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters index c7afda5e9..e88d6f21e 100644 --- a/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {2adf5837-cc97-4948-8be6-0889cf048456} + {912aeb72-d048-4f81-8a8c-7fa30ebb7882} - {7048f430-3f93-4496-b09e-9cb2015f6ec8} + {b2014557-acff-44a4-bb06-9aaf3dc8469a} - {06692aff-db86-4e16-805b-19fa05931012} + {8484a9a3-580e-4c35-904d-f7aa5fb04e1a} - {c2f127ec-405d-4abd-9721-6301aaf8459c} + {67a7c741-7fce-486f-99a4-cb342ac7a7a9} - {2931e21a-3f1e-4a31-afdc-3d78524bc12d} + {baecd127-a563-4dce-8c34-e2d1daff43b5} - {ddab0a95-33e0-4ae7-a59d-4f7dadebd999} + {2c671578-6f93-4f91-a571-1c511784622b} - {5af9021a-cc89-44ee-895e-845ce2854c1e} + {dc4d76e9-d429-4dd8-98e9-da89e888ac40} - {de3428f6-49cd-4d71-bd02-501daff83bdf} + {152bb8d3-6924-4f52-9192-dcddd50bc9a1} diff --git a/PDF/testsuite/TestSuite_x64_vs140.vcxproj b/PDF/testsuite/TestSuite_x64_vs140.vcxproj index 21581cf88..aa964aa2a 100644 --- a/PDF/testsuite/TestSuite_x64_vs140.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters index 24864ee32..a56964be3 100644 --- a/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {3805f8f0-37aa-4803-9f91-7b5776aa3429} + {46aeef0c-236d-4b80-b19a-6d95d6018adf} - {ded2f8a1-27e9-4889-9658-64f39be10219} + {0ee1a14c-e5b4-42ef-a22a-94bc7e084a8f} - {eac24d6d-22de-4b41-92b6-c47b65bb0ff5} + {062ef8fd-0428-43cd-92dd-1305cec8efaa} - {1432e3cd-2171-4fe9-92da-dc64ba584e8e} + {c763312c-d2e8-4d01-9db2-5cfacc7e323e} - {952d9617-5745-4fbc-b5ab-8eecdcdbd6a9} + {205c9a02-4115-460d-9af3-1ec93d338655} - {fb3b8980-ca34-4739-a3a0-2aa6c57ffd6c} + {b9ddae48-eca1-47db-b62c-f2728e4720d9} - {60bdbd91-a2f1-4382-835b-c71f914177dd} + {516d20f3-9515-4715-aaad-d142294945af} - {43158c85-5e3f-4de1-bd70-197a140edfd3} + {b601a474-682a-40e0-849f-602bbbdac6e2} diff --git a/PDF/testsuite/TestSuite_x64_vs90.vcproj b/PDF/testsuite/TestSuite_x64_vs90.vcproj index 81d5a7201..5881a6f69 100644 --- a/PDF/testsuite/TestSuite_x64_vs90.vcproj +++ b/PDF/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> + Keyword="Win32Proj"> + Name="x64"/> - - + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> - - + + Name="Source Files"> - + RelativePath=".\src\Array.cpp"/> - + RelativePath=".\src\AsyncReader.cpp"/> - + RelativePath=".\src\Client.cpp"/> - + RelativePath=".\src\Command.cpp"/> - + RelativePath=".\src\Error.cpp"/> - + RelativePath=".\src\Exception.cpp"/> - + RelativePath=".\src\RedisEventArgs.cpp"/> - + RelativePath=".\src\RedisStream.cpp"/> - + RelativePath=".\src\Type.cpp"/> + Name="Header Files"> - + RelativePath=".\include\Poco\Redis\Array.h"/> - + RelativePath=".\include\Poco\Redis\AsyncReader.h"/> - + RelativePath=".\include\Poco\Redis\Client.h"/> - + RelativePath=".\include\Poco\Redis\Command.h"/> - + RelativePath=".\include\Poco\Redis\Error.h"/> - + RelativePath=".\include\Poco\Redis\Exception.h"/> - + RelativePath=".\include\Poco\Redis\PoolableConnectionFactory.h"/> - + RelativePath=".\include\Poco\Redis\Redis.h"/> - + RelativePath=".\include\Poco\Redis\RedisEventArgs.cpp"/> - + RelativePath=".\include\Poco\Redis\RedisStream.h"/> - + RelativePath=".\include\Poco\Redis\Type.h"/> - - + diff --git a/Redis/testsuite/TestSuite.progen b/Redis/testsuite/TestSuite.progen index d55b05017..feb5c6909 100644 --- a/Redis/testsuite/TestSuite.progen +++ b/Redis/testsuite/TestSuite.progen @@ -5,5 +5,5 @@ vc.project.type = testsuite vc.project.pocobase = ..\\.. vc.project.platforms = Win32, x64 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = TestSuite_vs90.vcproj +vc.project.prototype = TestSuite_x64_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Net\\include diff --git a/Redis/testsuite/TestSuite_x64_vs90.vcproj b/Redis/testsuite/TestSuite_x64_vs90.vcproj index 8cc28cca7..be12df3f2 100644 --- a/Redis/testsuite/TestSuite_x64_vs90.vcproj +++ b/Redis/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - TestSuite - {E40E738C-447B-40F4-A878-EBA9A2459270} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - @@ -333,6 +27,29 @@ + + TestSuite + {E40E738C-447B-40F4-A878-EBA9A2459270} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + diff --git a/Util/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Util/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 623d36ed5..82f866ec6 100644 --- a/Util/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {225bc4c5-5068-4893-afed-8f2e53792a52} + {bfa3ceae-4db7-4ecc-b509-04209e0c179a} - {855f6bf9-05fe-4cd0-90d3-1f5ea4c85c35} + {a1eb14f5-3b3a-419c-80e2-313110aba27e} - {182df967-a37c-456a-a0a5-22f8704857df} + {8521b0d2-4a78-4957-bd6c-9d28f8ec98aa} - {615123ca-4fa8-41fa-8269-f6f16df99269} + {339feda8-b1c1-4688-a98b-3c07fb374c3c} - {d43e59fd-2ab1-4771-9050-de4779a38d36} + {f61cd50e-3f4c-4d59-93d3-e2ea23884408} - {9115454e-d43c-43e8-92e5-2704efa43b86} + {5ce2ac44-adc6-41bc-b39d-beceb4074e81} - {62fb58a2-3711-46f8-a750-63950323f55a} + {fb3a1d21-ac20-4526-930a-fa2e0af393bb} - {48fa37bb-e49a-438d-be36-bc4481f3ca7e} + {a9fcb0c3-38fe-4352-a3b6-e0ff091e5cd6} - {c53d6710-a977-42e4-bf99-260ad7b0023a} + {6c693cd0-4d12-45a2-9e84-a76994b719c6} - {90f2446e-4224-4802-bf9b-36adf5119153} + {a2a31c43-c7dd-48e7-8822-6642ef4ee191} - {6d2787af-85e0-4aef-875e-c5b4e9db9ae4} + {cdd1bf5d-079e-4375-ad63-716928ba63b0} - {465efe87-0c2b-487d-8fc2-15dd2b00cb63} + {f28d99f0-3356-4c0f-81d6-9d4c935d8726} - {fa12f8d1-4069-4483-bf1e-1d0b5797361b} + {680affe2-0fbd-4bd5-8e59-4e5770211d70} - {a3929791-9426-4926-ada5-22a4cf4a03be} + {bd4b6374-ddcd-4089-bf67-e0f46333bcbf} - {c4ebab2c-9e76-4dde-b82a-483b7eeaee4c} + {46b31642-a44e-4bd1-8317-4a8df2d3881d} - {56058614-9837-42d9-acfe-90cd8f8d7834} + {81543c21-3fce-4cac-8743-b8c7cffa6c9b} - {4212b7ff-035e-4c38-b24f-367cd278e6d8} + {5b7bf624-effc-4e3c-acf4-7d8e6d716784} - {9531cf07-47c3-4264-bf03-173f70b5d7e0} + {ac4f5607-728c-4ebf-b609-d19f5d73f189} - {8c4b61fe-80c9-4761-877a-f17f8b89a043} + {335b5a0c-3174-4fa5-9f13-1b261b8ee89d} - {25058b3b-53b9-4ece-acb7-e9fb36cffafb} + {628c74e7-0726-4593-82c9-cf9b5b2d93aa} diff --git a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj index 17b40cbff..fb632fb00 100644 --- a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -1,30 +1,31 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + + + + + + + + + + + + + + + + + + + + + + TestSuite @@ -36,59 +37,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -96,270 +49,34 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + + + - - - - - - - + + diff --git a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 5ea13154a..f0e2cf696 100644 --- a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {e879b64b-7005-44ef-b061-3d064189e85a} + {b6a37a46-7f26-483e-b0a5-16531560edc9} - {4040b191-e57a-4a87-92ee-f61943d26b07} + {13f7eefa-dd4e-4b8f-a5e0-ff1ea7a1186f} - {142b0f44-db2f-47b1-ac95-70478e1c7fa8} + {d7861775-3755-4f4f-bda1-8a82c7ede428} - {f6de8dbf-c93e-49e8-944d-c7c8fd929fbd} + {9bf12c0e-d084-4902-b428-6e0a40b3b69c} - {80d6d9a3-eabe-4565-a473-bc4475976fd1} + {9ab5b63f-1f1e-4dc2-b82d-1a11c1f4aab0} - {0205f006-33df-4ce2-b756-e54d06919ed7} + {a46abc97-7d1b-4ed9-9029-e2baa9ee4d7f} - {3cbca846-af31-4a66-abcb-9683aa8a317a} + {4744755f-b83c-4028-a2f4-f5fd0769e278} - {f783aed5-80f3-420f-8637-1e7e2c74bdde} + {2d5e8b42-7034-437f-9002-e50ecf7357c9} - {e937c220-71ba-43c0-9b48-5d2d03c5c36b} + {9f8768c7-2851-4063-8df1-b52498a06e25} - {aebd4d70-2060-4ff7-b0e7-3753efe626e1} + {dbf39555-ee18-4ae6-88fa-504d5406cf63} - {bb9c3aca-dffd-4edc-80dd-f05e05eac588} + {4aaa8698-12ed-4100-b5e8-4fdf87d1fadf} - {783a2211-76c7-429d-a361-7673663134b1} + {f52512c8-1d5f-45ac-aef6-2550d342865b} - {0b41c32c-0783-4424-87cb-4477a6cc9d44} + {4f6304da-1105-4e8d-aff5-cd06e06467d8} - {c9ae25d2-685c-465f-b3df-d35859b64a5c} + {beb1301d-0ae9-4733-ae39-ec5297a6477e} - {8e39bff3-2d7f-4272-bb04-62d9670c93fb} + {a55fce28-1751-46a7-aaca-87055bd09bfc} - {156e5bd0-3896-475b-a7ea-1e11474d264f} + {82f19423-95bf-4872-9d93-2763fede2db5} - {851cfb74-f388-4066-9082-ae0d7fce2c9e} + {e7f2dc6b-cb69-4291-b4b9-4502f0d8fd4b} - {f24504f4-13ad-499f-82fe-75aea3879206} + {eaa3014d-3dad-4423-958a-4d35fffb5ee4} - {eff62da1-1b7c-4c87-8404-afd1b12dd571} + {b5d99e05-4c15-419f-9944-9cd16f139fc1} - {62532a90-a280-4d49-9a6d-6dd2f3ee8820} + {e50e29ed-a296-4d72-822b-abc277f56d32} diff --git a/Util/testsuite/TestSuite_vs100.vcxproj b/Util/testsuite/TestSuite_vs100.vcxproj index 88c761325..062717960 100644 --- a/Util/testsuite/TestSuite_vs100.vcxproj +++ b/Util/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs100.vcxproj.filters b/Util/testsuite/TestSuite_vs100.vcxproj.filters index 57bb445a0..0e6326efa 100644 --- a/Util/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {d22574c0-6a22-4190-bc96-9b3186dd454e} + {17c6c0f8-6bd6-4119-95b2-ff6c2e4abfb4} - {e2e0a0eb-fe51-453a-96e4-d7c0fae16247} + {54f054b5-abb3-47cf-962f-2e9e693028a4} - {1bfd9580-1040-45d7-ae3f-65e38cbd847d} + {34698e18-3edd-410b-b313-ec8d7ad073e7} - {360d2e2f-221a-4c0e-b39e-6330ef10f643} + {eea0beb3-6a70-4c10-8211-100443bd5135} - {c9af359c-4ccb-4468-a63f-583d96e15fc9} + {7b93d872-cd76-4302-ad26-5b547253a9ba} - {89348770-e4c5-41fc-8f96-a34c976a8722} + {d491f961-33e9-4ea3-bcfc-0592a04658c8} - {7bb988e3-c802-4878-8a6b-1010945ca298} + {f35f6d8f-0460-4bbe-867e-041f4df01ae8} - {64c61632-8175-4860-b899-2fae8b1c0ef3} + {4d6b7b6e-a7d9-426a-a070-655c1cb269bf} - {abf011e6-ed72-4791-a0c1-b51427a3541b} + {bbdf8612-e849-417e-84a4-8ec6c77abcd1} - {bde50b37-7f7a-4cd5-8931-4f04acf46bfd} + {d6ea052c-274e-42d4-bb2a-ae9073d6928a} - {982514fe-b839-4ab5-bc6b-eebeff947df3} + {558b2e55-5672-46d6-b440-28e3434ce52e} - {1f340211-38aa-4b89-9815-72c164ee42e2} + {c48a7474-930e-4860-85e0-7ab87688e84e} - {4a6f6c8b-6825-48fa-a953-34e0d2eef73c} + {dca98b55-f556-4bc4-aa91-f8a1361f68ce} - {8e1fd5be-698d-4734-9d35-8fabd6852a88} + {5bdd4b08-9cca-4479-aab4-afcbd7bc160a} - {4fe1b260-f9d8-43c1-b724-a452e720fc4f} + {2c0a08ff-b44b-4b5a-91f5-60ee6aa973df} - {29d26dcb-8c55-4ed1-8da1-4cba690827db} + {58d98381-20a9-46ef-87d0-970af5ece4fe} - {e6bd4696-1092-4feb-b13e-a07891f1bdb7} + {27b69075-8468-4f58-8571-f4debd13017c} - {6ef44004-f8bc-4d83-bc19-76b9b05828f1} + {9c76c53b-1f31-4fe1-9687-8211076b587c} - {c1b1a3af-316b-4272-920d-683c7ebc2e09} + {eecbf4aa-2ddd-46e1-8a71-23089bd780b4} - {b72e2ad5-6674-4d0e-b407-dd99473114fb} + {db0bd26f-e9df-4012-95f3-6710df4096e3} diff --git a/Util/testsuite/TestSuite_vs110.vcxproj b/Util/testsuite/TestSuite_vs110.vcxproj index 38d8d074c..41e09c456 100644 --- a/Util/testsuite/TestSuite_vs110.vcxproj +++ b/Util/testsuite/TestSuite_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs110.vcxproj.filters b/Util/testsuite/TestSuite_vs110.vcxproj.filters index 0af45388b..429d8de7a 100644 --- a/Util/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {213926d5-0eab-4d5a-868e-1ef267ebc49a} + {f427b437-180b-4bc6-843b-36f4c2747bfe} - {2a900853-6a03-483f-a8eb-2d3f08f5a046} + {2e9ae9d6-bea0-4173-8629-0b4e087347e2} - {0f42a45f-98fc-4756-82c9-8e293b66fce1} + {05fd2092-b609-4a1e-a55f-96387a666077} - {a0c25c71-631f-41d8-8a45-1ca048961385} + {eba8d097-e648-4d59-b03b-f165306d0893} - {9f56eb80-18ac-4fd7-b7a2-2edf5213c5ba} + {8ff21ae3-be18-4747-bcb7-7235cfb92cf7} - {3dd67203-212e-4a64-b8e3-0074189c0391} + {3a4bfcbf-f247-4c9e-8971-a4106a72f73a} - {44d38f3e-8672-4ccc-8450-4e867b951782} + {ba4997b5-8a44-4885-a866-0c19cc14d825} - {5d17f2f2-b608-42ad-a0cb-819c2f0fe464} + {da5934a5-eb5d-45c6-a374-ae99bd76d9fb} - {66c87b1f-93a5-4f84-95cd-961586f1d483} + {281b8b69-687b-4a8f-bee2-53985e0d36d9} - {8d758c08-fc87-4964-93f5-13a5fa37e38b} + {2a209189-5fba-42ac-b4ff-f087313045d9} - {648b3e00-a0f2-4c84-9766-f5b90877da6d} + {971a11f4-87f7-4591-88a0-24557a25ce42} - {659dd9f5-d15c-4538-a0fb-fee647a9a4e3} + {802324fe-6991-46d3-9f8c-a70e2e46d0d3} - {8c70da8f-2507-4303-84c5-bba151583aa7} + {446180e1-e8e8-46ef-bffb-e9491685eb9e} - {e89a6f51-0674-477f-b983-c4a6ea58d9b3} + {43746f91-ddca-4fbb-97f9-ac345ee23533} - {51ebff3a-0cf3-419a-98fc-9431230ea337} + {3a594a6a-624e-400e-98a2-8095687d3df0} - {7bd1512a-50e3-46e5-9314-3eb9f7dfc746} + {d9669215-6adc-4741-9ace-7dbcd1d747a9} - {ffd1bfc0-3940-4f57-a6a3-0250abf66cd4} + {62a14302-2f7a-43d2-8a66-81792ad4f176} - {9fe59c04-3857-437e-9391-d8d65c2684b7} + {a23602db-21aa-4069-a3b0-dfd1c9d40bfb} - {b7d40779-5503-479f-b38c-6254bbcec233} + {b02b47ed-5f03-4da6-a056-a84727602a46} - {37ff8585-cbc4-4bf8-8515-f7a83731cdb0} + {8771ac1f-334e-4a1a-8e58-f97ab7f1d870} diff --git a/Util/testsuite/TestSuite_vs120.vcxproj b/Util/testsuite/TestSuite_vs120.vcxproj index 9bab91003..d12323a91 100644 --- a/Util/testsuite/TestSuite_vs120.vcxproj +++ b/Util/testsuite/TestSuite_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -304,59 +304,59 @@ + - + + + + - - - - - - + + + + - - + + + + - - - - - - + + diff --git a/Util/testsuite/TestSuite_vs120.vcxproj.filters b/Util/testsuite/TestSuite_vs120.vcxproj.filters index fd63dbf39..9e612972e 100644 --- a/Util/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {bdfc520d-1272-4040-9dcd-ad2040caef0d} + {335afec8-8aba-45a7-832d-f2fc1bff509a} - {3c77adce-a018-49ac-89c3-45af34dc2133} + {52ff15e2-c38b-4c90-a46a-e4eefcae7979} - {22012354-5c61-438b-8214-cff3681ccfbb} + {9a22e7a4-0a18-41ff-8bb1-89f339768bc4} - {7ce6c6c1-044c-42f5-8726-106fedbab0e0} + {86d6adcc-ebb9-4dd0-a5d2-7778beb787ff} - {0eb78cbd-8a06-4cc5-b5a0-0246ff7abc00} + {b268fee9-40dc-4d23-9f14-25a321b1b25a} - {fe690e75-c7a5-4249-aec8-d4a49a78797a} + {9dbeb53b-df4f-4c43-b181-97f6978cee9c} - {ac5c2752-0a6b-47d1-9ca0-72e92a8849e3} + {c962efbf-e809-49c0-b017-4bd63e6c6b83} - {e92bd11e-60ae-42c1-960f-2677105e8a4f} + {2b378f81-5daa-4dc6-ae24-3ed14095e3e0} - {c63cce66-a449-49a0-b87e-7b2f03e37ace} + {8bcc398d-aa7a-4312-9509-25ec8f2066c2} - {0fc196dc-c7d3-4c33-b2cd-dd00e99be791} + {e1912cdd-6729-44b7-bcdd-73110e30012a} - {f2f84e52-d123-451e-af8d-8d9198f801ab} + {505db863-dd58-4f1f-863b-b6d8c634f81e} - {60c54348-00f2-4d3c-ad18-b90c15e7bf10} + {4cf28c24-0fe5-4424-b1d0-c5cbe4de8dcd} - {6eafd6e2-e7c7-4e6b-8fb8-ecace9236fac} + {baf93df6-7595-4a3d-8ff7-29d4af4d283e} - {aff72109-8c96-40e4-ac8d-e4d215cf9ecb} + {d806efe3-44a8-48fc-96b3-fb26e00a1c98} - {43f86794-f0e0-4b19-927c-7f3fd44f38a1} + {0b96aae6-f052-49ed-84cd-4c9da672f0c2} - {e8c851d4-9179-433c-a545-f063689e5560} + {2ff0edfd-cfac-4f03-aec3-d645847fb5a1} - {6dd7039a-7cee-492a-a84c-3d41f326c5c0} + {f9facb7b-663f-47ee-92c3-3d713ea7dd04} - {3bb55ea1-4568-4d98-a3fc-f56e82442ed5} + {29726656-a8cf-4a2b-9e90-6fbc7e528775} - {c15080de-e082-426f-a82e-69171c3a79c7} + {feeea089-66ad-4ee6-9e78-f0e146c5720c} - {40f2b076-415b-4740-97ba-7f7c4641c439} + {9a595e38-91d9-41cd-9825-89c8e5f3dea0} diff --git a/Util/testsuite/TestSuite_vs140.vcxproj b/Util/testsuite/TestSuite_vs140.vcxproj index dccd54b38..eb5b0b359 100644 --- a/Util/testsuite/TestSuite_vs140.vcxproj +++ b/Util/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs140.vcxproj.filters b/Util/testsuite/TestSuite_vs140.vcxproj.filters index 06487a534..405a17069 100644 --- a/Util/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {be29220f-7523-4d95-a917-a3c415ce1529} + {79a6c1c5-afc3-4829-8ee2-c067b07d0ff4} - {1893eb59-050b-44d4-9502-d12db4df3f00} + {e90933bd-7779-4cbd-a4fd-ab126c349379} - {5bd38844-40fb-45d0-88b8-30f1ea05b725} + {7afba179-3199-40f6-91bb-8d385b2433b3} - {3c6dc8fd-633e-49c3-9f23-c80c1a84153d} + {9b46f13e-4ad4-4b56-9868-055c94ec9b58} - {33705ad3-2fd1-4d21-867d-e2262053a9c4} + {b18b06ca-45b2-443e-a8bd-e581e5f953b3} - {d6f66574-7eb9-402f-9549-bcc66db8f95b} + {dc1da441-617e-4981-96fc-e622e41887a3} - {be9c5cea-e30e-4a1d-8e8b-dc6047fc8e96} + {c187756c-6663-4581-821a-19561f18df4c} - {1f4eccb5-4992-4c67-91ec-dcb6229a479a} + {1cf98056-bebb-47f5-8ef5-b28f1af649ec} - {b7230318-9e8c-47be-8051-6f8a56f4bddc} + {8a2bea88-b2c0-4a06-8d2c-c654781fe70b} - {158c9e98-569e-4c7a-93d3-763b21f1d167} + {4d363b79-7b28-49bb-856a-53604c01e7ec} - {21c66330-434c-4234-8364-5ac6a7a0bb6a} + {e681a093-a1ec-447a-8226-825ac3aa6702} - {ca345ddb-ec79-4caf-a647-77318c406083} + {bba5b9e2-2fff-42de-b2ab-dbde3eb32294} - {5b4bbe68-59e6-4c67-9c20-4e2a62a449b6} + {840d97b2-ff80-44c9-b4f3-19f3f25f7dcc} - {035b38cf-fa17-4fa4-90e7-3598feb90760} + {8c33d93d-ba19-4849-bc69-1d0e4529fce0} - {8ca530f4-2ece-4d75-bb51-acc1b4fc8e91} + {02c0a1d5-e8c3-4b44-920d-a856bfe0a541} - {4e21485a-3e65-46b0-b67b-7dd665b74076} + {f8684dd1-998b-4635-8f5e-90c3fb646797} - {9ab12a45-5e02-402b-9094-1a00d938c456} + {9663d952-1008-45a3-9703-e87e72ed120e} - {bbff0b0d-6544-4ee8-ac22-c9c5ea542673} + {51fddecb-2990-40a6-b88d-c1b8a20bd2f7} - {8c9401e4-e775-45e1-8459-4c35d18d2797} + {de8a8d92-562f-4f5c-87cf-27a73bf4fc8e} - {27c706ac-beaf-4124-98f2-26eaf2df98ff} + {962c6d3a-6a27-45ae-9ea9-e46fdfe13eda} diff --git a/Util/testsuite/TestSuite_vs90.vcproj b/Util/testsuite/TestSuite_vs90.vcproj index 8b21a63f4..51e16d123 100644 --- a/Util/testsuite/TestSuite_vs90.vcproj +++ b/Util/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters index 5bab9cc55..29d5459b0 100644 --- a/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {78ea9918-cdb4-40f6-88e0-2ab9597376d2} + {cab83354-0d1e-4c65-8360-5ddc9f08d562} - {8bc00c79-a718-423e-bb0e-7e5d5ff94f1f} + {49faed96-5ab7-4d55-922f-8071680f1c91} - {ee781f82-03b3-4306-a2e4-f3bad169fbeb} + {b3517c1b-4b26-430e-a1b9-fe27cff94241} - {cb67d73e-c66f-4f06-b9d0-0d63d2565a73} + {759246cf-62f8-4a9d-85bd-a07c4bde6958} - {de0d39bb-7f54-4c78-91d7-b13f713643c0} + {c87b6c0e-39c3-4101-a813-f3f9dbf6707a} - {825a1078-ea76-447d-ab7b-795f09c3d266} + {eff1b487-d688-40ae-beb8-2c6e3512b626} - {06e87058-dc92-4426-919c-bdeed044410e} + {aabb9b15-d3f0-407c-801a-409d91bcad5d} - {a27df260-d9b2-43ab-ba8f-a2278a59fc19} + {d49c9670-b435-40ca-a7ef-5d68ea97a67f} - {c8bd6d45-1eb4-41a1-8129-d39fe1a48700} + {b74f05a6-4bde-4eb2-b943-b2ff9535842d} - {736e3b9d-8000-4a88-9c5c-454b759b83d6} + {86e73a8e-ebbf-4048-8adf-5be050419157} - {625f00ee-04ce-4842-a466-e78cf6d7a1c9} + {757d7437-bd8d-4bf4-8ed4-7b789831e481} - {04796406-005e-4fc1-9943-9a562ced4f90} + {af8ff328-b891-4bf9-b320-339b09e2b82c} - {5b3aa79e-d013-41d1-93dd-e4b3b57428f8} + {8beb531b-04a6-4561-9a1b-f2fdc3134974} - {2ee034aa-7b0b-4ffd-88f7-bc44103a5133} + {4e196f1d-2d8c-4692-8a4f-49adac2dc9c8} - {0ec27bb9-4af0-447f-a00c-af8c2cef03d6} + {597b24db-17d3-4ae6-9255-9ef13d689f4c} - {f299f073-7367-41a6-ad96-53528bce82f5} + {f4445db0-f421-4ed2-8bf7-677e280b6da1} - {7a991b65-12bd-4223-817b-26cf472c1e13} + {a01a7026-c7a9-415c-afb0-14aeb4bc18d7} - {3bf3ada2-8d1f-4015-ba1f-bb4aeb60f654} + {67c417a0-c251-4702-9a37-a43281546300} - {338b856b-6133-415f-8bc0-1e73d8a0e036} + {71e8394c-34a8-40a6-8c9a-f69d45f4ac69} - {46554289-c8e1-42ee-9d3c-b3807a3e1870} + {1e82c8a6-4c0b-47c4-998e-5bc693b33f9e} diff --git a/Util/testsuite/TestSuite_x64_vs110.vcxproj b/Util/testsuite/TestSuite_x64_vs110.vcxproj index 1735eb603..6953d4a62 100644 --- a/Util/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters index fac2bb11c..60ba0b8fc 100644 --- a/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {c8d0cb56-cb39-4495-bccd-f960fbe8ca5f} + {f90eeb3b-7991-4d06-b1bb-a92932517764} - {13a89358-4c4f-457e-89d5-a0572217156b} + {0f01c832-9b7d-48f8-8f4f-e4eda6be4028} - {8a921773-8f49-4596-9607-09977c44b418} + {34519710-d576-49c2-bf33-acc20acc6c60} - {84b1dd58-5096-41f8-aa79-9830df56d8d8} + {349eb113-b5a8-4195-8354-f9020b26629d} - {86ff356c-61a9-4437-a13d-399467cdb870} + {872f0eb0-a4dd-4b5f-9347-1a6477ad1c1b} - {b1beddc8-f890-4d68-9ea1-bd838522e1a5} + {51583bba-8f5a-4d9a-8aa6-fecece383036} - {54ca79c0-df5b-4cc5-916e-4b544da37485} + {81e370ff-76d1-4db3-8d37-30f836dd4754} - {c95b6290-6eac-42e7-ae85-291bfa97dcd0} + {fa4d0a30-4353-4aaf-924b-c7b27bc31f84} - {c43830ee-e5ca-4b8a-a389-e48d5dbe933b} + {1b9a1496-985b-4c3f-a836-580815aec626} - {bfead7b7-e350-4c10-93af-2f8c1a0ffc14} + {f0310236-6724-4acb-9d2b-55f79bfae7c6} - {1fcb8f28-973f-400a-89c5-da2093b91391} + {b9e98626-af9b-454a-8d8f-749e0efd2ac6} - {2361748c-1ab6-4205-95f2-44814c5bd6e0} + {b0518512-e8e0-41e5-b3fe-e93e1507fa2f} - {37de5a05-43dc-44fa-8519-3a10964a8709} + {feaa9ba7-f579-4d78-b5f5-4e2db1bb030d} - {3c1e0211-47a1-4e59-81e6-eedec3329cba} + {b90576c5-4d9d-4190-b966-5eb3c5c9f07a} - {c855f4db-3bb9-4f13-975d-ab47e68c2598} + {ed3e905a-68ef-4b60-9fd1-3534302726fb} - {11aff6d2-cfa1-4a85-a394-9e79c067fcc3} + {a1f203ca-0da0-4882-a32b-ea4ac3292a70} - {3d26a2b0-56b8-4309-a160-23986732c762} + {01c6b992-1cd3-412c-b662-d713a321c030} - {49adc112-22f0-4ec8-b242-bb4a2750de2d} + {f05361b3-15e2-41f2-ade0-78dc73a07f81} - {8fc53b1f-7f76-418f-8257-c829fdb849e6} + {d75bb8f6-4b67-4787-8668-3d613cff564b} - {7eee3bf0-e38f-4b2a-8b58-a4744d6d5b66} + {ec254ca8-0604-4baa-bebf-0bf212fb2c9f} diff --git a/Util/testsuite/TestSuite_x64_vs120.vcxproj b/Util/testsuite/TestSuite_x64_vs120.vcxproj index f25dd6945..31453c855 100644 --- a/Util/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -304,59 +304,59 @@ + - + + + + - - - - - - + + + + - - + + + + - - - - - - + + diff --git a/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters index 26221fb78..18830eeae 100644 --- a/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {d2a4bd06-4a72-4b30-9f3f-38e673bdbdbf} + {83983c5a-1c1c-4ee5-934b-1773636215c8} - {9e7df5bf-680a-4605-b1a0-e4c41d804e97} + {5f0fa859-c510-4154-9251-6a768e20369b} - {936a4a92-1ee7-4de6-90f5-3c28c4924871} + {ea37c974-6a02-4724-9392-cdf6d3ee4ada} - {c910213f-51b5-45ad-9d90-e1fcfbe6daf0} + {256a2dca-0f70-45f0-8855-8b262bd95644} - {ed02e154-c062-4300-9f78-8336a2acced3} + {aaa8f0a3-f47e-40f7-b6b1-96639fe8f5c3} - {c339dbef-57f5-4af4-89c8-672614f0f55d} + {7ae8fcd4-49b3-419a-87a1-a1ad9466d904} - {0f256069-e19e-4119-96f1-1d4fd6d58226} + {d621a278-dee2-4efd-ac43-db756a07db8a} - {9ed4e8d5-3f2b-4850-a26d-853fda22a155} + {4c4b035c-67cc-4d19-8fc2-3cc02060d707} - {12ef8ba6-967e-4eb7-97d0-1290eb4c4f37} + {1e5267a9-e82f-4a43-bc98-412b08148fb5} - {14b7c62e-9fda-4c69-adc5-83046fad410e} + {050fb22c-86d9-4312-aecc-5d48cce56be5} - {e5390f6f-7d11-4100-b81b-aa57a518d009} + {e69360db-436b-40e6-82ce-2d5a5bbf26b6} - {1660ca3f-8ed1-406f-8341-64f442d3c267} + {d430df06-7f10-4df9-b2de-9eafc9f83020} - {7fc0d7e3-f384-4db9-8165-95bc6d059fca} + {89d36677-8248-4320-960a-9e51ee8233b2} - {17f393b0-3198-4c11-853d-8ebcf58e543f} + {05a04b71-d2e5-4f12-b295-85538f5d8b79} - {59f9effd-e9de-42b8-a22e-44b48248fd68} + {312a7df4-1f50-4680-b0fb-2150db8210ba} - {e3fb0b0e-bb79-4cf1-8c8b-5e8c29fdd8e5} + {43bab7fa-1763-4519-9b84-4294b40ab647} - {d2e2e141-42d3-4da5-aa91-cac724affc39} + {135db426-03aa-423b-839b-b8511a957d8a} - {8e080bc1-0656-47f8-ba46-1c8a2992eae6} + {f4c6f35f-4b7b-46ac-b14d-977badb15c1f} - {5b0f2670-a589-4263-acd1-0af3c66aa961} + {36402252-318d-45fe-a204-c9cadea6f8a2} - {cbfa2563-12c5-4246-ae8b-2696fda8efb7} + {49ef8623-7d90-4909-9ccd-27e6ce98ee8b} diff --git a/Util/testsuite/TestSuite_x64_vs140.vcxproj b/Util/testsuite/TestSuite_x64_vs140.vcxproj index 6e26c3239..b9abccc7b 100644 --- a/Util/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters index 18c679584..4e782893f 100644 --- a/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {0106502b-4a7f-45f1-a056-620b17d11319} + {07fb7973-2390-4f24-913d-b37bd5c3f1db} - {d52fe374-b4e6-4347-a5e9-cba613a0bbc6} + {feb6662c-14d5-4b82-98ad-497580f8e9c3} - {6381a961-4ce9-44cf-a0a1-de2e7d1e6f7c} + {cdd90fd2-6a0d-447b-ac3e-3f8eacd806b1} - {773fb3f2-f7ee-472c-b3c3-4e684a5f8621} + {10264dff-72d1-471d-92c2-082e9d8c9393} - {14698724-8adf-47c4-853c-382e9df9068a} + {c76c9436-ac57-4f77-bf55-f48febaa6e00} - {93966e35-b4b4-4427-871b-7d44e07283f1} + {1dbb1be1-f36f-4b9e-bd93-800a2c8038ec} - {940ff165-7b60-4458-ba46-2976ee3f20cc} + {73b0bc2e-3a16-4ca6-a11d-6e232c4d3a8d} - {051c891e-abfb-4970-88c4-1aac63e422a2} + {9d73fcee-24d2-49a5-9c3b-f657b7e47255} - {69c7f9a0-7604-4139-8548-27f2e02dec4e} + {57cfa038-b454-43be-82b8-982f8b135459} - {3569f875-4ce6-45f2-8ab4-d842a7e2e52c} + {d545b8e7-4d08-4959-aa05-d3611410486d} - {d517c057-cf08-4b8f-b250-1e5dc32106b0} + {fa49c1b7-f3df-4354-8afb-ff77e9951ab4} - {56bbec44-bab1-4ccc-9f9b-acc42de80e95} + {8542a15c-dc15-4053-a793-5e318c867641} - {85cc21ae-92b8-4fee-9b2e-304c0dbe1c64} + {27b989ef-69eb-4784-bde5-4d3c8ae059fd} - {364a1ace-0e1b-49f7-8e8e-d1f8b9183b35} + {56eabeb6-53a6-4426-a683-f01a72ba809f} - {38812741-b07a-49e1-b87a-03258233383f} + {1ef87b34-8823-4f7c-a660-54602d2e10ea} - {b002f5e1-27a8-4da9-af4c-a3bd90d9acc4} + {12fec667-ce1c-4738-8d31-9ff89c89e3aa} - {0f080dc5-45eb-46bb-a2d0-8c61d12535e3} + {b27bb5f5-8565-4de4-8cfe-d5f16f85c83b} - {aa5a053c-8ee0-47c7-8236-98cb9c29a93d} + {93a1cc91-aa14-4285-915b-62cda26f34c3} - {05f12eb6-b461-4074-ac28-28d62f86937c} + {761d7fed-c7c9-4d81-9638-4a4800a36225} - {4a170686-c8f1-490e-94a2-1cff076b7fa7} + {d57f922f-4524-4f80-95b7-d8c3c3382986} diff --git a/Util/testsuite/TestSuite_x64_vs90.vcproj b/Util/testsuite/TestSuite_x64_vs90.vcproj index 76bf5ae69..dbcee40f1 100644 --- a/Util/testsuite/TestSuite_x64_vs90.vcproj +++ b/Util/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - TestSuite - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - @@ -329,6 +23,29 @@ + + TestSuite + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + diff --git a/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index f07c7cddc..83f7009df 100644 --- a/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {14993246-81b3-45d0-a5a8-f8f28bc72144} + {bea766df-cb2c-4665-8d25-142534747537} - {abbb650f-8e01-445c-83e0-834d1755c584} + {da27e750-0633-40fb-bda8-70f7b1275f61} - {cbc886fd-0051-422c-8ded-7eedb3794fd0} + {d3ef9c3d-1214-49c8-9f4d-d9425463761a} - {f440273c-e5f1-4ed7-a860-b3bedb550e58} + {c67e81f8-bb29-402e-8e4a-785eca6af934} - {af1a0506-0353-452b-adab-20d45fd7349d} + {70601f89-0641-46eb-b223-e4c779e610f5} - {9222a6e4-8a42-405a-8d7f-84b8a641fb02} + {e952ffcd-1950-4c6c-aefc-a5f9d396e0ca} - {cc634f41-c6f3-4f89-b48b-fd526323bf5f} + {45c53763-ca83-4081-814c-4c70773728f7} - {f3857835-f80d-47c3-bdf0-a1f89430a824} + {236f183a-d437-4f66-834f-ee0261d647e5} - {1e78620a-b7f1-4f73-b95e-7d0071b55b64} + {0025184e-6287-4eb9-b493-eee2142293b1} - {6b95b3c9-63e5-4290-8f82-4aa64660c60d} + {cdc3916a-ee8e-48bf-a272-ec8a1870e75c} - {1d53b669-c42d-4ca6-b1f0-874ba3a90f5e} + {62ce21a2-4a98-4228-a041-74dbd4d408f3} - {7bccd6ef-1413-486c-a980-7603a9c8a4fa} + {535b33ef-4d51-483e-af38-e9fb9daa5466} - {66bdcd09-831d-44c0-98c0-9c4554df25ed} + {baf4e5f4-ea30-47f8-abb4-269321ef729b} - {c31974b9-546e-40ad-89e5-2c8d57aa67a7} + {fbe9a46a-57f9-4e14-be4d-a1bab4f2c80b} diff --git a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj index a184909c2..5e1c9d598 100644 --- a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -1,30 +1,27 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + + + + + + + + + + + + + + + + + + TestSuite @@ -36,59 +33,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -96,262 +45,30 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - + diff --git a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 6fa110d4d..0627f83c9 100644 --- a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {8cb9d895-422a-4776-8444-d95c58aefe68} + {cfa5dadc-03a1-4495-82b5-cd03da11d6f3} - {476df276-d107-4ea0-bafe-b8c6c9e63ab5} + {252f1d7e-9436-430d-93e4-676e48397c30} - {1f8125ea-915e-4c72-8319-624565cbaffd} + {ff9f71c0-8c29-49d7-96dc-bbd8aed3152b} - {d16cb058-b766-427f-8c72-6d714f350f46} + {6743ff35-85b9-4ec1-9aea-ea0da62067bc} - {9c31f7ce-0b9e-4b82-8cc3-8691e1f7a098} + {653aee78-3340-414b-8f97-cc253a0b8348} - {8922883d-d7c8-491a-9b71-3395f36ed939} + {1d419170-a0f7-4f8b-ac99-71d38e5426eb} - {1197a3d5-6b5d-41f3-8c0f-83e29f6b546e} + {90d6f469-5469-446d-a404-c5ce191e6cb4} - {20714908-a338-49c3-9ab1-8c2004fbc7a8} + {af826f98-4dc8-406d-829e-bd2d90400d77} - {2c91e53d-22aa-4978-aaef-3f5d538a2915} + {82809bd5-d282-4f57-ac4b-c6c9a89a36e3} - {ef241032-c641-4f6c-8552-b911e81578aa} + {dd23ef30-2a72-49a7-b909-56ce58da9151} - {2842873a-0e73-4242-a8ee-8f62c48a93dd} + {7694f087-b846-4809-8439-f37559bf2489} - {a62f1517-842c-489b-b428-7da9fa944529} + {44e8412f-17c5-4bf4-8d65-569e7716af69} - {6cccecc3-755c-47c1-bb33-0116d59722c9} + {1c2bb1fe-9eb1-4801-8a75-4b39575f70c4} - {8364dc36-0dd5-4ba1-ba28-ee5acdf62c0d} + {c52bfd71-87a9-45e0-86b1-e1c2cd484e4e} diff --git a/XML/testsuite/TestSuite_vs100.vcxproj b/XML/testsuite/TestSuite_vs100.vcxproj index 85cb6f563..603c1e5b5 100644 --- a/XML/testsuite/TestSuite_vs100.vcxproj +++ b/XML/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs100.vcxproj.filters b/XML/testsuite/TestSuite_vs100.vcxproj.filters index 1256c4d41..9fdaea400 100644 --- a/XML/testsuite/TestSuite_vs100.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {ec2eb88c-1700-449f-8f6e-eb216be03640} + {faf5b72b-27f1-4a99-892f-feae94b9914b} - {dec39912-44cb-43f3-a3d1-01d8e040086b} + {bd823902-a003-46ed-b405-cb9a299719b7} - {d60502e2-58d7-4fd5-a6b6-56b40415a5c8} + {5ea257ae-1336-4cae-b03f-8f712763ac86} - {9399ed0e-48b8-40fe-8431-22da540639a0} + {69ff8b86-4ca0-4167-b0cf-c05dfdb6bb41} - {11050c4d-e490-4a8c-b0e8-d02f376ac81c} + {1c558761-dfb6-4ed5-bea3-6a0ee167c299} - {ec0988f7-17b0-437b-982f-07860a9827e9} + {cd48a8ea-9128-4c20-9fd8-8fda5a14c1e8} - {ce196639-c22c-44a8-90fa-0623e0b4c4e4} + {1bdba34d-0b57-4532-9803-9ef89669f779} - {faafea84-1544-45f9-80e6-0d9b9966dac4} + {e5a2104d-82e1-4584-ac2e-8883f6a98234} - {f56c5547-4f8e-45d7-9562-b25199d6bd7d} + {5fb5ad41-9006-4a31-8a39-b3753db283aa} - {5c6b2cde-333f-4148-bfb1-87353ad5a809} + {ebb9aefb-6f96-42bf-ab44-4f9efa1bc470} - {56286c53-dc19-48a1-bab9-88525b93baaf} + {0e4161bd-b729-4fa4-ae18-97f3325d6132} - {6aef83e8-5a0c-4823-afc3-36b73dffe291} + {876f902b-056c-4b1c-b300-d72801aefb45} - {26215b04-7cba-42bb-9320-e7ecf9744f4c} + {ea8c44f9-ea40-49b5-b8dd-7131e1e047f7} - {1bbe57dd-5f62-4fa7-9e2b-0b9c3d4de956} + {276f6715-ed6b-490a-b2a6-6b9c54cd514c} diff --git a/XML/testsuite/TestSuite_vs110.vcxproj b/XML/testsuite/TestSuite_vs110.vcxproj index 46258cef1..e98adf8d0 100644 --- a/XML/testsuite/TestSuite_vs110.vcxproj +++ b/XML/testsuite/TestSuite_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs110.vcxproj.filters b/XML/testsuite/TestSuite_vs110.vcxproj.filters index 94e325c4a..34e29d50b 100644 --- a/XML/testsuite/TestSuite_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {43bbfc68-bfe4-4bf7-a083-2a9c6c32e91c} + {2f455acd-674a-4beb-8e9b-5fd71e7b085d} - {15578e68-0dcb-4833-b9b9-503aa0abd4ab} + {f2e923ae-9baa-42ce-b476-223ff58dee2d} - {02c4bee6-0ac5-493d-8bd1-4a91a1508c19} + {8aca5c04-0b5d-4219-93ef-dc075f821340} - {61d2c8b5-7fd4-4dbb-8b82-9d6214915fa2} + {de3bc518-d4d1-4b7b-8cc1-1e36740eb135} - {77391364-028f-418a-8b62-2dc9ce96b77c} + {eb07ca8c-c87b-4552-bdfc-30a340213599} - {b4ac5212-5014-4a29-bc8e-33fb15ffb257} + {4b5cb8f0-45f8-44e5-a376-b71f21d0dc2c} - {1f50a48c-5e60-4898-a47f-371ad29a8121} + {84e1b29c-76f5-4a16-9b25-6957de521dd9} - {7003eabe-a384-4adb-bf95-e0119c7e0084} + {4a550140-5b31-4cc2-8221-d62c2426a756} - {9bb3489d-159a-478d-b409-de8b2c7b3f65} + {ab1cbf38-b71a-46bb-82ab-799892400d84} - {bbe2f546-3202-4d3c-8673-f13d152ff36f} + {37b05da4-03c0-44da-ae3c-5e9440848735} - {bceb424e-5b2e-4be8-91a7-5f720575500f} + {95e5d02a-6854-48d5-83e5-76a28456af2e} - {21472ddb-4d06-417b-8065-d839efc80032} + {9089f077-774a-424c-aeb4-57ccf0294da9} - {cfa29dc3-b002-4fe1-8899-5a81bff90b68} + {3058dd4b-edef-43db-8642-332c0a548155} - {a3f87eee-3f2e-49de-a202-f4db8f7d7851} + {134ffe0a-58df-4fc3-9e1c-b0a286fb628d} diff --git a/XML/testsuite/TestSuite_vs120.vcxproj b/XML/testsuite/TestSuite_vs120.vcxproj index 4437a391d..cc7ccfc78 100644 --- a/XML/testsuite/TestSuite_vs120.vcxproj +++ b/XML/testsuite/TestSuite_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -304,51 +304,51 @@ + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + diff --git a/XML/testsuite/TestSuite_vs120.vcxproj.filters b/XML/testsuite/TestSuite_vs120.vcxproj.filters index 6126d51e4..98a2a0ef8 100644 --- a/XML/testsuite/TestSuite_vs120.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {7177f691-34cf-4ca3-a2be-29fd8fa3a7f6} + {425c278e-56ff-4501-94bb-b270fed20e6b} - {2241c1e6-310f-4467-8842-3f595ee16ca4} + {300b64fe-5eee-4c61-a905-a2879338d4a3} - {8fb3fb9a-ebe1-4b45-b419-9608613defc9} + {faaaa02b-0cc1-4747-a141-0114b356c04e} - {91446034-2101-479a-914c-5f262949fd41} + {7aa2c01c-0ea4-4a58-9247-2d149ec0249a} - {fc8a1aa9-7b4f-4157-a1e6-272a862494ee} + {9fc65d7c-72c6-4ed7-898a-96f47097b5ad} - {79166f97-ce90-43d7-88b4-8d98fc35b112} + {dcaf4ccf-9817-4bea-b1c7-f951ad757be2} - {bbf4df39-e7e8-4cb9-ad40-b4f34002e415} + {330a44e3-bbe0-46c6-b150-10ee7dac161d} - {7d68faba-2358-488d-87f2-17a6e0d161bf} + {bbc4b3b0-abd2-41d0-83e0-47da35b5a760} - {b679fbe2-d088-476f-b122-1a16120f7a0b} + {a8f4ee53-268c-4640-9dfc-4e7dc4d0ef04} - {9fc2478a-304a-4295-95e1-cfaf36cfb184} + {c3b1c4da-389d-4bb3-8a27-22a0df0eb8de} - {a163677b-b142-4864-a22a-b2bc9c670266} + {aa8e51e2-44d6-4d27-ba76-f662c6913a50} - {ab05b85f-13ec-4d0c-8de9-02c41fb9d9d1} + {4f30509d-ec50-49d2-a433-944141c6b723} - {656be10c-5a7f-486b-a307-cfb24e2cdfff} + {5c2f3201-4bdb-470b-a306-71983e912683} - {5c7f23c3-9b86-402b-8462-f3feb7276ad1} + {108413c8-18cd-4c2f-97e2-512cb42402f8} diff --git a/XML/testsuite/TestSuite_vs140.vcxproj b/XML/testsuite/TestSuite_vs140.vcxproj index 8ffe9da4f..9e4115dd8 100644 --- a/XML/testsuite/TestSuite_vs140.vcxproj +++ b/XML/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs140.vcxproj.filters b/XML/testsuite/TestSuite_vs140.vcxproj.filters index eeb45b125..72e2cf9d2 100644 --- a/XML/testsuite/TestSuite_vs140.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {685faa05-1932-4358-8cf3-b1847bbd00aa} + {b7e1fe78-1037-4f58-9d0a-8c6e23f0bd63} - {b19b094b-2c03-4e4b-a152-7df341e5c89c} + {84754810-4867-4bf3-b570-b73ff14ed8b4} - {3f33afd7-5191-418f-8283-d1c06c635cc3} + {d5951eea-6fea-42a2-9bb7-4ef1ab05a16d} - {b1e72ce4-249a-443b-aafe-e388ba126e93} + {c6c673f7-0865-4eab-96f9-425ea83d851b} - {22603a36-6321-4e80-a8af-a4b5f65e50dc} + {ee4daee8-1036-4188-9939-28e9efc0fb70} - {e6d55069-2f76-4ead-aae8-1d64dd1459de} + {9336564e-f8d3-4513-be5e-615ca3d65cb3} - {855e5497-7f10-4117-b1e8-85999b8c9293} + {f36db70c-4381-490c-8dfd-17ea711ca492} - {fba25d90-d813-4dc5-b7b0-c4959620fcc1} + {90907f4d-8e17-45be-ad15-f51e1ae445c2} - {becd105f-bbfd-461b-b152-0b2d6f8d9a4e} + {031a52f3-102e-446d-a6f0-6a08dd00347d} - {86296a25-5f47-470f-8b8d-8640267440e1} + {331cde23-fc80-40c5-a2a8-9e5e0c3755f4} - {006c8503-e692-4f54-a10c-bd0686a8c298} + {394071e6-1027-4839-9130-3afab6d495b3} - {676536ec-c706-4c48-949a-05a6c815698f} + {48964380-459d-4e27-b506-e0fc5ef8d11b} - {ef648185-de9d-4c6c-b644-4c78b06f4cff} + {4ce09243-de57-4e58-9364-1ba02ccffbad} - {10390f1a-68a0-4c46-ac14-67026798063a} + {81d5d080-4dbd-41b5-8182-4b9b4ec6906a} diff --git a/XML/testsuite/TestSuite_vs90.vcproj b/XML/testsuite/TestSuite_vs90.vcproj index 22bb453b5..06096e8d2 100644 --- a/XML/testsuite/TestSuite_vs90.vcproj +++ b/XML/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters index 88b20ba07..be6bf8ea0 100644 --- a/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {756ae8fd-2c9d-416f-9007-0486cfea332a} + {42503e3e-667d-4860-8410-ec08bec9b36d} - {a615c3d2-5be7-4dff-940d-341c49136dba} + {c039219c-37c0-4a5c-8ba2-50da0ca39178} - {2fd29187-a891-4529-bd55-93dd518679ea} + {8006f15f-b28d-430d-a301-18cadcf39255} - {ef6b7ecf-99e6-4754-90a2-be0806a37c6b} + {272cae05-99bd-49fd-ab0e-0d3973486a47} - {537844a0-59e4-4ec3-b02c-f135f0cacaa7} + {6f809680-28f8-4b25-938a-377a1b50bcbd} - {3975afe3-3c30-4d1b-a6c3-62162131f9f5} + {28ca3dc1-e87e-4845-b99d-cd14d38d441e} - {d66152a6-35fd-4f01-a6b9-e4bc9b799e98} + {64a07226-7b4b-443b-8e2a-7dff00d34f68} - {c9bb4b63-d2c3-4eec-9def-52dd7477ddd3} + {8a9bce67-f37d-4d6e-b1b9-3350f5cdd801} - {3b5e2a25-42dc-4ad5-84f3-c769d42d30db} + {b2ac3f9c-4a4c-4284-83dd-3b49c0a7fe1a} - {08387115-4f1b-434e-a772-443675066920} + {df8c0f3f-2c39-4148-9ca3-bea46b7093c4} - {3f501b88-8ec9-445c-bf08-523270de7c44} + {684ec040-1002-47c3-9bb0-3f65d33a0606} - {8354ee4e-35dd-4fc8-aa4a-3d9b44bcb2c7} + {3e940c5f-0165-4c71-88f8-f1b51f711112} - {b8c91003-d3b3-482c-816d-725084b1fba9} + {43d21ad9-fd1d-4c79-8f66-4bfbfbed8540} - {52dccc56-6f02-4e55-a9fc-9102d3b71d78} + {ae5ac138-1daa-477b-a768-09b50588e357} diff --git a/XML/testsuite/TestSuite_x64_vs110.vcxproj b/XML/testsuite/TestSuite_x64_vs110.vcxproj index 818c4d15b..fa13e3642 100644 --- a/XML/testsuite/TestSuite_x64_vs110.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters index e6f656d21..e2d886dc0 100644 --- a/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {91b19ff2-2259-41e8-9382-91f43af59f09} + {311a0304-4614-4e0a-ab06-bb0841449834} - {55005bef-a40f-4a47-832c-00618940744b} + {190fe3c8-3290-41e7-b37a-8635e2012c8c} - {1439a8d0-2999-448b-a0b2-234dcf90f167} + {82818950-8015-4b79-90e0-a63cfdf38f1a} - {20cd544c-d3ed-4bb5-81b9-c85a8c51b04a} + {0f1dab0b-fb0b-47d2-8e07-eff1b6b24c71} - {96abbad6-02be-460a-9c92-3d49d9262cf1} + {9c37603c-e554-465b-b35d-672fab72f5c2} - {0b933f63-c45e-4a88-9d0a-1178e8771d8d} + {37882e29-f9de-485d-95c2-b9644477f3a6} - {17098242-1c03-4c21-9c3a-75b915da4c45} + {a95b721f-7405-4ee6-867b-2cc6f2730fe6} - {ed4d11a7-705c-4ced-94c8-ca473c6221fa} + {983c50a8-215c-40b3-9f12-720cfc73dbef} - {55169d8f-993d-4a5d-bb45-836ebc5e0b5d} + {177c863f-87d2-4ac8-9c4d-b847891f5cb0} - {b61eaec2-816d-4e22-95e6-23105ce131eb} + {9080c17f-85ee-4eac-b837-d2765cc2e112} - {7869ee36-81ec-4a99-8704-dd7830b4a1e7} + {ea6bed58-7400-4916-8a02-232827c35a5a} - {c32d5306-29d6-4977-a48b-7fe1d4c61ac0} + {1cc6e919-4855-43bf-a9af-b85926fb1058} - {07d2387f-3780-4e27-9acf-cf121610e4e5} + {cddc4155-6298-435e-bc29-2fd43eaaa9ba} - {4da0fabf-438d-4ed9-9e7c-57f06b53eb3e} + {a4d0b87e-bfac-4764-b884-19ef7610b1d7} diff --git a/XML/testsuite/TestSuite_x64_vs120.vcxproj b/XML/testsuite/TestSuite_x64_vs120.vcxproj index cc05ee181..05245d092 100644 --- a/XML/testsuite/TestSuite_x64_vs120.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -304,51 +304,51 @@ + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + diff --git a/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters index d160e8183..e72d13085 100644 --- a/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {b8169cfc-cea2-404f-a861-5c5642933475} + {5a3454b0-d091-4321-86cc-64228fbcde67} - {63946961-24f8-4ef6-b0b5-443e2f920ea2} + {362470a2-bc21-4ae2-b1e7-c93d3cb074b7} - {b187d08f-ccbb-4d0a-836b-57213d670ba6} + {4d148571-b710-4340-a392-89083dfc86e3} - {838a0d8d-7d17-4f61-a426-633af0e14ddc} + {2c178fdc-8c16-4e68-aed9-d6146f61c6c8} - {1672f929-5d30-4ed2-8b04-e04d10a66c9d} + {30345ef9-a16b-49e8-bdb8-9a12ef8cdae1} - {22b9604c-3851-42bc-bc2d-44b3ba3befb0} + {79687fa3-9d28-4742-8560-ed9a2febd614} - {dcdd221a-a16f-4ad9-b78d-1a975b4a3772} + {13af7ed1-2ea0-4776-b09a-f10e0afc2794} - {b3b1a945-8c16-4851-b111-09425e409a99} + {2f028466-0b65-4a8f-b519-7a48ba263339} - {feb33e81-f76f-4c64-8cdb-c1f927175179} + {c8d3843e-08a5-4d51-964d-12780f2b018f} - {c72f089c-fe87-44b1-8fc2-e6a945f6c2cf} + {acd19706-6fd3-4303-aca4-5bb128616554} - {1e6ee134-f65e-420a-a143-c3d4df95c998} + {952a08e8-973a-4859-99c5-fc2ee6be0ad7} - {84d1c6e7-5e49-439e-825e-67aa256c9f20} + {9bc8e194-be7e-484c-8086-059e3696138e} - {cb0e4ff4-72d3-4aaa-9dde-cf18e4d1409c} + {07b2380e-c166-43a1-9167-3238a3c9d2e2} - {4eb10896-0f4d-4a6d-b727-67da0fb8a62e} + {51794669-23be-4481-8b40-f62cb4888363} diff --git a/XML/testsuite/TestSuite_x64_vs140.vcxproj b/XML/testsuite/TestSuite_x64_vs140.vcxproj index 5f833f6cf..628ad7417 100644 --- a/XML/testsuite/TestSuite_x64_vs140.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters index 289afb416..e491477c9 100644 --- a/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {e59b8b5c-eed7-4926-9258-590c5abde857} + {2cd1ecb1-a8e6-46da-a488-8fcf0c0f8eca} - {0a5c3832-2211-4d27-a159-aedcdf2acc75} + {f205f174-69c6-4ad9-a20b-91649f0de16d} - {dbe9c0d2-cabb-4cb4-8e89-58f892354625} + {8c7b9ccc-a2a1-4c6c-8d03-96e7064d4120} - {c02ff0d6-f08d-4d8f-b4ea-4a18c4b31d1d} + {178aa701-93d2-492a-b29b-49927eff147c} - {72f47ec0-42ee-4740-a7eb-55d1731972f8} + {b65deff1-d7d0-4017-8ed0-1d66ab77425a} - {003c1725-82e9-4ec4-97f2-4aaac760ea34} + {92dd6b8b-daed-4de7-9978-a589693f8e80} - {e4c0fdea-fedd-45fa-a4ec-c86029578475} + {ea581140-ac69-4bd6-9334-79fa762b8813} - {f4e72b05-f017-4cc1-80b0-6b8414ca5938} + {6dd18787-cf01-4395-8236-172d3fbcc140} - {353cead1-84ea-4925-a4cd-73095cbcd079} + {8253117b-0964-4052-b5ab-130bade93edf} - {8bc04bdd-b80d-4eb2-9a14-0a4d889d132a} + {7bceaefd-1c6e-42b3-a2f7-48df26171f5b} - {494e7516-583e-4d7f-9a2b-113f5cd51914} + {ac0797ff-a708-4962-a7cc-1e7fef4d29d3} - {d654db14-789d-4962-a218-800281fe5b25} + {348c6d25-4545-4408-bf48-250b71c612c0} - {41477b5c-0276-4acc-adbb-54fdf2c0b8bf} + {23f6f44e-0956-44ce-9b45-4a24668bf00d} - {78707bfd-fe2a-4ea6-9a88-4e7c7185ad1b} + {d542f488-4181-46b8-b3a3-5604e09a5611} diff --git a/XML/testsuite/TestSuite_x64_vs90.vcproj b/XML/testsuite/TestSuite_x64_vs90.vcproj index b02aea373..febe2ce07 100644 --- a/XML/testsuite/TestSuite_x64_vs90.vcproj +++ b/XML/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - + + + + TestSuite @@ -36,59 +16,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -96,222 +28,7 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - - - - + diff --git a/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index f089d5c08..b50eb9637 100644 --- a/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {6349bd0f-a698-4f8c-a0e4-6030b2396a4d} + {b3f9a949-7a1c-4c47-b58d-0719bf0c77fd} - {f15a913e-7e60-419f-926f-67cd20acc670} + {a850d4ef-7b81-44c9-9cd8-6f7efa7ff4ac} - {dd7b2d44-6f92-4601-a4ac-ed7baa9c3523} + {236e1be4-cd9f-4441-afb4-b28b8c05dbce} - {0deec944-f185-4814-88d0-b2ebf0dd1113} + {58ffbd27-ebb1-480b-b441-5c1fda5541c3} - {24e97296-8722-4bbf-9a18-23dfc5aed015} + {1e938b69-6364-4709-ae0a-090fcff85f23} - {bf2bd599-51c3-46ee-bdb9-33f49903f3ec} + {c580f609-90f2-4481-9e6f-1be2becd08bf} - {d5976a15-d365-4968-be26-6f11fb26d417} + {c765c191-f0e9-4413-9fa8-4ba391a7bccc} - {b66f2d41-62e9-41c1-85c0-bfd64edc83e3} + {712bc771-658e-4650-a07d-e5ff8ee4fa77} diff --git a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj index d877fe6c0..a7aa5f7e7 100644 --- a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -1,30 +1,10 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + TestSuite @@ -36,59 +16,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -96,228 +28,13 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - - - - + - + diff --git a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index ff61a27a4..3adf9a3dc 100644 --- a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {29bb4373-cc07-43d2-8546-484a28be943a} + {5f1f3f1e-0cb3-4655-8dc2-ff1fb231ba31} - {5294b7fd-fd19-4ab4-9adb-db1a29a6b3fb} + {32d452af-5d5c-44b8-9519-7bb7e3b3a191} - {305f6e55-7c07-4037-a273-316177f8bd9a} + {d7b28c36-4049-4c75-ab7f-ab6bbad52909} - {5aa3724f-8fb2-41d1-96c3-0103f1f3c14e} + {d27a088f-8fe9-464c-9dc6-fc8570391dcc} - {d49adc99-db63-43d8-af4f-607c097485f8} + {a791551f-7233-4b08-9eb4-d4965c8f4885} - {0a5e442a-7e6c-4fed-b8e2-08eadea98dd9} + {2f74821e-888c-4be1-9381-9e2f18699a8a} - {b7de4d73-eb8a-4fc6-a206-6815c263d6df} + {db73ae80-1ee0-404d-b90f-1d9c97519e03} - {c0055dd8-3fc4-46e5-a5d1-8f3892d9ce2c} + {2614a38e-2076-4a3b-b5a7-fc2740b83bd5} diff --git a/Zip/testsuite/TestSuite_vs100.vcxproj b/Zip/testsuite/TestSuite_vs100.vcxproj index 438b84f8d..f883a8c27 100644 --- a/Zip/testsuite/TestSuite_vs100.vcxproj +++ b/Zip/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs100.vcxproj.filters b/Zip/testsuite/TestSuite_vs100.vcxproj.filters index c3b9a940d..11b6f93b5 100644 --- a/Zip/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {afaddbdf-ee31-403f-bb79-be3406de9df3} + {e7ed51ed-4684-48b6-9d98-2f304f4538c2} - {17c9a88e-c648-4700-b7ed-3b948775bf33} + {33de48c6-ff60-4fdf-8f82-b9c0a5bf28ab} - {8d66516d-32ce-4471-8287-35391dc8a714} + {250d7fb3-ee3e-4513-b723-070e60e96045} - {17b09285-6fbd-467e-9bd1-e8e1c806ef67} + {000d63a8-b1d4-4a01-a168-80f68a57b796} - {e124271f-629a-4253-8fc7-24e1fd5fc143} + {44a6a219-50ca-4836-9eb8-390d1a3706c4} - {b7312646-f1df-4884-be43-11b0bfb3d794} + {2911280c-e896-4add-8fdb-c00778f51f7b} - {d34f0ac6-4cc8-491e-a3dc-8c5ac079455e} + {df6239ad-22dc-4f0c-b691-693e4cb1ad16} - {92848819-448e-4b71-a1a2-c06ebe08d6ca} + {0e2d9de8-b0a3-4a1e-a81b-2bcce783091f} diff --git a/Zip/testsuite/TestSuite_vs110.vcxproj b/Zip/testsuite/TestSuite_vs110.vcxproj index 5b5e1d729..c03b68c20 100644 --- a/Zip/testsuite/TestSuite_vs110.vcxproj +++ b/Zip/testsuite/TestSuite_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_vs110.vcxproj.filters index fbae98cb5..6736cdf09 100644 --- a/Zip/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {04897bf5-6bf0-4c59-a391-21ed5fcac2d0} + {38edd4f2-e8ff-43a8-851a-6923ee350780} - {07cc5b97-3183-4f2a-bb99-7801e88762d0} + {ae2bc61b-1ba9-41a9-8732-5203e89e7c1c} - {d894b596-2f82-441a-b8f4-6fca2c6b85c0} + {2434a755-e06f-4ae9-a37a-c2ee20c4062d} - {a127a768-0c86-45f0-be17-391ef943b302} + {addb45ad-34c7-48a8-8aac-6d435dead449} - {8471b531-079d-4a02-91b9-f37628f0098c} + {46ba51c5-8933-48d1-be84-9bca7fef9da4} - {cff2d456-44df-4db1-a6df-f4dff5db6465} + {9cbae5f0-9812-4e29-8b04-304e6e9aed91} - {3cf8e660-28e0-4fe3-b9a7-d66addfcf7e7} + {52510158-1d93-4de5-abc0-0616a8e4c91c} - {672ffa44-4827-44da-a385-1c39afe1a8e6} + {034e0450-5c13-4fec-a7e9-d1d0015f1837} diff --git a/Zip/testsuite/TestSuite_vs120.vcxproj b/Zip/testsuite/TestSuite_vs120.vcxproj index 88c1e251a..0ac2b305f 100644 --- a/Zip/testsuite/TestSuite_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -311,10 +311,10 @@ - + diff --git a/Zip/testsuite/TestSuite_vs120.vcxproj.filters b/Zip/testsuite/TestSuite_vs120.vcxproj.filters index 65e5b8cb4..020fb2821 100644 --- a/Zip/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {95b4df22-3b51-4eb3-9157-7c3ba3a11901} + {c107b8e6-540f-4f24-8d2b-9895f1a93754} - {54f262d0-905e-4eb1-9f7b-bace738fdbd3} + {8b59f15f-585a-4fed-9ac5-398d0c983971} - {8419537d-f0a2-46c5-925d-686966c057f3} + {5c0de210-7ac3-4842-b23f-854a4305d1c5} - {9e3e8484-a9d9-4144-bd89-efbabf526db3} + {f3dc079f-441d-4b9b-9dd5-4206e27b6adb} - {4912aa57-26a4-49ab-b718-25f545408123} + {0f2b7b14-22c7-46af-9a74-32f611d876c8} - {d0fb141c-9f45-4817-83df-1bdf77454957} + {17e4f2fc-73d0-4612-9bb4-ccbbe6429f81} - {9cf42870-3189-49dd-b3a4-2d6207694652} + {1d82f041-8f28-4a20-9198-2e27a51b1020} - {5b63a452-c627-4ace-973b-b9fa743aa774} + {8bb34186-d01e-4761-aa9d-e63614c9a6c7} diff --git a/Zip/testsuite/TestSuite_vs140.vcxproj b/Zip/testsuite/TestSuite_vs140.vcxproj index d1969ec4e..b397d3153 100644 --- a/Zip/testsuite/TestSuite_vs140.vcxproj +++ b/Zip/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs140.vcxproj.filters b/Zip/testsuite/TestSuite_vs140.vcxproj.filters index e59d67058..92b761105 100644 --- a/Zip/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {34e2a3a3-757b-47fe-b467-6905260545f7} + {2495dbe1-614b-4536-87ff-d8f165b46235} - {2944968b-59b7-4325-8f6b-b91037d3e864} + {ce5e28fe-6fd8-4e1b-8a0f-d669f9da1fc3} - {ff7f7380-845e-4547-af35-246023ef6fed} + {eca7338b-926d-4b58-a977-f59e1315a2ba} - {0af0cae3-7621-43cc-8a2c-7a9e95781710} + {42d7520c-713b-4ab1-8112-1bd1aef68a2a} - {73b5a22a-53a7-445e-b10a-84ad758415e4} + {d2de8778-1d2a-4115-ab3c-bcf0198bf200} - {aade6612-f22d-481e-ac86-2770614ce181} + {1616258c-d8cb-4fb8-b8aa-f2c99daec74e} - {73c7399c-f63c-4cb2-b71e-03ef45361acb} + {7dd2de48-b7a6-46f6-a81a-c69dd624aabe} - {b391f78d-f025-49fb-8aad-2e53761bd2f0} + {8dc1aa1e-5a78-4e38-8f71-ae8b171f6c8b} diff --git a/Zip/testsuite/TestSuite_vs90.vcproj b/Zip/testsuite/TestSuite_vs90.vcproj index fd716ad37..c2b4ba78c 100644 --- a/Zip/testsuite/TestSuite_vs90.vcproj +++ b/Zip/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters index 6e130ea3d..c90a0248b 100644 --- a/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {d5f41bd2-7918-4132-b8f5-6c0852685a7a} + {67883957-916c-4eaa-83c1-e8b69c477627} - {f94b4d96-1ad5-4bc9-81b2-80f8f7729d9c} + {21226ba1-261d-440f-b744-8d0e45f40bc0} - {e998918c-1b23-4e0d-bed3-86659208e47b} + {8df5f2a0-4561-4659-8cd6-549155a85c5e} - {e10eb53e-7072-4b81-bd5b-e916d71c34e0} + {09b9ea48-78d7-464c-808f-7e90a26bcf21} - {85910b7c-c5ec-4714-baea-a9071ba99d37} + {bb0c90bb-9394-411d-a314-d2d66b58c18a} - {8e580370-e2cf-4ed1-b24b-0e988f0b9829} + {4bdf708a-5b73-4aa8-9741-d4d3352f27bc} - {a3e1af0a-2ffd-43b4-88f8-164e4dbfbadb} + {1af08662-1192-4831-9c27-5cee4451f86a} - {37456b77-9876-4427-a071-2ea11e016f64} + {c47d9532-54e1-4bba-8777-4a54e03b5046} diff --git a/Zip/testsuite/TestSuite_x64_vs110.vcxproj b/Zip/testsuite/TestSuite_x64_vs110.vcxproj index 9ad6ffadd..464898c65 100644 --- a/Zip/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters index 93ca92670..1d45bb485 100644 --- a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {9a9df737-59b4-4396-86fd-866457be71e0} + {110f1d08-c7c6-4956-bfea-d973a29ec298} - {ea69dec4-25d0-4025-8caa-c8cc639b0946} + {a17be6e6-614f-4ccf-957d-b02879867447} - {b5aad6bc-25ff-4400-90df-f3286de578e0} + {ec68edb4-500a-4561-90e9-f6f7da1ff0ee} - {9866f652-d7b0-40f6-b67d-308cf4e9e4a3} + {b1795cca-c875-4162-8b48-f7d1a8746497} - {cf05df26-b21e-43af-8257-0b46571e05dc} + {1d35d666-84c8-4282-9201-6ef0a5ab9abe} - {e331a4ec-e7ae-40f5-a318-1870d97a1d16} + {feeafb90-f975-4c46-9156-11487a7baa5f} - {45f5a2d9-d949-43f7-9364-cb107cdb5063} + {f823b668-b05b-414d-b8d2-00df523866ec} - {7801a156-eee0-4231-b8f2-60124056af4a} + {e5cdd108-0d1b-4d56-a1e4-cc4d09ee9aed} diff --git a/Zip/testsuite/TestSuite_x64_vs120.vcxproj b/Zip/testsuite/TestSuite_x64_vs120.vcxproj index cf8b82e28..eb7acb5c3 100644 --- a/Zip/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -311,10 +311,10 @@ - + diff --git a/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters index 0eb9dd4a1..1c7a0b393 100644 --- a/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {1eea6556-ac4c-4ab3-a0a0-f1addba65c05} + {46c75f64-7baa-421c-9f73-19cbf9b2a151} - {7aaa7b62-67b4-4d94-a616-034ff971d420} + {2c319960-7560-4c60-b89c-a59cfa3bac91} - {acd7678b-858d-43f2-b4cb-a219733c18fd} + {3031af35-9ee4-40f0-b61c-a90771f1ad4e} - {7d833dc4-a899-45db-ae52-d1caf417c908} + {7aed8bb4-a01f-4b7d-98c6-b6667c1495e1} - {82d58a8b-6c21-4dd3-b29b-293207355112} + {709c05c4-4511-43e4-816b-b0240eba6ee2} - {8899a7f5-0f15-471d-9745-e9065d45ea44} + {a4acda9a-9648-4cc3-a00c-74d7c4641222} - {fdc4a83e-464b-474d-851b-c6c0c132d05a} + {c9699965-bfcb-49f6-aa41-2887a7b787c8} - {28aa010f-b546-4163-a5ca-ac5258220459} + {bdf8bcd1-45ea-4ba5-a578-a8b5c02c75b7} diff --git a/Zip/testsuite/TestSuite_x64_vs140.vcxproj b/Zip/testsuite/TestSuite_x64_vs140.vcxproj index deeb493a1..93e6f2dc0 100644 --- a/Zip/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters index 518b7fcd6..d577d89a2 100644 --- a/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {a5fb133d-31a2-4efc-b287-028b24ed1d29} + {abcd6863-4e11-4a9e-9313-35b3e07d1ba9} - {612e0a9a-530d-4938-9894-00564336aa24} + {6004d72d-5217-435f-af9c-793dc2689dcd} - {455d18cb-6ef9-4196-99f8-d229294bc9ae} + {52e3db9c-cea5-4e22-b3a5-3558aa3e6b3a} - {bfeed80b-dca3-4d73-a827-3f5359b1dd3f} + {91200cac-4925-4870-b6f4-639ee5d6a27f} - {49f2a803-ff44-4f8f-a120-6e8d5ca6267a} + {8e08a2e2-d073-4a2a-a2a0-f4347a84cd5c} - {0a59dca7-6bf7-4335-8b71-061f17d9aba8} + {e412cc59-6cbf-4e5a-8035-3ae02980de01} - {acb3c9d9-d153-4a6a-82eb-30208fa2db7b} + {5cd78030-018e-41f1-a5db-a0d6900105f3} - {fe2b52e5-f62b-4c4b-9632-a9fb29edffed} + {fd01fd72-8293-4165-8b33-40a8cdcfb388} diff --git a/Zip/testsuite/TestSuite_x64_vs90.vcproj b/Zip/testsuite/TestSuite_x64_vs90.vcproj index 0ea678b05..854fb61af 100644 --- a/Zip/testsuite/TestSuite_x64_vs90.vcproj +++ b/Zip/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> Date: Sun, 6 Mar 2016 20:55:38 -0800 Subject: [PATCH 037/131] added generated VS projects --- CppUnit/CppUnit.progen | 15 + Redis/Redis_vs100.sln | 60 +++ Redis/Redis_vs100.vcxproj | 303 ++++++++++++ Redis/Redis_vs100.vcxproj.filters | 75 +++ Redis/Redis_vs110.sln | 60 +++ Redis/Redis_vs110.vcxproj | 304 ++++++++++++ Redis/Redis_vs110.vcxproj.filters | 75 +++ Redis/Redis_vs120.sln | 60 +++ Redis/Redis_vs120.vcxproj | 304 ++++++++++++ Redis/Redis_vs120.vcxproj.filters | 75 +++ Redis/Redis_vs140.sln | 60 +++ Redis/Redis_vs140.vcxproj | 304 ++++++++++++ Redis/Redis_vs140.vcxproj.filters | 75 +++ Redis/Redis_vs90.sln | 60 +++ Redis/Redis_vs90.vcproj | 439 +++++++++++++++++ Redis/Redis_x64_vs100.sln | 60 +++ Redis/Redis_x64_vs100.vcxproj | 301 ++++++++++++ Redis/Redis_x64_vs100.vcxproj.filters | 75 +++ Redis/Redis_x64_vs110.sln | 60 +++ Redis/Redis_x64_vs110.vcxproj | 303 ++++++++++++ Redis/Redis_x64_vs110.vcxproj.filters | 75 +++ Redis/Redis_x64_vs120.sln | 60 +++ Redis/Redis_x64_vs120.vcxproj | 303 ++++++++++++ Redis/Redis_x64_vs120.vcxproj.filters | 75 +++ Redis/Redis_x64_vs140.sln | 60 +++ Redis/Redis_x64_vs140.vcxproj | 303 ++++++++++++ Redis/Redis_x64_vs140.vcxproj.filters | 75 +++ Redis/testsuite/TestSuite_vs100.vcxproj | 325 ++++++++++++ .../testsuite/TestSuite_vs100.vcxproj.filters | 30 ++ Redis/testsuite/TestSuite_vs110.vcxproj | 325 ++++++++++++ .../testsuite/TestSuite_vs110.vcxproj.filters | 30 ++ Redis/testsuite/TestSuite_vs120.vcxproj | 317 ++++++++++++ .../testsuite/TestSuite_vs120.vcxproj.filters | 30 ++ Redis/testsuite/TestSuite_vs140.vcxproj | 317 ++++++++++++ .../testsuite/TestSuite_vs140.vcxproj.filters | 30 ++ Redis/testsuite/TestSuite_vs90.vcproj | 464 ++++++++++++++++++ Redis/testsuite/TestSuite_x64_vs100.vcxproj | 325 ++++++++++++ .../TestSuite_x64_vs100.vcxproj.filters | 30 ++ Redis/testsuite/TestSuite_x64_vs110.vcxproj | 325 ++++++++++++ .../TestSuite_x64_vs110.vcxproj.filters | 30 ++ Redis/testsuite/TestSuite_x64_vs120.vcxproj | 317 ++++++++++++ .../TestSuite_x64_vs120.vcxproj.filters | 30 ++ Redis/testsuite/TestSuite_x64_vs140.vcxproj | 317 ++++++++++++ .../TestSuite_x64_vs140.vcxproj.filters | 30 ++ 44 files changed, 7291 insertions(+) create mode 100644 CppUnit/CppUnit.progen create mode 100644 Redis/Redis_vs100.sln create mode 100644 Redis/Redis_vs100.vcxproj create mode 100644 Redis/Redis_vs100.vcxproj.filters create mode 100644 Redis/Redis_vs110.sln create mode 100644 Redis/Redis_vs110.vcxproj create mode 100644 Redis/Redis_vs110.vcxproj.filters create mode 100644 Redis/Redis_vs120.sln create mode 100644 Redis/Redis_vs120.vcxproj create mode 100644 Redis/Redis_vs120.vcxproj.filters create mode 100644 Redis/Redis_vs140.sln create mode 100644 Redis/Redis_vs140.vcxproj create mode 100644 Redis/Redis_vs140.vcxproj.filters create mode 100644 Redis/Redis_vs90.sln create mode 100644 Redis/Redis_vs90.vcproj create mode 100644 Redis/Redis_x64_vs100.sln create mode 100644 Redis/Redis_x64_vs100.vcxproj create mode 100644 Redis/Redis_x64_vs100.vcxproj.filters create mode 100644 Redis/Redis_x64_vs110.sln create mode 100644 Redis/Redis_x64_vs110.vcxproj create mode 100644 Redis/Redis_x64_vs110.vcxproj.filters create mode 100644 Redis/Redis_x64_vs120.sln create mode 100644 Redis/Redis_x64_vs120.vcxproj create mode 100644 Redis/Redis_x64_vs120.vcxproj.filters create mode 100644 Redis/Redis_x64_vs140.sln create mode 100644 Redis/Redis_x64_vs140.vcxproj create mode 100644 Redis/Redis_x64_vs140.vcxproj.filters create mode 100644 Redis/testsuite/TestSuite_vs100.vcxproj create mode 100644 Redis/testsuite/TestSuite_vs100.vcxproj.filters create mode 100644 Redis/testsuite/TestSuite_vs110.vcxproj create mode 100644 Redis/testsuite/TestSuite_vs110.vcxproj.filters create mode 100644 Redis/testsuite/TestSuite_vs120.vcxproj create mode 100644 Redis/testsuite/TestSuite_vs120.vcxproj.filters create mode 100644 Redis/testsuite/TestSuite_vs140.vcxproj create mode 100644 Redis/testsuite/TestSuite_vs140.vcxproj.filters create mode 100644 Redis/testsuite/TestSuite_vs90.vcproj create mode 100644 Redis/testsuite/TestSuite_x64_vs100.vcxproj create mode 100644 Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters create mode 100644 Redis/testsuite/TestSuite_x64_vs110.vcxproj create mode 100644 Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters create mode 100644 Redis/testsuite/TestSuite_x64_vs120.vcxproj create mode 100644 Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters create mode 100644 Redis/testsuite/TestSuite_x64_vs140.vcxproj create mode 100644 Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters diff --git a/CppUnit/CppUnit.progen b/CppUnit/CppUnit.progen new file mode 100644 index 000000000..a5d90da81 --- /dev/null +++ b/CppUnit/CppUnit.progen @@ -0,0 +1,15 @@ +vc.project.guid = 138BB448-808A-4FE5-A66D-78D1F8770F59 +vc.project.name = CppUnit +vc.project.target = Poco${vc.project.name} +vc.project.type = library +vc.project.pocobase = .. +vc.project.outdir = ${vc.project.pocobase} +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs90.vcproj +vc.project.compiler.include = +vc.project.compiler.defines = +vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS, _CRT_SECURE_NO_WARNINGS +vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} +vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} +vc.solution.create = true diff --git a/Redis/Redis_vs100.sln b/Redis/Redis_vs100.sln new file mode 100644 index 000000000..bf00e4ed9 --- /dev/null +++ b/Redis/Redis_vs100.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_vs100.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Build.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Redis/Redis_vs100.vcxproj b/Redis/Redis_vs100.vcxproj new file mode 100644 index 000000000..beb03ee75 --- /dev/null +++ b/Redis/Redis_vs100.vcxproj @@ -0,0 +1,303 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Redis + {12E39EE2-7049-312D-B390-7568D727CA25} + Redis + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\Redis\$(Configuration)\ + true + ..\bin\ + obj\Redis\$(Configuration)\ + false + ..\lib\ + obj\Redis\$(Configuration)\ + ..\lib\ + obj\Redis\$(Configuration)\ + ..\lib\ + obj\Redis\$(Configuration)\ + ..\lib\ + obj\Redis\$(Configuration)\ + PocoRedisd + PocoRedismdd + PocoRedismtd + PocoRedis + PocoRedismd + PocoRedismt + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + %(AdditionalDependencies) + ..\bin\PocoRedisd.dll + true + true + ..\bin\PocoRedisd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoRedisd.lib + MachineX86 + %(AdditionalOptions) + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + %(AdditionalDependencies) + ..\bin\PocoRedis.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoRedis.lib + MachineX86 + %(AdditionalOptions) + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoRedismtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib\PocoRedismtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib\PocoRedismt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoRedismdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib\PocoRedismdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoRedismd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + %(AdditionalDependencies) + ..\lib\PocoRedismd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/Redis_vs100.vcxproj.filters b/Redis/Redis_vs100.vcxproj.filters new file mode 100644 index 000000000..38e399208 --- /dev/null +++ b/Redis/Redis_vs100.vcxproj.filters @@ -0,0 +1,75 @@ + + + + + {6dcae768-8067-47a7-9481-ac894f3b30b6} + + + {f89b1edd-a21c-48b6-90e4-b636be5fdbd6} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/Redis_vs110.sln b/Redis/Redis_vs110.sln new file mode 100644 index 000000000..77990db2a --- /dev/null +++ b/Redis/Redis_vs110.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_vs110.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Build.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Redis/Redis_vs110.vcxproj b/Redis/Redis_vs110.vcxproj new file mode 100644 index 000000000..c4f87a532 --- /dev/null +++ b/Redis/Redis_vs110.vcxproj @@ -0,0 +1,304 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Redis + {12E39EE2-7049-312D-B390-7568D727CA25} + Redis + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoRedisd + PocoRedismdd + PocoRedismtd + PocoRedis + PocoRedismd + PocoRedismt + + + ..\bin\ + obj\Redis\$(Configuration)\ + true + + + ..\bin\ + obj\Redis\$(Configuration)\ + false + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin\PocoRedisd.dll + true + true + ..\bin\PocoRedisd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoRedisd.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin\PocoRedis.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoRedis.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoRedismtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoRedismtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib\PocoRedismt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoRedismdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoRedismdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoRedismd.pdb + Level3 + + Default + + + ..\lib\PocoRedismd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/Redis_vs110.vcxproj.filters b/Redis/Redis_vs110.vcxproj.filters new file mode 100644 index 000000000..6d5236c20 --- /dev/null +++ b/Redis/Redis_vs110.vcxproj.filters @@ -0,0 +1,75 @@ + + + + + {00b62a5b-811f-446c-a9ec-7d4a0be21b51} + + + {31c7afaf-db79-4c7a-b181-38f9203efbb4} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/Redis_vs120.sln b/Redis/Redis_vs120.sln new file mode 100644 index 000000000..170bfa0f0 --- /dev/null +++ b/Redis/Redis_vs120.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_vs120.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Build.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Redis/Redis_vs120.vcxproj b/Redis/Redis_vs120.vcxproj new file mode 100644 index 000000000..14d9455e4 --- /dev/null +++ b/Redis/Redis_vs120.vcxproj @@ -0,0 +1,304 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Redis + {12E39EE2-7049-312D-B390-7568D727CA25} + Redis + Win32Proj + + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + PocoRedisd + PocoRedismdd + PocoRedismtd + PocoRedis + PocoRedismd + PocoRedismt + + + ..\bin\ + obj\Redis\$(Configuration)\ + true + + + ..\bin\ + obj\Redis\$(Configuration)\ + false + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin\PocoRedisd.dll + true + true + ..\bin\PocoRedisd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoRedisd.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin\PocoRedis.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoRedis.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoRedismtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoRedismtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib\PocoRedismt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoRedismdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoRedismdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoRedismd.pdb + Level3 + + Default + + + ..\lib\PocoRedismd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/Redis_vs120.vcxproj.filters b/Redis/Redis_vs120.vcxproj.filters new file mode 100644 index 000000000..a099b378c --- /dev/null +++ b/Redis/Redis_vs120.vcxproj.filters @@ -0,0 +1,75 @@ + + + + + {5baf4745-44bb-4873-850a-e4bed127388b} + + + {a0f08266-6bac-4f2f-abc3-c0912a9f7750} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/Redis_vs140.sln b/Redis/Redis_vs140.sln new file mode 100644 index 000000000..04498a30e --- /dev/null +++ b/Redis/Redis_vs140.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 14.00 +# Visual Studio 2015 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_vs140.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs140.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Build.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Redis/Redis_vs140.vcxproj b/Redis/Redis_vs140.vcxproj new file mode 100644 index 000000000..bc2d00155 --- /dev/null +++ b/Redis/Redis_vs140.vcxproj @@ -0,0 +1,304 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Redis + {12E39EE2-7049-312D-B390-7568D727CA25} + Redis + Win32Proj + + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + DynamicLibrary + MultiByte + v140 + + + DynamicLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoRedisd + PocoRedismdd + PocoRedismtd + PocoRedis + PocoRedismd + PocoRedismt + + + ..\bin\ + obj\Redis\$(Configuration)\ + true + + + ..\bin\ + obj\Redis\$(Configuration)\ + false + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + ..\lib\ + obj\Redis\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin\PocoRedisd.dll + true + true + ..\bin\PocoRedisd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoRedisd.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin\PocoRedis.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoRedis.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoRedismtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoRedismtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib\PocoRedismt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoRedismdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoRedismdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoRedismd.pdb + Level3 + + Default + + + ..\lib\PocoRedismd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/Redis_vs140.vcxproj.filters b/Redis/Redis_vs140.vcxproj.filters new file mode 100644 index 000000000..6a867fcdc --- /dev/null +++ b/Redis/Redis_vs140.vcxproj.filters @@ -0,0 +1,75 @@ + + + + + {ecd36673-7746-4725-8d7c-21936f60a2a6} + + + {df25fd21-fd54-4853-80d3-80be8e5b26ba} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/Redis_vs90.sln b/Redis/Redis_vs90.sln new file mode 100644 index 000000000..a4d3c6cd5 --- /dev/null +++ b/Redis/Redis_vs90.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_vs90.vcproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs90.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Build.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Redis/Redis_vs90.vcproj b/Redis/Redis_vs90.vcproj new file mode 100644 index 000000000..e94143dfc --- /dev/null +++ b/Redis/Redis_vs90.vcproj @@ -0,0 +1,439 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/Redis_x64_vs100.sln b/Redis/Redis_x64_vs100.sln new file mode 100644 index 000000000..9a04835c2 --- /dev/null +++ b/Redis/Redis_x64_vs100.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_x64_vs100.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs100.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.Build.0 = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.ActiveCfg = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.Build.0 = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.Deploy.0 = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Build.0 = release_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Redis/Redis_x64_vs100.vcxproj b/Redis/Redis_x64_vs100.vcxproj new file mode 100644 index 000000000..4b01c4295 --- /dev/null +++ b/Redis/Redis_x64_vs100.vcxproj @@ -0,0 +1,301 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Redis + {12E39EE2-7049-312D-B390-7568D727CA25} + Redis + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\Redis\$(Configuration)\ + true + ..\bin64\ + obj64\Redis\$(Configuration)\ + false + ..\lib64\ + obj64\Redis\$(Configuration)\ + ..\lib64\ + obj64\Redis\$(Configuration)\ + ..\lib64\ + obj64\Redis\$(Configuration)\ + ..\lib64\ + obj64\Redis\$(Configuration)\ + PocoRedis64d + PocoRedismdd + PocoRedismtd + PocoRedis64 + PocoRedismd + PocoRedismt + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + %(AdditionalDependencies) + ..\bin64\PocoRedis64d.dll + true + true + ..\bin64\PocoRedis64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoRedisd.lib + MachineX64 + %(AdditionalOptions) + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + %(AdditionalDependencies) + ..\bin64\PocoRedis64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoRedis.lib + MachineX64 + %(AdditionalOptions) + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoRedismtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib64\PocoRedismtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib64\PocoRedismt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoRedismdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib64\PocoRedismdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + ..\lib64\PocoRedismd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/Redis_x64_vs100.vcxproj.filters b/Redis/Redis_x64_vs100.vcxproj.filters new file mode 100644 index 000000000..fd0b93140 --- /dev/null +++ b/Redis/Redis_x64_vs100.vcxproj.filters @@ -0,0 +1,75 @@ + + + + + {a38ebf2a-7201-459f-9529-982e658330a2} + + + {47576743-6de7-4ab2-a8e8-b4006575ca04} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/Redis_x64_vs110.sln b/Redis/Redis_x64_vs110.sln new file mode 100644 index 000000000..b3f4da0b2 --- /dev/null +++ b/Redis/Redis_x64_vs110.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_x64_vs110.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.Build.0 = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.ActiveCfg = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.Build.0 = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.Deploy.0 = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Build.0 = release_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Redis/Redis_x64_vs110.vcxproj b/Redis/Redis_x64_vs110.vcxproj new file mode 100644 index 000000000..080b04eff --- /dev/null +++ b/Redis/Redis_x64_vs110.vcxproj @@ -0,0 +1,303 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Redis + {12E39EE2-7049-312D-B390-7568D727CA25} + Redis + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoRedis64d + PocoRedismdd + PocoRedismtd + PocoRedis64 + PocoRedismd + PocoRedismt + + + ..\bin64\ + obj64\Redis\$(Configuration)\ + true + + + ..\bin64\ + obj64\Redis\$(Configuration)\ + false + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin64\PocoRedis64d.dll + true + true + ..\bin64\PocoRedis64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoRedisd.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin64\PocoRedis64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoRedis.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoRedismtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoRedismtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoRedismt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoRedismdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoRedismdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoRedismd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/Redis_x64_vs110.vcxproj.filters b/Redis/Redis_x64_vs110.vcxproj.filters new file mode 100644 index 000000000..16bf8d72c --- /dev/null +++ b/Redis/Redis_x64_vs110.vcxproj.filters @@ -0,0 +1,75 @@ + + + + + {22086ac6-28cb-4ea1-8467-10c1b47d8389} + + + {1b9893f7-c778-4baf-b849-ffedeca495b3} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/Redis_x64_vs120.sln b/Redis/Redis_x64_vs120.sln new file mode 100644 index 000000000..17fc520dd --- /dev/null +++ b/Redis/Redis_x64_vs120.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_x64_vs120.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.Build.0 = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.ActiveCfg = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.Build.0 = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.Deploy.0 = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Build.0 = release_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Redis/Redis_x64_vs120.vcxproj b/Redis/Redis_x64_vs120.vcxproj new file mode 100644 index 000000000..06e07a53f --- /dev/null +++ b/Redis/Redis_x64_vs120.vcxproj @@ -0,0 +1,303 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Redis + {12E39EE2-7049-312D-B390-7568D727CA25} + Redis + Win32Proj + + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + PocoRedis64d + PocoRedismdd + PocoRedismtd + PocoRedis64 + PocoRedismd + PocoRedismt + + + ..\bin64\ + obj64\Redis\$(Configuration)\ + true + + + ..\bin64\ + obj64\Redis\$(Configuration)\ + false + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin64\PocoRedis64d.dll + true + true + ..\bin64\PocoRedis64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoRedisd.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin64\PocoRedis64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoRedis.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoRedismtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoRedismtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoRedismt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoRedismdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoRedismdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoRedismd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/Redis_x64_vs120.vcxproj.filters b/Redis/Redis_x64_vs120.vcxproj.filters new file mode 100644 index 000000000..291ff7879 --- /dev/null +++ b/Redis/Redis_x64_vs120.vcxproj.filters @@ -0,0 +1,75 @@ + + + + + {ccc8ed4d-5024-46de-9a7b-f8f3ccd67864} + + + {de5467c5-c688-4d45-b854-f6bdecc06624} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/Redis_x64_vs140.sln b/Redis/Redis_x64_vs140.sln new file mode 100644 index 000000000..40d4f61f0 --- /dev/null +++ b/Redis/Redis_x64_vs140.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 14.00 +# Visual Studio 2015 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_x64_vs140.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs140.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.Build.0 = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.ActiveCfg = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.Build.0 = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|x64.Deploy.0 = release_shared|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Build.0 = release_static_md|x64 + {12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Redis/Redis_x64_vs140.vcxproj b/Redis/Redis_x64_vs140.vcxproj new file mode 100644 index 000000000..0b549eccd --- /dev/null +++ b/Redis/Redis_x64_vs140.vcxproj @@ -0,0 +1,303 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Redis + {12E39EE2-7049-312D-B390-7568D727CA25} + Redis + Win32Proj + + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + DynamicLibrary + MultiByte + v140 + + + DynamicLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoRedis64d + PocoRedismdd + PocoRedismtd + PocoRedis64 + PocoRedismd + PocoRedismt + + + ..\bin64\ + obj64\Redis\$(Configuration)\ + true + + + ..\bin64\ + obj64\Redis\$(Configuration)\ + false + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + ..\lib64\ + obj64\Redis\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin64\PocoRedis64d.dll + true + true + ..\bin64\PocoRedis64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoRedisd.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin64\PocoRedis64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoRedis.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoRedismtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoRedismtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoRedismt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoRedismdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoRedismdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoRedismd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/Redis_x64_vs140.vcxproj.filters b/Redis/Redis_x64_vs140.vcxproj.filters new file mode 100644 index 000000000..8f210571b --- /dev/null +++ b/Redis/Redis_x64_vs140.vcxproj.filters @@ -0,0 +1,75 @@ + + + + + {29acefbf-e487-412a-a81a-d25789c3a843} + + + {e85f7a69-9ab4-433b-9dad-130b5df5932a} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_vs100.vcxproj b/Redis/testsuite/TestSuite_vs100.vcxproj new file mode 100644 index 000000000..2d8d7ceff --- /dev/null +++ b/Redis/testsuite/TestSuite_vs100.vcxproj @@ -0,0 +1,325 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\TestSuite\$(Configuration)\ + true + bin\ + obj\TestSuite\$(Configuration)\ + false + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + true + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + false + bin\static_md\ + obj\TestSuite\$(Configuration)\ + true + bin\static_md\ + obj\TestSuite\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + %(AdditionalOptions) + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + %(AdditionalOptions) + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + %(AdditionalOptions) + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + %(AdditionalOptions) + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + %(AdditionalOptions) + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + %(AdditionalOptions) + + + + + + + + + + + + + + diff --git a/Redis/testsuite/TestSuite_vs100.vcxproj.filters b/Redis/testsuite/TestSuite_vs100.vcxproj.filters new file mode 100644 index 000000000..a782241ab --- /dev/null +++ b/Redis/testsuite/TestSuite_vs100.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {8cfd05a6-6b14-47ac-804d-5210887755ef} + + + {a7691369-e3b0-4eba-b478-97103ea1bee1} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_vs110.vcxproj b/Redis/testsuite/TestSuite_vs110.vcxproj new file mode 100644 index 000000000..5397f8d97 --- /dev/null +++ b/Redis/testsuite/TestSuite_vs110.vcxproj @@ -0,0 +1,325 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin\ + obj\TestSuite\$(Configuration)\ + true + + + bin\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + diff --git a/Redis/testsuite/TestSuite_vs110.vcxproj.filters b/Redis/testsuite/TestSuite_vs110.vcxproj.filters new file mode 100644 index 000000000..1b09e0684 --- /dev/null +++ b/Redis/testsuite/TestSuite_vs110.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {8868df83-0c3b-4fc7-b3fe-145e58d889ba} + + + {a5063940-1cd3-493b-b70e-a55607dd9398} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj b/Redis/testsuite/TestSuite_vs120.vcxproj new file mode 100644 index 000000000..def498763 --- /dev/null +++ b/Redis/testsuite/TestSuite_vs120.vcxproj @@ -0,0 +1,317 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin\ + obj\TestSuite\$(Configuration)\ + true + + + bin\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnit.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + + + diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj.filters b/Redis/testsuite/TestSuite_vs120.vcxproj.filters new file mode 100644 index 000000000..67fadb91e --- /dev/null +++ b/Redis/testsuite/TestSuite_vs120.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {49d91e9d-d81b-4e1c-96b9-f119b8fd1ebd} + + + {66c98dbb-b9b8-4430-afa3-d0dfac97937b} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_vs140.vcxproj b/Redis/testsuite/TestSuite_vs140.vcxproj new file mode 100644 index 000000000..049da2c55 --- /dev/null +++ b/Redis/testsuite/TestSuite_vs140.vcxproj @@ -0,0 +1,317 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin\ + obj\TestSuite\$(Configuration)\ + true + + + bin\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnit.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + + + diff --git a/Redis/testsuite/TestSuite_vs140.vcxproj.filters b/Redis/testsuite/TestSuite_vs140.vcxproj.filters new file mode 100644 index 000000000..9cd7b3fe7 --- /dev/null +++ b/Redis/testsuite/TestSuite_vs140.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {f7eef316-b51c-49d6-8cc0-9cd358e0237a} + + + {0c83830e-d1e3-4ad8-833c-5cfdbc27904f} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_vs90.vcproj b/Redis/testsuite/TestSuite_vs90.vcproj new file mode 100644 index 000000000..67b07872c --- /dev/null +++ b/Redis/testsuite/TestSuite_vs90.vcproj @@ -0,0 +1,464 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Redis/testsuite/TestSuite_x64_vs100.vcxproj b/Redis/testsuite/TestSuite_x64_vs100.vcxproj new file mode 100644 index 000000000..88cc539f6 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs100.vcxproj @@ -0,0 +1,325 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\TestSuite\$(Configuration)\ + true + bin64\ + obj64\TestSuite\$(Configuration)\ + false + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + true + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + false + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + true + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + %(AdditionalOptions) + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + %(AdditionalOptions) + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + %(AdditionalOptions) + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + %(AdditionalOptions) + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + %(AdditionalOptions) + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + %(AdditionalOptions) + + + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + %(AdditionalOptions) + + + + + + + + + + + + + + diff --git a/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters new file mode 100644 index 000000000..7e203d8b0 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {ab7634a1-1fbd-42d7-9f94-2ea6e5975d36} + + + {6f4f4265-0e8b-46d5-9b7a-00e723656f1b} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_x64_vs110.vcxproj b/Redis/testsuite/TestSuite_x64_vs110.vcxproj new file mode 100644 index 000000000..8d22e641d --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs110.vcxproj @@ -0,0 +1,325 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin64\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + diff --git a/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters new file mode 100644 index 000000000..936544ff3 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {cf0b663c-ca3e-45c2-87d5-70033cdc2b24} + + + {e008f572-57ab-4099-9539-f4a910ab2630} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_x64_vs120.vcxproj b/Redis/testsuite/TestSuite_x64_vs120.vcxproj new file mode 100644 index 000000000..38716e311 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj @@ -0,0 +1,317 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin64\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnit.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + + + diff --git a/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters new file mode 100644 index 000000000..eccba3954 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {64c39fac-1b97-4357-8a41-a0407ea79025} + + + {8bf8c61e-beb9-4e98-984d-293e36d028d3} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_x64_vs140.vcxproj b/Redis/testsuite/TestSuite_x64_vs140.vcxproj new file mode 100644 index 000000000..3e681d749 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs140.vcxproj @@ -0,0 +1,317 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin64\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnit.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + + + diff --git a/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters new file mode 100644 index 000000000..2d5c9e830 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {68163283-dc2c-4733-84f2-ea36a060e03a} + + + {e6d09f3a-bf0f-48fc-8bae-4d878bd2d65a} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file From 357aab1c7c82b8c19d326f4d094ad0161e8bc6c2 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Mon, 7 Mar 2016 06:57:52 +0100 Subject: [PATCH 038/131] bumped version of develop to 2.0 --- DLLVersion.rc | 6 +++--- Foundation/include/Poco/Version.h | 2 +- VERSION | 2 +- libversion | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DLLVersion.rc b/DLLVersion.rc index 5f0dd0591..9c2920005 100644 --- a/DLLVersion.rc +++ b/DLLVersion.rc @@ -4,8 +4,8 @@ #include "winres.h" -#define POCO_VERSION 1,7,0,0 -#define POCO_VERSION_STR "1.7.0" +#define POCO_VERSION 2,0,0,0 +#define POCO_VERSION_STR "2.0.0" VS_VERSION_INFO VERSIONINFO FILEVERSION POCO_VERSION @@ -28,7 +28,7 @@ BEGIN VALUE "FileDescription", "This file is part of the POCO C++ Libraries." VALUE "FileVersion", POCO_VERSION_STR VALUE "InternalName", "POCO" - VALUE "LegalCopyright", "Copyright (C) 2004-2015, Applied Informatics Software Engineering GmbH and Contributors." + VALUE "LegalCopyright", "Copyright (C) 2004-2016, Applied Informatics Software Engineering GmbH and Contributors." VALUE "ProductName", "POCO C++ Libraries - http://pocoproject.org" VALUE "ProductVersion", POCO_VERSION_STR END diff --git a/Foundation/include/Poco/Version.h b/Foundation/include/Poco/Version.h index cf2ae97a5..609b0e540 100644 --- a/Foundation/include/Poco/Version.h +++ b/Foundation/include/Poco/Version.h @@ -37,7 +37,7 @@ // Ax: alpha releases // Bx: beta releases // -#define POCO_VERSION 0x01070000 +#define POCO_VERSION 0x02000000 #endif // Foundation_Version_INCLUDED diff --git a/VERSION b/VERSION index bd8bf882d..227cea215 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.0 +2.0.0 diff --git a/libversion b/libversion index 425151f3a..abdfb053e 100644 --- a/libversion +++ b/libversion @@ -1 +1 @@ -40 +60 From 0708ba13926d39c2610b99e1776344e77692c5d8 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Mon, 7 Mar 2016 07:25:13 +0100 Subject: [PATCH 039/131] readd lost appveyor.yml --- appveyor.yml | 468 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 468 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..da63465f8 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,468 @@ +version: build {branch}-{build} + +cache: + - c:\mysql-5.7.9-win32 + - C:\ProgramData\chocolatey + - C:\OpenSSL-Win32 + - C:\OpenSSL-Win64 + +hosts: + localhost: 127.0.0.1 + db.server.com: 127.0.0.2 + +# mysql : server: localhost, port: 3306 +# mysql : user : root, password: Password12! +# - mysql + +# mongodb config : C:\mongodb\mongod.cfg +# mongodb database: C:\mongodb\data\db + +# Server name: localhost +# Server port: 5432 +# postgres account password: Password12! +services: + - postgresql94 + - mongodb + + +platform: + - x64 + - Win32 + +# ------------------------------------------------------------------------------------------- +# building debug configuration doubles the round time and isn't so useful. +# tests are run only in release & shared. +# ------------------------------------------------------------------------------------------- +configuration: + - release +# - debug +# ------------------------------------------------------------------------------------------- + +environment: + bundling: bundled + + matrix: + + - builder: msbuild + vsver: 120 + linkmode: shared + + - builder: msbuild + vsver: 120 + linkmode: static_md + + - builder: msbuild + vsver: 120 + linkmode: static_mt + +# ------------------------------------------------------------------------------------------- +# VS2013 runs a x64 or Win32 build & tests in around 32 mn +# Environment: builder=msbuild, vsver=120, linkmode=shared; Platform: Win32 31 min 33 sec +# Environment: builder=msbuild, vsver=120, linkmode=shared; Platform: x64 33 min 32 sec +# +# In VS2015 running either a x64 or Win32 build & tests takes twice time and thus makes the build failed since +# it overpasses 1 hour and free Appveyor account job are limited to 1 hour. Thus VS2015 builds +# are removed until one finds out the reason why build time is doubled. +# +# Environment: builder=msbuild, vsver=140, linkmode=shared; Platform: Win32 1 hr +# Environment: builder=msbuild, vsver=140, linkmode=shared; Platform: x64 1 hr +# ------------------------------------------------------------------------------------------- +# - builder: msbuild +# vsver: 140 +# linkmode: shared + +# - builder: msbuild +# vsver: 140 +# linkmode: static_md + +# - builder: msbuild +# vsver: 140 +# linkmode: static_mt + + - builder: cmake + vsver: 120 + +matrix: + fast_finish: true + +install: + - set POCO_BASE=%CD% + - set PATH=C:\ProgramData\chocolatey\bin;%PATH% + - c:\cygwin\bin\uname -a + - c:\cygwin\bin\cat /proc/cpuinfo + - c:\cygwin\bin\cat /proc/meminfo + - ps: | + if ($env:builder -eq "cmake") + { + if (Test-Path "$env:ChocolateyInstall\bin\jom.exe") { + echo "using jom from cache" + } else { + choco install jom + } + if (Test-Path "$env:ChocolateyInstall\bin\cmake.exe") { + echo "using cmake from cache" + } else { + choco install cmake + } + } + - set + +# ------------------------------------------------------------------------------------------- +# chocolatey brokes jom, here's workaround +# see https://github.com/jcfr/qt-easy-build/commit/6366f4275562bdaf4f686838600f46894579c41e) +# ------------------------------------------------------------------------------------------- + - ps: | + if ($env:builder -eq "cmake") + { + $env:PATH = $env:ChocolateyInstall + "\bin" + ";" + $env:PATH + $env:PATH = $env:ChocolateyInstall + "\lib\jom\content" + ";" + $env:PATH + } +# ------------------------------------------------------------------------------------------- + + +# ------------------------------------------------------------------------------------------- +# OpenSSL-Win32 & OpenSSL-Win64 +# Download & use OpenSSL from Shining Light Productions for CMake +# until CMake use implicitly the embedded openssl from the Poco repo. See issue #1093 +# ------------------------------------------------------------------------------------------- + - ps: | + if ($env:builder -eq "cmake") + { + if ($env:platform -eq "Win32") + { + if (Test-Path "C:\OpenSSL-Win32") { + echo "using C:\OpenSSL-Win32 from cache" + } else { + echo "downloading OpenSSL-Win32" + Start-FileDownload 'http://slproweb.com/download/Win32OpenSSL-1_0_2e.exe' + echo "installing C:\OpenSSL-Win32" + Start-Process "Win32OpenSSL-1_0_2e.exe" -Args "/silent /verysilent /sp- /suppressmsgboxes" -Wait + } + } + if ($env:platform -eq "x64") + { + if (Test-Path "C:\OpenSSL-Win64") { + echo "using C:\OpenSSL-Win64 from cache" + } else { + echo "downloading OpenSSL-Win64" + Start-FileDownload 'http://slproweb.com/download/Win64OpenSSL-1_0_2e.exe' + echo "installing C:\OpenSSL-Win64" + Start-Process "Win64OpenSSL-1_0_2e.exe" -Args "/silent /verysilent /sp- /suppressmsgboxes" -Wait + } + } + } +# ------------------------------------------------------------------------------------------- +# MySQL 32 bit is not available by default on AppVeyor +# ------------------------------------------------------------------------------------------- + - ps: | + if ($env:platform -eq "Win32") + { + if (Test-Path "c:\mysql-5.7.9-win32") { + echo "using c:\mysql-5.7.9-win32 from cache" + } + else + { + echo "downloading mysql-5.7.9-win32" + Invoke-WebRequest "http://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.9-win32.zip" -OutFile mysql-5.7.9-win32.zip + echo "installing c:\mysql-5.7.9-win32" + 7z x -y mysql-5.7.9-win32.zip -oc:\ + } + } + # ------------------------------------------------------------------------------------------- + + +before_build: + - ps: | + if ($env:vsver -eq "110") + { + $vspath= convert-path $env:VS110COMNTOOLS\..\..\VC\bin; $yyyy='2010' + if($env:platform -eq 'Win32') { $vctool='';} + if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } + } + if ($env:vsver -eq "120") + { + $vspath= convert-path $env:VS120COMNTOOLS\..\..\VC\bin;$yyyy='2013' + if($env:platform -eq 'Win32') { $vctool='';} + if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } + + } + if ($env:vsver -eq "140") + { + $vspath= convert-path $env:VS140COMNTOOLS\..\..\VC\bin; $yyyy='2015' + if($env:platform -eq 'Win32') { $vctool='';} + if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } + } + pushd $vspath; + $tool= if($vctool -eq '') {'32'} else {$vctool} + cmd /c "vcvars$tool.bat&set" | + foreach { + if ($_ -match "=") { + $v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" + } + } + popd + write-host "`nVisual Studio $yyyy CLI variables set." -ForegroundColor Yellow + +# ------------------------------------------------------------------------------------------- +# MySQL +# ------------------------------------------------------------------------------------------- + - ps: | + if ($env:platform -eq "Win32") + { + $env:INCLUDE = "C:\mysql-5.7.9-win32\include;" + $env:INCLUDE + $env:LIB = "C:\mysql-5.7.9-win32\lib;" + $env:LIB + } + if ($env:platform -eq "x64") + { + $env:INCLUDE = "C:\Program Files\MySql\MySQL Server 5.6\include;" + $env:INCLUDE + $env:LIB = "C:\Program Files\MySql\MySQL Server 5.6\lib;" + $env:LIB + } + +# ------------------------------------------------------------------------------------------- +# PostgreSQL +# ------------------------------------------------------------------------------------------- + - ps: | + if ($env:platform -eq "Win32") + { + $env:INCLUDE = "C:\Program Files (x86)\PostgreSQL\9.4\include;" + $env:INCLUDE + $env:LIB = "C:\Program Files (x86)\PostgreSQL\9.4\lib;" + $env:LIB + } + if ($env:platform -eq "x64") + { + $env:INCLUDE = "C:\Program Files\PostgreSQL\9.4\include;" + $env:INCLUDE + $env:LIB = "C:\Program Files\PostgreSQL\9.4\lib;" + $env:LIB + } + +after_build: + - ps: | + $line='-------------------------------------------------------------------------------------'; + $find='c:\cygwin\bin\find.exe'; + $arg1="$env:POCO_BASE -type f -name '*.cpp' -exec c:\cygwin\bin\grep -n -H "; + $arg2=" {} ;" + + $word='FIXME' + Write-Host -ForegroundColor Yellow $word; + Write-Host -ForegroundColor Yellow $line; + Start-Process -nnw -Wait -FilePath $find -Args "$arg1 $word $arg2" -RSO cout -RSE cerr; + gc cout; gc cerr; + Write-Host -ForegroundColor Yellow $line; + Write-Host;Write-Host; + + $word='TODO' + Write-Host -ForegroundColor Yellow $word; + Write-Host -ForegroundColor Yellow $line; + Start-Process -nnw -Wait -FilePath $find -Args "$arg1 $word $arg2" -RSO cout -RSE cerr; + gc cout; gc cerr; + Write-Host -ForegroundColor Yellow $line; + Write-Host;Write-Host; + + $word='HACK' + Write-Host -ForegroundColor Yellow $word; + Write-Host -ForegroundColor Yellow $line; + Start-Process -nnw -Wait -FilePath $find -Args "$arg1 $word $arg2" -RSO cout -RSE cerr; + gc cout; gc cerr; + Write-Host -ForegroundColor Yellow $line; + Write-Host;Write-Host; + + +build_script: +# ------------------------------------------------------------------------------------------- +# When building with cmake, it remains one exception reported below +# Once this problem be fixed, a fix from Microsoft about mc.exe outputing informative +# message on stderr: https://connect.microsoft.com/VisualStudio/Feedback/Details/2161572 +# the try/catch around the cmake builder can be removed +# +# [ 1%] Generating pocomsg.h +# cmake : MC: Compiling C:/projects/poco/Foundation/src/pocomsg.mc +# At line:16 char:3 +# + cmake --build . --config $env:configuration +# + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# + CategoryInfo : NotSpecified: (MC: Compiling C.../src/pocomsg.mc:String) [], RemoteException +# + FullyQualifiedErrorId : NativeCommandError +# +# Command executed with exception: MC: Compiling C:/projects/poco/Foundation/src/pocomsg.mc +# ------------------------------------------------------------------------------------------- + - ps: | + if ($env:builder -eq "msbuild") + { + $logger='"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"'; + $verbosity='minimal'; + + $process = Start-Process -PassThru -nnw -Wait -FilePath "$env:poco_base\buildwin.cmd" -RSO cout -RSE cerr ` + -Args "$env:vsver build $env:linkmode $env:configuration $env:platform samples tests msbuild $verbosity $logger"; + gc cout; gc cerr; + Write-Host -ForegroundColor Yellow '>>> current directory is ' $(get-location).Path; + } + if ($env:builder -eq "cmake") + { + mkdir cmake-build | out-null;pushd cmake-build; + if ($env:platform -eq "Win32") + { + $opensslrootdir = 'C:\OpenSSL-Win32' + } + if ($env:platform -eq "x64") + { + $opensslrootdir = 'C:\OpenSSL-Win64' + } + $defs =' -G"NMake Makefiles"'; + $defs+=" -DCMAKE_BUILD_TYPE=$env:configuration"; + $defs+=" -DOPENSSL_ROOT_DIR=$opensslrootdir"; + $defs+=" -DENABLE_NETSSL=OFF"; + $defs+=" -DENABLE_NETSSL_WIN=ON"; + $defs+=" -DENABLE_DATA_MYSQL=OFF"; + $defs+=" -DENABLE_REDIS=OFF"; + $defs+=" -DENABLE_SAMPLES=ON"; + $defs+=" -DENABLE_TESTS=ON"; + $defs+=" .."; + Write-Host -ForegroundColor Yellow cmake $defs + $process = Start-Process -PassThru -nnw -Wait -FilePath "cmake" -RSO cout -RSE cerr -Args $defs; + gc cout; gc cerr; + try { + $ErrorActionPreference = 'Continue'; + Write-Host -ForegroundColor Yellow cmake `-`-build . + cmake `-`-build . + } catch { + Write-Warning "Oops: $_" + } + popd + Write-Host -ForegroundColor Yellow '>>> current directory is ' $(get-location).Path; + $ErrorActionPreference = 'Stop'; + } + +before_test: +# ------------------------------------------------------------------------------------------- +# PostgreSQL + - set PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH% +# ------------------------------------------------------------------------------------------- + + - ps: | + $line='-------------------------------------------------------------------------------------'; + $CPPUNIT_IGNORE=''; + $CPPUNIT_IGNORE+='class CppUnit::TestCaller.testTimeSync'; + $CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testEchoIPv4'; + $CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testSendToReceiveFromIPv4'; + $CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testPing'; + $CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testProxy'; + $CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testProxy'; + set-item -force -path "ENV:CPPUNIT_IGNORE" -value $CPPUNIT_IGNORE + Write-Host -ForegroundColor Yellow 'CPPUNIT_IGNORE' + Write-Host -ForegroundColor Yellow $line; + foreach($t in $CPPUNIT_IGNORE.split(",")) { Write-Host -ForegroundColor Yellow $t.trim() } + Write-Host -ForegroundColor Yellow $line; + +after_test: + +test_script: + - ps: | + $runs=0;$fails=0;$failedTests='';$status=0;$tab="`t"; + $line='-------------------------------------------------------------------------------------'; + if ($env:configuration -eq "release") + { + if ($env:builder -eq "msbuild" -and $env:linkmode -eq "shared") + { + $suffix = ''; + if ($env:platform -eq "Win32") + { + $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = ''; + $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Data/PostgreSQL', 'Redis', 'PDF') + } + if ($env:platform -eq "x64") + { + $env:PATH = "$env:POCO_BASE\bin64;" + $env:PATH;$suffix = 64; + $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Redis', 'PDF') + } + + Write-Host -ForegroundColor Yellow '>>> current directory is ' $(get-location).Path; + + $components = gc $env:poco_base\components; + Write-Host components; + Write-Host -ForegroundColor Yellow $line; + $components; + Write-Host -ForegroundColor Yellow $line; + + + Write-Host excluded; + Write-Host -ForegroundColor Yellow $line; + $excluded + Write-Host -ForegroundColor Yellow $line; + + foreach ($component in $components) { + if ($excluded -notcontains $component) { + $path = "$env:poco_base\" + $component + "\testsuite\bin$suffix\TestSuite.exe"; + + if (Test-Path -Path $path) { + $runs += 1; + Add-AppveyorTest -Framework 'CppUnit' -Name $component -Outcome 'Running' + + Write-Host -ForegroundColor Yellow $line; + Write-Host -ForegroundColor Yellow '|' $env:APPVEYOR_BUILD_VERSION $env:vs$vsver $env:Platform $env:Configuration $env:linkmode '|' $tab $tab $component; + Write-Host -ForegroundColor Yellow $line; + + $started = Get-Date + $process = Start-Process -PassThru -nnw -Wait -FilePath "$path" -Args "-all" -RSO cout -RSE cerr; + $ended = Get-Date + $millisec = ($ended - $started).totalmilliseconds + + gc cout; gc cerr; + + if ($process.ExitCode -gt 0) { + $fails += 1;$failedTests += $component + ', '; + Add-AppveyorTest -Framework 'CppUnit' -Name $component -Outcome 'Failed' -Duration $millisec + } else { + Add-AppveyorTest -Framework 'CppUnit' -Name $component -Outcome 'Passed' -Duration $millisec + } + } else { + Add-AppveyorTest -Framework 'CppUnit' -Name $component -Outcome 'NotFound' + } + } else { + Add-AppveyorTest -Framework 'CppUnit' -Name $component -Outcome 'Skipped' + } + } + } + if ($env:builder -eq "cmake" -and $env:platform -eq "Win32") + { + pushd cmake-build; + Write-Host -ForegroundColor Yellow $line; + ctest -N + Write-Host -ForegroundColor Yellow $line; + + Write-Host -ForegroundColor Yellow 'ctest -VV -E Data*' + ctest -VV -E Data* + popd + } + Write-Host $runs' runs, ' $fails' fails' + if ($fails -gt 0) + { + Write-Host 'Failed: ' $failedTests + $host.SetShouldExit($fails); + } else + { + $host.SetShouldExit(0); + } + } + +on_success: + - echo success + +on_failure: + - echo failure + +on_finish: + - echo finish + +notifications: + - provider: Email + on_build_success: false + on_build_failure: false + on_build_status_changed: false + + - provider: Slack + incoming_webhook: https://hooks.slack.com/services/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 + auth_token: + secure: Xsss/K3VV9wZI9Ffwvafa67kyohNA437xJ3WA9fVI4w= + channel: appveyor + on_build_success: false + on_build_failure: true + on_build_status_changed: true + + From 3e47ae2fb1e88e7c1a4efadab7b9497ed37f27d1 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 08:16:48 +0100 Subject: [PATCH 040/131] Run Data/MySQL on AppVeyor Signed-off-by: FrancisANDRE --- Data/MySQL/testsuite/src/MySQLTest.cpp | 63 +++++++++++++++++------- Data/MySQL/testsuite/src/MySQLTest.h | 5 ++ Data/MySQL/testsuite/src/SQLExecutor.cpp | 8 +-- Data/MySQL/testsuite/src/SQLExecutor.h | 2 +- appveyor.yml | 13 +++-- 5 files changed, 63 insertions(+), 28 deletions(-) diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp index 1ab1f59a6..a61f0377a 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.cpp +++ b/Data/MySQL/testsuite/src/MySQLTest.cpp @@ -13,6 +13,7 @@ #include "MySQLTest.h" #include "CppUnit/TestCaller.h" #include "CppUnit/TestSuite.h" +#include "Poco/Environment.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Tuple.h" @@ -33,6 +34,7 @@ using Poco::Data::MySQL::ConnectionException; using Poco::Data::MySQL::Utility; using Poco::Data::MySQL::StatementException; using Poco::format; +using Poco::Environment; using Poco::NotFoundException; using Poco::Int32; using Poco::Nullable; @@ -44,21 +46,37 @@ Poco::SharedPtr MySQLTest::_pExecutor = 0; // // Parameters for barebone-test -#define MYSQL_USER "root" -#define MYSQL_PWD "poco" -#define MYSQL_HOST "localhost" -#define MYSQL_PORT 3306 -#define MYSQL_DB "pocotestdb" + +std::string MySQLTest::getHost() +{ + return "localhost"; +} +std::string MySQLTest::getPort() +{ + return "3306"; +} +std::string MySQLTest::getUser() +{ + return "root"; +} +std::string MySQLTest::getPass() +{ + if (Environment::has("APPVEYOR")) + return "Password12!"; + else + return "poco"; +} +std::string MySQLTest::getBase() +{ + return "pocotestdb"; +} + +std::string MySQLTest::_dbConnString; + + // // Connection string -std::string MySQLTest::_dbConnString = "host=" MYSQL_HOST - ";user=" MYSQL_USER - ";password=" MYSQL_PWD - ";db=" MYSQL_DB - ";compress=true" - ";auto-reconnect=true" - ";secure-auth=true"; MySQLTest::MySQLTest(const std::string& name): @@ -84,17 +102,18 @@ void MySQLTest::dbInfo(Session& session) void MySQLTest::connectNoDB() { - std::string dbConnString = "host=" MYSQL_HOST - ";user=" MYSQL_USER - ";password=" MYSQL_PWD - ";compress=true;auto-reconnect=true"; + std::string dbConnString; + dbConnString = "host=" + getHost(); + dbConnString += ";user=" + getUser(); + dbConnString += ";password=" + getPass(); + dbConnString += ";compress=true;auto-reconnect=true"; try { Session session(MySQL::Connector::KEY, dbConnString); std::cout << "Connected to [" << "MySQL" << "] without database." << std::endl; dbInfo(session); - session << "CREATE DATABASE IF NOT EXISTS " MYSQL_DB ";", now; + session << "CREATE DATABASE IF NOT EXISTS " + getBase() + ";", now; std::cout << "Disconnecting ..." << std::endl; session.close(); std::cout << "Disconnected." << std::endl; @@ -117,7 +136,7 @@ void MySQLTest::testBareboneMySQL() "Fourth INTEGER," "Fifth FLOAT)"; - _pExecutor->bareboneMySQLTest(MYSQL_HOST, MYSQL_USER, MYSQL_PWD, MYSQL_DB, MYSQL_PORT, tableCreateString.c_str()); + _pExecutor->bareboneMySQLTest(getHost(), getUser(), getPass(), getBase(), getPort(), tableCreateString.c_str()); } @@ -837,6 +856,14 @@ CppUnit::Test* MySQLTest::suite() { MySQL::Connector::registerConnector(); + _dbConnString = "host=" + getHost(); + _dbConnString += ";user=" + getUser(); + _dbConnString += ";password=" + getPass(); + _dbConnString += ";db=" + getBase(); + _dbConnString += ";compress=true"; + _dbConnString += ";auto-reconnect=true"; + _dbConnString += ";secure-auth=true"; + try { _pSession = new Session(MySQL::Connector::KEY, _dbConnString); diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h index d3eea4a65..af3f3a6a3 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.h +++ b/Data/MySQL/testsuite/src/MySQLTest.h @@ -128,6 +128,11 @@ private: static void dbInfo(Poco::Data::Session& session); + static std::string getHost(); + static std::string getPort(); + static std::string getUser(); + static std::string getPass(); + static std::string getBase(); static std::string _dbConnString; static Poco::SharedPtr _pSession; static Poco::SharedPtr _pExecutor; diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 00cfb351f..f2814d1bb 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -27,10 +27,6 @@ #include "Poco/Data/MySQL/Connector.h" #include "Poco/Data/MySQL/MySQLException.h" -#ifdef _WIN32 -#include -#endif - #include #include #include @@ -155,13 +151,13 @@ SQLExecutor::~SQLExecutor() } -void SQLExecutor::bareboneMySQLTest(const char* host, const char* user, const char* pwd, const char* db, int port, const char* tableCreateString) +void SQLExecutor::bareboneMySQLTest(const std::string& host, const std::string& user, const std::string& pwd, const std::string& db, const std::string& port, const char* tableCreateString) { int rc; MYSQL* hsession = mysql_init(0); assert (hsession != 0); - MYSQL* tmp = mysql_real_connect(hsession, host, user, pwd, db, port, 0, 0); + MYSQL* tmp = mysql_real_connect(hsession, host.c_str(), user.c_str(), pwd.c_str(), db.c_str(), stoi(port), 0, 0); assert(tmp == hsession); MYSQL_STMT* hstmt = mysql_stmt_init(hsession); diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h b/Data/MySQL/testsuite/src/SQLExecutor.h index e39baf81c..9a19eb2e3 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.h +++ b/Data/MySQL/testsuite/src/SQLExecutor.h @@ -38,7 +38,7 @@ public: SQLExecutor(const std::string& name, Poco::Data::Session* _pSession); ~SQLExecutor(); - void bareboneMySQLTest(const char* host, const char* user, const char* pwd, const char* db, int port, const char* tableCreateString); + void bareboneMySQLTest(const std::string& host, const std::string& user, const std::string& pwd, const std::string& db, const std::string& port, const char* tableCreateString); /// This function uses "bare bone" MySQL API calls (i.e. calls are not /// "wrapped" in PocoData framework structures). /// The purpose of the function is to verify that driver behaves diff --git a/appveyor.yml b/appveyor.yml index da63465f8..0d4393a12 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -330,10 +330,16 @@ build_script: } before_test: +# ------------------------------------------------------------------------------------------- +# MySQL + - ps: | + $env:MYSQL_PWD="Password12!" + $cmd = 'mysql -e "create database pocotestdb;" --user=root'; + iex "& $cmd" + # ------------------------------------------------------------------------------------------- # PostgreSQL - set PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH% -# ------------------------------------------------------------------------------------------- - ps: | $line='-------------------------------------------------------------------------------------'; @@ -352,6 +358,7 @@ before_test: after_test: + test_script: - ps: | $runs=0;$fails=0;$failedTests='';$status=0;$tab="`t"; @@ -364,12 +371,12 @@ test_script: if ($env:platform -eq "Win32") { $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = ''; - $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Data/PostgreSQL', 'Redis', 'PDF') + $excluded = @('Data', 'Data/ODBC','Data/PostgreSQL', 'Redis', 'PDF') } if ($env:platform -eq "x64") { $env:PATH = "$env:POCO_BASE\bin64;" + $env:PATH;$suffix = 64; - $excluded = @('Data', 'Data/MySQL', 'Data/ODBC','Redis', 'PDF') + $excluded = @('Data', 'Data/ODBC','Redis', 'PDF') } Write-Host -ForegroundColor Yellow '>>> current directory is ' $(get-location).Path; From b158ae11dbe00d3420557cbec8f652161c5139d2 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 08:21:53 +0100 Subject: [PATCH 041/131] Use getPass instead of getPassword as in MySQL. Signed-off-by: FrancisANDRE --- Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp | 8 ++++---- Data/PostgreSQL/testsuite/src/PostgreSQLTest.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp index 67aa79150..196f360fb 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp @@ -83,7 +83,7 @@ std::string PostgreSQLTest::getBase(){ std::string PostgreSQLTest::getUser(){ return "postgres"; } -std::string PostgreSQLTest::getPassword(){ +std::string PostgreSQLTest::getPass(){ if (Environment::has("APPVEYOR")) { return "Password12!"; @@ -123,7 +123,7 @@ void PostgreSQLTest::testConnectNoDB() std::string dbConnString; dbConnString += "host=" + getHost(); dbConnString += " user=" + getUser(); - dbConnString += " password=" + getPassword(); + dbConnString += " password=" + getPass(); try { @@ -293,7 +293,7 @@ void PostgreSQLTest::testPostgreSQLOIDs() 142 }; - _pExecutor->oidPostgreSQLTest(getHost(), getUser(), getPassword(), getBase(), getPort(), tableCreateString.c_str(), OIDArray); + _pExecutor->oidPostgreSQLTest(getHost(), getUser(), getPass(), getBase(), getPort(), tableCreateString.c_str(), OIDArray); } @@ -1047,7 +1047,7 @@ CppUnit::Test* PostgreSQLTest::suite() _dbConnString += "host=" + getHost(); _dbConnString += " user=" + getUser(); - _dbConnString += " password=" + getPassword(); + _dbConnString += " password=" + getPass(); _dbConnString += " dbname=" + getBase(); _dbConnString += " port=" + getPort(); diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h index 638067cbe..515c76d3e 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h @@ -151,7 +151,7 @@ private: static std::string getPort(); static std::string getBase(); static std::string getUser(); - static std::string getPassword(); + static std::string getPass(); static std::string _dbConnString; static Poco::SharedPtr _pSession; From 8fd22dd5bcf2c6e1725e9fae518cba1279c66f56 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 08:22:13 +0100 Subject: [PATCH 042/131] Fix tml typo. Signed-off-by: FrancisANDRE --- appveyor.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0d4393a12..4f85b5122 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -330,16 +330,17 @@ build_script: } before_test: -# ------------------------------------------------------------------------------------------- -# MySQL - - ps: | - $env:MYSQL_PWD="Password12!" - $cmd = 'mysql -e "create database pocotestdb;" --user=root'; - iex "& $cmd" - # ------------------------------------------------------------------------------------------- # PostgreSQL - set PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH% + +# ------------------------------------------------------------------------------------------- +# MySQL + - ps: | + $env:MYSQL_PWD="Password12!" + $cmd = 'mysql -e "create database pocotestdb;" --user=root'; + iex "& $cmd" + - ps: | $line='-------------------------------------------------------------------------------------'; From 0432b414a905a1b492e9d3ff2e73ae238494d731 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 08:48:41 +0100 Subject: [PATCH 043/131] Separate mysql PATH between Win32 & x64 Signed-off-by: FrancisANDRE --- appveyor.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 4f85b5122..d385b94a9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -337,6 +337,14 @@ before_test: # ------------------------------------------------------------------------------------------- # MySQL - ps: | + if ($env:platform -eq "Win32") + { + $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH + } + if ($env:platform -eq "x64") + { + $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH + } $env:MYSQL_PWD="Password12!" $cmd = 'mysql -e "create database pocotestdb;" --user=root'; iex "& $cmd" From 2d42e526eaacccdf6023c390ab76b9678b581d12 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 10:39:36 +0100 Subject: [PATCH 044/131] Add MySQL to Travis Signed-off-by: FrancisANDRE --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 879e4f198..0cc9c75bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ services: - mongodb - redis-server - postgresql + - mysql addons: postgresql: "9.3" @@ -41,6 +42,7 @@ before_script: - sqlite3 -version - chmod 755 ./travis/Linux/runtests.sh - chmod 755 ./travis/OSX/runtests.sh + - mysql -u root -e 'create database pocotestdb;' matrix: include: From 29140dbf61b6a7d7477179dc312d46697923b090 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Mon, 7 Mar 2016 11:48:45 +0100 Subject: [PATCH 045/131] use Poco::NumberParser to convert the port to int --- Data/MySQL/testsuite/src/SQLExecutor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index f2814d1bb..e680fa8f0 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -12,6 +12,7 @@ #include "CppUnit/TestCase.h" #include "SQLExecutor.h" +#include "Poco/NumberParser.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Tuple.h" @@ -39,6 +40,7 @@ using Poco::Data::MySQL::StatementException; using Poco::format; using Poco::Tuple; using Poco::DateTime; +using Poco::NumberParser; using Poco::Any; using Poco::AnyCast; using Poco::NotFoundException; @@ -157,7 +159,7 @@ void SQLExecutor::bareboneMySQLTest(const std::string& host, const std::string& MYSQL* hsession = mysql_init(0); assert (hsession != 0); - MYSQL* tmp = mysql_real_connect(hsession, host.c_str(), user.c_str(), pwd.c_str(), db.c_str(), stoi(port), 0, 0); + MYSQL* tmp = mysql_real_connect(hsession, host.c_str(), user.c_str(), pwd.c_str(), db.c_str(), NumberParser::parse(port), 0, 0); assert(tmp == hsession); MYSQL_STMT* hstmt = mysql_stmt_init(hsession); From c7335cfc7837f025d173ac6badbf0a1fe26c7947 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 12:27:03 +0100 Subject: [PATCH 046/131] Run mysql create database only on Linux. Signed-off-by: FrancisANDRE --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0cc9c75bd..06d21f48f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ before_script: - sqlite3 -version - chmod 755 ./travis/Linux/runtests.sh - chmod 755 ./travis/OSX/runtests.sh - - mysql -u root -e 'create database pocotestdb;' + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql -u root -e 'create database pocotestdb;'; fi matrix: include: From f42babf066920de00f57248eb03e60e14bd342f8 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 14:29:24 +0100 Subject: [PATCH 047/131] Run Data/MySQL testsuite. Signed-off-by: FrancisANDRE --- travis/Linux/excluded.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/Linux/excluded.sh b/travis/Linux/excluded.sh index 4f04e8c2d..784abb1f7 100755 --- a/travis/Linux/excluded.sh +++ b/travis/Linux/excluded.sh @@ -1,2 +1,2 @@ -export EXCLUDE_TESTS="Data/MySQL Data/ODBC PDF" +export EXCLUDE_TESTS="Data/ODBC PDF" From d9089617404bcb9da0a3e3ba7f5941cbc5afd819 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Mon, 7 Mar 2016 14:40:08 +0100 Subject: [PATCH 048/131] restore filemode --- travis/Linux/runtests.sh | 2 ++ travis/OSX/runtests.sh | 2 ++ travis/ignored.sh | 0 3 files changed, 4 insertions(+) mode change 100644 => 100755 travis/ignored.sh diff --git a/travis/Linux/runtests.sh b/travis/Linux/runtests.sh index 666932a7d..6540a5d3d 100755 --- a/travis/Linux/runtests.sh +++ b/travis/Linux/runtests.sh @@ -1,5 +1,7 @@ #!/bin/bash +# # set -ev +# set -v export POCO_BASE=`pwd` export PATH=$PATH:. diff --git a/travis/OSX/runtests.sh b/travis/OSX/runtests.sh index 3445e88fa..3619f165a 100755 --- a/travis/OSX/runtests.sh +++ b/travis/OSX/runtests.sh @@ -1,5 +1,7 @@ #!/bin/bash +# # set -ev +# set -v export POCO_BASE=`pwd` export PATH=$PATH:. diff --git a/travis/ignored.sh b/travis/ignored.sh old mode 100644 new mode 100755 From bbe99915bb3df4336a05d9628e3602a238b62c57 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 15:05:39 +0100 Subject: [PATCH 049/131] Test MySQL database creation. Signed-off-by: FrancisANDRE --- appveyor.yml | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d385b94a9..d2590770f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -155,19 +155,34 @@ install: # MySQL 32 bit is not available by default on AppVeyor # ------------------------------------------------------------------------------------------- - ps: | - if ($env:platform -eq "Win32") - { - if (Test-Path "c:\mysql-5.7.9-win32") { - echo "using c:\mysql-5.7.9-win32 from cache" - } - else - { - echo "downloading mysql-5.7.9-win32" - Invoke-WebRequest "http://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.9-win32.zip" -OutFile mysql-5.7.9-win32.zip - echo "installing c:\mysql-5.7.9-win32" - 7z x -y mysql-5.7.9-win32.zip -oc:\ - } - } + if ($env:platform -eq "Win32") + { + if (Test-Path "c:\mysql-5.7.9-win32") { + echo "using c:\mysql-5.7.9-win32 from cache" + } + else + { + echo "downloading mysql-5.7.9-win32" + Invoke-WebRequest "http://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.9-win32.zip" -OutFile mysql-5.7.9-win32.zip + echo "installing c:\mysql-5.7.9-win32" + 7z x -y mysql-5.7.9-win32.zip -oc:\ + } + } +# ------------------------------------------------------------------------------------------- +# MySQL + - ps: | + if ($env:platform -eq "Win32") + { + $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH + } + if ($env:platform -eq "x64") + { + $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH + } + $env:MYSQL_PWD="Password12!" + $cmd = 'mysql -e "create database pocotestdb;" --user=root'; + iex "& $cmd" + # ------------------------------------------------------------------------------------------- @@ -334,21 +349,6 @@ before_test: # PostgreSQL - set PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH% -# ------------------------------------------------------------------------------------------- -# MySQL - - ps: | - if ($env:platform -eq "Win32") - { - $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH - } - if ($env:platform -eq "x64") - { - $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH - } - $env:MYSQL_PWD="Password12!" - $cmd = 'mysql -e "create database pocotestdb;" --user=root'; - iex "& $cmd" - - ps: | $line='-------------------------------------------------------------------------------------'; From 70bd0c1c8437a2676f65d26e012fd2bb3c035399 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 15:13:05 +0100 Subject: [PATCH 050/131] Start mysql service Signed-off-by: FrancisANDRE --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d2590770f..afa871a1c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,19 +10,19 @@ hosts: localhost: 127.0.0.1 db.server.com: 127.0.0.2 +services: # mysql : server: localhost, port: 3306 # mysql : user : root, password: Password12! -# - mysql + - mysql # mongodb config : C:\mongodb\mongod.cfg # mongodb database: C:\mongodb\data\db + - mongodb # Server name: localhost # Server port: 5432 # postgres account password: Password12! -services: - postgresql94 - - mongodb platform: From 65c57f0ac54156c79d56b684b76deed25057836b Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 15:31:28 +0100 Subject: [PATCH 051/131] Create MySQL database after MySQL service be started! Signed-off-by: FrancisANDRE --- appveyor.yml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index afa871a1c..ad336c230 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -169,21 +169,6 @@ install: } } # ------------------------------------------------------------------------------------------- -# MySQL - - ps: | - if ($env:platform -eq "Win32") - { - $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH - } - if ($env:platform -eq "x64") - { - $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH - } - $env:MYSQL_PWD="Password12!" - $cmd = 'mysql -e "create database pocotestdb;" --user=root'; - iex "& $cmd" - - # ------------------------------------------------------------------------------------------- before_build: @@ -226,12 +211,19 @@ before_build: { $env:INCLUDE = "C:\mysql-5.7.9-win32\include;" + $env:INCLUDE $env:LIB = "C:\mysql-5.7.9-win32\lib;" + $env:LIB + $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH } if ($env:platform -eq "x64") { $env:INCLUDE = "C:\Program Files\MySql\MySQL Server 5.6\include;" + $env:INCLUDE $env:LIB = "C:\Program Files\MySql\MySQL Server 5.6\lib;" + $env:LIB + $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH } + $env:MYSQL_PWD="Password12!" + $cmd = 'mysql -e "create database pocotestdb;" --user=root'; + iex "& $cmd" + + # ------------------------------------------------------------------------------------------- # ------------------------------------------------------------------------------------------- # PostgreSQL From 660cae629bdb4cb750c2aa43123a0b1bec9b909f Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 7 Mar 2016 16:06:03 +0100 Subject: [PATCH 052/131] WIP Data/MySQL Signed-off-by: FrancisANDRE --- .../testsuite/TestSuite_x64_vs120.vcxproj | 60 +++++++++---------- appveyor.yml | 1 - 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj index 5b357abea..89c1a5618 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.30501.0 TestSuited @@ -136,7 +136,7 @@ true true true - + Level3 ProgramDatabase Default @@ -167,9 +167,9 @@ true true true - + Level3 - + Default @@ -196,7 +196,7 @@ true true true - + Level3 ProgramDatabase Default @@ -227,9 +227,9 @@ true true true - + Level3 - + Default @@ -256,7 +256,7 @@ true true true - + Level3 ProgramDatabase Default @@ -287,9 +287,9 @@ true true true - + Level3 - + Default @@ -304,16 +304,16 @@ - - - + + + - - - - + + + + - - - + + + \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index ad336c230..45a3a8efd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -222,7 +222,6 @@ before_build: $env:MYSQL_PWD="Password12!" $cmd = 'mysql -e "create database pocotestdb;" --user=root'; iex "& $cmd" - # ------------------------------------------------------------------------------------------- # ------------------------------------------------------------------------------------------- From d17882f6d05044166e3fa1881f43069a35159b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Mon, 7 Mar 2016 15:36:51 -0300 Subject: [PATCH 053/131] Added initial support for IBM XLC for AIX systems --- cmake/DefinePlatformSpecifc.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/DefinePlatformSpecifc.cmake b/cmake/DefinePlatformSpecifc.cmake index 8937f34cd..039674725 100644 --- a/cmake/DefinePlatformSpecifc.cmake +++ b/cmake/DefinePlatformSpecifc.cmake @@ -88,10 +88,12 @@ else (CYGWIN) if (QNX) add_definitions( -DPOCO_HAVE_FD_POLL) set(SYSLIBS m socket) - else (QNX) + elseif(${CMAKE_SYSTEM} MATCHES "AIX") + add_definitions(-D__IBMCPP_TR1__) + else () add_definitions( -D_XOPEN_SOURCE=500 -DPOCO_HAVE_FD_EPOLL) set(SYSLIBS pthread dl rt) - endif (QNX) + endif () endif (APPLE) endif(UNIX AND NOT ANDROID ) endif (CYGWIN) @@ -121,3 +123,9 @@ endif(IOS) if (ANDROID) add_definitions( -DPOCO_ANDROID -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING -DPOCO_NO_SHAREDMEMORY ) endif(ANDROID) + +# IBM XLC for AIX +if ((${CMAKE_CXX_COMPILER_ID} MATCHES "XL") and (${CMAKE_SYSTEM} MATCHES "AIX")) + set(WARNINGS_FLAGS "-qsuppress=1540-0198 -qsuppress=1540-1628 -qsuppress=1540-0095 -qsuppress=1500-030") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qlanglvl=extended0x -qlanglvl=noconstexpr -qlanglvl=newexcp ${WARNINGS_FLAGS}") +endif() From 7ec1cf4c2d5ee123d83dc28889a0611d4d0ff447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Mon, 7 Mar 2016 20:22:32 +0100 Subject: [PATCH 054/131] remove biicode link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 32cdc80ae..c8db4970f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Build Status - Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=develop)](https://travis-ci.org/pocoproject/poco) - AppVeyor: [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae)](https://ci.appveyor.com/project/obiltschnig/poco) -- biicode: [![Build Status](https://webapi.biicode.com/v1/badges/fenix/fenix/poco/develop)](https://www.biicode.com/fenix/fenix/poco/develop) + ![alt text][logo] From db95b94c8cd89fd3668bf9baed35da719f6b83c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Mon, 7 Mar 2016 16:28:02 -0300 Subject: [PATCH 055/131] Fixed compilation on IBM XLC due to incorrect function call Templated functions dependent of a templated class must be prefixed with the "template" keyword. --- Foundation/include/Poco/Dynamic/Struct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/include/Poco/Dynamic/Struct.h b/Foundation/include/Poco/Dynamic/Struct.h index 7f419cad3..83875785e 100644 --- a/Foundation/include/Poco/Dynamic/Struct.h +++ b/Foundation/include/Poco/Dynamic/Struct.h @@ -190,7 +190,7 @@ public: std::string toString() { std::string str; - Var(*this).convert(str); + Var(*this).template convert(str); return str; } From d67c9ea6f271c75288d8a52027fd47e91766f2b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Mon, 7 Mar 2016 16:31:07 -0300 Subject: [PATCH 056/131] On AIX, statfs takes a non-const char* as the first parameter. Fixing it. Since the function does not change the content of the variable, it is safe to remove the constness of the variable for UNIX platforms. --- Foundation/src/File_UNIX.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Foundation/src/File_UNIX.cpp b/Foundation/src/File_UNIX.cpp index 9546b8e2b..933d3f2d8 100644 --- a/Foundation/src/File_UNIX.cpp +++ b/Foundation/src/File_UNIX.cpp @@ -419,7 +419,7 @@ FileImpl::FileSizeImpl FileImpl::totalSpaceImpl() const poco_assert(!_path.empty()); struct statfs stats; - if (statfs(_path.c_str(), &stats) != 0) + if (statfs(const_cast(_path.c_str()), &stats) != 0) handleLastErrorImpl(_path); return (FileSizeImpl)stats.f_blocks * (FileSizeImpl)stats.f_bsize; @@ -431,7 +431,7 @@ FileImpl::FileSizeImpl FileImpl::usableSpaceImpl() const poco_assert(!_path.empty()); struct statfs stats; - if (statfs(_path.c_str(), &stats) != 0) + if (statfs(const_cast(_path.c_str()), &stats) != 0) handleLastErrorImpl(_path); return (FileSizeImpl)stats.f_bavail * (FileSizeImpl)stats.f_bsize; @@ -443,7 +443,7 @@ FileImpl::FileSizeImpl FileImpl::freeSpaceImpl() const poco_assert(!_path.empty()); struct statfs stats; - if (statfs(_path.c_str(), &stats) != 0) + if (statfs(const_cast(_path.c_str()), &stats) != 0) handleLastErrorImpl(_path); return (FileSizeImpl)stats.f_bfree * (FileSizeImpl)stats.f_bsize; From 5f94a7488693340ca43713510aa4062367a138c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Mon, 7 Mar 2016 16:33:59 -0300 Subject: [PATCH 057/131] Removed "using std::swap" directive from nested namespace IBM XLC refuses to compile since it tries to instantiate all the possible specializations for std::swap, right before one. --- Foundation/include/Poco/Dynamic/VarIterator.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Foundation/include/Poco/Dynamic/VarIterator.h b/Foundation/include/Poco/Dynamic/VarIterator.h index 2f3694912..a3b58328e 100644 --- a/Foundation/include/Poco/Dynamic/VarIterator.h +++ b/Foundation/include/Poco/Dynamic/VarIterator.h @@ -139,7 +139,6 @@ inline bool VarIterator::operator != (const VarIterator& other) const namespace std { - using std::swap; template<> inline void swap(Poco::Dynamic::VarIterator& s1, Poco::Dynamic::VarIterator& s2) From 6dcf71dd9669e2a7ae04340255e6ad3760ee3f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Mon, 7 Mar 2016 16:36:39 -0300 Subject: [PATCH 058/131] Fixed wrong casing on the CMake script --- cmake/DefinePlatformSpecifc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/DefinePlatformSpecifc.cmake b/cmake/DefinePlatformSpecifc.cmake index 039674725..3ffb35475 100644 --- a/cmake/DefinePlatformSpecifc.cmake +++ b/cmake/DefinePlatformSpecifc.cmake @@ -125,7 +125,7 @@ if (ANDROID) endif(ANDROID) # IBM XLC for AIX -if ((${CMAKE_CXX_COMPILER_ID} MATCHES "XL") and (${CMAKE_SYSTEM} MATCHES "AIX")) +if ((${CMAKE_CXX_COMPILER_ID} MATCHES "XL") AND (${CMAKE_SYSTEM} MATCHES "AIX")) set(WARNINGS_FLAGS "-qsuppress=1540-0198 -qsuppress=1540-1628 -qsuppress=1540-0095 -qsuppress=1500-030") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qlanglvl=extended0x -qlanglvl=noconstexpr -qlanglvl=newexcp ${WARNINGS_FLAGS}") endif() From 80ce6016dd7eb220cc302b9e53991c8f33375dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Mon, 7 Mar 2016 16:39:18 -0300 Subject: [PATCH 059/131] Fixed compilation error due to missing functions from cmath IBM XLC has no functions from under the std namespace. Added a workaround for XLC on AIX. --- Foundation/include/Poco/FPEnvironment_C99.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Foundation/include/Poco/FPEnvironment_C99.h b/Foundation/include/Poco/FPEnvironment_C99.h index 3dbe70396..b5381dd58 100644 --- a/Foundation/include/Poco/FPEnvironment_C99.h +++ b/Foundation/include/Poco/FPEnvironment_C99.h @@ -25,6 +25,22 @@ #include +#if defined(POCO_OS_AIX) + + +namespace std { + + +using ::isinf; +using ::isnan; + + +} // namespace std + + +#endif + + namespace Poco { From 4b4b3527a0d8368e5df2e1442494b12ed982d845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Mon, 7 Mar 2016 17:36:51 -0300 Subject: [PATCH 060/131] Fixed PageCompiler miscompilation due to missing pthreads libs on AIX Added the support for it through CMake. --- PageCompiler/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PageCompiler/CMakeLists.txt b/PageCompiler/CMakeLists.txt index 4aa148965..289dc7ba9 100644 --- a/PageCompiler/CMakeLists.txt +++ b/PageCompiler/CMakeLists.txt @@ -4,13 +4,15 @@ set(POCO_EXENAME "PageCompiler") file(GLOB SRCS_G "src/*.cpp") POCO_SOURCES_AUTO( SRCS ${SRCS_G}) +find_package(Threads REQUIRED) + add_executable( "${POCO_EXENAME}" ${SRCS} ) set_target_properties( "${POCO_EXENAME}" PROPERTIES OUTPUT_NAME cpspc ) -target_link_libraries( "${POCO_EXENAME}" Net Util XML JSON Foundation) +target_link_libraries( "${POCO_EXENAME}" ${CMAKE_THREAD_LIBS_INIT} Net Util XML JSON Foundation) install( TARGETS "${POCO_EXENAME}" EXPORT "${POCO_EXENAME}Targets" @@ -22,4 +24,4 @@ install( if (ENABLE_SAMPLES) # add_subdirectory(samples) endif () - \ No newline at end of file + From 70fcca0d58f769b65c9fb25cd2332b0b9e15357f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Mon, 7 Mar 2016 17:40:09 -0300 Subject: [PATCH 061/131] Fixed miscompilation of File2Page due to missing pthreads libs on AIX --- PageCompiler/File2Page/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PageCompiler/File2Page/CMakeLists.txt b/PageCompiler/File2Page/CMakeLists.txt index cb6d9694b..68c32362b 100644 --- a/PageCompiler/File2Page/CMakeLists.txt +++ b/PageCompiler/File2Page/CMakeLists.txt @@ -10,7 +10,7 @@ set_target_properties( "${POCO_EXENAME}" OUTPUT_NAME f2cpsp ) -target_link_libraries( "${POCO_EXENAME}" Net Util XML JSON Foundation) +target_link_libraries( "${POCO_EXENAME}" ${CMAKE_THREAD_LIBS_INIT} Net Util XML JSON Foundation) install( TARGETS "${POCO_EXENAME}" EXPORT "${POCO_EXENAME}Targets" From 19d1657feb66d8796b282dff284a4cd5b0f79029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Mon, 7 Mar 2016 17:42:56 -0300 Subject: [PATCH 062/131] Fixed miscompilation due to missing libraries on AIX Added the find_packages directive in the right place now. --- CMakeLists.txt | 2 ++ PageCompiler/CMakeLists.txt | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b38de57e..550b2759c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,6 +169,8 @@ add_subdirectory(Net) list(APPEND Poco_COMPONENTS "Net") endif() +# Pthreads/threads support +find_package(Threads REQUIRED) #NetSSL diff --git a/PageCompiler/CMakeLists.txt b/PageCompiler/CMakeLists.txt index 289dc7ba9..5d0a479e5 100644 --- a/PageCompiler/CMakeLists.txt +++ b/PageCompiler/CMakeLists.txt @@ -4,8 +4,6 @@ set(POCO_EXENAME "PageCompiler") file(GLOB SRCS_G "src/*.cpp") POCO_SOURCES_AUTO( SRCS ${SRCS_G}) -find_package(Threads REQUIRED) - add_executable( "${POCO_EXENAME}" ${SRCS} ) set_target_properties( "${POCO_EXENAME}" PROPERTIES From c3041eefd53df8684fb304f236b12034d9667646 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Mon, 7 Mar 2016 22:13:28 -0800 Subject: [PATCH 063/131] Update TestSuite_vs120.vcxproj --- Foundation/testsuite/TestSuite_vs120.vcxproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj b/Foundation/testsuite/TestSuite_vs120.vcxproj index ed2aecd49..c8de003b1 100644 --- a/Foundation/testsuite/TestSuite_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_vs120.vcxproj @@ -588,11 +588,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> develop From ec168cad6fc91572aa6808cffd849d3d93e8a9f9 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 10:55:14 +0100 Subject: [PATCH 064/131] Use empty password for root user on Travis. Signed-off-by: FrancisANDRE --- Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj | 8 +++++++- Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters | 5 +++++ Data/MySQL/testsuite/src/MySQLTest.cpp | 2 ++ Data/MySQL/testsuite/src/SQLExecutor.cpp | 1 - 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj index 89c1a5618..45bfb0a42 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -312,7 +312,13 @@ - + + false + false + + + + diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters index 75d5f77a5..706aad139 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -51,4 +51,9 @@ _Driver\Source Files + + + MySQL\Source Files + + \ No newline at end of file diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp index a61f0377a..e9bf2f676 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.cpp +++ b/Data/MySQL/testsuite/src/MySQLTest.cpp @@ -63,6 +63,8 @@ std::string MySQLTest::getPass() { if (Environment::has("APPVEYOR")) return "Password12!"; + else if (Environment::has("TRAVIS")) + return ""; else return "poco"; } diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index e680fa8f0..b4270de4a 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -9,7 +9,6 @@ // SPDX-License-Identifier: BSL-1.0 // - #include "CppUnit/TestCase.h" #include "SQLExecutor.h" #include "Poco/NumberParser.h" From 7f56eac7cbbd9a46644633925192c52d41de0769 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 11:52:51 +0100 Subject: [PATCH 065/131] MySQL win32 is empty. Fix proper download URL. Signed-off-by: FrancisANDRE --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 45a3a8efd..259599660 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -157,13 +157,13 @@ install: - ps: | if ($env:platform -eq "Win32") { - if (Test-Path "c:\mysql-5.7.9-win32") { + if (Test-Path "c:\mysql-5.7.9-win32" -and false) { echo "using c:\mysql-5.7.9-win32 from cache" } else { echo "downloading mysql-5.7.9-win32" - Invoke-WebRequest "http://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.9-win32.zip" -OutFile mysql-5.7.9-win32.zip + Invoke-WebRequest "http://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.11-win32.zip" -OutFile mysql-5.7.9-win32.zip echo "installing c:\mysql-5.7.9-win32" 7z x -y mysql-5.7.9-win32.zip -oc:\ } From 4441b38228433dd76b32701bd571ce052cb363c5 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 12:32:17 +0100 Subject: [PATCH 066/131] PowerShell false constant is False and not false! Signed-off-by: FrancisANDRE --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 259599660..cc62f59b6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,8 +26,8 @@ services: platform: - - x64 - Win32 + - x64 # ------------------------------------------------------------------------------------------- # building debug configuration doubles the round time and isn't so useful. @@ -157,7 +157,7 @@ install: - ps: | if ($env:platform -eq "Win32") { - if (Test-Path "c:\mysql-5.7.9-win32" -and false) { + if (Test-Path "c:\mysql-5.7.9-win32" -and False) { echo "using c:\mysql-5.7.9-win32 from cache" } else From be1a697791b0ee8a1b5c7636fb31ce90a0c3e60c Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 12:36:00 +0100 Subject: [PATCH 067/131] Merge with pocoproject/develop Signed-off-by: FrancisANDRE --- PocoDoc/resources/js/iframeResizer.contentWindow.js | 0 PocoDoc/resources/js/iframeResizer.contentWindow.min.js | 0 PocoDoc/resources/js/iframeResizer.js | 0 PocoDoc/resources/js/iframeResizer.min.js | 0 SevenZip/src/7z.h | 0 SevenZip/src/7zAlloc.c | 0 SevenZip/src/7zAlloc.h | 0 SevenZip/src/7zBuf.c | 0 SevenZip/src/7zBuf.h | 0 SevenZip/src/7zBuf2.c | 0 SevenZip/src/7zCrc.c | 0 SevenZip/src/7zCrc.h | 0 SevenZip/src/7zCrcOpt.c | 0 SevenZip/src/7zDec.c | 0 SevenZip/src/7zFile.c | 0 SevenZip/src/7zFile.h | 0 SevenZip/src/7zIn.c | 0 SevenZip/src/7zStream.c | 0 SevenZip/src/7zVersion.h | 0 SevenZip/src/Alloc.c | 0 SevenZip/src/Alloc.h | 0 SevenZip/src/Bcj2.c | 0 SevenZip/src/Bcj2.h | 0 SevenZip/src/Bra.c | 0 SevenZip/src/Bra.h | 0 SevenZip/src/Bra86.c | 0 SevenZip/src/BraIA64.c | 0 SevenZip/src/CpuArch.c | 0 SevenZip/src/CpuArch.h | 0 SevenZip/src/Delta.c | 0 SevenZip/src/Delta.h | 0 SevenZip/src/LzFind.c | 0 SevenZip/src/LzFind.h | 0 SevenZip/src/LzFindMt.c | 0 SevenZip/src/LzFindMt.h | 0 SevenZip/src/LzHash.h | 0 SevenZip/src/Lzma2Dec.c | 0 SevenZip/src/Lzma2Dec.h | 0 SevenZip/src/Lzma2Enc.c | 0 SevenZip/src/Lzma2Enc.h | 0 SevenZip/src/Lzma86.h | 0 SevenZip/src/Lzma86Dec.c | 0 SevenZip/src/Lzma86Enc.c | 0 SevenZip/src/LzmaDec.c | 0 SevenZip/src/LzmaDec.h | 0 SevenZip/src/LzmaEnc.c | 0 SevenZip/src/LzmaEnc.h | 0 SevenZip/src/LzmaLib.c | 0 SevenZip/src/LzmaLib.h | 0 SevenZip/src/MtCoder.c | 0 SevenZip/src/MtCoder.h | 0 SevenZip/src/Ppmd.h | 0 SevenZip/src/Ppmd7.c | 0 SevenZip/src/Ppmd7.h | 0 SevenZip/src/Ppmd7Dec.c | 0 SevenZip/src/Ppmd7Enc.c | 0 SevenZip/src/RotateDefs.h | 0 SevenZip/src/Sha256.c | 0 SevenZip/src/Sha256.h | 0 SevenZip/src/Threads.c | 0 SevenZip/src/Threads.h | 0 SevenZip/src/Types.h | 0 SevenZip/src/Xz.c | 0 SevenZip/src/Xz.h | 0 SevenZip/src/XzCrc64.c | 0 SevenZip/src/XzCrc64.h | 0 SevenZip/src/XzDec.c | 0 SevenZip/src/XzEnc.c | 0 SevenZip/src/XzEnc.h | 0 SevenZip/src/XzIn.c | 0 build/script/makedepend.SunCC | 0 build/script/makedepend.aCC | 0 build/script/makedepend.clang | 0 build/script/makedepend.cxx | 0 build/script/makedepend.gcc | 0 build/script/makedepend.qcc | 0 build/script/makedepend.xlC | 0 build/script/makeldpath | 0 build/script/projname | 0 build/script/runtests.sh | 0 build/script/shlibln | 0 build/script/vxprogen | 0 build_cmake.sh | 0 configure | 0 release/script/cpproj | 0 release/script/mkdoc | 0 release/script/mkdocumentation | 0 release/script/mkrel | 0 release/script/mkrelease | 0 travis/Linux/excluded.sh | 0 travis/Linux/runtests.sh | 0 travis/OSX/excluded.sh | 0 travis/OSX/runtests.sh | 0 travis/ignored.sh | 0 94 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 PocoDoc/resources/js/iframeResizer.contentWindow.js mode change 100755 => 100644 PocoDoc/resources/js/iframeResizer.contentWindow.min.js mode change 100755 => 100644 PocoDoc/resources/js/iframeResizer.js mode change 100755 => 100644 PocoDoc/resources/js/iframeResizer.min.js mode change 100755 => 100644 SevenZip/src/7z.h mode change 100755 => 100644 SevenZip/src/7zAlloc.c mode change 100755 => 100644 SevenZip/src/7zAlloc.h mode change 100755 => 100644 SevenZip/src/7zBuf.c mode change 100755 => 100644 SevenZip/src/7zBuf.h mode change 100755 => 100644 SevenZip/src/7zBuf2.c mode change 100755 => 100644 SevenZip/src/7zCrc.c mode change 100755 => 100644 SevenZip/src/7zCrc.h mode change 100755 => 100644 SevenZip/src/7zCrcOpt.c mode change 100755 => 100644 SevenZip/src/7zDec.c mode change 100755 => 100644 SevenZip/src/7zFile.c mode change 100755 => 100644 SevenZip/src/7zFile.h mode change 100755 => 100644 SevenZip/src/7zIn.c mode change 100755 => 100644 SevenZip/src/7zStream.c mode change 100755 => 100644 SevenZip/src/7zVersion.h mode change 100755 => 100644 SevenZip/src/Alloc.c mode change 100755 => 100644 SevenZip/src/Alloc.h mode change 100755 => 100644 SevenZip/src/Bcj2.c mode change 100755 => 100644 SevenZip/src/Bcj2.h mode change 100755 => 100644 SevenZip/src/Bra.c mode change 100755 => 100644 SevenZip/src/Bra.h mode change 100755 => 100644 SevenZip/src/Bra86.c mode change 100755 => 100644 SevenZip/src/BraIA64.c mode change 100755 => 100644 SevenZip/src/CpuArch.c mode change 100755 => 100644 SevenZip/src/CpuArch.h mode change 100755 => 100644 SevenZip/src/Delta.c mode change 100755 => 100644 SevenZip/src/Delta.h mode change 100755 => 100644 SevenZip/src/LzFind.c mode change 100755 => 100644 SevenZip/src/LzFind.h mode change 100755 => 100644 SevenZip/src/LzFindMt.c mode change 100755 => 100644 SevenZip/src/LzFindMt.h mode change 100755 => 100644 SevenZip/src/LzHash.h mode change 100755 => 100644 SevenZip/src/Lzma2Dec.c mode change 100755 => 100644 SevenZip/src/Lzma2Dec.h mode change 100755 => 100644 SevenZip/src/Lzma2Enc.c mode change 100755 => 100644 SevenZip/src/Lzma2Enc.h mode change 100755 => 100644 SevenZip/src/Lzma86.h mode change 100755 => 100644 SevenZip/src/Lzma86Dec.c mode change 100755 => 100644 SevenZip/src/Lzma86Enc.c mode change 100755 => 100644 SevenZip/src/LzmaDec.c mode change 100755 => 100644 SevenZip/src/LzmaDec.h mode change 100755 => 100644 SevenZip/src/LzmaEnc.c mode change 100755 => 100644 SevenZip/src/LzmaEnc.h mode change 100755 => 100644 SevenZip/src/LzmaLib.c mode change 100755 => 100644 SevenZip/src/LzmaLib.h mode change 100755 => 100644 SevenZip/src/MtCoder.c mode change 100755 => 100644 SevenZip/src/MtCoder.h mode change 100755 => 100644 SevenZip/src/Ppmd.h mode change 100755 => 100644 SevenZip/src/Ppmd7.c mode change 100755 => 100644 SevenZip/src/Ppmd7.h mode change 100755 => 100644 SevenZip/src/Ppmd7Dec.c mode change 100755 => 100644 SevenZip/src/Ppmd7Enc.c mode change 100755 => 100644 SevenZip/src/RotateDefs.h mode change 100755 => 100644 SevenZip/src/Sha256.c mode change 100755 => 100644 SevenZip/src/Sha256.h mode change 100755 => 100644 SevenZip/src/Threads.c mode change 100755 => 100644 SevenZip/src/Threads.h mode change 100755 => 100644 SevenZip/src/Types.h mode change 100755 => 100644 SevenZip/src/Xz.c mode change 100755 => 100644 SevenZip/src/Xz.h mode change 100755 => 100644 SevenZip/src/XzCrc64.c mode change 100755 => 100644 SevenZip/src/XzCrc64.h mode change 100755 => 100644 SevenZip/src/XzDec.c mode change 100755 => 100644 SevenZip/src/XzEnc.c mode change 100755 => 100644 SevenZip/src/XzEnc.h mode change 100755 => 100644 SevenZip/src/XzIn.c mode change 100755 => 100644 build/script/makedepend.SunCC mode change 100755 => 100644 build/script/makedepend.aCC mode change 100755 => 100644 build/script/makedepend.clang mode change 100755 => 100644 build/script/makedepend.cxx mode change 100755 => 100644 build/script/makedepend.gcc mode change 100755 => 100644 build/script/makedepend.qcc mode change 100755 => 100644 build/script/makedepend.xlC mode change 100755 => 100644 build/script/makeldpath mode change 100755 => 100644 build/script/projname mode change 100755 => 100644 build/script/runtests.sh mode change 100755 => 100644 build/script/shlibln mode change 100755 => 100644 build/script/vxprogen mode change 100755 => 100644 build_cmake.sh mode change 100755 => 100644 configure mode change 100755 => 100644 release/script/cpproj mode change 100755 => 100644 release/script/mkdoc mode change 100755 => 100644 release/script/mkdocumentation mode change 100755 => 100644 release/script/mkrel mode change 100755 => 100644 release/script/mkrelease mode change 100755 => 100644 travis/Linux/excluded.sh mode change 100755 => 100644 travis/Linux/runtests.sh mode change 100755 => 100644 travis/OSX/excluded.sh mode change 100755 => 100644 travis/OSX/runtests.sh mode change 100755 => 100644 travis/ignored.sh diff --git a/PocoDoc/resources/js/iframeResizer.contentWindow.js b/PocoDoc/resources/js/iframeResizer.contentWindow.js old mode 100755 new mode 100644 diff --git a/PocoDoc/resources/js/iframeResizer.contentWindow.min.js b/PocoDoc/resources/js/iframeResizer.contentWindow.min.js old mode 100755 new mode 100644 diff --git a/PocoDoc/resources/js/iframeResizer.js b/PocoDoc/resources/js/iframeResizer.js old mode 100755 new mode 100644 diff --git a/PocoDoc/resources/js/iframeResizer.min.js b/PocoDoc/resources/js/iframeResizer.min.js old mode 100755 new mode 100644 diff --git a/SevenZip/src/7z.h b/SevenZip/src/7z.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zAlloc.c b/SevenZip/src/7zAlloc.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zAlloc.h b/SevenZip/src/7zAlloc.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zBuf.c b/SevenZip/src/7zBuf.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zBuf.h b/SevenZip/src/7zBuf.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zBuf2.c b/SevenZip/src/7zBuf2.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zCrc.c b/SevenZip/src/7zCrc.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zCrc.h b/SevenZip/src/7zCrc.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zCrcOpt.c b/SevenZip/src/7zCrcOpt.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zDec.c b/SevenZip/src/7zDec.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zFile.c b/SevenZip/src/7zFile.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zFile.h b/SevenZip/src/7zFile.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zIn.c b/SevenZip/src/7zIn.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zStream.c b/SevenZip/src/7zStream.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/7zVersion.h b/SevenZip/src/7zVersion.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Alloc.c b/SevenZip/src/Alloc.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Alloc.h b/SevenZip/src/Alloc.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Bcj2.c b/SevenZip/src/Bcj2.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Bcj2.h b/SevenZip/src/Bcj2.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Bra.c b/SevenZip/src/Bra.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Bra.h b/SevenZip/src/Bra.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Bra86.c b/SevenZip/src/Bra86.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/BraIA64.c b/SevenZip/src/BraIA64.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/CpuArch.c b/SevenZip/src/CpuArch.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/CpuArch.h b/SevenZip/src/CpuArch.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Delta.c b/SevenZip/src/Delta.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Delta.h b/SevenZip/src/Delta.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzFind.c b/SevenZip/src/LzFind.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzFind.h b/SevenZip/src/LzFind.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzFindMt.c b/SevenZip/src/LzFindMt.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzFindMt.h b/SevenZip/src/LzFindMt.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzHash.h b/SevenZip/src/LzHash.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Lzma2Dec.c b/SevenZip/src/Lzma2Dec.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Lzma2Dec.h b/SevenZip/src/Lzma2Dec.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Lzma2Enc.c b/SevenZip/src/Lzma2Enc.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Lzma2Enc.h b/SevenZip/src/Lzma2Enc.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Lzma86.h b/SevenZip/src/Lzma86.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Lzma86Dec.c b/SevenZip/src/Lzma86Dec.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Lzma86Enc.c b/SevenZip/src/Lzma86Enc.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzmaDec.c b/SevenZip/src/LzmaDec.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzmaDec.h b/SevenZip/src/LzmaDec.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzmaEnc.c b/SevenZip/src/LzmaEnc.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzmaEnc.h b/SevenZip/src/LzmaEnc.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzmaLib.c b/SevenZip/src/LzmaLib.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/LzmaLib.h b/SevenZip/src/LzmaLib.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/MtCoder.c b/SevenZip/src/MtCoder.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/MtCoder.h b/SevenZip/src/MtCoder.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Ppmd.h b/SevenZip/src/Ppmd.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Ppmd7.c b/SevenZip/src/Ppmd7.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Ppmd7.h b/SevenZip/src/Ppmd7.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Ppmd7Dec.c b/SevenZip/src/Ppmd7Dec.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Ppmd7Enc.c b/SevenZip/src/Ppmd7Enc.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/RotateDefs.h b/SevenZip/src/RotateDefs.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Sha256.c b/SevenZip/src/Sha256.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Sha256.h b/SevenZip/src/Sha256.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Threads.c b/SevenZip/src/Threads.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Threads.h b/SevenZip/src/Threads.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Types.h b/SevenZip/src/Types.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/Xz.c b/SevenZip/src/Xz.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/Xz.h b/SevenZip/src/Xz.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/XzCrc64.c b/SevenZip/src/XzCrc64.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/XzCrc64.h b/SevenZip/src/XzCrc64.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/XzDec.c b/SevenZip/src/XzDec.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/XzEnc.c b/SevenZip/src/XzEnc.c old mode 100755 new mode 100644 diff --git a/SevenZip/src/XzEnc.h b/SevenZip/src/XzEnc.h old mode 100755 new mode 100644 diff --git a/SevenZip/src/XzIn.c b/SevenZip/src/XzIn.c old mode 100755 new mode 100644 diff --git a/build/script/makedepend.SunCC b/build/script/makedepend.SunCC old mode 100755 new mode 100644 diff --git a/build/script/makedepend.aCC b/build/script/makedepend.aCC old mode 100755 new mode 100644 diff --git a/build/script/makedepend.clang b/build/script/makedepend.clang old mode 100755 new mode 100644 diff --git a/build/script/makedepend.cxx b/build/script/makedepend.cxx old mode 100755 new mode 100644 diff --git a/build/script/makedepend.gcc b/build/script/makedepend.gcc old mode 100755 new mode 100644 diff --git a/build/script/makedepend.qcc b/build/script/makedepend.qcc old mode 100755 new mode 100644 diff --git a/build/script/makedepend.xlC b/build/script/makedepend.xlC old mode 100755 new mode 100644 diff --git a/build/script/makeldpath b/build/script/makeldpath old mode 100755 new mode 100644 diff --git a/build/script/projname b/build/script/projname old mode 100755 new mode 100644 diff --git a/build/script/runtests.sh b/build/script/runtests.sh old mode 100755 new mode 100644 diff --git a/build/script/shlibln b/build/script/shlibln old mode 100755 new mode 100644 diff --git a/build/script/vxprogen b/build/script/vxprogen old mode 100755 new mode 100644 diff --git a/build_cmake.sh b/build_cmake.sh old mode 100755 new mode 100644 diff --git a/configure b/configure old mode 100755 new mode 100644 diff --git a/release/script/cpproj b/release/script/cpproj old mode 100755 new mode 100644 diff --git a/release/script/mkdoc b/release/script/mkdoc old mode 100755 new mode 100644 diff --git a/release/script/mkdocumentation b/release/script/mkdocumentation old mode 100755 new mode 100644 diff --git a/release/script/mkrel b/release/script/mkrel old mode 100755 new mode 100644 diff --git a/release/script/mkrelease b/release/script/mkrelease old mode 100755 new mode 100644 diff --git a/travis/Linux/excluded.sh b/travis/Linux/excluded.sh old mode 100755 new mode 100644 diff --git a/travis/Linux/runtests.sh b/travis/Linux/runtests.sh old mode 100755 new mode 100644 diff --git a/travis/OSX/excluded.sh b/travis/OSX/excluded.sh old mode 100755 new mode 100644 diff --git a/travis/OSX/runtests.sh b/travis/OSX/runtests.sh old mode 100755 new mode 100644 diff --git a/travis/ignored.sh b/travis/ignored.sh old mode 100755 new mode 100644 From d7f8761771a75f86fdbdcd940e705d16f0e11be4 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 12:39:52 +0100 Subject: [PATCH 068/131] missing parenthesis on Test-Path. Signed-off-by: FrancisANDRE --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index cc62f59b6..86c3ee3b9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -157,7 +157,7 @@ install: - ps: | if ($env:platform -eq "Win32") { - if (Test-Path "c:\mysql-5.7.9-win32" -and False) { + if ((Test-Path "c:\mysql-5.7.9-win32") -and False) { echo "using c:\mysql-5.7.9-win32 from cache" } else From e16a0fa481cbdbd150f90f5dabdef2657cf9886f Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 12:52:57 +0100 Subject: [PATCH 069/131] PSowerShell does not recognize (Test-Path path) as a boolean! Signed-off-by: FrancisANDRE --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 86c3ee3b9..e4e0f64e6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -157,7 +157,7 @@ install: - ps: | if ($env:platform -eq "Win32") { - if ((Test-Path "c:\mysql-5.7.9-win32") -and False) { + if (Test-Path "Z:\mysql-5.7.9-win32") { echo "using c:\mysql-5.7.9-win32 from cache" } else From 7dda3867c608f615c27cfb73c10bd853c2e43904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Tue, 8 Mar 2016 09:53:46 -0300 Subject: [PATCH 070/131] Removed isnan and isinf from the namespace std for IBM XLC Due to the implication of changing the standard library behavior on IBM XLC when using the POCO Libraries, the functions from previously added to the namespace std are now guarded by #ifdef directives to cover only the needed cases (IBM XLC compiler on AIX). --- Foundation/include/Poco/FPEnvironment_C99.h | 40 ++++++++++++--------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/Foundation/include/Poco/FPEnvironment_C99.h b/Foundation/include/Poco/FPEnvironment_C99.h index b5381dd58..72926538d 100644 --- a/Foundation/include/Poco/FPEnvironment_C99.h +++ b/Foundation/include/Poco/FPEnvironment_C99.h @@ -25,22 +25,6 @@ #include -#if defined(POCO_OS_AIX) - - -namespace std { - - -using ::isinf; -using ::isnan; - - -} // namespace std - - -#endif - - namespace Poco { @@ -91,37 +75,61 @@ private: // inline bool FPEnvironmentImpl::isInfiniteImpl(float value) { +#if POCO_OS == POCO_OS_AIX + return ::isinf(value) != 0; +#else return std::isinf(value) != 0; +#endif } inline bool FPEnvironmentImpl::isInfiniteImpl(double value) { +#if POCO_OS == POCO_OS_AIX + return ::isinf(value) != 0; +#else return std::isinf(value) != 0; +#endif } inline bool FPEnvironmentImpl::isInfiniteImpl(long double value) { +#if POCO_OS == POCO_OS_AIX + return ::isinf((double) value) != 0; +#else return std::isinf((double) value) != 0; +#endif } inline bool FPEnvironmentImpl::isNaNImpl(float value) { +#if POCO_OS == POCO_OS_AIX + return ::isnan(value) != 0; +#else return std::isnan(value) != 0; +#endif } inline bool FPEnvironmentImpl::isNaNImpl(double value) { +#if POCO_OS == POCO_OS_AIX + return ::isnan(value) != 0; +#else return std::isnan(value) != 0; +#endif } inline bool FPEnvironmentImpl::isNaNImpl(long double value) { +#if POCO_OS == POCO_OS_AIX + return ::isnan((double) value) != 0; +#else return std::isnan((double) value) != 0; +#endif } From 8b6587d0f91a9827ede236c239ecfa02881e53b9 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 14:10:15 +0100 Subject: [PATCH 071/131] Restore Test-Path "c:\mysql-5.7.9-win32" Signed-off-by: FrancisANDRE --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e4e0f64e6..728e1cc72 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -157,7 +157,7 @@ install: - ps: | if ($env:platform -eq "Win32") { - if (Test-Path "Z:\mysql-5.7.9-win32") { + if (Test-Path "c:\mysql-5.7.9-win32") { echo "using c:\mysql-5.7.9-win32 from cache" } else From 97fb4c6e381f13d4e3408a1424c281e4c81272b3 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 16:20:12 +0100 Subject: [PATCH 072/131] Download and install postgreSQL 32 bit versions Signed-off-by: FrancisANDRE --- appveyor.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 728e1cc72..a7f2f59fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -169,7 +169,28 @@ install: } } # ------------------------------------------------------------------------------------------- - + +# ------------------------------------------------------------------------------------------- +# PostgreSQL 32 bit is not available by default on AppVeyor +# http://www.enterprisedb.com/products-services-training/pgdownload#windows +# ------------------------------------------------------------------------------------------- + - ps: | + Write-Host "Installing PostgreSQL 9.4..." -ForegroundColor Cyan + + Write-Host "Downloading..." + $exePath = "$($env:USERPROFILE)\postgresql-9.4.5-1-windows.exe" + (New-Object Net.WebClient).DownloadFile('http://get.enterprisedb.com/postgresql/postgresql-9.4.5-1-windows.exe', $exePath) + + Write-Host "Installing..." + cmd /c start /wait $exePath --mode unattended --superpassword Password12! + del $exePath + + Write-Host "Setting up services..." + Stop-Service postgresql-x64-9.4 + Set-Service -Name postgresql-x64-9.4 -StartupType Manual + + Write-Host "PostgreSQL 9.4 installed" -ForegroundColor Green# ------------------------------------------------------------------------------------------- + before_build: - ps: | From 7068c797b3f4dcfdb010be27ca290a0593f83d80 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 16:28:30 +0100 Subject: [PATCH 073/131] Fix invalid concatenation. Signed-off-by: FrancisANDRE --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a7f2f59fe..07400631d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -189,7 +189,9 @@ install: Stop-Service postgresql-x64-9.4 Set-Service -Name postgresql-x64-9.4 -StartupType Manual - Write-Host "PostgreSQL 9.4 installed" -ForegroundColor Green# ------------------------------------------------------------------------------------------- + Write-Host "PostgreSQL 9.4 installed" -ForegroundColor Green + +# ------------------------------------------------------------------------------------------- before_build: From 2e39c6c874162cd3c9eb11f84117959048d9d151 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 16:36:08 +0100 Subject: [PATCH 074/131] Stop & Start PostgreSQL service. Signed-off-by: FrancisANDRE --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 07400631d..2a59e2719 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -186,8 +186,8 @@ install: del $exePath Write-Host "Setting up services..." - Stop-Service postgresql-x64-9.4 - Set-Service -Name postgresql-x64-9.4 -StartupType Manual + Stop-Service postgresql-9.4 + Set-Service -Name postgresql-9.4 -StartupType Manual Write-Host "PostgreSQL 9.4 installed" -ForegroundColor Green From 080302b92155b3ac3dc2f9919e2167d4012f36d3 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Tue, 8 Mar 2016 19:04:50 +0100 Subject: [PATCH 075/131] Exclude Data/MySQL testsuite on Win32 for now. Infinite loop. Signed-off-by: FrancisANDRE --- appveyor.yml | 121 +++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2a59e2719..577a6df89 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,7 @@ cache: - C:\ProgramData\chocolatey - C:\OpenSSL-Win32 - C:\OpenSSL-Win64 + - C:\Program Files (x86)\PostgreSQL hosts: localhost: 127.0.0.1 @@ -157,74 +158,75 @@ install: - ps: | if ($env:platform -eq "Win32") { - if (Test-Path "c:\mysql-5.7.9-win32") { - echo "using c:\mysql-5.7.9-win32 from cache" - } - else - { - echo "downloading mysql-5.7.9-win32" - Invoke-WebRequest "http://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.11-win32.zip" -OutFile mysql-5.7.9-win32.zip - echo "installing c:\mysql-5.7.9-win32" - 7z x -y mysql-5.7.9-win32.zip -oc:\ - } - } + if (Test-Path "c:\mysql-5.7.9-win32") { + echo "using c:\mysql-5.7.9-win32 from cache" + } + else + { + echo "downloading mysql-5.7.9-win32" + Invoke-WebRequest "http://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.11-win32.zip" -OutFile mysql-5.7.9-win32.zip + echo "installing c:\mysql-5.7.9-win32" + 7z x -y mysql-5.7.9-win32.zip -oc:\ + } + } # ------------------------------------------------------------------------------------------- # ------------------------------------------------------------------------------------------- # PostgreSQL 32 bit is not available by default on AppVeyor -# http://www.enterprisedb.com/products-services-training/pgdownload#windows +# http://www.enterprisedb.com/products-services-training/pgdownload#windows # ------------------------------------------------------------------------------------------- - ps: | - Write-Host "Installing PostgreSQL 9.4..." -ForegroundColor Cyan + if ($env:platform -eq "Win32") + { + Write-Host "Installing PostgreSQL 9.4..." -ForegroundColor Cyan - Write-Host "Downloading..." - $exePath = "$($env:USERPROFILE)\postgresql-9.4.5-1-windows.exe" - (New-Object Net.WebClient).DownloadFile('http://get.enterprisedb.com/postgresql/postgresql-9.4.5-1-windows.exe', $exePath) + Write-Host "Downloading..." + $exePath = "$($env:USERPROFILE)\postgresql-9.4.5-1-windows.exe" + (New-Object Net.WebClient).DownloadFile('http://get.enterprisedb.com/postgresql/postgresql-9.4.5-1-windows.exe', $exePath) - Write-Host "Installing..." - cmd /c start /wait $exePath --mode unattended --superpassword Password12! - del $exePath + Write-Host "Installing..." + cmd /c start /wait $exePath --mode unattended --superpassword Password12! + del $exePath - Write-Host "Setting up services..." - Stop-Service postgresql-9.4 - Set-Service -Name postgresql-9.4 -StartupType Manual - - Write-Host "PostgreSQL 9.4 installed" -ForegroundColor Green + Write-Host "Setting up services..." + Stop-Service postgresql-9.4 + Set-Service -Name postgresql-9.4 -StartupType Manual + Write-Host "PostgreSQL 9.4 installed" -ForegroundColor Green + } # ------------------------------------------------------------------------------------------- before_build: - ps: | - if ($env:vsver -eq "110") - { - $vspath= convert-path $env:VS110COMNTOOLS\..\..\VC\bin; $yyyy='2010' - if($env:platform -eq 'Win32') { $vctool='';} - if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } + if ($env:vsver -eq "110") + { + $vspath= convert-path $env:VS110COMNTOOLS\..\..\VC\bin; $yyyy='2010' + if($env:platform -eq 'Win32') { $vctool='';} + if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } + } + if ($env:vsver -eq "120") + { + $vspath= convert-path $env:VS120COMNTOOLS\..\..\VC\bin;$yyyy='2013' + if($env:platform -eq 'Win32') { $vctool='';} + if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } + } + if ($env:vsver -eq "140") + { + $vspath= convert-path $env:VS140COMNTOOLS\..\..\VC\bin; $yyyy='2015' + if($env:platform -eq 'Win32') { $vctool='';} + if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } + } + pushd $vspath; + $tool= if($vctool -eq '') {'32'} else {$vctool} + cmd /c "vcvars$tool.bat&set" | + foreach { + if ($_ -match "=") { + $v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" } - if ($env:vsver -eq "120") - { - $vspath= convert-path $env:VS120COMNTOOLS\..\..\VC\bin;$yyyy='2013' - if($env:platform -eq 'Win32') { $vctool='';} - if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } - - } - if ($env:vsver -eq "140") - { - $vspath= convert-path $env:VS140COMNTOOLS\..\..\VC\bin; $yyyy='2015' - if($env:platform -eq 'Win32') { $vctool='';} - if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } - } - pushd $vspath; - $tool= if($vctool -eq '') {'32'} else {$vctool} - cmd /c "vcvars$tool.bat&set" | - foreach { - if ($_ -match "=") { - $v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" - } - } - popd - write-host "`nVisual Studio $yyyy CLI variables set." -ForegroundColor Yellow + } + popd + write-host "`nVisual Studio $yyyy CLI variables set." -ForegroundColor Yellow # ------------------------------------------------------------------------------------------- # MySQL @@ -234,13 +236,13 @@ before_build: { $env:INCLUDE = "C:\mysql-5.7.9-win32\include;" + $env:INCLUDE $env:LIB = "C:\mysql-5.7.9-win32\lib;" + $env:LIB - $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH + $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH } if ($env:platform -eq "x64") { $env:INCLUDE = "C:\Program Files\MySql\MySQL Server 5.6\include;" + $env:INCLUDE $env:LIB = "C:\Program Files\MySql\MySQL Server 5.6\lib;" + $env:LIB - $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH + $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH } $env:MYSQL_PWD="Password12!" $cmd = 'mysql -e "create database pocotestdb;" --user=root'; @@ -255,11 +257,13 @@ before_build: { $env:INCLUDE = "C:\Program Files (x86)\PostgreSQL\9.4\include;" + $env:INCLUDE $env:LIB = "C:\Program Files (x86)\PostgreSQL\9.4\lib;" + $env:LIB + $env:PATH = "C:\Program Files (x86)\PostgreSQL\9.4\lib;" + $env:PATH } if ($env:platform -eq "x64") { $env:INCLUDE = "C:\Program Files\PostgreSQL\9.4\include;" + $env:INCLUDE $env:LIB = "C:\Program Files\PostgreSQL\9.4\lib;" + $env:LIB + $env:PATH = "C:\Program Files\PostgreSQL\9.4\lib;" + $env:PATH } after_build: @@ -359,12 +363,7 @@ build_script: } before_test: -# ------------------------------------------------------------------------------------------- -# PostgreSQL - - set PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH% - - - - ps: | +- ps: | $line='-------------------------------------------------------------------------------------'; $CPPUNIT_IGNORE=''; $CPPUNIT_IGNORE+='class CppUnit::TestCaller.testTimeSync'; @@ -394,7 +393,7 @@ test_script: if ($env:platform -eq "Win32") { $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = ''; - $excluded = @('Data', 'Data/ODBC','Data/PostgreSQL', 'Redis', 'PDF') + $excluded = @('Data', 'Data/ODBC', 'Data/MySQL', 'Data/PostgreSQL', 'Redis', 'PDF') } if ($env:platform -eq "x64") { From 422fe0ecedc3d5f7faa4f6116dd6393f4dee58b0 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Tue, 8 Mar 2016 14:49:48 -0800 Subject: [PATCH 076/131] CppUnit alignment for PostgreSQL and ODBC Sybase --- Data/ODBC/testsuite/src/ODBCSybaseTest.cpp | 8 +- Data/PostgreSQL/PostgreSQL_vs110.vcxproj | 89 +++-- Data/PostgreSQL/PostgreSQL_vs120.sln | 46 ++- Data/PostgreSQL/PostgreSQL_vs120.vcxproj | 92 ++--- Data/PostgreSQL/PostgreSQL_vs140.vcxproj | 308 +++++++++++++++++ .../PostgreSQL_vs140.vcxproj.filters | 84 +++++ Data/PostgreSQL/PostgreSQL_x64_vs120.sln | 49 ++- Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj | 92 ++--- .../PostgreSQL_x64_vs120.vcxproj.filters | 84 +++++ Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj | 306 +++++++++++++++++ .../PostgreSQL_x64_vs140.vcxproj.filters | 84 +++++ .../testsuite/TestSuite_VS90.vcproj | 12 +- .../testsuite/TestSuite_vs100.vcxproj | 12 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs110.vcxproj | 12 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs120.vcxproj | 93 +++-- .../testsuite/TestSuite_vs120.vcxproj.filters | 54 +++ .../testsuite/TestSuite_vs140.vcxproj | 319 ++++++++++++++++++ .../testsuite/TestSuite_vs140.vcxproj.filters | 54 +++ .../testsuite/TestSuite_x64_vs100.vcxproj | 12 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 12 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 96 +++--- .../TestSuite_x64_vs120.vcxproj.filters | 54 +++ .../testsuite/TestSuite_x64_vs140.vcxproj | 319 ++++++++++++++++++ .../TestSuite_x64_vs140.vcxproj.filters | 54 +++ .../testsuite/TestSuite_x64_vs90.vcproj | 12 +- Data/PostgreSQL/testsuite/src/Driver.cpp | 2 +- .../PostgreSQL/testsuite/src/PostgreSQLTest.h | 2 +- .../testsuite/src/PostgreSQLTestSuite.h | 2 +- Data/PostgreSQL/testsuite/src/SQLExecutor.cpp | 2 +- 33 files changed, 2077 insertions(+), 352 deletions(-) create mode 100644 Data/PostgreSQL/PostgreSQL_vs140.vcxproj create mode 100644 Data/PostgreSQL/PostgreSQL_vs140.vcxproj.filters create mode 100644 Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj.filters create mode 100644 Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj create mode 100644 Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj.filters create mode 100644 Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters create mode 100644 Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj create mode 100644 Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters create mode 100644 Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters create mode 100644 Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj create mode 100644 Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters diff --git a/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp b/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp index 7d50f88f0..d75c4e726 100644 --- a/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp @@ -24,8 +24,8 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "ODBCSybaseTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Any.h" @@ -57,8 +57,8 @@ using Poco::AnyCast; using Poco::DynamicAny; using Poco::NotFoundException; -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #define SYBASE_DSN "" #define SYBASE_UID "" diff --git a/Data/PostgreSQL/PostgreSQL_vs110.vcxproj b/Data/PostgreSQL/PostgreSQL_vs110.vcxproj index c2d088026..452b6cdff 100644 --- a/Data/PostgreSQL/PostgreSQL_vs110.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs110.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ PostgreSQL Win32Proj - + StaticLibrary MultiByte @@ -63,27 +63,27 @@ MultiByte v110 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>11.0.50727.1 PocoDataPostgreSQLd @@ -97,7 +97,6 @@ ..\..\bin\ obj\PostgreSQL\$(Configuration)\ true - $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); ..\..\bin\ @@ -133,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -165,9 +164,9 @@ true true true - + Level3 - + Default @@ -196,7 +195,7 @@ true true true - + ..\..\lib\PocoDataPostgreSQLmtd.pdb Level3 ProgramDatabase @@ -221,9 +220,9 @@ true true true - + Level3 - + Default @@ -243,7 +242,7 @@ true true true - + ..\..\lib\PocoDataPostgreSQLmdd.pdb Level3 ProgramDatabase @@ -268,10 +267,10 @@ true true true - + ..\..\lib\PocoDataPostgreSQLmd.pdb Level3 - + Default @@ -280,30 +279,30 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Data/PostgreSQL/PostgreSQL_vs120.sln b/Data/PostgreSQL/PostgreSQL_vs120.sln index 7324e9a28..006fd28a3 100644 --- a/Data/PostgreSQL/PostgreSQL_vs120.sln +++ b/Data/PostgreSQL/PostgreSQL_vs120.sln @@ -1,7 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2013 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostgreSQL", "PostgreSQL_vs120.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" @@ -12,37 +10,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.ActiveCfg = release_shared|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Build.0 = release_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.ActiveCfg = release_shared|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Build.0 = release_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/PostgreSQL/PostgreSQL_vs120.vcxproj b/Data/PostgreSQL/PostgreSQL_vs120.vcxproj index a3bbcf224..f95336044 100644 --- a/Data/PostgreSQL/PostgreSQL_vs120.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ PostgreSQL Win32Proj - + StaticLibrary MultiByte @@ -63,29 +63,29 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>11.0.50727.1 + <_ProjectFileVersion>12.0.21005.1 PocoDataPostgreSQLd PocoDataPostgreSQLmdd PocoDataPostgreSQLmtd @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -164,13 +164,13 @@ true true true - + Level3 - + Default - CppUnit.lib;libpq.lib;%(AdditionalDependencies) + libpq.lib;%(AdditionalDependencies) ..\..\bin\PocoDataPostgreSQL.dll true false @@ -195,7 +195,7 @@ true true true - + ..\..\lib\PocoDataPostgreSQLmtd.pdb Level3 ProgramDatabase @@ -220,9 +220,9 @@ true true true - + Level3 - + Default @@ -242,7 +242,7 @@ true true true - + ..\..\lib\PocoDataPostgreSQLmdd.pdb Level3 ProgramDatabase @@ -267,10 +267,10 @@ true true true - + ..\..\lib\PocoDataPostgreSQLmd.pdb Level3 - + Default @@ -279,30 +279,30 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Data/PostgreSQL/PostgreSQL_vs140.vcxproj b/Data/PostgreSQL/PostgreSQL_vs140.vcxproj new file mode 100644 index 000000000..276eb66e0 --- /dev/null +++ b/Data/PostgreSQL/PostgreSQL_vs140.vcxproj @@ -0,0 +1,308 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + PostgreSQL + {73E19FDE-1570-488C-B3DB-72A60FADD408} + PostgreSQL + Win32Proj + + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + DynamicLibrary + MultiByte + v140 + + + DynamicLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoDataPostgreSQLd + PocoDataPostgreSQLmdd + PocoDataPostgreSQLmtd + PocoDataPostgreSQL + PocoDataPostgreSQLmd + PocoDataPostgreSQLmt + + + ..\..\bin\ + obj\PostgreSQL\$(Configuration)\ + true + + + ..\..\bin\ + obj\PostgreSQL\$(Configuration)\ + false + + + ..\..\lib\ + obj\PostgreSQL\$(Configuration)\ + + + ..\..\lib\ + obj\PostgreSQL\$(Configuration)\ + + + ..\..\lib\ + obj\PostgreSQL\$(Configuration)\ + + + ..\..\lib\ + obj\PostgreSQL\$(Configuration)\ + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libpq.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataPostgreSQLd.dll + true + true + ..\..\bin\PocoDataPostgreSQLd.pdb + ..\..\lib;%(AdditionalLibraryDirectories) + Console + ..\..\lib\PocoDataPostgreSQLd.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libpq.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataPostgreSQL.dll + true + false + ..\..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib\PocoDataPostgreSQL.lib + MachineX86 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib\PocoDataPostgreSQLmtd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib\PocoDataPostgreSQLmtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\..\lib\PocoDataPostgreSQLmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib\PocoDataPostgreSQLmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib\PocoDataPostgreSQLmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\..\lib\PocoDataPostgreSQLmd.pdb + Level3 + + Default + + + libpq.lib;%(AdditionalDependencies) + ..\..\lib\PocoDataPostgreSQLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/PostgreSQL/PostgreSQL_vs140.vcxproj.filters b/Data/PostgreSQL/PostgreSQL_vs140.vcxproj.filters new file mode 100644 index 000000000..03e1ca51e --- /dev/null +++ b/Data/PostgreSQL/PostgreSQL_vs140.vcxproj.filters @@ -0,0 +1,84 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs120.sln b/Data/PostgreSQL/PostgreSQL_x64_vs120.sln index 46f74ea9b..cef748cec 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs120.sln +++ b/Data/PostgreSQL/PostgreSQL_x64_vs120.sln @@ -1,45 +1,58 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2013 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostgreSQL", "PostgreSQL_x64_vs120.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" + ProjectSection(ProjectDependencies) = postProject + {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.ActiveCfg = debug_shared|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Build.0 = debug_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Deploy.0 = debug_shared|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.ActiveCfg = release_shared|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Build.0 = release_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Deploy.0 = release_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Deploy.0 = release_static_md|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.ActiveCfg = debug_shared|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Build.0 = debug_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Deploy.0 = debug_shared|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.ActiveCfg = release_shared|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Build.0 = release_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Build.0 = release_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Deploy.0 = release_shared|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Build.0 = release_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj b/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj index d4b00450b..a8bffb47d 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj @@ -1,5 +1,5 @@ - - + + debug_shared @@ -32,7 +32,7 @@ PostgreSQL Win32Proj - + StaticLibrary MultiByte @@ -63,29 +63,29 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>11.0.50727.1 + <_ProjectFileVersion>12.0.21005.1 PocoDataPostgreSQL64d PocoDataPostgreSQLmdd PocoDataPostgreSQLmtd @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -164,9 +164,9 @@ true true true - + Level3 - + Default @@ -195,7 +195,7 @@ true true true - + ..\..\lib64\PocoDataPostgreSQLmtd.pdb Level3 ProgramDatabase @@ -220,9 +220,9 @@ true true true - + Level3 - + Default @@ -242,7 +242,7 @@ true true true - + ..\..\lib64\PocoDataPostgreSQLmdd.pdb Level3 ProgramDatabase @@ -267,9 +267,9 @@ true true true - + Level3 - + Default @@ -277,30 +277,30 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj.filters b/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj.filters new file mode 100644 index 000000000..03e1ca51e --- /dev/null +++ b/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj.filters @@ -0,0 +1,84 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj b/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj new file mode 100644 index 000000000..f345d3d5c --- /dev/null +++ b/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj @@ -0,0 +1,306 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + PostgreSQL + {73E19FDE-1570-488C-B3DB-72A60FADD408} + PostgreSQL + Win32Proj + + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + DynamicLibrary + MultiByte + v140 + + + DynamicLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoDataPostgreSQL64d + PocoDataPostgreSQLmdd + PocoDataPostgreSQLmtd + PocoDataPostgreSQL64 + PocoDataPostgreSQLmd + PocoDataPostgreSQLmt + + + ..\..\bin64\ + obj64\PostgreSQL\$(Configuration)\ + true + + + ..\..\bin64\ + obj64\PostgreSQL\$(Configuration)\ + false + + + ..\..\lib64\ + obj64\PostgreSQL\$(Configuration)\ + + + ..\..\lib64\ + obj64\PostgreSQL\$(Configuration)\ + + + ..\..\lib64\ + obj64\PostgreSQL\$(Configuration)\ + + + ..\..\lib64\ + obj64\PostgreSQL\$(Configuration)\ + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libpq.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataPostgreSQL64d.dll + true + true + ..\..\bin64\PocoDataPostgreSQL64d.pdb + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + ..\..\lib64\PocoDataPostgreSQLd.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libpq.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataPostgreSQL64.dll + true + false + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib64\PocoDataPostgreSQL.lib + MachineX64 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib64\PocoDataPostgreSQLmtd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib64\PocoDataPostgreSQLmtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\..\lib64\PocoDataPostgreSQLmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib64\PocoDataPostgreSQLmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib64\PocoDataPostgreSQLmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\..\lib64\PocoDataPostgreSQLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj.filters b/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj.filters new file mode 100644 index 000000000..03e1ca51e --- /dev/null +++ b/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj.filters @@ -0,0 +1,84 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj index a0801cbbe..da2c67fdc 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj +++ b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;libpq.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;libpq.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters index 6b5b8bbde..03c9078c4 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {fa53be41-89cb-4214-8391-294acac6d786} + {a3f23662-8657-45c4-a601-c64b3beb6048} - {37c113b8-1d8c-44ce-8278-8b23984febd0} + {73370c7a-069f-4594-b436-24d564f7f85b} - {7eb48815-4a20-42d9-aa12-2b9ed8910aad} + {a2fcd03a-01b0-4976-a07c-c7a2c40d39af} - {5ccf08c0-3ed6-41c3-bf86-19b260a8587f} + {aa2f7b5d-cd67-4fea-9896-5be1b2bee518} - {f328a95a-0a70-4fff-95cc-7cb0f8745d1d} + {bf432e3a-60fb-4407-87ba-5d7246ca151d} - {b12e4030-d62e-48ca-b4f0-1a13ca9017a1} + {3cb1f5c0-6d7e-4b11-b25d-16d3a50dcec1} - {0a71eb1b-8d75-4d46-a707-30ca34fcd26a} + {6f297e2e-c565-4cb5-a71b-914c4a608861} - {1cd75a94-8f9e-498c-bc18-0651754434af} + {335b317b-22f1-4141-b267-096e3f3ee139} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj index 810601ec9..e2c736f36 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;libpq.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;libpq.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters index 7d56610be..8ee6880e5 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {436e16f2-64ee-4e7b-a7c0-33b272328d45} + {11d27db5-da94-45a4-bd01-a64dfb8cb742} - {65b77f18-4437-4d73-846e-974754ae069b} + {e90269cf-2f54-46bd-ab08-8abc434e919f} - {7932292f-088d-4ef5-b8b4-105b430d259e} + {88c121a4-7160-4397-ac71-ef210735bb13} - {28dbea41-0e42-4192-889c-3f2a2abbe50e} + {4f7533e9-cf4e-434f-900a-6f25d4b7cba8} - {c3125beb-d731-44d4-a714-065aa8e6f654} + {54b79320-038e-4e71-8074-6ca6bc6857d3} - {2a031888-a913-4005-bd7a-9f302915dc44} + {2511bd5f-0a98-4556-92c1-5aa8f684980c} - {f61faf75-b3bc-41d0-911b-7ddebb35eb88} + {4c29d8c1-d9ce-4522-82fc-2cae1ed861fd} - {72d1e9e2-863c-4a19-a4c4-a78313a292e5} + {8d1c3294-352c-4b4d-9e89-2857dfebd585} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj index f69cebba5..ad364a471 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,66 +32,60 @@ TestSuite Win32Proj - + Application - Dynamic MultiByte v120 Application - Dynamic MultiByte v120 Application - Static MultiByte v120 Application - Static MultiByte v120 Application - false - v120 MultiByte + v120 Application - false MultiByte v120 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>11.0.50727.1 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -103,7 +97,6 @@ bin\ obj\TestSuite\$(Configuration)\ true - $(ExecutablePath) bin\ @@ -143,13 +136,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitd.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;libpq.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -174,13 +167,13 @@ true true true - + Level3 - + Default - libpq.lib;CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;libpq.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -203,20 +196,19 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -235,18 +227,17 @@ true true true - + Level3 - + Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -265,19 +256,19 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -296,33 +287,33 @@ true true true - + Level3 - + Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 - - - + + + - - - - + + + + - - - \ No newline at end of file + + + diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters new file mode 100644 index 000000000..6fd64c11b --- /dev/null +++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {919eb759-df13-47d8-8365-ef37dda7715f} + + + {f27a1cfb-8792-4d0a-8e2b-fbe595d754ca} + + + {3d219078-a283-47fd-b2b8-d842bcba0d99} + + + {9ce61d85-de21-4be9-a6cc-f7ed49b49168} + + + {75addcd3-24ca-4b2a-be62-0ab6f3e51afd} + + + {b7e0eb3f-ca52-4c83-b501-85f80e59eeb3} + + + {8b5e8a2d-1dda-4ee6-a5c7-0129a36ed678} + + + {0ac1dc5c-de21-47d3-9590-660a75e7e473} + + + + + PostgreSQL\Header Files + + + PostgreSQL\Header Files + + + _Suite\Header Files + + + + + PostgreSQL\Source Files + + + PostgreSQL\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + \ No newline at end of file diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj new file mode 100644 index 000000000..e36fb1db8 --- /dev/null +++ b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj @@ -0,0 +1,319 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} + TestSuite + Win32Proj + + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin\ + obj\TestSuite\$(Configuration)\ + true + + + bin\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_mt\ + obj\TestSuite\$(Configuration)\ + false + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + true + + + bin\static_md\ + obj\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitd.lib;libpq.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnit.lib;libpq.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + + + + + diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters new file mode 100644 index 000000000..ba92a03cb --- /dev/null +++ b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {ce383d39-86c9-41ce-b469-a7c0a2971ea4} + + + {75cea721-0048-46a2-a2dd-4bc7bc55330c} + + + {5ed3e193-9b1c-4f16-8f62-d373e1831fb1} + + + {fc32ba8a-cb9c-46d6-adc8-1fc140e3f134} + + + {21bb6fe9-b21c-4a82-a5d1-6a8708d3bb45} + + + {c4a7d106-b3ae-4224-ad83-827190831237} + + + {016d6a14-186e-4fb5-88a5-dd222cf16b6a} + + + {9d2193d4-05c8-4c11-a848-9c656c0b393f} + + + + + PostgreSQL\Header Files + + + PostgreSQL\Header Files + + + _Suite\Header Files + + + + + PostgreSQL\Source Files + + + PostgreSQL\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + \ No newline at end of file diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj index 119264850..32d5be098 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;libpq.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;libpq.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters index ed2ec3921..0ef1daba6 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {e01f57ab-cc6b-46d0-a0b5-be27d4a4abee} + {e4161e61-cd8c-4dfd-9de3-0d1b717d7959} - {f22a3f17-805a-4751-b645-3d4df751d8b6} + {c6713b66-1868-42c0-aea1-251bd1771872} - {ecb17409-fa09-43e0-aee9-95e73f5ee278} + {70f48c38-ebd6-4ebb-8810-a702a0a3b08e} - {15e6ca62-0838-41df-aa55-40635ee8afd4} + {d132dab6-9a45-46f8-97bc-b7e9c5846a4e} - {fb245d1d-2614-4534-83dd-ce4178462ce3} + {bffa78bb-31f3-4861-b196-16b3174bb5da} - {c2f4cbb4-0c25-4081-8b71-77b3372b524d} + {4aa8286a-b482-46d0-b44a-870be9448487} - {afe88f15-abfe-4479-b4de-dd50a2b2f858} + {4f4b8e3f-6697-468e-a9f9-8b90155aa806} - {7de47e10-c873-49cc-90a7-a3c0de9e3008} + {f900cdf6-c615-4dfb-a2ab-241cfa1f8520} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj index 824aaf59a..9023f764e 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;libpq.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;libpq.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters index a9573b31e..d7ac1db98 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {2bb5606e-7e2c-4145-896e-664153008c56} + {2ebf8545-7592-4e0d-9eca-d6d6cc786764} - {cfef6850-7503-4f8e-afd2-cc20fbdf1fb6} + {00c078d8-45cb-4ce9-9128-66cccfa9ffdd} - {efddc5cf-56c1-4788-920d-406a64b73458} + {65a560b6-09b9-48a9-81bb-98d4deb92735} - {acd237a9-7ba0-4abb-a994-6cd95a510fc0} + {3505c055-208a-4339-87f4-ebd83d8d758a} - {6d2f21ec-6361-4561-a6fd-d15bc7498169} + {6bb62831-8f9c-4374-bbe2-2f46a02931c7} - {21cee6dd-52bb-4d3b-8856-79b3848a1eba} + {0f61e625-a44e-4a20-ba5f-334f4677e9e3} - {0b23fb10-9fe4-4477-9a7b-3e31a8397b18} + {b01e559f-16c3-4cc0-8865-4e267b72725c} - {616ef9b6-ebf7-4414-9ce6-054f0439f72b} + {facfb8ba-64c9-48e0-9523-2b19adc2014a} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj index e3e8e5dae..7748f8267 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,5 +1,5 @@ - - + + debug_shared @@ -32,66 +32,60 @@ TestSuite Win32Proj - + Application - Dynamic MultiByte v120 Application - Dynamic MultiByte v120 Application - Static MultiByte v120 Application - Static MultiByte v120 Application - false MultiByte v120 Application - false MultiByte v120 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>11.0.50727.1 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -132,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,13 +136,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitd.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;libpq.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -165,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,13 +167,13 @@ true true true - + Level3 - + Default - CppUnit.lib;libpq.lib;%(AdditionalDependencies) + PocoCppUnit.lib;libpq.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,20 +196,19 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -234,18 +227,17 @@ true true true - + Level3 - + Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -264,19 +256,19 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -295,33 +287,33 @@ true true true - + Level3 - + Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libpq.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 - - - + + + - - - - + + + + - - - \ No newline at end of file + + + diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters new file mode 100644 index 000000000..46c3ad48c --- /dev/null +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {d649759e-7367-4208-ae2d-bba2dd77b627} + + + {f3887afa-aef8-48f5-8216-77cc332ba035} + + + {5aaec5da-d176-4389-94f7-ea0ef48a9f34} + + + {05643abc-22dc-4be1-a933-ab3d9e62ffc5} + + + {cc23427a-b5c1-4a2d-b7b1-09ffc5d501b2} + + + {412356a3-a73c-4c36-9b5b-df16d6af5a40} + + + {110328dd-c1d6-44f9-8c2e-0e980e4f0b56} + + + {3b46728f-de7d-431e-a3d3-518ca0613722} + + + + + PostgreSQL\Header Files + + + PostgreSQL\Header Files + + + _Suite\Header Files + + + + + PostgreSQL\Source Files + + + PostgreSQL\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + \ No newline at end of file diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj new file mode 100644 index 000000000..3cb8927a5 --- /dev/null +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj @@ -0,0 +1,319 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} + TestSuite + Win32Proj + + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + bin64\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_mt\ + obj64\TestSuite\$(Configuration)\ + false + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + true + + + bin64\static_md\ + obj64\TestSuite\$(Configuration)\ + false + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitd.lib;libpq.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnit.lib;libpq.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libpq.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + + + + + diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters new file mode 100644 index 000000000..a4ded8260 --- /dev/null +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {5a5e9f18-8535-483d-9bc6-b3a482e2cf4d} + + + {61b2e4d0-e74e-418f-ac7d-c5c84b41c747} + + + {f556d67d-6b8f-4ad6-a09b-1cf05debe1d4} + + + {894b43f7-0c0c-4bfb-a11c-2b327e58aa23} + + + {a8b81a0f-e683-4e58-bbf1-669fd67b4c0d} + + + {42750c12-5981-48e8-baec-7bcccaa0bd67} + + + {01b7af2a-626f-4441-9134-47003a2169fd} + + + {27715cc7-b928-4f59-a2db-387c701d47c7} + + + + + PostgreSQL\Header Files + + + PostgreSQL\Header Files + + + _Suite\Header Files + + + + + PostgreSQL\Source Files + + + PostgreSQL\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + \ No newline at end of file diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj index 000f53962..399364859 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> Date: Wed, 9 Mar 2016 10:05:53 +0100 Subject: [PATCH 077/131] Copy libmysql.dll to bin Signed-off-by: FrancisANDRE --- appveyor.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 577a6df89..4ceaff290 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -237,6 +237,7 @@ before_build: $env:INCLUDE = "C:\mysql-5.7.9-win32\include;" + $env:INCLUDE $env:LIB = "C:\mysql-5.7.9-win32\lib;" + $env:LIB $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH + copy C:\mysql-5.7.11-win32\lib\libmysql.dll C:\mysql-5.7.11-win32\bin\libmysql.dll } if ($env:platform -eq "x64") { @@ -257,13 +258,13 @@ before_build: { $env:INCLUDE = "C:\Program Files (x86)\PostgreSQL\9.4\include;" + $env:INCLUDE $env:LIB = "C:\Program Files (x86)\PostgreSQL\9.4\lib;" + $env:LIB - $env:PATH = "C:\Program Files (x86)\PostgreSQL\9.4\lib;" + $env:PATH + $env:PATH = "C:\Program Files (x86)\PostgreSQL\9.4\bin;" + $env:PATH } if ($env:platform -eq "x64") { $env:INCLUDE = "C:\Program Files\PostgreSQL\9.4\include;" + $env:INCLUDE $env:LIB = "C:\Program Files\PostgreSQL\9.4\lib;" + $env:LIB - $env:PATH = "C:\Program Files\PostgreSQL\9.4\lib;" + $env:PATH + $env:PATH = "C:\Program Files\PostgreSQL\9.4\bin;" + $env:PATH } after_build: @@ -393,7 +394,7 @@ test_script: if ($env:platform -eq "Win32") { $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = ''; - $excluded = @('Data', 'Data/ODBC', 'Data/MySQL', 'Data/PostgreSQL', 'Redis', 'PDF') + $excluded = @('Data', 'Data/ODBC', 'Data/PostgreSQL', 'Redis', 'PDF') } if ($env:platform -eq "x64") { From 57f22761f55404520e27186248ab7045232a6ae2 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Wed, 9 Mar 2016 10:22:05 +0100 Subject: [PATCH 078/131] Test libmysql.dll with Test-Path Signed-off-by: FrancisANDRE --- appveyor.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4ceaff290..22af77053 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,6 +41,10 @@ configuration: environment: bundling: bundled + mysql32: C:\mysql-5.7.9-win32 + mysql64: C:\Program Files\MySql\MySQL Server 5.6 + postgres32: C:\Program Files (x86)\PostgreSQL\9.4 + postgres64: C:\Program Files\PostgreSQL\9.4 matrix: @@ -237,13 +241,18 @@ before_build: $env:INCLUDE = "C:\mysql-5.7.9-win32\include;" + $env:INCLUDE $env:LIB = "C:\mysql-5.7.9-win32\lib;" + $env:LIB $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH - copy C:\mysql-5.7.11-win32\lib\libmysql.dll C:\mysql-5.7.11-win32\bin\libmysql.dll + if (Test-Path "C:\mysql-5.7.11-win32\lib\libmysql.dll") { + copy C:\mysql-5.7.11-win32\lib\libmysql.dll C:\mysql-5.7.11-win32\bin\libmysql.dll + } } if ($env:platform -eq "x64") { $env:INCLUDE = "C:\Program Files\MySql\MySQL Server 5.6\include;" + $env:INCLUDE $env:LIB = "C:\Program Files\MySql\MySQL Server 5.6\lib;" + $env:LIB $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH + if (Test-Path "C:\Program Files\MySql\MySQL Server 5.6\lib\libmysql.dlll") { + copy C:\Program Files\MySql\MySQL Server 5.6\lib\libmysql.dll C:\Program Files\MySql\MySQL Server 5.6\bin\libmysql.dll + } } $env:MYSQL_PWD="Password12!" $cmd = 'mysql -e "create database pocotestdb;" --user=root'; From 3d897371a87d1373f75f69d0049ed220cb8d9689 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Wed, 9 Mar 2016 11:04:45 +0100 Subject: [PATCH 079/131] Exclude Data/MySQL testsuite Signed-off-by: FrancisANDRE --- appveyor.yml | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 22af77053..153195406 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -168,9 +168,9 @@ install: else { echo "downloading mysql-5.7.9-win32" - Invoke-WebRequest "http://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.11-win32.zip" -OutFile mysql-5.7.9-win32.zip - echo "installing c:\mysql-5.7.9-win32" - 7z x -y mysql-5.7.9-win32.zip -oc:\ + Invoke-WebRequest "http://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.11-win32.zip" -OutFile mysql-5.7.9-win32.zip + echo "installing c:\mysql-5.7.9-win32" + 7z x -y mysql-5.7.9-win32.zip -oc:\ } } # ------------------------------------------------------------------------------------------- @@ -182,21 +182,27 @@ install: - ps: | if ($env:platform -eq "Win32") { - Write-Host "Installing PostgreSQL 9.4..." -ForegroundColor Cyan + if (Test-Path "C:\Program Files (x86)\PostgreSQL\9.4") { + echo "using C:\Program Files (x86)\PostgreSQL\9.4 from cache" + } + else + { + Write-Host "Installing PostgreSQL 9.4..." -ForegroundColor Cyan - Write-Host "Downloading..." - $exePath = "$($env:USERPROFILE)\postgresql-9.4.5-1-windows.exe" - (New-Object Net.WebClient).DownloadFile('http://get.enterprisedb.com/postgresql/postgresql-9.4.5-1-windows.exe', $exePath) + Write-Host "Downloading..." + $exePath = "$($env:USERPROFILE)\postgresql-9.4.5-1-windows.exe" + (New-Object Net.WebClient).DownloadFile('http://get.enterprisedb.com/postgresql/postgresql-9.4.5-1-windows.exe', $exePath) - Write-Host "Installing..." - cmd /c start /wait $exePath --mode unattended --superpassword Password12! - del $exePath + Write-Host "Installing..." + cmd /c start /wait $exePath --mode unattended --superpassword Password12! + del $exePath - Write-Host "Setting up services..." - Stop-Service postgresql-9.4 - Set-Service -Name postgresql-9.4 -StartupType Manual + Write-Host "Setting up services..." + Stop-Service postgresql-9.4 + Set-Service -Name postgresql-9.4 -StartupType Manual - Write-Host "PostgreSQL 9.4 installed" -ForegroundColor Green + Write-Host "PostgreSQL 9.4 installed" -ForegroundColor Green + } } # ------------------------------------------------------------------------------------------- @@ -403,7 +409,7 @@ test_script: if ($env:platform -eq "Win32") { $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = ''; - $excluded = @('Data', 'Data/ODBC', 'Data/PostgreSQL', 'Redis', 'PDF') + $excluded = @('Data', 'Data/ODBC', 'Data/MySQL', 'Redis', 'PDF') } if ($env:platform -eq "x64") { From 0b6486cc5dac35541ced418c9c50790b06898a31 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Wed, 9 Mar 2016 11:18:14 +0100 Subject: [PATCH 080/131] list content of MySQL dir. Signed-off-by: FrancisANDRE --- appveyor.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 153195406..8f6622c2b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -244,21 +244,23 @@ before_build: - ps: | if ($env:platform -eq "Win32") { - $env:INCLUDE = "C:\mysql-5.7.9-win32\include;" + $env:INCLUDE - $env:LIB = "C:\mysql-5.7.9-win32\lib;" + $env:LIB - $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH - if (Test-Path "C:\mysql-5.7.11-win32\lib\libmysql.dll") { - copy C:\mysql-5.7.11-win32\lib\libmysql.dll C:\mysql-5.7.11-win32\bin\libmysql.dll - } + $env:INCLUDE = "C:\mysql-5.7.9-win32\include;" + $env:INCLUDE + $env:LIB = "C:\mysql-5.7.9-win32\lib;" + $env:LIB + $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH + if (Test-Path "C:\mysql-5.7.11-win32\lib\libmysql.dll") { + copy C:\mysql-5.7.11-win32\lib\libmysql.dll C:\mysql-5.7.11-win32\bin\libmysql.dll + } + & C:\cygwin\ls -lR /cygwin/C/mysql-5.7.11-win32 } if ($env:platform -eq "x64") { - $env:INCLUDE = "C:\Program Files\MySql\MySQL Server 5.6\include;" + $env:INCLUDE - $env:LIB = "C:\Program Files\MySql\MySQL Server 5.6\lib;" + $env:LIB - $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH - if (Test-Path "C:\Program Files\MySql\MySQL Server 5.6\lib\libmysql.dlll") { - copy C:\Program Files\MySql\MySQL Server 5.6\lib\libmysql.dll C:\Program Files\MySql\MySQL Server 5.6\bin\libmysql.dll - } + $env:INCLUDE = "C:\Program Files\MySql\MySQL Server 5.6\include;" + $env:INCLUDE + $env:LIB = "C:\Program Files\MySql\MySQL Server 5.6\lib;" + $env:LIB + $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH + if (Test-Path "C:\Program Files\MySql\MySQL Server 5.6\lib\libmysql.dlll") { + copy C:\Program Files\MySql\MySQL Server 5.6\lib\libmysql.dll C:\Program Files\MySql\MySQL Server 5.6\bin\libmysql.dll + } + & C:\cygwin\ls -lR "/cygwin/C/Program Files/MySql/MySQL Server 5.6" } $env:MYSQL_PWD="Password12!" $cmd = 'mysql -e "create database pocotestdb;" --user=root'; From 59210ca68ee538553a8da75b76ec2d19ce66b61c Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 9 Mar 2016 11:23:08 +0100 Subject: [PATCH 081/131] Restore 755 on shell --- configure | 0 travis/Linux/runtests.sh | 0 travis/OSX/runtests.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 configure mode change 100644 => 100755 travis/Linux/runtests.sh mode change 100644 => 100755 travis/OSX/runtests.sh diff --git a/configure b/configure old mode 100644 new mode 100755 diff --git a/travis/Linux/runtests.sh b/travis/Linux/runtests.sh old mode 100644 new mode 100755 diff --git a/travis/OSX/runtests.sh b/travis/OSX/runtests.sh old mode 100644 new mode 100755 From 4691479f4f1e26b2607299e9144cc6d07e0a26a3 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 9 Mar 2016 11:35:32 +0100 Subject: [PATCH 082/131] Restore 755 on shell --- build/script/makedepend.SunCC | 0 build/script/makedepend.aCC | 0 build/script/makedepend.clang | 0 build/script/makedepend.cxx | 0 build/script/makedepend.gcc | 0 build/script/makedepend.qcc | 0 build/script/makedepend.xlC | 0 build/script/makeldpath | 0 build/script/projname | 0 build/script/runtests.sh | 0 build/script/shlibln | 0 build/script/vxprogen | 0 12 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build/script/makedepend.SunCC mode change 100644 => 100755 build/script/makedepend.aCC mode change 100644 => 100755 build/script/makedepend.clang mode change 100644 => 100755 build/script/makedepend.cxx mode change 100644 => 100755 build/script/makedepend.gcc mode change 100644 => 100755 build/script/makedepend.qcc mode change 100644 => 100755 build/script/makedepend.xlC mode change 100644 => 100755 build/script/makeldpath mode change 100644 => 100755 build/script/projname mode change 100644 => 100755 build/script/runtests.sh mode change 100644 => 100755 build/script/shlibln mode change 100644 => 100755 build/script/vxprogen diff --git a/build/script/makedepend.SunCC b/build/script/makedepend.SunCC old mode 100644 new mode 100755 diff --git a/build/script/makedepend.aCC b/build/script/makedepend.aCC old mode 100644 new mode 100755 diff --git a/build/script/makedepend.clang b/build/script/makedepend.clang old mode 100644 new mode 100755 diff --git a/build/script/makedepend.cxx b/build/script/makedepend.cxx old mode 100644 new mode 100755 diff --git a/build/script/makedepend.gcc b/build/script/makedepend.gcc old mode 100644 new mode 100755 diff --git a/build/script/makedepend.qcc b/build/script/makedepend.qcc old mode 100644 new mode 100755 diff --git a/build/script/makedepend.xlC b/build/script/makedepend.xlC old mode 100644 new mode 100755 diff --git a/build/script/makeldpath b/build/script/makeldpath old mode 100644 new mode 100755 diff --git a/build/script/projname b/build/script/projname old mode 100644 new mode 100755 diff --git a/build/script/runtests.sh b/build/script/runtests.sh old mode 100644 new mode 100755 diff --git a/build/script/shlibln b/build/script/shlibln old mode 100644 new mode 100755 diff --git a/build/script/vxprogen b/build/script/vxprogen old mode 100644 new mode 100755 From d8db30cbb69784f76a059342816ae7dc1b9b467d Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 9 Mar 2016 11:38:41 +0100 Subject: [PATCH 083/131] Restore 755 on shell --- build_cmake.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build_cmake.sh diff --git a/build_cmake.sh b/build_cmake.sh old mode 100644 new mode 100755 From 200ade5299e94e3628fd762bc5eb62da917167f2 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 9 Mar 2016 14:38:00 +0100 Subject: [PATCH 084/131] Restore 755 on shell --- release/script/cpproj | 0 release/script/mkdoc | 0 release/script/mkdocumentation | 0 release/script/mkrel | 0 release/script/mkrelease | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 release/script/cpproj mode change 100644 => 100755 release/script/mkdoc mode change 100644 => 100755 release/script/mkdocumentation mode change 100644 => 100755 release/script/mkrel mode change 100644 => 100755 release/script/mkrelease diff --git a/release/script/cpproj b/release/script/cpproj old mode 100644 new mode 100755 diff --git a/release/script/mkdoc b/release/script/mkdoc old mode 100644 new mode 100755 diff --git a/release/script/mkdocumentation b/release/script/mkdocumentation old mode 100644 new mode 100755 diff --git a/release/script/mkrel b/release/script/mkrel old mode 100644 new mode 100755 diff --git a/release/script/mkrelease b/release/script/mkrelease old mode 100644 new mode 100755 From b4ecb76799a9392ae40f76203163d1285101e8d7 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 9 Mar 2016 15:10:13 +0100 Subject: [PATCH 085/131] Use environement variables --- appveyor.yml | 71 +++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8f6622c2b..72166a29c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,10 +41,10 @@ configuration: environment: bundling: bundled - mysql32: C:\mysql-5.7.9-win32 - mysql64: C:\Program Files\MySql\MySQL Server 5.6 - postgres32: C:\Program Files (x86)\PostgreSQL\9.4 - postgres64: C:\Program Files\PostgreSQL\9.4 + MYSQL32: C:\mysql-5.7.9-win32 + MYSQL64: C:\Program Files\MySql\MySQL Server 5.6 + POSTGRES32: C:\Program Files (x86)\PostgreSQL\9.4 + POSTGRES64: C:\Program Files\PostgreSQL\9.4 matrix: @@ -162,17 +162,17 @@ install: - ps: | if ($env:platform -eq "Win32") { - if (Test-Path "c:\mysql-5.7.9-win32") { - echo "using c:\mysql-5.7.9-win32 from cache" + if (Test-Path $env:MYSQL32) { + echo "using $env:MYSQL32 from cache" } else { - echo "downloading mysql-5.7.9-win32" - Invoke-WebRequest "http://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.11-win32.zip" -OutFile mysql-5.7.9-win32.zip - echo "installing c:\mysql-5.7.9-win32" - 7z x -y mysql-5.7.9-win32.zip -oc:\ - } - } + echo "downloading $env:MYSQL32" + Invoke-WebRequest "http://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.11-win32.zip" -OutFile mysql-5.7.9-win32.zip + echo "installing $env:MYSQL32" + 7z x -y mysql-5.7.9-win32.zip -oc:\ + } + } # ------------------------------------------------------------------------------------------- # ------------------------------------------------------------------------------------------- @@ -182,26 +182,23 @@ install: - ps: | if ($env:platform -eq "Win32") { - if (Test-Path "C:\Program Files (x86)\PostgreSQL\9.4") { - echo "using C:\Program Files (x86)\PostgreSQL\9.4 from cache" + if (Test-Path $env:POSTGRES32) { + echo "using $env:POSTRGES32 from cache" } else { - Write-Host "Installing PostgreSQL 9.4..." -ForegroundColor Cyan - + Write-Host "Installing $env:POSTGRES32 ..." -ForegroundColor Cyan Write-Host "Downloading..." $exePath = "$($env:USERPROFILE)\postgresql-9.4.5-1-windows.exe" (New-Object Net.WebClient).DownloadFile('http://get.enterprisedb.com/postgresql/postgresql-9.4.5-1-windows.exe', $exePath) - Write-Host "Installing..." cmd /c start /wait $exePath --mode unattended --superpassword Password12! del $exePath - Write-Host "Setting up services..." Stop-Service postgresql-9.4 Set-Service -Name postgresql-9.4 -StartupType Manual - Write-Host "PostgreSQL 9.4 installed" -ForegroundColor Green + Write-Host "$env:POSTGRES32 installed" -ForegroundColor Green } } # ------------------------------------------------------------------------------------------- @@ -244,23 +241,23 @@ before_build: - ps: | if ($env:platform -eq "Win32") { - $env:INCLUDE = "C:\mysql-5.7.9-win32\include;" + $env:INCLUDE - $env:LIB = "C:\mysql-5.7.9-win32\lib;" + $env:LIB - $env:PATH = "C:\mysql-5.7.9-win32\bin;" + $env:PATH - if (Test-Path "C:\mysql-5.7.11-win32\lib\libmysql.dll") { - copy C:\mysql-5.7.11-win32\lib\libmysql.dll C:\mysql-5.7.11-win32\bin\libmysql.dll + $env:INCLUDE = $env:MYSQL32 + "\include;" + $env:INCLUDE + $env:LIB = $env:MYSQL32 + "\lib;" + $env:LIB + $env:PATH = $env:MYSQL32 + "\bin;" + $env:PATH + if (Test-Path ($env:MYSQL32 + "\lib\libmysql.dll")) { + copy $env:MYSQL32 + "\lib\libmysql.dll" $env:MYSQL32 + "\bin\libmysql.dll" } - & C:\cygwin\ls -lR /cygwin/C/mysql-5.7.11-win32 + & C:\cygwin\ibin\ls -lR %MYSQL32% } if ($env:platform -eq "x64") { - $env:INCLUDE = "C:\Program Files\MySql\MySQL Server 5.6\include;" + $env:INCLUDE - $env:LIB = "C:\Program Files\MySql\MySQL Server 5.6\lib;" + $env:LIB - $env:PATH = "C:\Program Files\MySql\MySQL Server 5.6\bin;" + $env:PATH - if (Test-Path "C:\Program Files\MySql\MySQL Server 5.6\lib\libmysql.dlll") { - copy C:\Program Files\MySql\MySQL Server 5.6\lib\libmysql.dll C:\Program Files\MySql\MySQL Server 5.6\bin\libmysql.dll + $env:INCLUDE = $env:MYSQL64 + "\include;" + $env:INCLUDE + $env:LIB = $env:MYSQL64 + "\lib;" + $env:LIB + $env:PATH = $env:MYSQL64 + "\bin;" + $env:PATH + if (Test-Path ($env:MYSQL64 + "\lib\libmysql.dll")) { + copy i$env:MYSQL64 + "\lib\libmysql.dll $env:MYSQL64 + "\bin\libmysql.dll } - & C:\cygwin\ls -lR "/cygwin/C/Program Files/MySql/MySQL Server 5.6" + & C:\cygwin\bin\ls -lR %MYSQL64% } $env:MYSQL_PWD="Password12!" $cmd = 'mysql -e "create database pocotestdb;" --user=root'; @@ -273,15 +270,15 @@ before_build: - ps: | if ($env:platform -eq "Win32") { - $env:INCLUDE = "C:\Program Files (x86)\PostgreSQL\9.4\include;" + $env:INCLUDE - $env:LIB = "C:\Program Files (x86)\PostgreSQL\9.4\lib;" + $env:LIB - $env:PATH = "C:\Program Files (x86)\PostgreSQL\9.4\bin;" + $env:PATH + $env:INCLUDE = $env:POSTGRES32 + "\include;" + $env:INCLUDE + $env:LIB = $env:POSTGRES32 + "\lib;" + $env:LIB + $env:PATH = $env:POSTGRES32 + "\bin;" + $env:PATH } if ($env:platform -eq "x64") { - $env:INCLUDE = "C:\Program Files\PostgreSQL\9.4\include;" + $env:INCLUDE - $env:LIB = "C:\Program Files\PostgreSQL\9.4\lib;" + $env:LIB - $env:PATH = "C:\Program Files\PostgreSQL\9.4\bin;" + $env:PATH + $env:INCLUDE = $env:POSTGRES64 + "\include;" + $env:INCLUDE + $env:LIB = $env:POSTGRES64 + "\lib;" + $env:LIB + $env:PATH = $env:POSTGRES64 + "\bin;" + $env:PATH } after_build: From 58c5962599af3cda35e8e9d30e59c4d315a9af7d Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 9 Mar 2016 15:22:03 +0100 Subject: [PATCH 086/131] Use from to fpr copy statement --- appveyor.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 72166a29c..665cf8138 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -245,7 +245,9 @@ before_build: $env:LIB = $env:MYSQL32 + "\lib;" + $env:LIB $env:PATH = $env:MYSQL32 + "\bin;" + $env:PATH if (Test-Path ($env:MYSQL32 + "\lib\libmysql.dll")) { - copy $env:MYSQL32 + "\lib\libmysql.dll" $env:MYSQL32 + "\bin\libmysql.dll" + $from = $env:MYSQL32 + "\lib\libmysql.dll"; + $to = $env:MYSQL32 + "\bin\libmysql.dll" + copy $from $to } & C:\cygwin\ibin\ls -lR %MYSQL32% } @@ -255,7 +257,9 @@ before_build: $env:LIB = $env:MYSQL64 + "\lib;" + $env:LIB $env:PATH = $env:MYSQL64 + "\bin;" + $env:PATH if (Test-Path ($env:MYSQL64 + "\lib\libmysql.dll")) { - copy i$env:MYSQL64 + "\lib\libmysql.dll $env:MYSQL64 + "\bin\libmysql.dll + $from = $env:MYSQL64 + "\lib\libmysql.dll"; + $to = $env:MYSQL64 + "\bin\libmysql.dll" + copy $from $to } & C:\cygwin\bin\ls -lR %MYSQL64% } From 181b8e8aa26c26e375d58ddcb2e3ea186ea2fa7e Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 9 Mar 2016 15:35:04 +0100 Subject: [PATCH 087/131] Fix typo --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 665cf8138..aafca1fa1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -183,7 +183,7 @@ install: if ($env:platform -eq "Win32") { if (Test-Path $env:POSTGRES32) { - echo "using $env:POSTRGES32 from cache" + echo "using $env:POSTGRES32 from cache" } else { @@ -249,7 +249,7 @@ before_build: $to = $env:MYSQL32 + "\bin\libmysql.dll" copy $from $to } - & C:\cygwin\ibin\ls -lR %MYSQL32% + & C:\cygwin\bin\ls -lR %MYSQL32% } if ($env:platform -eq "x64") { From 6121a451a34f57616a6602bb92a973e94e44deab Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Wed, 9 Mar 2016 17:27:42 +0100 Subject: [PATCH 088/131] Prefix CppUnit include path with Poco/ Signed-off-by: FrancisANDRE --- Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp index 67aa79150..5c4bfd5fa 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp @@ -31,8 +31,8 @@ #include "PostgreSQLTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Environment.h" #include "Poco/String.h" #include "Poco/Format.h" From 4122f47c91fa82309f03755fd9413b99eef56559 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Wed, 9 Mar 2016 17:32:36 +0100 Subject: [PATCH 089/131] Remove duplicate entry. Signed-off-by: FrancisANDRE --- Redis/Redis_x64_vs120.vcxproj | 85 +++++++++++++-------------- Redis/Redis_x64_vs120.vcxproj.filters | 3 - 2 files changed, 42 insertions(+), 46 deletions(-) diff --git a/Redis/Redis_x64_vs120.vcxproj b/Redis/Redis_x64_vs120.vcxproj index 06e07a53f..d9fdc9668 100644 --- a/Redis/Redis_x64_vs120.vcxproj +++ b/Redis/Redis_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ Redis Win32Proj - + StaticLibrary MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 PocoRedis64d @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -163,9 +163,9 @@ true true true - + Level3 - + Default @@ -193,7 +193,7 @@ true true true - + ..\lib64\PocoRedismtd.pdb Level3 ProgramDatabase @@ -218,9 +218,9 @@ true true true - + Level3 - + Default @@ -240,7 +240,7 @@ true true true - + ..\lib64\PocoRedismdd.pdb Level3 ProgramDatabase @@ -265,9 +265,9 @@ true true true - + Level3 - + Default @@ -275,29 +275,28 @@ - - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + \ No newline at end of file diff --git a/Redis/Redis_x64_vs120.vcxproj.filters b/Redis/Redis_x64_vs120.vcxproj.filters index 291ff7879..243929f23 100644 --- a/Redis/Redis_x64_vs120.vcxproj.filters +++ b/Redis/Redis_x64_vs120.vcxproj.filters @@ -36,9 +36,6 @@ Source Files - - Header Files - From 139649fd617e42bc8bbeca7d93b15917077d2988 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Wed, 9 Mar 2016 20:22:44 +0100 Subject: [PATCH 090/131] TaskManager::count() now returns std::size_t; release mutex before posting progress notification --- Foundation/include/Poco/TaskManager.h | 6 +++--- Foundation/src/TaskManager.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Foundation/include/Poco/TaskManager.h b/Foundation/include/Poco/TaskManager.h index c4c3aa8e7..30f95972e 100644 --- a/Foundation/include/Poco/TaskManager.h +++ b/Foundation/include/Poco/TaskManager.h @@ -86,7 +86,7 @@ public: TaskList taskList() const; /// Returns a copy of the internal task list. - int count() const; + std::size_t count() const; /// Returns the number of tasks in the internal task list. void addObserver(const AbstractObserver& observer); @@ -125,11 +125,11 @@ private: // // inlines // -inline int TaskManager::count() const +inline std::size_t TaskManager::count() const { FastMutex::ScopedLock lock(_mutex); - return (int) _taskList.size(); + return _taskList.size(); } diff --git a/Foundation/src/TaskManager.cpp b/Foundation/src/TaskManager.cpp index 1e2e6bc9a..77f2aa8f0 100644 --- a/Foundation/src/TaskManager.cpp +++ b/Foundation/src/TaskManager.cpp @@ -115,11 +115,12 @@ void TaskManager::taskStarted(Task* pTask) void TaskManager::taskProgress(Task* pTask, float progress) { - FastMutex::ScopedLock lock(_mutex); + ScopedLockWithUnlock lock(_mutex); if (_lastProgressNotification.isElapsed(MIN_PROGRESS_NOTIFICATION_INTERVAL)) { _lastProgressNotification.update(); + lock.unlock(); _nc.postNotification(new TaskProgressNotification(pTask, progress)); } } From d2240e910fbbf6bb595c4b5e9260b25ef0d9f047 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Wed, 9 Mar 2016 21:01:45 +0100 Subject: [PATCH 091/131] Remove dupplicate entry. Signed-off-by: FrancisANDRE --- Redis/Redis_vs120.vcxproj | 85 +++++++++++++++---------------- Redis/Redis_vs120.vcxproj.filters | 3 -- 2 files changed, 42 insertions(+), 46 deletions(-) diff --git a/Redis/Redis_vs120.vcxproj b/Redis/Redis_vs120.vcxproj index 14d9455e4..6ee874ece 100644 --- a/Redis/Redis_vs120.vcxproj +++ b/Redis/Redis_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ Redis Win32Proj - + StaticLibrary MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 PocoRedisd @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -163,9 +163,9 @@ true true true - + Level3 - + Default @@ -193,7 +193,7 @@ true true true - + ..\lib\PocoRedismtd.pdb Level3 ProgramDatabase @@ -218,9 +218,9 @@ true true true - + Level3 - + Default @@ -240,7 +240,7 @@ true true true - + ..\lib\PocoRedismdd.pdb Level3 ProgramDatabase @@ -265,10 +265,10 @@ true true true - + ..\lib\PocoRedismd.pdb Level3 - + Default @@ -276,29 +276,28 @@ - - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + \ No newline at end of file diff --git a/Redis/Redis_vs120.vcxproj.filters b/Redis/Redis_vs120.vcxproj.filters index a099b378c..0aa7847e8 100644 --- a/Redis/Redis_vs120.vcxproj.filters +++ b/Redis/Redis_vs120.vcxproj.filters @@ -36,9 +36,6 @@ Source Files - - Header Files - From ede77f46eec4dc7607f8c25458ee7ed637c3b05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Wed, 9 Mar 2016 17:20:37 -0300 Subject: [PATCH 092/131] Removed unused variables When compiling with higher warning levels the compiler warns about these unused variables. --- Foundation/include/Poco/NamedEvent_UNIX.h | 2 -- Foundation/include/Poco/NamedMutex_UNIX.h | 2 -- MongoDB/include/Poco/MongoDB/GetMoreRequest.h | 1 - 3 files changed, 5 deletions(-) diff --git a/Foundation/include/Poco/NamedEvent_UNIX.h b/Foundation/include/Poco/NamedEvent_UNIX.h index 63dabcad3..9aba82104 100644 --- a/Foundation/include/Poco/NamedEvent_UNIX.h +++ b/Foundation/include/Poco/NamedEvent_UNIX.h @@ -44,8 +44,6 @@ private: #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX) sem_t* _sem; #else - int _lockfd; // lock file descriptor - int _semfd; // file used to identify semaphore int _semid; // semaphore id #endif }; diff --git a/Foundation/include/Poco/NamedMutex_UNIX.h b/Foundation/include/Poco/NamedMutex_UNIX.h index 631231867..78515545b 100644 --- a/Foundation/include/Poco/NamedMutex_UNIX.h +++ b/Foundation/include/Poco/NamedMutex_UNIX.h @@ -47,8 +47,6 @@ private: #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX) sem_t* _sem; #else - int _lockfd; // lock file descriptor - int _semfd; // file used to identify semaphore int _semid; // semaphore id #endif }; diff --git a/MongoDB/include/Poco/MongoDB/GetMoreRequest.h b/MongoDB/include/Poco/MongoDB/GetMoreRequest.h index 9b2a4c8bd..e73941e1e 100644 --- a/MongoDB/include/Poco/MongoDB/GetMoreRequest.h +++ b/MongoDB/include/Poco/MongoDB/GetMoreRequest.h @@ -58,7 +58,6 @@ protected: void buildRequest(BinaryWriter& writer); private: - Int32 _flags; std::string _fullCollectionName; Int32 _numberToReturn; Int64 _cursorID; From f634ab8d6d2430289a21aa324c3be4879fa99975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Wed, 9 Mar 2016 17:21:25 -0300 Subject: [PATCH 093/131] Fixed an inline initialization issue in the constructor Class members are initialized in the order they are declared. --- Redis/include/Poco/Redis/AsyncReader.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Redis/include/Poco/Redis/AsyncReader.h b/Redis/include/Poco/Redis/AsyncReader.h index ad99a3975..2a7e3a996 100644 --- a/Redis/include/Poco/Redis/AsyncReader.h +++ b/Redis/include/Poco/Redis/AsyncReader.h @@ -67,10 +67,8 @@ private: AsyncReader(const AsyncReader&); AsyncReader& operator = (const AsyncReader&); - - Activity _activity; - Client& _client; + Activity _activity; }; From b70ccde3a20d9bcefe536689dde3a407feb53c68 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Wed, 9 Mar 2016 21:23:16 +0100 Subject: [PATCH 094/131] copy of libCppUnit* no more needed. Signed-off-by: FrancisANDRE --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index fd7c9751a..ff4df66bb 100644 --- a/Makefile +++ b/Makefile @@ -108,8 +108,6 @@ ifeq ($(OSNAME), Cygwin) find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type f -exec cp -f {} $(INSTALLDIR)/bin \; find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/bin \; endif - find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libCppUnit*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; - find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libCppUnit*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; From e9bc9fe8d40498069e039c893e1f865e1df689a8 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Wed, 9 Mar 2016 19:55:42 -0800 Subject: [PATCH 095/131] fix PostgreSQL testsuite Makefile --- Data/PostgreSQL/testsuite/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/PostgreSQL/testsuite/Makefile b/Data/PostgreSQL/testsuite/Makefile index e4f137d55..5924586a5 100644 --- a/Data/PostgreSQL/testsuite/Makefile +++ b/Data/PostgreSQL/testsuite/Makefile @@ -19,6 +19,6 @@ objects = PostgreSQLTestSuite Driver PostgreSQLTest SQLExecutor target = testrunner target_version = 1 -target_libs = PocoDataPostgreSQL PocoData PocoFoundation CppUnit +target_libs = PocoDataPostgreSQL PocoData PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec From 3a43ac0b94f1bb1705a8c8a0d615f302e0ee92c4 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 10 Mar 2016 07:09:31 +0100 Subject: [PATCH 096/131] Add missing ws2_lib32.lib Signed-off-by: FrancisANDRE --- Redis/testsuite/TestSuite.progen | 2 + Redis/testsuite/TestSuite_vs120.vcxproj | 62 ++++++++++---------- Redis/testsuite/TestSuite_x64_vs120.vcxproj | 64 ++++++++++----------- 3 files changed, 65 insertions(+), 63 deletions(-) diff --git a/Redis/testsuite/TestSuite.progen b/Redis/testsuite/TestSuite.progen index feb5c6909..178b5a446 100644 --- a/Redis/testsuite/TestSuite.progen +++ b/Redis/testsuite/TestSuite.progen @@ -7,3 +7,5 @@ vc.project.platforms = Win32, x64 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_x64_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Net\\include +vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj b/Redis/testsuite/TestSuite_vs120.vcxproj index def498763..96f652e6c 100644 --- a/Redis/testsuite/TestSuite_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,7 +136,7 @@ true true true - + Level3 ProgramDatabase Default @@ -167,9 +167,9 @@ true true true - + Level3 - + Default @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -256,7 +256,7 @@ true true true - + Level3 ProgramDatabase Default @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -304,14 +304,14 @@ - - - + + + - - + + - - - + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_x64_vs120.vcxproj b/Redis/testsuite/TestSuite_x64_vs120.vcxproj index 38716e311..2c9273a08 100644 --- a/Redis/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,7 +136,7 @@ true true true - + Level3 ProgramDatabase Default @@ -167,9 +167,9 @@ true true true - + Level3 - + Default @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -304,14 +304,14 @@ - - - + + + - - + + - - - + + + \ No newline at end of file From b2ac8702408f23071af39bf822225ea1a5a291f8 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Thu, 10 Mar 2016 09:54:08 +0100 Subject: [PATCH 097/131] fixed GH# 1184: Attempting to connect via a proxy throws a DNS error "Host not found" --- NetSSL_OpenSSL/src/SecureSocketImpl.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp index 129a98777..9a81898a7 100644 --- a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp @@ -376,8 +376,15 @@ long SecureSocketImpl::verifyPeerCertificateImpl(const std::string& hostName) bool SecureSocketImpl::isLocalHost(const std::string& hostName) { - SocketAddress addr(hostName, 0); - return addr.host().isLoopback(); + try + { + SocketAddress addr(hostName, 0); + return addr.host().isLoopback(); + } + catch (Poco::Exception&) + { + return false; + } } From 47461e041f3638475cee51ed864f2705b4bfffaf Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 10 Mar 2016 12:22:48 +0100 Subject: [PATCH 098/131] Add missing ws2_lib32.lib Signed-off-by: FrancisANDRE --- Redis/testsuite/TestSuite_vs120.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj b/Redis/testsuite/TestSuite_vs120.vcxproj index 96f652e6c..78e04fff9 100644 --- a/Redis/testsuite/TestSuite_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_vs120.vcxproj @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true From 28a40c1c563409740252a76315d6c613874ca26d Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 10 Mar 2016 12:27:10 +0100 Subject: [PATCH 099/131] Put Data/Postgresql as last component for AppVeyor. Signed-off-by: FrancisANDRE --- components | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components b/components index a93a69823..8c2c951c6 100644 --- a/components +++ b/components @@ -12,7 +12,6 @@ Data Data/SQLite Data/ODBC Data/MySQL -Data/PostgreSQL Zip PageCompiler PageCompiler/File2Page @@ -22,3 +21,4 @@ MongoDB Redis PocoDoc ProGen +Data/PostgreSQL From 1f6ccce76d69dc477253963023b96b994bd74ff1 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 10 Mar 2016 13:07:20 +0100 Subject: [PATCH 100/131] Put Data/MySQL by end for AppVeyor Signed-off-by: FrancisANDRE --- components | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components b/components index 8c2c951c6..35c4f3075 100644 --- a/components +++ b/components @@ -11,7 +11,7 @@ NetSSL_Win Data Data/SQLite Data/ODBC -Data/MySQL +Data/PostgreSQL Zip PageCompiler PageCompiler/File2Page @@ -21,4 +21,4 @@ MongoDB Redis PocoDoc ProGen -Data/PostgreSQL +Data/MySQL From ca49ef5d955b77e1f1b9c34f26ee0e86644fc295 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 10 Mar 2016 13:13:42 +0100 Subject: [PATCH 101/131] Run Data/SQLite on Travis OSX Signed-off-by: FrancisANDRE --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb167d29a..d82df67ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 + - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -s -j2 - sudo make install - ./travis/OSX/runtests.sh From 34e47481052dc908a6febcb881b66aa9f971e257 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 10 Mar 2016 17:50:16 +0100 Subject: [PATCH 102/131] Replace DOS variable by PS variable. Signed-off-by: FrancisANDRE --- appveyor.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index aafca1fa1..3b87d3124 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,8 @@ cache: - C:\ProgramData\chocolatey - C:\OpenSSL-Win32 - C:\OpenSSL-Win64 - - C:\Program Files (x86)\PostgreSQL + - C:\Program Files (x86)\PostgreSQL\9.4 + - C:\Program Files\PostgreSQL\9.4 hosts: localhost: 127.0.0.1 @@ -249,7 +250,7 @@ before_build: $to = $env:MYSQL32 + "\bin\libmysql.dll" copy $from $to } - & C:\cygwin\bin\ls -lR %MYSQL32% + & C:\cygwin\bin\ls -lR $env:MYSQL32 } if ($env:platform -eq "x64") { @@ -261,7 +262,7 @@ before_build: $to = $env:MYSQL64 + "\bin\libmysql.dll" copy $from $to } - & C:\cygwin\bin\ls -lR %MYSQL64% + & C:\cygwin\bin\ls -lR $env:MYSQL64 } $env:MYSQL_PWD="Password12!" $cmd = 'mysql -e "create database pocotestdb;" --user=root'; From ad83c85663611865d7d73cb4127f0a85cd39ce64 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Thu, 10 Mar 2016 08:59:18 -0800 Subject: [PATCH 103/131] regenerate redis testsuite vs projects --- Redis/testsuite/TestSuite_vs100.vcxproj | 12 ++-- .../testsuite/TestSuite_vs100.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_vs110.vcxproj | 12 ++-- .../testsuite/TestSuite_vs110.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_vs120.vcxproj | 68 +++++++++---------- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_vs140.vcxproj | 12 ++-- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_vs90.vcproj | 12 ++-- Redis/testsuite/TestSuite_x64_vs100.vcxproj | 12 ++-- .../TestSuite_x64_vs100.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_x64_vs110.vcxproj | 12 ++-- .../TestSuite_x64_vs110.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_x64_vs120.vcxproj | 68 +++++++++---------- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_x64_vs140.vcxproj | 12 ++-- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_x64_vs90.vcproj | 12 ++-- 18 files changed, 132 insertions(+), 132 deletions(-) diff --git a/Redis/testsuite/TestSuite_vs100.vcxproj b/Redis/testsuite/TestSuite_vs100.vcxproj index 2d8d7ceff..08961eac6 100644 --- a/Redis/testsuite/TestSuite_vs100.vcxproj +++ b/Redis/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_vs100.vcxproj.filters b/Redis/testsuite/TestSuite_vs100.vcxproj.filters index a782241ab..62f25fc94 100644 --- a/Redis/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {8cfd05a6-6b14-47ac-804d-5210887755ef} + {3c934d48-a7eb-44a0-a1ea-ecc0ed7de689} - {a7691369-e3b0-4eba-b478-97103ea1bee1} + {ba497fd6-c76f-4c82-b584-2e0f72e69ddb} diff --git a/Redis/testsuite/TestSuite_vs110.vcxproj b/Redis/testsuite/TestSuite_vs110.vcxproj index 5397f8d97..d9e58b2b6 100644 --- a/Redis/testsuite/TestSuite_vs110.vcxproj +++ b/Redis/testsuite/TestSuite_vs110.vcxproj @@ -148,7 +148,7 @@ Default - PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_vs110.vcxproj.filters b/Redis/testsuite/TestSuite_vs110.vcxproj.filters index 1b09e0684..dbc663585 100644 --- a/Redis/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {8868df83-0c3b-4fc7-b3fe-145e58d889ba} + {663776a1-2102-4515-95bd-13d9ed614276} - {a5063940-1cd3-493b-b70e-a55607dd9398} + {bced4e5f-13db-496d-a2f2-3c5cb5de211c} diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj b/Redis/testsuite/TestSuite_vs120.vcxproj index 78e04fff9..4dee6b1f8 100644 --- a/Redis/testsuite/TestSuite_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,13 +136,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -167,13 +167,13 @@ true true true - + Level3 - + Default - PocoCppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmtd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - PocoCppUnitmt.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmdd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - PocoCppUnitmd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -304,14 +304,14 @@ - - - + + + - - + + - - - \ No newline at end of file + + + diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj.filters b/Redis/testsuite/TestSuite_vs120.vcxproj.filters index 67fadb91e..2d9450e51 100644 --- a/Redis/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {49d91e9d-d81b-4e1c-96b9-f119b8fd1ebd} + {97158bee-67ec-422b-a6b2-bea200ca607b} - {66c98dbb-b9b8-4430-afa3-d0dfac97937b} + {e20526bd-3c4a-4eda-a66f-ba861cdb2f67} diff --git a/Redis/testsuite/TestSuite_vs140.vcxproj b/Redis/testsuite/TestSuite_vs140.vcxproj index 049da2c55..42b988324 100644 --- a/Redis/testsuite/TestSuite_vs140.vcxproj +++ b/Redis/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - PocoCppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - PocoCppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_vs140.vcxproj.filters b/Redis/testsuite/TestSuite_vs140.vcxproj.filters index 9cd7b3fe7..d50a0fb95 100644 --- a/Redis/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {f7eef316-b51c-49d6-8cc0-9cd358e0237a} + {c56cc5bc-db89-42f0-adec-e9b1cb2ef404} - {0c83830e-d1e3-4ad8-833c-5cfdbc27904f} + {4d43c6b3-5696-496c-9b21-0ccc1bf21f7b} diff --git a/Redis/testsuite/TestSuite_vs90.vcproj b/Redis/testsuite/TestSuite_vs90.vcproj index 67b07872c..5c0b8cf29 100644 --- a/Redis/testsuite/TestSuite_vs90.vcproj +++ b/Redis/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,7 +198,7 @@ %(AdditionalOptions) - PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -266,7 +266,7 @@ %(AdditionalOptions) - PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters index 7e203d8b0..02646ef79 100644 --- a/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {ab7634a1-1fbd-42d7-9f94-2ea6e5975d36} + {70af8c65-8c21-470b-8e52-5349ff7ad932} - {6f4f4265-0e8b-46d5-9b7a-00e723656f1b} + {9e4b9972-d24c-465a-9c04-532c1a8984ed} diff --git a/Redis/testsuite/TestSuite_x64_vs110.vcxproj b/Redis/testsuite/TestSuite_x64_vs110.vcxproj index 8d22e641d..fdd5fc482 100644 --- a/Redis/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,7 +148,7 @@ Default - PocoCppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - PocoCppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,7 +208,7 @@ Default - PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -240,7 +240,7 @@ Default - PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -270,7 +270,7 @@ Default - PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters index 936544ff3..81db354bd 100644 --- a/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {cf0b663c-ca3e-45c2-87d5-70033cdc2b24} + {2eef7653-c645-4780-8e3d-d41074e092ed} - {e008f572-57ab-4099-9539-f4a910ab2630} + {6932d75a-7522-455e-bad2-e9356eb6ebe1} diff --git a/Redis/testsuite/TestSuite_x64_vs120.vcxproj b/Redis/testsuite/TestSuite_x64_vs120.vcxproj index 2c9273a08..ee1c27208 100644 --- a/Redis/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,13 +136,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -167,13 +167,13 @@ true true true - + Level3 - + Default - PocoCppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmtd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - PocoCppUnitmt.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmdd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - PocoCppUnitmd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -304,14 +304,14 @@ - - - + + + - - + + - - - \ No newline at end of file + + + diff --git a/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters index eccba3954..e133cb5e3 100644 --- a/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {64c39fac-1b97-4357-8a41-a0407ea79025} + {df09b19f-ebe8-4afe-9192-12c2cd2d1ce0} - {8bf8c61e-beb9-4e98-984d-293e36d028d3} + {7fb8becc-981e-4a12-8713-297cfe8af5d1} diff --git a/Redis/testsuite/TestSuite_x64_vs140.vcxproj b/Redis/testsuite/TestSuite_x64_vs140.vcxproj index 3e681d749..d24dc6d54 100644 --- a/Redis/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - PocoCppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - PocoCppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters index 2d5c9e830..4c883d6c5 100644 --- a/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {68163283-dc2c-4733-84f2-ea36a060e03a} + {a539755c-0791-4159-a416-5a43b7b3b4f2} - {e6d09f3a-bf0f-48fc-8bae-4d878bd2d65a} + {babaebed-7710-4b21-8b85-efd0763703e8} diff --git a/Redis/testsuite/TestSuite_x64_vs90.vcproj b/Redis/testsuite/TestSuite_x64_vs90.vcproj index be12df3f2..12acc7db3 100644 --- a/Redis/testsuite/TestSuite_x64_vs90.vcproj +++ b/Redis/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> Date: Thu, 10 Mar 2016 21:30:17 +0100 Subject: [PATCH 104/131] fix for #1187: don't send timeout to zero --- Data/MySQL/src/SessionImpl.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Data/MySQL/src/SessionImpl.cpp b/Data/MySQL/src/SessionImpl.cpp index b234639e6..b6ffd7f11 100644 --- a/Data/MySQL/src/SessionImpl.cpp +++ b/Data/MySQL/src/SessionImpl.cpp @@ -55,7 +55,6 @@ SessionImpl::SessionImpl(const std::string& connectionString, std::size_t loginT addProperty("insertId", &SessionImpl::setInsertId, &SessionImpl::getInsertId); setProperty("handle", static_cast(_handle)); open(); - setConnectionTimeout(CONNECTION_TIMEOUT_DEFAULT); } From 0645fa79a29f0b52e5e2395b5a51560822500673 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 11 Mar 2016 12:09:49 +0100 Subject: [PATCH 105/131] Add fast fail. Restore arm-linux-gnueabi-g++. Signed-off-by: FrancisANDRE --- .travis.yml | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06d21f48f..1f6dfd804 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,8 @@ before_script: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql -u root -e 'create database pocotestdb;'; fi matrix: + fast_finish: true + include: - env: TEST_NAME="OSX clang (make) bundled" os: osx @@ -53,25 +55,21 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 - - sudo make install - - ./travis/OSX/runtests.sh + - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 && sudo make install && ./travis/OSX/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) bundled" compiler: gcc script: - export CC="gcc" - export CXX="g++" - - ./configure --everything && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) bundled" compiler: gcc script: - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" compiler: gcc @@ -79,8 +77,7 @@ matrix: - export CC="gcc" - export CXX="g++" - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - ./configure --everything --unbundled && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" compiler: gcc @@ -88,19 +85,17 @@ matrix: - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything --unbundled && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux clang 3.4 (make)" compiler: clang script: - - ./configure --everything --config=Linux-clang && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything --config=Linux-clang && make -s -j2 install && - ./travis/Linux/runtests.sh #FIXME the -m64 option bring by the Linux config is not supported by arm-linux-gnueabi-g++ which makes this test failing - #FIXME - env: TEST_NAME="arm-linux-gnueabi- (make)" - #FIXME script: - #FIXME - ./configure --omit=Data/ODBC,Data/MySQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l + - env: TEST_NAME="arm-linux-gnueabi- (make)" + script: + - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 install CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - env: TEST_NAME="Linux gcc 4.6 (CMake)" compiler: gcc @@ -134,7 +129,7 @@ matrix: - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - - make -s -j2 && cd .. + - make -s -j2 install && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" script: @@ -143,17 +138,8 @@ matrix: - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - - make -s -j2 && cd .. + - make -s -j2 install && cd .. - # TODO osx build - # TODO run test suite - # script: - # - ./configure && make -s -i -j2 - # - sudo ifconfig -a - # - sudo ifconfig venet0 multicast - # - sudo ifconfig -a - # - export POCO_BASE=`pwd` - # - sudo -E build/script/runtests.sh # QA jobs for code analytics and metrics # build documentation and release From b2453077809dc9445fccf93aab8530fc2535e6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Fri, 11 Mar 2016 10:14:43 -0300 Subject: [PATCH 106/131] Poco.Foundation now links with pthreads on Unix platforms Some of the libraries relies on functions from Poco.Foundation that are implemented using pthreads and were leading to link errors. --- Foundation/CMakeLists.txt | 6 +++--- PageCompiler/CMakeLists.txt | 2 +- PageCompiler/File2Page/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt index a583c8985..7d572f319 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt @@ -111,14 +111,14 @@ endif(ANDROID) # TODO: Why is this here? add_definitions( -DPCRE_STATIC) -# For SetAffinity +# For POSIX threads on Unix if(UNIX AND NOT APPLE) + # We still need pthreads on Unix + set(SYSLIBS ${SYSLIBS} ${CMAKE_THREAD_LIBS_INIT}) INCLUDE (CheckFunctionExists) INCLUDE (CheckCXXSourceCompiles) INCLUDE (CheckLibraryExists) CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np "pthread.h" HAVE_PTHREAD_SETAFFINITY_NP) - #set(CMAKE_EXTRA_INCLUDE_FILES pthread.h) - #CHECK_FUNCTION_EXISTS(pthread_setaffinity_np HAVE_PTHREAD_SETAFFINITY_NP) if(NOT HAVE_PTHREAD_SETAFFINITY_NP) message(STATUS "Platform has not PTHREAD_SETAFFINITY_NP") else(HAVE_PTHREAD_SETAFFINITY_NP) diff --git a/PageCompiler/CMakeLists.txt b/PageCompiler/CMakeLists.txt index 5d0a479e5..2f8af6c87 100644 --- a/PageCompiler/CMakeLists.txt +++ b/PageCompiler/CMakeLists.txt @@ -10,7 +10,7 @@ set_target_properties( "${POCO_EXENAME}" OUTPUT_NAME cpspc ) -target_link_libraries( "${POCO_EXENAME}" ${CMAKE_THREAD_LIBS_INIT} Net Util XML JSON Foundation) +target_link_libraries( "${POCO_EXENAME}" Net Util XML JSON Foundation) install( TARGETS "${POCO_EXENAME}" EXPORT "${POCO_EXENAME}Targets" diff --git a/PageCompiler/File2Page/CMakeLists.txt b/PageCompiler/File2Page/CMakeLists.txt index 68c32362b..cb6d9694b 100644 --- a/PageCompiler/File2Page/CMakeLists.txt +++ b/PageCompiler/File2Page/CMakeLists.txt @@ -10,7 +10,7 @@ set_target_properties( "${POCO_EXENAME}" OUTPUT_NAME f2cpsp ) -target_link_libraries( "${POCO_EXENAME}" ${CMAKE_THREAD_LIBS_INIT} Net Util XML JSON Foundation) +target_link_libraries( "${POCO_EXENAME}" Net Util XML JSON Foundation) install( TARGETS "${POCO_EXENAME}" EXPORT "${POCO_EXENAME}Targets" From b3423e660141b81be67d1292b00777432ceb23ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Fri, 11 Mar 2016 10:17:33 -0300 Subject: [PATCH 107/131] Fixed compilation on IBM XLC due to incorrect function call Templated functions dependent of a templated class must be prefixed with the "template" keyword. --- Foundation/include/Poco/Dynamic/Pair.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/include/Poco/Dynamic/Pair.h b/Foundation/include/Poco/Dynamic/Pair.h index b16f833b2..aab63f993 100644 --- a/Foundation/include/Poco/Dynamic/Pair.h +++ b/Foundation/include/Poco/Dynamic/Pair.h @@ -98,7 +98,7 @@ public: std::string toString() { std::string str; - Var(*this).convert(str); + Var(*this).template convert(str); return str; } From 473de6d1b136b2fba82858944690d50c1a1ff60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Fri, 11 Mar 2016 10:21:40 -0300 Subject: [PATCH 108/131] Fixed compilation on IBM AIX due to name clash with UTF32Char Both poco and AIX's system header defines UTF32Char type which lead to a name clash and compilation error. --- Foundation/testsuite/src/UnicodeConverterTest.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Foundation/testsuite/src/UnicodeConverterTest.cpp b/Foundation/testsuite/src/UnicodeConverterTest.cpp index e638513a4..db01d83f9 100644 --- a/Foundation/testsuite/src/UnicodeConverterTest.cpp +++ b/Foundation/testsuite/src/UnicodeConverterTest.cpp @@ -20,13 +20,6 @@ #include "Poco/UTFString.h" -using Poco::UnicodeConverter; -using Poco::UTF16Char; -using Poco::UTF16String; -using Poco::UTF32Char; -using Poco::UTF32String; - - UnicodeConverterTest::UnicodeConverterTest(const std::string& rName): CppUnit::TestCase(rName) { } @@ -39,14 +32,13 @@ UnicodeConverterTest::~UnicodeConverterTest() void UnicodeConverterTest::testUTF16() { - - runTests(); + runTests(); } void UnicodeConverterTest::testUTF32() { - runTests(); + runTests(); } From 3efe787a6415175b16af899f7ebf4386ecafad7e Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 11 Mar 2016 14:25:23 +0100 Subject: [PATCH 109/131] Use sudo for installing Poco libs. Signed-off-by: FrancisANDRE --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f6dfd804..d1057f79e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,14 +62,14 @@ matrix: script: - export CC="gcc" - export CXX="g++" - - ./configure --everything && make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything && sudo make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) bundled" compiler: gcc script: - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything && make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything && sudo make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" compiler: gcc @@ -77,7 +77,7 @@ matrix: - export CC="gcc" - export CXX="g++" - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - ./configure --everything --unbundled && make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && sudo make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" compiler: gcc @@ -85,17 +85,17 @@ matrix: - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything --unbundled && make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && sudo make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux clang 3.4 (make)" compiler: clang script: - - ./configure --everything --config=Linux-clang && make -s -j2 install && - ./travis/Linux/runtests.sh + - ./configure --everything --config=Linux-clang && sudo make -s -j2 install && - ./travis/Linux/runtests.sh #FIXME the -m64 option bring by the Linux config is not supported by arm-linux-gnueabi-g++ which makes this test failing - env: TEST_NAME="arm-linux-gnueabi- (make)" script: - - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 install CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l + - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && sudo make -s -j2 install CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - env: TEST_NAME="Linux gcc 4.6 (CMake)" compiler: gcc @@ -128,8 +128,8 @@ matrix: - export CXX="arm-linux-gnueabi-g++" - source ./travis/ignored.sh - export POCO_BASE=`pwd` - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - - make -s -j2 install && cd .. + - mkdir cmake-build + - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && sudo make -s -j2 install && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" script: @@ -137,8 +137,8 @@ matrix: - export CXX="arm-linux-gnueabihf-g++" - source ./travis/ignored.sh - export POCO_BASE=`pwd` - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - - make -s -j2 install && cd .. + - mkdir cmake-build + - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && sudo make -s -j2 install && cd .. # QA jobs for code analytics and metrics From 8895045fb59965551ae44be16a10d91fb7c471d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Fri, 11 Mar 2016 10:30:15 -0300 Subject: [PATCH 110/131] Made all testsuite link with pthreads on Unix systems This fixes the linker errors due to missing pthreads library on AIX. --- Data/SQLite/testsuite/CMakeLists.txt | 2 +- Data/testsuite/CMakeLists.txt | 2 +- JSON/testsuite/CMakeLists.txt | 2 +- MongoDB/testsuite/CMakeLists.txt | 2 +- Net/testsuite/CMakeLists.txt | 2 +- NetSSL_OpenSSL/testsuite/CMakeLists.txt | 2 +- PageCompiler/CMakeLists.txt | 2 +- PageCompiler/File2Page/CMakeLists.txt | 2 +- Redis/testsuite/CMakeLists.txt | 2 +- Util/testsuite/CMakeLists.txt | 2 +- XML/testsuite/CMakeLists.txt | 2 +- Zip/testsuite/CMakeLists.txt | 3 +-- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Data/SQLite/testsuite/CMakeLists.txt b/Data/SQLite/testsuite/CMakeLists.txt index 536c8742d..57463122a 100644 --- a/Data/SQLite/testsuite/CMakeLists.txt +++ b/Data/SQLite/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoDataSQLite PocoData PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoDataSQLite PocoData PocoFoundation CppUnit ) diff --git a/Data/testsuite/CMakeLists.txt b/Data/testsuite/CMakeLists.txt index b20cff408..acb3d1313 100644 --- a/Data/testsuite/CMakeLists.txt +++ b/Data/testsuite/CMakeLists.txt @@ -23,4 +23,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoData PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoData PocoUtil PocoXML PocoFoundation CppUnit) diff --git a/JSON/testsuite/CMakeLists.txt b/JSON/testsuite/CMakeLists.txt index 7ef42b406..e5899d562 100644 --- a/JSON/testsuite/CMakeLists.txt +++ b/JSON/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoJSON PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoJSON PocoFoundation CppUnit ) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/MongoDB/testsuite/CMakeLists.txt b/MongoDB/testsuite/CMakeLists.txt index d65c57f61..c4a4293d3 100644 --- a/MongoDB/testsuite/CMakeLists.txt +++ b/MongoDB/testsuite/CMakeLists.txt @@ -20,4 +20,4 @@ set(TESTUNIT "${LIBNAME}-testrunner") add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoMongoDB PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoMongoDB PocoFoundation CppUnit ) diff --git a/Net/testsuite/CMakeLists.txt b/Net/testsuite/CMakeLists.txt index 6f3585ccc..ac0458bcb 100644 --- a/Net/testsuite/CMakeLists.txt +++ b/Net/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoNet PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoNet PocoUtil PocoXML PocoFoundation CppUnit) diff --git a/NetSSL_OpenSSL/testsuite/CMakeLists.txt b/NetSSL_OpenSSL/testsuite/CMakeLists.txt index 5819a70d9..9f37754be 100644 --- a/NetSSL_OpenSSL/testsuite/CMakeLists.txt +++ b/NetSSL_OpenSSL/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation CppUnit) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/PageCompiler/CMakeLists.txt b/PageCompiler/CMakeLists.txt index 2f8af6c87..5d0a479e5 100644 --- a/PageCompiler/CMakeLists.txt +++ b/PageCompiler/CMakeLists.txt @@ -10,7 +10,7 @@ set_target_properties( "${POCO_EXENAME}" OUTPUT_NAME cpspc ) -target_link_libraries( "${POCO_EXENAME}" Net Util XML JSON Foundation) +target_link_libraries( "${POCO_EXENAME}" ${CMAKE_THREAD_LIBS_INIT} Net Util XML JSON Foundation) install( TARGETS "${POCO_EXENAME}" EXPORT "${POCO_EXENAME}Targets" diff --git a/PageCompiler/File2Page/CMakeLists.txt b/PageCompiler/File2Page/CMakeLists.txt index cb6d9694b..68c32362b 100644 --- a/PageCompiler/File2Page/CMakeLists.txt +++ b/PageCompiler/File2Page/CMakeLists.txt @@ -10,7 +10,7 @@ set_target_properties( "${POCO_EXENAME}" OUTPUT_NAME f2cpsp ) -target_link_libraries( "${POCO_EXENAME}" Net Util XML JSON Foundation) +target_link_libraries( "${POCO_EXENAME}" ${CMAKE_THREAD_LIBS_INIT} Net Util XML JSON Foundation) install( TARGETS "${POCO_EXENAME}" EXPORT "${POCO_EXENAME}Targets" diff --git a/Redis/testsuite/CMakeLists.txt b/Redis/testsuite/CMakeLists.txt index 2cd26aefe..16d9408a1 100644 --- a/Redis/testsuite/CMakeLists.txt +++ b/Redis/testsuite/CMakeLists.txt @@ -20,4 +20,4 @@ set(TESTUNIT "${LIBNAME}-testrunner") add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoRedis PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoRedis PocoFoundation CppUnit ) diff --git a/Util/testsuite/CMakeLists.txt b/Util/testsuite/CMakeLists.txt index c65d4565d..1b6d16cbb 100644 --- a/Util/testsuite/CMakeLists.txt +++ b/Util/testsuite/CMakeLists.txt @@ -24,4 +24,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoUtil PocoJSON PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoUtil PocoJSON PocoXML PocoFoundation CppUnit) diff --git a/XML/testsuite/CMakeLists.txt b/XML/testsuite/CMakeLists.txt index 30b18a41f..318192e60 100644 --- a/XML/testsuite/CMakeLists.txt +++ b/XML/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoXML PocoFoundation CppUnit) diff --git a/Zip/testsuite/CMakeLists.txt b/Zip/testsuite/CMakeLists.txt index dd7ee3a7b..317694ce9 100644 --- a/Zip/testsuite/CMakeLists.txt +++ b/Zip/testsuite/CMakeLists.txt @@ -18,8 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -#set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${TESTUNIT} PocoZip PocoNet PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoZip PocoNet PocoFoundation CppUnit ) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD From ce8e88cc4bc58ccafdd44fe34b771ea6917eb58d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Fri, 11 Mar 2016 10:35:23 -0300 Subject: [PATCH 111/131] Fixed ${CMAKE_THREAD_LIBS_INIT} being empty during the compilation The directive checking for the native threads library must be called before everything else. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 550b2759c..95d9eaedd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,6 +139,9 @@ include(DefinePlatformSpecifc) # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file set(Poco_COMPONENTS "") +# Pthreads/threads support +find_package(Threads REQUIRED) + if (ENABLE_TESTS) add_subdirectory(CppUnit) endif () @@ -169,9 +172,6 @@ add_subdirectory(Net) list(APPEND Poco_COMPONENTS "Net") endif() -# Pthreads/threads support -find_package(Threads REQUIRED) - #NetSSL From c4ca7bb7328b974d738ee4524b4e6c7e69975097 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 11 Mar 2016 14:46:32 +0100 Subject: [PATCH 112/131] another attempt at #1187: retry mysql_stmt_prepare if server has gone away --- Data/MySQL/src/StatementExecutor.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Data/MySQL/src/StatementExecutor.cpp b/Data/MySQL/src/StatementExecutor.cpp index ad8290797..3f3857d84 100644 --- a/Data/MySQL/src/StatementExecutor.cpp +++ b/Data/MySQL/src/StatementExecutor.cpp @@ -55,8 +55,17 @@ void StatementExecutor::prepare(const std::string& query) return; } - if (mysql_stmt_prepare(_pHandle, query.c_str(), static_cast(query.length())) != 0) - throw StatementException("mysql_stmt_prepare error", _pHandle, query); + int rc = mysql_stmt_prepare(_pHandle, query.c_str(), static_cast(query.length())); + if (rc != 0) + { + // retry if connection lost + int err = mysql_errno(_pSessionHandle); + if (err == 2006 /* CR_SERVER_GONE_ERROR */ || err == 2013 /* CR_SERVER_LOST */) + { + rc = mysql_stmt_prepare(_pHandle, query.c_str(), static_cast(query.length())); + } + } + if (rc != 0) throw StatementException("mysql_stmt_prepare error", _pHandle, query); _query = query; _state = STMT_COMPILED; From ff32e89a278f8e99e0fc651e8825a8a121bb00a9 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 11 Mar 2016 14:50:05 +0100 Subject: [PATCH 113/131] Restore travis/script/runtests Signed-off-by: FrancisANDRE --- .travis.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1057f79e..c57356e7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,8 @@ before_script: - chmod 755 ./travis/Linux/runtests.sh - chmod 755 ./travis/OSX/runtests.sh - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql -u root -e 'create database pocotestdb;'; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql --version; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then postgres --version; fi matrix: fast_finish: true @@ -55,21 +57,24 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 && sudo make install && ./travis/OSX/runtests.sh + - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 && sudo make install + - ./travis/OSX/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) bundled" compiler: gcc script: - export CC="gcc" - export CXX="g++" - - ./configure --everything && sudo make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 + - ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) bundled" compiler: gcc script: - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything && sudo make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 + - ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" compiler: gcc @@ -77,7 +82,8 @@ matrix: - export CC="gcc" - export CXX="g++" - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - ./configure --everything --unbundled && sudo make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 + - ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" compiler: gcc @@ -85,17 +91,19 @@ matrix: - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything --unbundled && sudo make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 + - ./travis/Linux/runtests.sh - env: TEST_NAME="Linux clang 3.4 (make)" compiler: clang script: - - ./configure --everything --config=Linux-clang && sudo make -s -j2 install && - ./travis/Linux/runtests.sh + - ./configure --everything --config=Linux-clang && make -s -j2 + - ./travis/Linux/runtests.sh - #FIXME the -m64 option bring by the Linux config is not supported by arm-linux-gnueabi-g++ which makes this test failing - - env: TEST_NAME="arm-linux-gnueabi- (make)" + - env: TEST_NAME="Linux arm-linux-gnueabi- (make)" + compiler: gcc script: - - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && sudo make -s -j2 install CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l + - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - env: TEST_NAME="Linux gcc 4.6 (CMake)" compiler: gcc @@ -115,7 +123,7 @@ matrix: - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. - - env: TEST_NAME="clang 3.4 (CMake)" + - env: TEST_NAME="Linux clang 3.4 (CMake)" compiler: clang script: - source ./travis/ignored.sh @@ -129,7 +137,7 @@ matrix: - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build - - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && sudo make -s -j2 install && cd .. + - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" script: @@ -138,7 +146,7 @@ matrix: - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build - - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && sudo make -s -j2 install && cd .. + - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. # QA jobs for code analytics and metrics From 57bc0cc4cf5f34159cdc3b7ef4231cb6ef4913c5 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 11 Mar 2016 15:34:12 +0100 Subject: [PATCH 114/131] Display postgres and mysql version. Signed-off-by: FrancisANDRE --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index c57356e7b..21752b173 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,6 +131,7 @@ matrix: - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. - env: TEST_NAME="Linux arm-linux-gnueabi-g++ (CMake)" + compiler: gcc script: - export CC="arm-linux-gnueabi-gcc" - export CXX="arm-linux-gnueabi-g++" @@ -140,6 +141,7 @@ matrix: - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" + compiler: gcc script: - export CC="arm-linux-gnueabihf-gcc" - export CXX="arm-linux-gnueabihf-g++" From f42d829105847408cc4cf41b2af3af8f4aaaefee Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 11:13:15 +0100 Subject: [PATCH 115/131] Remove cache of C:\Program Files\PostgreSQL\9.4 Signed-off-by: FrancisANDRE --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3b87d3124..91b6a90f5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,6 @@ cache: - C:\OpenSSL-Win32 - C:\OpenSSL-Win64 - C:\Program Files (x86)\PostgreSQL\9.4 - - C:\Program Files\PostgreSQL\9.4 hosts: localhost: 127.0.0.1 From c878878b483c93b74f5f0e4d16d4054ababb3861 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 11:48:07 +0100 Subject: [PATCH 116/131] Restore Data/MySQL at it properplace. Signed-off-by: FrancisANDRE --- components | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components b/components index 35c4f3075..f119611ab 100644 --- a/components +++ b/components @@ -9,8 +9,9 @@ Crypto NetSSL_OpenSSL NetSSL_Win Data -Data/SQLite Data/ODBC +Data/SQLite +Data/MySQL Data/PostgreSQL Zip PageCompiler @@ -21,4 +22,3 @@ MongoDB Redis PocoDoc ProGen -Data/MySQL From eda8a13b96fdcfeeca8068f2aeb810a525ab2bbc Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 11:51:13 +0100 Subject: [PATCH 117/131] Adding introduces the macro max with #define max on Linux. Signed-off-by: FrancisANDRE --- Data/MySQL/testsuite/src/SQLExecutor.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 345c63466..b0fb25947 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -27,10 +27,14 @@ #include "Poco/Data/MySQL/Connector.h" #include "Poco/Data/MySQL/MySQLException.h" +#include #include #include #include +#ifdef max +#undef max +#endif using namespace Poco::Data; using namespace Poco::Data::Keywords; From fa1ba4295718f38e902c5de7ab8a6df94d6072a7 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 11:54:11 +0100 Subject: [PATCH 118/131] Reorder omitted components Signed-off-by: FrancisANDRE --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 37b9ff640..65bde64f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 && sudo make install + - ./configure --everything --omit=Data/ODBC,Data/SQLite,Data/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install - ./travis/OSX/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) bundled" From 356a729be4f0c61153accec4e4c6ea3c08dc3cef Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 11:55:36 +0100 Subject: [PATCH 119/131] Reformat. Setup VS variable only with cmake. Readd Data/MySQL testsuite on Win32. Signed-off-by: FrancisANDRE --- appveyor.yml | 81 +++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 91b6a90f5..c5d4a8aed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -97,19 +97,19 @@ install: - c:\cygwin\bin\cat /proc/cpuinfo - c:\cygwin\bin\cat /proc/meminfo - ps: | - if ($env:builder -eq "cmake") - { - if (Test-Path "$env:ChocolateyInstall\bin\jom.exe") { - echo "using jom from cache" - } else { - choco install jom - } - if (Test-Path "$env:ChocolateyInstall\bin\cmake.exe") { - echo "using cmake from cache" - } else { - choco install cmake - } + if ($env:builder -eq "cmake") + { + if (Test-Path "$env:ChocolateyInstall\bin\jom.exe") { + echo "using jom from cache" + } else { + choco install jom } + if (Test-Path "$env:ChocolateyInstall\bin\cmake.exe") { + echo "using cmake from cache" + } else { + choco install cmake + } + } - set # ------------------------------------------------------------------------------------------- @@ -206,34 +206,37 @@ install: before_build: - ps: | - if ($env:vsver -eq "110") + if ($env:builder -eq "cmake") { - $vspath= convert-path $env:VS110COMNTOOLS\..\..\VC\bin; $yyyy='2010' - if($env:platform -eq 'Win32') { $vctool='';} - if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } - } - if ($env:vsver -eq "120") - { - $vspath= convert-path $env:VS120COMNTOOLS\..\..\VC\bin;$yyyy='2013' - if($env:platform -eq 'Win32') { $vctool='';} - if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } - } - if ($env:vsver -eq "140") - { - $vspath= convert-path $env:VS140COMNTOOLS\..\..\VC\bin; $yyyy='2015' - if($env:platform -eq 'Win32') { $vctool='';} - if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } - } - pushd $vspath; - $tool= if($vctool -eq '') {'32'} else {$vctool} - cmd /c "vcvars$tool.bat&set" | - foreach { - if ($_ -match "=") { - $v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" + if ($env:vsver -eq "110") + { + $vspath= convert-path $env:VS110COMNTOOLS\..\..\VC\bin; $yyyy='2010' + if($env:platform -eq 'Win32') { $vctool='';} + if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } } + if ($env:vsver -eq "120") + { + $vspath= convert-path $env:VS120COMNTOOLS\..\..\VC\bin;$yyyy='2013' + if($env:platform -eq 'Win32') { $vctool='';} + if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } + } + if ($env:vsver -eq "140") + { + $vspath= convert-path $env:VS140COMNTOOLS\..\..\VC\bin; $yyyy='2015' + if($env:platform -eq 'Win32') { $vctool='';} + if($env:platform -eq 'x64') { $vctool='x86_amd64';$vspath+='\'+$vctool } + } + pushd $vspath; + $tool= if($vctool -eq '') {'32'} else {$vctool} + cmd /c "vcvars$tool.bat&set" | + foreach { + if ($_ -match "=") { + $v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" + } + } + popd + write-host "`nVisual Studio $yyyy CLI variables set." -ForegroundColor Yellow } - popd - write-host "`nVisual Studio $yyyy CLI variables set." -ForegroundColor Yellow # ------------------------------------------------------------------------------------------- # MySQL @@ -412,12 +415,12 @@ test_script: if ($env:platform -eq "Win32") { $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = ''; - $excluded = @('Data', 'Data/ODBC', 'Data/MySQL', 'Redis', 'PDF') + $excluded = @('Data', 'Data/ODBC', 'Redis', 'PDF') } if ($env:platform -eq "x64") { $env:PATH = "$env:POCO_BASE\bin64;" + $env:PATH;$suffix = 64; - $excluded = @('Data', 'Data/ODBC','Redis', 'PDF') + $excluded = @('Data', 'Data/ODBC', 'Redis', 'PDF') } Write-Host -ForegroundColor Yellow '>>> current directory is ' $(get-location).Path; From a10a2d5fc49240bc2ac6774c350983d4e80d5abd Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 11:59:10 +0100 Subject: [PATCH 120/131] Exclude Data/MySQL. Signed-off-by: FrancisANDRE --- travis/OSX/excluded.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/OSX/excluded.sh b/travis/OSX/excluded.sh index 889bddcd3..69eb19d28 100644 --- a/travis/OSX/excluded.sh +++ b/travis/OSX/excluded.sh @@ -3,5 +3,5 @@ # should be restored later on when the OSX environment would have # been fixed by Travis # -export EXCLUDE_TESTS="Data/MySQL Data/ODBC MongoDB Redis PDF" +export EXCLUDE_TESTS="Data/ODBC Data/MySQL Data/PostgreSQL MongoDB Redis PDF" From 443e54fdde36ff458801f2760d7d471fc7d52fb8 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 12 Mar 2016 12:18:18 +0100 Subject: [PATCH 121/131] use TLS_*_method() instead of deprecated SSLv23_*_method() if OpenSSL version is >= 1.1; initialize default/fallback client context to support all TLS protocols, not just TLSv1 --- NetSSL_OpenSSL/src/Context.cpp | 8 ++++++++ NetSSL_OpenSSL/src/SSLManager.cpp | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/NetSSL_OpenSSL/src/Context.cpp b/NetSSL_OpenSSL/src/Context.cpp index 2696de937..aa5e314ab 100644 --- a/NetSSL_OpenSSL/src/Context.cpp +++ b/NetSSL_OpenSSL/src/Context.cpp @@ -368,10 +368,18 @@ void Context::createSSLContext() switch (_usage) { case CLIENT_USE: +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + _pSSLContext = SSL_CTX_new(TLS_client_method()); +#else _pSSLContext = SSL_CTX_new(SSLv23_client_method()); +#endif break; case SERVER_USE: +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + _pSSLContext = SSL_CTX_new(TLS_server_method()); +#else _pSSLContext = SSL_CTX_new(SSLv23_server_method()); +#endif break; #if defined(SSL_OP_NO_TLSv1) && !defined(OPENSSL_NO_TLS1) case TLSV1_CLIENT_USE: diff --git a/NetSSL_OpenSSL/src/SSLManager.cpp b/NetSSL_OpenSSL/src/SSLManager.cpp index 0e7c0560f..74077fc7d 100644 --- a/NetSSL_OpenSSL/src/SSLManager.cpp +++ b/NetSSL_OpenSSL/src/SSLManager.cpp @@ -148,7 +148,8 @@ Context::Ptr SSLManager::defaultClientContext() catch (Poco::IllegalStateException&) { _ptrClientCertificateHandler = new RejectCertificateHandler(false); - _ptrDefaultClientContext = new Context(Context::TLSV1_CLIENT_USE, "", Context::VERIFY_RELAXED, 9, true); + _ptrDefaultClientContext = new Context(Context::CLIENT_USE, "", Context::VERIFY_RELAXED, 9, true); + _ptrDefaultClientContext->disableProtocols(Context::PROTO_SSLV2 | Context::PROTO_SSLV3); } } From 89895be433da16a70004abaefe006cb4c20ddc38 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 16:26:44 +0100 Subject: [PATCH 122/131] Compact COMPONENTS definition. Signed-off-by: FrancisANDRE --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ff4df66bb..fa6342560 100644 --- a/Makefile +++ b/Makefile @@ -79,8 +79,7 @@ all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) -COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL -COMPONENTS += Data Data/SQLite Data/ODBC Data/MySQL +COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/ODBC Data/SQLiteData/MySQL ifneq ($(OSNAME), Cygwin) COMPONENTS += Data/PostgreSQL endif @@ -113,7 +112,7 @@ endif # ------------------------------------------------------------------------------------------------------------------------------------- libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec -libexecs += Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec +libexecs += Data-libexec Data/ODBC-libexec Data/SQLite-libexecData/MySQL-libexec ifneq ($(OSNAME), Cygwin) libexecs += Data/PostgreSQL-libexec endif @@ -121,7 +120,7 @@ libexecs += MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageC # ------------------------------------------------------------------------------------------------------------------------------------- tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests -tests += Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests +tests += Data-tests Data/ODBC-tests Data/SQLite-testsData/MySQL-tests ifneq ($(OSNAME), Cygwin) tests += Data/PostgreSQL-tests endif @@ -134,7 +133,7 @@ samples += MongoDB-samples Zip-samples PageCompiler-samples PDF-samples # ------------------------------------------------------------------------------------------------------------------------------------- cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean -cleans += Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean +cleans += Data-clean Data/ODBC-clean Data/SQLite-cleanData/MySQL-clean ifneq ($(OSNAME), Cygwin) cleans += Data/PostgreSQL-clean endif From 1b737fb5dbe073937e33939f79f3baaee78ec7e1 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 16:27:14 +0100 Subject: [PATCH 123/131] Cache cmake-3.2.3-Linux-x86_64. Signed-off-by: FrancisANDRE --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65bde64f3..623c42bf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ language: cpp cache: - - apt + - apt + directories: + - cmake-3.2.3-Linux-x86_64 branches: except: @@ -11,8 +13,8 @@ before_install: # we need a recent version of CMake # - sudo add-apt-repository -y ppa:andykimpe/cmake3 # linux prereqisite packages - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! -d cmake-3.2.3-Linux-x86_64 ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! -d cmake-3.2.3-Linux-x86_64 ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/cmake-3.2.3-Linux-x86_64/bin:$PATH; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev libsqlite3-dev; fi @@ -43,12 +45,12 @@ env: before_script: - echo ${TEST_NAME} - - sqlite3 -version - chmod 755 ./travis/Linux/runtests.sh - chmod 755 ./travis/OSX/runtests.sh - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql -u root -e 'create database pocotestdb;'; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql --version; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then postgres --version; fi + - sqlite3 -version matrix: fast_finish: true From 6067364d5b925115a58aed50dc90ff55bf586c7a Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 16:28:19 +0100 Subject: [PATCH 124/131] Comment out list of MySQL directory. Signed-off-by: FrancisANDRE --- appveyor.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c5d4a8aed..e79fee5ff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -240,6 +240,8 @@ before_build: # ------------------------------------------------------------------------------------------- # MySQL +# & C:\cygwin\bin\ls -lR $env:MYSQL32 +# & C:\cygwin\bin\ls -lR $env:MYSQL64 # ------------------------------------------------------------------------------------------- - ps: | if ($env:platform -eq "Win32") @@ -252,7 +254,6 @@ before_build: $to = $env:MYSQL32 + "\bin\libmysql.dll" copy $from $to } - & C:\cygwin\bin\ls -lR $env:MYSQL32 } if ($env:platform -eq "x64") { @@ -264,12 +265,11 @@ before_build: $to = $env:MYSQL64 + "\bin\libmysql.dll" copy $from $to } - & C:\cygwin\bin\ls -lR $env:MYSQL64 } $env:MYSQL_PWD="Password12!" $cmd = 'mysql -e "create database pocotestdb;" --user=root'; iex "& $cmd" - # ------------------------------------------------------------------------------------------- +# ------------------------------------------------------------------------------------------- # ------------------------------------------------------------------------------------------- # PostgreSQL @@ -287,6 +287,7 @@ before_build: $env:LIB = $env:POSTGRES64 + "\lib;" + $env:LIB $env:PATH = $env:POSTGRES64 + "\bin;" + $env:PATH } +# ------------------------------------------------------------------------------------------- after_build: - ps: | From f713beea531b4a2cc8d28c3e39afc97da003fd55 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 16:46:02 +0100 Subject: [PATCH 125/131] Fix syntax of cache. Signed-off-by: FrancisANDRE --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 623c42bf9..72ac50005 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: cpp cache: - - apt directories: - cmake-3.2.3-Linux-x86_64 + - apt branches: except: From cee7b3e7b85e4ee220c64bd5e940290eacd1dcfa Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 17:42:06 +0100 Subject: [PATCH 126/131] Fix missing space in sub-targets. Signed-off-by: FrancisANDRE --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fa6342560..992ef1b64 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,8 @@ all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) -COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/ODBC Data/SQLiteData/MySQL +COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL +COMPONENTS += Data Data/ODBC Data/SQLite Data/MySQL ifneq ($(OSNAME), Cygwin) COMPONENTS += Data/PostgreSQL endif @@ -112,7 +113,7 @@ endif # ------------------------------------------------------------------------------------------------------------------------------------- libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec -libexecs += Data-libexec Data/ODBC-libexec Data/SQLite-libexecData/MySQL-libexec +libexecs += Data-libexec Data/ODBC-libexec Data/SQLite-libexec Data/MySQL-libexec ifneq ($(OSNAME), Cygwin) libexecs += Data/PostgreSQL-libexec endif @@ -120,7 +121,7 @@ libexecs += MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageC # ------------------------------------------------------------------------------------------------------------------------------------- tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests -tests += Data-tests Data/ODBC-tests Data/SQLite-testsData/MySQL-tests +tests += Data-tests Data/ODBC-tests Data/SQLite-tests Data/MySQL-tests ifneq ($(OSNAME), Cygwin) tests += Data/PostgreSQL-tests endif @@ -133,7 +134,7 @@ samples += MongoDB-samples Zip-samples PageCompiler-samples PDF-samples # ------------------------------------------------------------------------------------------------------------------------------------- cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean -cleans += Data-clean Data/ODBC-clean Data/SQLite-cleanData/MySQL-clean +cleans += Data-clean Data/ODBC-clean Data/SQLite-clean Data/MySQL-clean ifneq ($(OSNAME), Cygwin) cleans += Data/PostgreSQL-clean endif From 978924cef6c9115907de53831ece14bfd4aa6e83 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 18:07:08 +0100 Subject: [PATCH 127/131] Restore Data/SQLite for OSX Signed-off-by: FrancisANDRE --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72ac50005..f745ac583 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/SQLite,Data/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install + - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install - ./travis/OSX/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) bundled" From 6521d559e251519855315722e246a734a49dff8c Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 18:51:57 +0100 Subject: [PATCH 128/131] Remove cache of cmake-3.2.3-Linux-x86_64. Does not work as expected. Signed-off-by: FrancisANDRE --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f745ac583..fd7059bef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ language: cpp cache: - directories: - - cmake-3.2.3-Linux-x86_64 - - apt + - apt branches: except: @@ -13,8 +11,8 @@ before_install: # we need a recent version of CMake # - sudo add-apt-repository -y ppa:andykimpe/cmake3 # linux prereqisite packages - - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! -d cmake-3.2.3-Linux-x86_64 ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! -d cmake-3.2.3-Linux-x86_64 ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/cmake-3.2.3-Linux-x86_64/bin:$PATH; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev libsqlite3-dev; fi From b30da7bcca5b1f35553684e6b6806ead32d6afb9 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 12 Mar 2016 20:39:51 +0100 Subject: [PATCH 129/131] better logging if rollback fails with Exception --- Data/src/Transaction.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Data/src/Transaction.cpp b/Data/src/Transaction.cpp index b00c377c7..a27e54c2f 100644 --- a/Data/src/Transaction.cpp +++ b/Data/src/Transaction.cpp @@ -51,6 +51,11 @@ Transaction::~Transaction() _rSession.rollback(); } + catch (Poco::Exception& exc) + { + if (_pLogger) + _pLogger->error("Error while rolling back database transaction: %s", exc.displayText()); + } catch (...) { if (_pLogger) @@ -93,7 +98,7 @@ void Transaction::execute(const std::vector& sql) } catch (Exception& ex) { - if (_pLogger) _pLogger->error(ex.displayText()); + if (_pLogger) _pLogger->log(ex); } rollback(); From 297d4d1046f05d88adc08413bd97d611b4160101 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 21:31:11 +0100 Subject: [PATCH 130/131] Fix typo. Signed-off-by: FrancisANDRE --- release/script/mkrelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/script/mkrelease b/release/script/mkrelease index 89c827040..d07fc2342 100755 --- a/release/script/mkrelease +++ b/release/script/mkrelease @@ -293,7 +293,7 @@ cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit CppUnit-clean: - $(MAKE) -C \$(POCO_BASE)/CppUnit clean + $(MAKE) -C $(POCO_BASE)/CppUnit clean install: libexecs mkdir -p $(INSTALLDIR)/include/Poco From 8c83e7696e02cf42312149617681a17805ee8d58 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 12 Mar 2016 21:32:31 +0100 Subject: [PATCH 131/131] Omit Data/postgreSQL for Cygwin as postgreSQL front end is not available. Signed-off-by: FrancisANDRE --- Makefile | 20 ++++---------------- build/config/Cygwin | 2 ++ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 992ef1b64..31f2d4ced 100644 --- a/Makefile +++ b/Makefile @@ -80,10 +80,7 @@ all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL -COMPONENTS += Data Data/ODBC Data/SQLite Data/MySQL -ifneq ($(OSNAME), Cygwin) -COMPONENTS += Data/PostgreSQL -endif +COMPONENTS += Data Data/ODBC Data/SQLite Data/MySQL Data/PostgreSQL COMPONENTS += MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF cppunit: @@ -113,18 +110,12 @@ endif # ------------------------------------------------------------------------------------------------------------------------------------- libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec -libexecs += Data-libexec Data/ODBC-libexec Data/SQLite-libexec Data/MySQL-libexec -ifneq ($(OSNAME), Cygwin) -libexecs += Data/PostgreSQL-libexec -endif +libexecs += Data-libexec Data/ODBC-libexec Data/SQLite-libexec Data/MySQL-libexec Data/PostgreSQL-libexec libexecs += MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec # ------------------------------------------------------------------------------------------------------------------------------------- tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests -tests += Data-tests Data/ODBC-tests Data/SQLite-tests Data/MySQL-tests -ifneq ($(OSNAME), Cygwin) -tests += Data/PostgreSQL-tests -endif +tests += Data-tests Data/ODBC-tests Data/SQLite-tests Data/MySQL-tests Data/PostgreSQL-tests tests += MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests # ------------------------------------------------------------------------------------------------------------------------------------- @@ -134,10 +125,7 @@ samples += MongoDB-samples Zip-samples PageCompiler-samples PDF-samples # ------------------------------------------------------------------------------------------------------------------------------------- cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean -cleans += Data-clean Data/ODBC-clean Data/SQLite-clean Data/MySQL-clean -ifneq ($(OSNAME), Cygwin) -cleans += Data/PostgreSQL-clean -endif +cleans += Data-clean Data/ODBC-clean Data/SQLite-clean Data/MySQL-clean Data/PostgreSQL-clean cleans += MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean # ------------------------------------------------------------------------------------------------------------------------------------- diff --git a/build/config/Cygwin b/build/config/Cygwin index 5cfbf70ba..bb3c6db59 100644 --- a/build/config/Cygwin +++ b/build/config/Cygwin @@ -12,6 +12,8 @@ # LINKMODE ?= SHARED +OMIT = Data/PostgreSQL + # # Define Tools #