Move include/CppUnit to include/Poco/CppUnit

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE 2016-01-06 13:48:48 +01:00
parent 547a82be63
commit ce641c216a
29 changed files with 499 additions and 153 deletions

View File

@ -1,4 +1,4 @@
set(LIBNAME "CppUnit")
set(LIBNAME "PocoCppUnit")
# Sources
file(GLOB SRCS_G "src/*.cpp")

View File

@ -128,7 +128,7 @@
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -180,7 +180,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@ -392,22 +392,22 @@
<ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" />
<ClInclude Include="include\Poco\CppUnit\CppUnit.h" />
<ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -37,52 +37,52 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h">
<ClInclude Include="include\Poco\CppUnit\CppUnit.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\CppUnitException.h">
<ClInclude Include="include\Poco\CppUnit\CppUnitException.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\estring.h">
<ClInclude Include="include\Poco\CppUnit\estring.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\Guards.h">
<ClInclude Include="include\Poco\CppUnit\Guards.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\Orthodox.h">
<ClInclude Include="include\Poco\CppUnit\Orthodox.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\RepeatedTest.h">
<ClInclude Include="include\Poco\CppUnit\RepeatedTest.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\Test.h">
<ClInclude Include="include\Poco\CppUnit\Test.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\TestCaller.h">
<ClInclude Include="include\Poco\CppUnit\TestCaller.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\TestCase.h">
<ClInclude Include="include\Poco\CppUnit\TestCase.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\TestDecorator.h">
<ClInclude Include="include\Poco\CppUnit\TestDecorator.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\TestFailure.h">
<ClInclude Include="include\Poco\CppUnit\TestFailure.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\TestResult.h">
<ClInclude Include="include\Poco\CppUnit\TestResult.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\TestRunner.h">
<ClInclude Include="include\Poco\CppUnit\TestRunner.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\TestSetup.h">
<ClInclude Include="include\Poco\CppUnit\TestSetup.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\TestSuite.h">
<ClInclude Include="include\Poco\CppUnit\TestSuite.h">
<Filter>Include Files</Filter>
</ClInclude>
<ClInclude Include="include\CppUnit\TextTestResult.h">
<ClInclude Include="include\Poco\CppUnit\TextTestResult.h">
<Filter>Include Files</Filter>
</ClInclude>
</ItemGroup>

View File

@ -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 =

View File

@ -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

View File

@ -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 <exception>
#include <string>
@ -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

View File

@ -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

View File

@ -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<ClassUnderTest>::call(ClassUnderTest object)
} // namespace CppUnit
#endif // CppUnit_Orthodox_INCLUDED
#endif // Poco_CppUnit_Orthodox_INCLUDED

View File

@ -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

View File

@ -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 <string>
@ -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

View File

@ -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 <memory>
@ -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<cls>(#mth, &cls::mth))
#endif // CppUnit_TestCaller_INCLUDED
#endif // Poco_CppUnit_TestCaller_INCLUDED

View File

@ -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 <string>
#include <typeinfo>
@ -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

View File

@ -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

View File

@ -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

View File

@ -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 <vector>
@ -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

View File

@ -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 <vector>
#include <string>
#include <ostream>
@ -38,7 +38,7 @@ class Test;
* TestRunner [-all] [-print] [-wait] ExampleTestCase
*
*/
class CppUnit_API TestRunner
class Poco_CppUnit_API TestRunner
{
typedef std::pair<std::string, Test*> Mapping;
typedef std::vector<Mapping> Mappings;
@ -100,4 +100,4 @@ private:
#endif
#endif // CppUnit_TestRunner_INCLUDED
#endif // Poco_CppUnit_TestRunner_INCLUDED

View File

@ -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

View File

@ -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 <vector>
#include <string>
@ -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<Test*> TestSuite::tests() const
} // namespace CppUnit
#endif // CppUnit_TestSuite_INCLUDED
#endif // Poco_CppUnit_TestSuite_INCLUDED

View File

@ -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 <set>
#include <ostream>
@ -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

View File

@ -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 <string>
#include <stdio.h>
@ -70,4 +70,4 @@ inline std::string estring(const void* ptr)
} // namespace CppUnit
#endif // CppUnit_estring_INCLUDED
#endif // Poco_CppUnit_estring_INCLUDED

View File

@ -5,7 +5,7 @@
//
#include "CppUnit/CppUnitException.h"
#include "Poco/CppUnit/CppUnitException.h"
namespace CppUnit {

View File

@ -7,9 +7,9 @@
#include <stdexcept>
#include <math.h>
#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 <typeinfo>
#include <iostream>

View File

@ -5,7 +5,7 @@
//
#include "CppUnit/TestDecorator.h"
#include "Poco/CppUnit/TestDecorator.h"
namespace CppUnit {

View File

@ -5,8 +5,8 @@
//
#include "CppUnit/TestFailure.h"
#include "CppUnit/Test.h"
#include "Poco/CppUnit/TestFailure.h"
#include "Poco/CppUnit/Test.h"
namespace CppUnit {

View File

@ -5,7 +5,7 @@
//
#include "CppUnit/TestResult.h"
#include "Poco/CppUnit/TestResult.h"
namespace CppUnit {

View File

@ -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 <iostream>

View File

@ -5,8 +5,8 @@
//
#include "CppUnit/TestSuite.h"
#include "CppUnit/TestResult.h"
#include "Poco/CppUnit/TestSuite.h"
#include "Poco/CppUnit/TestResult.h"
namespace CppUnit {

View File

@ -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 <iostream>
#include <iomanip>
#include <cstdlib>

346
Cygwin/Makefile Normal file
View File

@ -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