diff --git a/.travis.yml b/.travis.yml index 21752b173..fd7059bef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,11 @@ language: cpp cache: - - apt + - apt + +branches: + except: + - /.*pp.eyor.*/ before_install: # we need a recent version of CMake @@ -39,12 +43,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 @@ -57,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/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install - ./travis/OSX/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) bundled" @@ -113,7 +117,7 @@ matrix: - 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 .. - + - env: TEST_NAME="Linux gcc 4.8 (CMake)" compiler: gcc script: diff --git a/CMakeLists.txt b/CMakeLists.txt index 95d9eaedd..a95ec5db6 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) @@ -144,6 +145,7 @@ find_package(Threads REQUIRED) if (ENABLE_TESTS) add_subdirectory(CppUnit) + list(APPEND Poco_COMPONENTS "CppUnit") endif () add_subdirectory(Foundation) 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/CMakeLists.txt b/CppUnit/CMakeLists.txt index 3efc09a09..d37fdcac6 100644 --- a/CppUnit/CMakeLists.txt +++ b/CppUnit/CMakeLists.txt @@ -1,4 +1,5 @@ set(LIBNAME "CppUnit") +set(POCO_LIBNAME "Poco${LIBNAME}") # Sources file(GLOB SRCS_G "src/*.cpp") @@ -9,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}) -SIMPLE_INSTALL(${LIBNAME}) +POCO_INSTALL("${LIBNAME}") + + 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/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 b7235dba5..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 6cfe507c8..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)\CppUnitd.dll - true - %(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\CppUnitd.pdb - ..\lib\$(Platform)\CppUnitd.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)\CppUnit.dll - true - %(AdditionalLibraryDirectories) - - - ..\lib\$(Platform)\CppUnit.lib - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib\$(Platform)\CppUnitmdd.pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\CppUnitmdd.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)\CppUnitmd.lib - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\lib\$(Platform)\CppUnitmtd.pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\CppUnitmtd.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)\CppUnitmt.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 a863a58bb..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)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + <_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)\CppUnitd.dll - true - %(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\CppUnitd.pdb - ..\lib\$(Platform)\CppUnitd.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)\CppUnit.dll - true - %(AdditionalLibraryDirectories) - - - ..\lib\$(Platform)\CppUnit.lib - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib\$(Platform)\CppUnitmdd.pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\CppUnitmdd.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)\CppUnitmd.lib - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\lib\$(Platform)\CppUnitmtd.pdb - Level3 - true - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\$(Platform)\CppUnitmtd.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)\CppUnitmt.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 9e3900390..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)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + obj\CppUnit\$(Configuration)\ + ..\lib\ + obj\CppUnit\$(Configuration)\ + ..\lib\ + obj\CppUnit\$(Configuration)\ + PocoCppUnitd + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit + PocoCppUnitmd + PocoCppUnitmt - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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 - ..\bin\CppUnitd.dll + %(AdditionalDependencies) + ..\bin\PocoCppUnitd.dll true - %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\PocoCppUnitd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppUnitd.lib MachineX86 + %(AdditionalOptions) - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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 - - ..\bin\CppUnit.dll + %(AdditionalDependencies) + ..\bin\PocoCppUnit.dll true - %(AdditionalLibraryDirectories) - - - ..\lib\CppUnit.lib + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppUnit.lib MachineX86 + %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmd.lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmtd.pdb + + ..\lib\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false + %(DisableSpecificWarnings) + %(AdditionalOptions) - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\CppUnitmtd.lib + ..\lib\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmt.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 f7c991872..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)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + <_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\CppUnit.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\CppUnitd.dll + ..\bin\PocoCppUnitd.dll true - %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\PocoCppUnitd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppUnitd.lib MachineX86 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnit.dll + ..\bin\PocoCppUnit.dll true - %(AdditionalLibraryDirectories) - - - ..\lib\CppUnit.lib + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppUnit.lib MachineX86 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmd.lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmtd.pdb + + ..\lib\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\CppUnitmtd.lib + ..\lib\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmt.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 f43a397dc..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)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + <_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\CppUnit.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\CppUnitd.dll + ..\bin\PocoCppUnitd.dll true - %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\PocoCppUnitd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppUnitd.lib MachineX86 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnit.dll + ..\bin\PocoCppUnit.dll true - %(AdditionalLibraryDirectories) - - - ..\lib\CppUnit.lib + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppUnit.lib MachineX86 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmd.lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmtd.pdb + + ..\lib\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\CppUnitmtd.lib + ..\lib\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmt.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 6ad984e0c..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,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_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 bd263a6eb..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)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + <_ProjectFileVersion>14.0.23107.0 + 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\CppUnit.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\CppUnitd.dll + ..\bin\PocoCppUnitd.dll true - %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\PocoCppUnitd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppUnitd.lib MachineX86 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnit.dll + ..\bin\PocoCppUnit.dll true - %(AdditionalLibraryDirectories) - - - ..\lib\CppUnit.lib + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppUnit.lib MachineX86 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmd.lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmtd.pdb + + ..\lib\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib\CppUnitmtd.lib + ..\lib\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.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\CppUnitmt.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 f1c8158f0..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 655826ff5..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)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + obj64\CppUnit\$(Configuration)\ + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + ..\lib64\ + obj64\CppUnit\$(Configuration)\ + PocoCppUnit64d + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit64 + PocoCppUnitmd + PocoCppUnitmt - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnit64d.dll + %(AdditionalDependencies) + ..\bin64\PocoCppUnit64d.dll true - %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\PocoCppUnit64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppUnitd.lib MachineX64 + %(AdditionalOptions) - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnit64.dll + %(AdditionalDependencies) + ..\bin64\PocoCppUnit64.dll true - %(AdditionalLibraryDirectories) - - - ..\lib64\CppUnit.lib + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppUnit.lib MachineX64 + %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmd.lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmtd.pdb + + ..\lib64\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false + %(DisableSpecificWarnings) + %(AdditionalOptions) - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\CppUnitmtd.lib + ..\lib64\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmt.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 c5a56904a..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)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + <_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\CppUnit.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\CppUnit64d.dll + ..\bin64\PocoCppUnit64d.dll true - %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\PocoCppUnit64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppUnitd.lib MachineX64 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnit64.dll + ..\bin64\PocoCppUnit64.dll true - %(AdditionalLibraryDirectories) - - - ..\lib64\CppUnit.lib + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppUnit.lib MachineX64 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmd.lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmtd.pdb + + ..\lib64\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\CppUnitmtd.lib + ..\lib64\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmt.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 b20ad3937..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)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + <_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\CppUnit.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\CppUnit64d.dll + ..\bin64\PocoCppUnit64d.dll true - %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\PocoCppUnit64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppUnitd.lib MachineX64 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnit64.dll + ..\bin64\PocoCppUnit64.dll true - %(AdditionalLibraryDirectories) - - - ..\lib64\CppUnit.lib + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppUnit.lib MachineX64 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmd.lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmtd.pdb + + ..\lib64\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\CppUnitmtd.lib + ..\lib64\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmt.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 67519df3c..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)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + <_ProjectFileVersion>14.0.23107.0 + 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\CppUnit.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\CppUnit64d.dll + ..\bin64\PocoCppUnit64d.dll true - %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\PocoCppUnit64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppUnitd.lib MachineX64 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnit64.dll + ..\bin64\PocoCppUnit64.dll true - %(AdditionalLibraryDirectories) - - - ..\lib64\CppUnit.lib + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppUnit.lib MachineX64 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmd.lib - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmtd.pdb + + ..\lib64\PocoCppUnitmtd.pdb Level3 - true ProgramDatabase Default - false - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - ..\lib64\CppUnitmtd.lib + ..\lib64\PocoCppUnitmtd.lib - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.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\CppUnitmt.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 1f9e7b07b..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/Makefile b/CppUnit/Makefile index d2c3974cb..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 # @@ -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/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/CppUnit/CppUnit.h b/CppUnit/include/Poco/CppUnit/CppUnit.h similarity index 69% rename from CppUnit/include/CppUnit/CppUnit.h rename to CppUnit/include/Poco/CppUnit/CppUnit.h index 57583bc8b..5cb67d461 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,7 +21,7 @@ // // 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 @@ -44,6 +44,35 @@ #endif #endif +// +// Automatically link CppUnit 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 + // Turn off some annoying warnings #ifdef _MSC_VER @@ -57,4 +86,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 77% rename from CppUnit/include/CppUnit/CppUnitException.h rename to CppUnit/include/Poco/CppUnit/CppUnitException.h index 902354256..670290c58 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 @@ -68,17 +68,17 @@ inline CppUnitException::CppUnitException(const CppUnitException& other): except } -inline CppUnitException::CppUnitException (const std::string& message, long exceptionLineNumber, const std::string& rFileName): _message(message), _lineNumber(exceptionLineNumber), _data1lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(rFileName) +inline CppUnitException::CppUnitException (const std::string& message, long lineNumber, const std::string& fileName): _message(message), _lineNumber(lineNumber), _data1lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(fileName) { } -inline CppUnitException::CppUnitException (const std::string& message, long exceptionLineNumber, long data1lineNumber, const std::string& rFileName): _message(message), _lineNumber(exceptionLineNumber), _data1lineNumber(data1lineNumber), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(rFileName) +inline CppUnitException::CppUnitException (const std::string& message, long lineNumber, long data1lineNumber, const std::string& fileName): _message(message), _lineNumber(lineNumber), _data1lineNumber(data1lineNumber), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(fileName) { } -inline CppUnitException::CppUnitException (const std::string& message, long exceptionLineNumber, long data1lineNumber, long data2lineNumber, const std::string& rFileName): _message(message), _lineNumber(exceptionLineNumber), _data1lineNumber(data1lineNumber), _data2lineNumber(data2lineNumber), _fileName(rFileName) +inline CppUnitException::CppUnitException (const std::string& message, long lineNumber, long data1lineNumber, long data2lineNumber, const std::string& fileName): _message(message), _lineNumber(lineNumber), _data1lineNumber(data1lineNumber), _data2lineNumber(data2lineNumber), _fileName(fileName) { } @@ -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 82% rename from CppUnit/include/CppUnit/RepeatedTest.h rename to CppUnit/include/Poco/CppUnit/RepeatedTest.h index 1842762ef..a23021837 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 { @@ -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 84% rename from CppUnit/include/CppUnit/Test.h rename to CppUnit/include/Poco/CppUnit/Test.h index 84be16793..0d4128500 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 @@ -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 86% rename from CppUnit/include/CppUnit/TestCaller.h rename to CppUnit/include/Poco/CppUnit/TestCaller.h index ef2909468..d859bb7ce 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 @@ -56,10 +56,10 @@ class TestCaller: public TestCase typedef void (Fixture::*TestMethod)(); public: - TestCaller(const std::string& rName, TestMethod test): - TestCase(rName), + TestCaller(const std::string& name, TestMethod test): + TestCase(name), _test(test), - _fixture(new Fixture(rName)) + _fixture(new Fixture(name)) { } @@ -100,4 +100,4 @@ private: 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 30188e9ee..cbe648a57 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 @@ -173,7 +173,7 @@ protected: // Constructs a test case -inline TestCase::TestCase(const std::string& rName): _name (rName) +inline TestCase::TestCase(const std::string& name): _name (name) { } @@ -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 68% rename from CppUnit/include/CppUnit/TestDecorator.h rename to CppUnit/include/Poco/CppUnit/TestDecorator.h index ac57c591e..dc781ac31 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 { @@ -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 75% rename from CppUnit/include/CppUnit/TestFailure.h rename to CppUnit/include/Poco/CppUnit/TestFailure.h index be54d7e4e..830dec1c8 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 { @@ -52,7 +52,7 @@ protected: // Constructs a TestFailure with the given test and exception. -inline TestFailure::TestFailure(Test* pFailedTest, CppUnitException* pThrownException): _failedTest(pFailedTest), _thrownException(pThrownException) +inline TestFailure::TestFailure(Test* failedTest, CppUnitException* thrownException): _failedTest(failedTest), _thrownException(thrownException) { } @@ -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 95% rename from CppUnit/include/CppUnit/TestResult.h rename to CppUnit/include/Poco/CppUnit/TestResult.h index 22fbd44c4..3470a8b53 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 @@ -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 93% rename from CppUnit/include/CppUnit/TestRunner.h rename to CppUnit/include/Poco/CppUnit/TestRunner.h index e43934659..8b859f5f8 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 @@ -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 69% rename from CppUnit/include/CppUnit/TestSetup.h rename to CppUnit/include/Poco/CppUnit/TestSetup.h index 789a076e5..57be08f19 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 { @@ -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 87% rename from CppUnit/include/CppUnit/TestSuite.h rename to CppUnit/include/Poco/CppUnit/TestSuite.h index 197cf2747..7aba91da0 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 @@ -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 82% rename from CppUnit/include/CppUnit/TextTestResult.h rename to CppUnit/include/Poco/CppUnit/TextTestResult.h index d3b191fd9..901e740a9 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 @@ -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/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_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 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_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 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/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"/> 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 45bfb0a42..b214ff188 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 @@ -322,4 +322,4 @@ - \ No newline at end of file + 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 e9bf2f676..7a12e7bdd 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/Environment.h" #include "Poco/String.h" #include "Poco/Format.h" diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h index af3f3a6a3..5af3c7c0d 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 b4270de4a..b0fb25947 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -9,7 +9,7 @@ // SPDX-License-Identifier: BSL-1.0 // -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "SQLExecutor.h" #include "Poco/NumberParser.h" #include "Poco/String.h" @@ -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; 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 2eacd766f..0e0869263 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 7c913d23d..ceb854871 100644 --- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj @@ -143,7 +143,7 @@ true - CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -174,7 +174,7 @@ Default - CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -204,7 +204,7 @@ true - 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 @@ -235,7 +235,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 @@ -265,7 +265,7 @@ true - 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 @@ -296,7 +296,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 648e126f0..2775cce09 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj @@ -143,7 +143,7 @@ true - CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -175,7 +175,7 @@ true - CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -205,7 +205,7 @@ true - 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 @@ -237,7 +237,7 @@ true - 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 @@ -267,7 +267,7 @@ true - 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 @@ -299,7 +299,7 @@ true - 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 2444273e9..e30ad1a2d 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 39ee880ac..a0685d0da 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 e30e34de7..58fe6dc31 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 24280216f..b1cfaa690 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 6b2bcdeb2..67ca19b12 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 f2d39fdf1..2b95ab449 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 a6997deb8..4e7b600c9 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/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/ODBC/testsuite/src/ODBCTest.cpp b/Data/ODBC/testsuite/src/ODBCTest.cpp index 5c57636b6..665e2d0bd 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 aa0591a21..d27c4c5fa 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 62bf10194..fd3a63647 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/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/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 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"/> xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff); -** iOff>=0; +** iCol>=0; ** pApi->xPhraseNext(pFts, &iter, &iCol, &iOff) ** ){ ** // An instance of phrase iPhrase at offset iOff of column iCol @@ -8527,13 +8547,51 @@ struct Fts5PhraseIter { ** ** The Fts5PhraseIter structure is defined above. Applications should not ** modify this structure directly - it should only be used as shown above -** with the xPhraseFirst() and xPhraseNext() API methods. +** with the xPhraseFirst() and xPhraseNext() API methods (and by +** xPhraseFirstColumn() and xPhraseNextColumn() as illustrated below). +** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" or "detail=column" option. If the FTS5 table is created +** with either "detail=none" or "detail=column" and "content=" option +** (i.e. if it is a contentless table), then this API always iterates +** through an empty set (all calls to xPhraseFirst() set iCol to -1). ** ** xPhraseNext() ** See xPhraseFirst above. +** +** xPhraseFirstColumn() +** This function and xPhraseNextColumn() are similar to the xPhraseFirst() +** and xPhraseNext() APIs described above. The difference is that instead +** of iterating through all instances of a phrase in the current row, these +** APIs are used to iterate through the set of columns in the current row +** that contain one or more instances of a specified phrase. For example: +** +** Fts5PhraseIter iter; +** int iCol; +** for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol); +** iCol>=0; +** pApi->xPhraseNextColumn(pFts, &iter, &iCol) +** ){ +** // Column iCol contains at least one instance of phrase iPhrase +** } +** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" option. If the FTS5 table is created with either +** "detail=none" "content=" option (i.e. if it is a contentless table), +** then this API always iterates through an empty set (all calls to +** xPhraseFirstColumn() set iCol to -1). +** +** The information accessed using this API and its companion +** xPhraseFirstColumn() may also be obtained using xPhraseFirst/xPhraseNext +** (or xInst/xInstCount). The chief advantage of this API is that it is +** significantly more efficient than those alternatives when used with +** "detail=column" tables. +** +** xPhraseNextColumn() +** See xPhraseFirstColumn above. */ struct Fts5ExtensionApi { - int iVersion; /* Currently always set to 1 */ + int iVersion; /* Currently always set to 3 */ void *(*xUserData)(Fts5Context*); @@ -8563,8 +8621,11 @@ struct Fts5ExtensionApi { int (*xSetAuxdata)(Fts5Context*, void *pAux, void(*xDelete)(void*)); void *(*xGetAuxdata)(Fts5Context*, int bClear); - void (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*); + int (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*); void (*xPhraseNext)(Fts5Context*, Fts5PhraseIter*, int *piCol, int *piOff); + + int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*); + void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol); }; /* @@ -9348,6 +9409,21 @@ SQLITE_PRIVATE void sqlite3Coverage(int); # define NEVER(X) (X) #endif +/* +** Some malloc failures are only possible if SQLITE_TEST_REALLOC_STRESS is +** defined. We need to defend against those failures when testing with +** SQLITE_TEST_REALLOC_STRESS, but we don't want the unreachable branches +** during a normal build. The following macro can be used to disable tests +** that are always false except when SQLITE_TEST_REALLOC_STRESS is set. +*/ +#if defined(SQLITE_TEST_REALLOC_STRESS) +# define ONLY_IF_REALLOC_STRESS(X) (X) +#elif !defined(NDEBUG) +# define ONLY_IF_REALLOC_STRESS(X) ((X)?(assert(0),1):0) +#else +# define ONLY_IF_REALLOC_STRESS(X) (0) +#endif + /* ** Declarations used for tracing the operating system interfaces. */ @@ -9984,10 +10060,6 @@ typedef INT16_TYPE LogEst; */ #ifdef __APPLE__ # include -# if TARGET_OS_IPHONE -# undef SQLITE_MAX_MMAP_SIZE -# define SQLITE_MAX_MMAP_SIZE 0 -# endif #endif #ifndef SQLITE_MAX_MMAP_SIZE # if defined(__linux__) \ @@ -10399,14 +10471,24 @@ SQLITE_PRIVATE int sqlite3BtreeNewDb(Btree *p); ** Flags passed as the third argument to sqlite3BtreeCursor(). ** ** For read-only cursors the wrFlag argument is always zero. For read-write -** cursors it may be set to either (BTREE_WRCSR|BTREE_FORDELETE) or -** (BTREE_WRCSR). If the BTREE_FORDELETE flag is set, then the cursor will +** cursors it may be set to either (BTREE_WRCSR|BTREE_FORDELETE) or just +** (BTREE_WRCSR). If the BTREE_FORDELETE bit is set, then the cursor will ** only be used by SQLite for the following: ** -** * to seek to and delete specific entries, and/or +** * to seek to and then delete specific entries, and/or ** ** * to read values that will be used to create keys that other ** BTREE_FORDELETE cursors will seek to and delete. +** +** The BTREE_FORDELETE flag is an optimization hint. It is not used by +** by this, the native b-tree engine of SQLite, but it is available to +** alternative storage engines that might be substituted in place of this +** b-tree system. For alternative storage engines in which a delete of +** the main table row automatically deletes corresponding index rows, +** the FORDELETE flag hint allows those alternative storage engines to +** skip a lot of work. Namely: FORDELETE cursors may treat all SEEK +** and DELETE operations as no-ops, and any READ operation against a +** FORDELETE cursor may return a null row: 0x01 0x00. */ #define BTREE_WRCSR 0x00000004 /* read-write cursor */ #define BTREE_FORDELETE 0x00000008 /* Cursor is for seek/delete only */ @@ -10435,7 +10517,12 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked( ); SQLITE_PRIVATE int sqlite3BtreeCursorHasMoved(BtCursor*); SQLITE_PRIVATE int sqlite3BtreeCursorRestore(BtCursor*, int*); -SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor*, int); +SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor*, u8 flags); + +/* Allowed flags for the 2nd argument to sqlite3BtreeDelete() */ +#define BTREE_SAVEPOSITION 0x02 /* Leave cursor pointing at NEXT or PREV */ +#define BTREE_AUXDELETE 0x04 /* not the primary delete operation */ + SQLITE_PRIVATE int sqlite3BtreeInsert(BtCursor*, const void *pKey, i64 nKey, const void *pData, int nData, int nZero, int bias, int seekResult); @@ -10487,15 +10574,17 @@ SQLITE_PRIVATE int sqlite3BtreeCheckpoint(Btree*, int, int *, int *); #ifndef SQLITE_OMIT_SHARED_CACHE SQLITE_PRIVATE void sqlite3BtreeEnter(Btree*); SQLITE_PRIVATE void sqlite3BtreeEnterAll(sqlite3*); +SQLITE_PRIVATE int sqlite3BtreeSharable(Btree*); +SQLITE_PRIVATE void sqlite3BtreeEnterCursor(BtCursor*); #else # define sqlite3BtreeEnter(X) # define sqlite3BtreeEnterAll(X) +# define sqlite3BtreeSharable(X) 0 +# define sqlite3BtreeEnterCursor(X) #endif #if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE -SQLITE_PRIVATE int sqlite3BtreeSharable(Btree*); SQLITE_PRIVATE void sqlite3BtreeLeave(Btree*); -SQLITE_PRIVATE void sqlite3BtreeEnterCursor(BtCursor*); SQLITE_PRIVATE void sqlite3BtreeLeaveCursor(BtCursor*); SQLITE_PRIVATE void sqlite3BtreeLeaveAll(sqlite3*); #ifndef NDEBUG @@ -10506,9 +10595,7 @@ SQLITE_PRIVATE int sqlite3SchemaMutexHeld(sqlite3*,int,Schema*); #endif #else -# define sqlite3BtreeSharable(X) 0 # define sqlite3BtreeLeave(X) -# define sqlite3BtreeEnterCursor(X) # define sqlite3BtreeLeaveCursor(X) # define sqlite3BtreeLeaveAll(X) @@ -10693,81 +10780,82 @@ typedef struct VdbeOpList VdbeOpList; /************** Begin file opcodes.h *****************************************/ /* Automatically generated. Do not edit */ /* See the tool/mkopcodeh.tcl script for details */ -#define OP_Savepoint 1 -#define OP_AutoCommit 2 -#define OP_Transaction 3 -#define OP_SorterNext 4 -#define OP_PrevIfOpen 5 -#define OP_NextIfOpen 6 -#define OP_Prev 7 -#define OP_Next 8 -#define OP_Checkpoint 9 -#define OP_JournalMode 10 -#define OP_Vacuum 11 -#define OP_VFilter 12 /* synopsis: iplan=r[P3] zplan='P4' */ -#define OP_VUpdate 13 /* synopsis: data=r[P3@P2] */ -#define OP_Goto 14 -#define OP_Gosub 15 -#define OP_Return 16 -#define OP_InitCoroutine 17 -#define OP_EndCoroutine 18 +#define OP_Savepoint 0 +#define OP_AutoCommit 1 +#define OP_Transaction 2 +#define OP_SorterNext 3 +#define OP_PrevIfOpen 4 +#define OP_NextIfOpen 5 +#define OP_Prev 6 +#define OP_Next 7 +#define OP_Checkpoint 8 +#define OP_JournalMode 9 +#define OP_Vacuum 10 +#define OP_VFilter 11 /* synopsis: iplan=r[P3] zplan='P4' */ +#define OP_VUpdate 12 /* synopsis: data=r[P3@P2] */ +#define OP_Goto 13 +#define OP_Gosub 14 +#define OP_Return 15 +#define OP_InitCoroutine 16 +#define OP_EndCoroutine 17 +#define OP_Yield 18 #define OP_Not 19 /* same as TK_NOT, synopsis: r[P2]= !r[P1] */ -#define OP_Yield 20 -#define OP_HaltIfNull 21 /* synopsis: if r[P3]=null halt */ -#define OP_Halt 22 -#define OP_Integer 23 /* synopsis: r[P2]=P1 */ -#define OP_Int64 24 /* synopsis: r[P2]=P4 */ -#define OP_String 25 /* synopsis: r[P2]='P4' (len=P1) */ -#define OP_Null 26 /* synopsis: r[P2..P3]=NULL */ -#define OP_SoftNull 27 /* synopsis: r[P1]=NULL */ -#define OP_Blob 28 /* synopsis: r[P2]=P4 (len=P1) */ -#define OP_Variable 29 /* synopsis: r[P2]=parameter(P1,P4) */ -#define OP_Move 30 /* synopsis: r[P2@P3]=r[P1@P3] */ -#define OP_Copy 31 /* synopsis: r[P2@P3+1]=r[P1@P3+1] */ -#define OP_SCopy 32 /* synopsis: r[P2]=r[P1] */ -#define OP_IntCopy 33 /* synopsis: r[P2]=r[P1] */ -#define OP_ResultRow 34 /* synopsis: output=r[P1@P2] */ -#define OP_CollSeq 35 -#define OP_Function0 36 /* synopsis: r[P3]=func(r[P2@P5]) */ -#define OP_Function 37 /* synopsis: r[P3]=func(r[P2@P5]) */ -#define OP_AddImm 38 /* synopsis: r[P1]=r[P1]+P2 */ -#define OP_MustBeInt 39 -#define OP_RealAffinity 40 -#define OP_Cast 41 /* synopsis: affinity(r[P1]) */ -#define OP_Permutation 42 -#define OP_Compare 43 /* synopsis: r[P1@P3] <-> r[P2@P3] */ -#define OP_Jump 44 -#define OP_Once 45 -#define OP_If 46 -#define OP_IfNot 47 -#define OP_Column 48 /* synopsis: r[P3]=PX */ -#define OP_Affinity 49 /* synopsis: affinity(r[P1@P2]) */ -#define OP_MakeRecord 50 /* synopsis: r[P3]=mkrec(r[P1@P2]) */ -#define OP_Count 51 /* synopsis: r[P2]=count() */ -#define OP_ReadCookie 52 -#define OP_SetCookie 53 -#define OP_ReopenIdx 54 /* synopsis: root=P2 iDb=P3 */ -#define OP_OpenRead 55 /* synopsis: root=P2 iDb=P3 */ -#define OP_OpenWrite 56 /* synopsis: root=P2 iDb=P3 */ -#define OP_OpenAutoindex 57 /* synopsis: nColumn=P2 */ -#define OP_OpenEphemeral 58 /* synopsis: nColumn=P2 */ -#define OP_SorterOpen 59 -#define OP_SequenceTest 60 /* synopsis: if( cursor[P1].ctr++ ) pc = P2 */ -#define OP_OpenPseudo 61 /* synopsis: P3 columns in r[P2] */ -#define OP_Close 62 -#define OP_ColumnsUsed 63 -#define OP_SeekLT 64 /* synopsis: key=r[P3@P4] */ -#define OP_SeekLE 65 /* synopsis: key=r[P3@P4] */ -#define OP_SeekGE 66 /* synopsis: key=r[P3@P4] */ -#define OP_SeekGT 67 /* synopsis: key=r[P3@P4] */ -#define OP_Seek 68 /* synopsis: intkey=r[P2] */ -#define OP_NoConflict 69 /* synopsis: key=r[P3@P4] */ -#define OP_NotFound 70 /* synopsis: key=r[P3@P4] */ +#define OP_HaltIfNull 20 /* synopsis: if r[P3]=null halt */ +#define OP_Halt 21 +#define OP_Integer 22 /* synopsis: r[P2]=P1 */ +#define OP_Int64 23 /* synopsis: r[P2]=P4 */ +#define OP_String 24 /* synopsis: r[P2]='P4' (len=P1) */ +#define OP_Null 25 /* synopsis: r[P2..P3]=NULL */ +#define OP_SoftNull 26 /* synopsis: r[P1]=NULL */ +#define OP_Blob 27 /* synopsis: r[P2]=P4 (len=P1) */ +#define OP_Variable 28 /* synopsis: r[P2]=parameter(P1,P4) */ +#define OP_Move 29 /* synopsis: r[P2@P3]=r[P1@P3] */ +#define OP_Copy 30 /* synopsis: r[P2@P3+1]=r[P1@P3+1] */ +#define OP_SCopy 31 /* synopsis: r[P2]=r[P1] */ +#define OP_IntCopy 32 /* synopsis: r[P2]=r[P1] */ +#define OP_ResultRow 33 /* synopsis: output=r[P1@P2] */ +#define OP_CollSeq 34 +#define OP_Function0 35 /* synopsis: r[P3]=func(r[P2@P5]) */ +#define OP_Function 36 /* synopsis: r[P3]=func(r[P2@P5]) */ +#define OP_AddImm 37 /* synopsis: r[P1]=r[P1]+P2 */ +#define OP_MustBeInt 38 +#define OP_RealAffinity 39 +#define OP_Cast 40 /* synopsis: affinity(r[P1]) */ +#define OP_Permutation 41 +#define OP_Compare 42 /* synopsis: r[P1@P3] <-> r[P2@P3] */ +#define OP_Jump 43 +#define OP_Once 44 +#define OP_If 45 +#define OP_IfNot 46 +#define OP_Column 47 /* synopsis: r[P3]=PX */ +#define OP_Affinity 48 /* synopsis: affinity(r[P1@P2]) */ +#define OP_MakeRecord 49 /* synopsis: r[P3]=mkrec(r[P1@P2]) */ +#define OP_Count 50 /* synopsis: r[P2]=count() */ +#define OP_ReadCookie 51 +#define OP_SetCookie 52 +#define OP_ReopenIdx 53 /* synopsis: root=P2 iDb=P3 */ +#define OP_OpenRead 54 /* synopsis: root=P2 iDb=P3 */ +#define OP_OpenWrite 55 /* synopsis: root=P2 iDb=P3 */ +#define OP_OpenAutoindex 56 /* synopsis: nColumn=P2 */ +#define OP_OpenEphemeral 57 /* synopsis: nColumn=P2 */ +#define OP_SorterOpen 58 +#define OP_SequenceTest 59 /* synopsis: if( cursor[P1].ctr++ ) pc = P2 */ +#define OP_OpenPseudo 60 /* synopsis: P3 columns in r[P2] */ +#define OP_Close 61 +#define OP_ColumnsUsed 62 +#define OP_SeekLT 63 /* synopsis: key=r[P3@P4] */ +#define OP_SeekLE 64 /* synopsis: key=r[P3@P4] */ +#define OP_SeekGE 65 /* synopsis: key=r[P3@P4] */ +#define OP_SeekGT 66 /* synopsis: key=r[P3@P4] */ +#define OP_NoConflict 67 /* synopsis: key=r[P3@P4] */ +#define OP_NotFound 68 /* synopsis: key=r[P3@P4] */ +#define OP_Found 69 /* synopsis: key=r[P3@P4] */ +#define OP_NotExists 70 /* synopsis: intkey=r[P3] */ #define OP_Or 71 /* same as TK_OR, synopsis: r[P3]=(r[P1] || r[P2]) */ #define OP_And 72 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */ -#define OP_Found 73 /* synopsis: key=r[P3@P4] */ -#define OP_NotExists 74 /* synopsis: intkey=r[P3] */ -#define OP_Sequence 75 /* synopsis: r[P2]=cursor[P1].ctr++ */ +#define OP_Sequence 73 /* synopsis: r[P2]=cursor[P1].ctr++ */ +#define OP_NewRowid 74 /* synopsis: r[P2]=rowid */ +#define OP_Insert 75 /* synopsis: intkey=r[P3] data=r[P2] */ #define OP_IsNull 76 /* same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */ #define OP_NotNull 77 /* same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */ #define OP_Ne 78 /* same as TK_NE, synopsis: if r[P1]!=r[P3] goto P2 */ @@ -10776,7 +10864,7 @@ typedef struct VdbeOpList VdbeOpList; #define OP_Le 81 /* same as TK_LE, synopsis: if r[P1]<=r[P3] goto P2 */ #define OP_Lt 82 /* same as TK_LT, synopsis: if r[P1]=r[P3] goto P2 */ -#define OP_NewRowid 84 /* synopsis: r[P2]=rowid */ +#define OP_InsertInt 84 /* synopsis: intkey=P3 data=r[P2] */ #define OP_BitAnd 85 /* same as TK_BITAND, synopsis: r[P3]=r[P1]&r[P2] */ #define OP_BitOr 86 /* same as TK_BITOR, synopsis: r[P3]=r[P1]|r[P2] */ #define OP_ShiftLeft 87 /* same as TK_LSHIFT, synopsis: r[P3]=r[P2]<0 then r[P1]-=P3, goto P2 */ -#define OP_SetIfNotPos 140 /* synopsis: if r[P1]<=0 then r[P2]=P3 */ -#define OP_IfNotZero 141 /* synopsis: if r[P1]!=0 then r[P1]-=P3, goto P2 */ -#define OP_DecrJumpZero 142 /* synopsis: if (--r[P1])==0 goto P2 */ -#define OP_JumpZeroIncr 143 /* synopsis: if (r[P1]++)==0 ) goto P2 */ -#define OP_AggStep0 144 /* synopsis: accum=r[P3] step(r[P2@P5]) */ -#define OP_AggStep 145 /* synopsis: accum=r[P3] step(r[P2@P5]) */ -#define OP_AggFinal 146 /* synopsis: accum=r[P1] N=P2 */ -#define OP_IncrVacuum 147 -#define OP_Expire 148 -#define OP_TableLock 149 /* synopsis: iDb=P1 root=P2 write=P3 */ -#define OP_VBegin 150 -#define OP_VCreate 151 -#define OP_VDestroy 152 -#define OP_VOpen 153 -#define OP_VColumn 154 /* synopsis: r[P3]=vcolumn(P2) */ -#define OP_VNext 155 -#define OP_VRename 156 -#define OP_Pagecount 157 -#define OP_MaxPgcnt 158 -#define OP_Init 159 /* synopsis: Start at P2 */ -#define OP_CursorHint 160 -#define OP_Noop 161 -#define OP_Explain 162 +#define OP_Param 134 +#define OP_FkCounter 135 /* synopsis: fkctr[P1]+=P2 */ +#define OP_FkIfZero 136 /* synopsis: if fkctr[P1]==0 goto P2 */ +#define OP_MemMax 137 /* synopsis: r[P1]=max(r[P1],r[P2]) */ +#define OP_IfPos 138 /* synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */ +#define OP_OffsetLimit 139 /* synopsis: if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1) */ +#define OP_IfNotZero 140 /* synopsis: if r[P1]!=0 then r[P1]-=P3, goto P2 */ +#define OP_DecrJumpZero 141 /* synopsis: if (--r[P1])==0 goto P2 */ +#define OP_JumpZeroIncr 142 /* synopsis: if (r[P1]++)==0 ) goto P2 */ +#define OP_AggStep0 143 /* synopsis: accum=r[P3] step(r[P2@P5]) */ +#define OP_AggStep 144 /* synopsis: accum=r[P3] step(r[P2@P5]) */ +#define OP_AggFinal 145 /* synopsis: accum=r[P1] N=P2 */ +#define OP_IncrVacuum 146 +#define OP_Expire 147 +#define OP_TableLock 148 /* synopsis: iDb=P1 root=P2 write=P3 */ +#define OP_VBegin 149 +#define OP_VCreate 150 +#define OP_VDestroy 151 +#define OP_VOpen 152 +#define OP_VColumn 153 /* synopsis: r[P3]=vcolumn(P2) */ +#define OP_VNext 154 +#define OP_VRename 155 +#define OP_Pagecount 156 +#define OP_MaxPgcnt 157 +#define OP_Init 158 /* synopsis: Start at P2 */ +#define OP_CursorHint 159 +#define OP_Noop 160 +#define OP_Explain 161 /* Properties such as "out2" or "jump" that are specified in ** comments following the "case" for each opcode in the vdbe.c ** are encoded into bitvectors as follows: */ -#define OPFLG_JUMP 0x0001 /* jump: P2 holds jmp target */ -#define OPFLG_IN1 0x0002 /* in1: P1 is an input */ -#define OPFLG_IN2 0x0004 /* in2: P2 is an input */ -#define OPFLG_IN3 0x0008 /* in3: P3 is an input */ -#define OPFLG_OUT2 0x0010 /* out2: P2 is an output */ -#define OPFLG_OUT3 0x0020 /* out3: P3 is an output */ +#define OPFLG_JUMP 0x01 /* jump: P2 holds jmp target */ +#define OPFLG_IN1 0x02 /* in1: P1 is an input */ +#define OPFLG_IN2 0x04 /* in2: P2 is an input */ +#define OPFLG_IN3 0x08 /* in3: P3 is an input */ +#define OPFLG_OUT2 0x10 /* out2: P2 is an output */ +#define OPFLG_OUT3 0x20 /* out3: P3 is an output */ #define OPFLG_INITIALIZER {\ -/* 0 */ 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,\ -/* 8 */ 0x01, 0x00, 0x10, 0x00, 0x01, 0x00, 0x01, 0x01,\ -/* 16 */ 0x02, 0x01, 0x02, 0x12, 0x03, 0x08, 0x00, 0x10,\ -/* 24 */ 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x00,\ -/* 32 */ 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03,\ -/* 40 */ 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03,\ -/* 48 */ 0x00, 0x00, 0x00, 0x10, 0x10, 0x08, 0x00, 0x00,\ -/* 56 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ -/* 64 */ 0x09, 0x09, 0x09, 0x09, 0x04, 0x09, 0x09, 0x26,\ -/* 72 */ 0x26, 0x09, 0x09, 0x10, 0x03, 0x03, 0x0b, 0x0b,\ -/* 80 */ 0x0b, 0x0b, 0x0b, 0x0b, 0x10, 0x26, 0x26, 0x26,\ +/* 0 */ 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01,\ +/* 8 */ 0x00, 0x10, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02,\ +/* 16 */ 0x01, 0x02, 0x03, 0x12, 0x08, 0x00, 0x10, 0x10,\ +/* 24 */ 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x00, 0x10,\ +/* 32 */ 0x10, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x02,\ +/* 40 */ 0x02, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x00,\ +/* 48 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,\ +/* 56 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,\ +/* 64 */ 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x26,\ +/* 72 */ 0x26, 0x10, 0x10, 0x00, 0x03, 0x03, 0x0b, 0x0b,\ +/* 80 */ 0x0b, 0x0b, 0x0b, 0x0b, 0x00, 0x26, 0x26, 0x26,\ /* 88 */ 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x00,\ -/* 96 */ 0x12, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ -/* 104 */ 0x00, 0x10, 0x00, 0x01, 0x01, 0x01, 0x01, 0x04,\ -/* 112 */ 0x04, 0x00, 0x10, 0x01, 0x01, 0x01, 0x01, 0x10,\ -/* 120 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,\ -/* 128 */ 0x00, 0x00, 0x06, 0x23, 0x0b, 0x10, 0x01, 0x10,\ -/* 136 */ 0x00, 0x01, 0x04, 0x03, 0x06, 0x03, 0x03, 0x03,\ -/* 144 */ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,\ -/* 152 */ 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x10, 0x01,\ -/* 160 */ 0x00, 0x00, 0x00,} +/* 96 */ 0x12, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,\ +/* 104 */ 0x00, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x00,\ +/* 112 */ 0x00, 0x10, 0x01, 0x01, 0x01, 0x01, 0x10, 0x00,\ +/* 120 */ 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,\ +/* 128 */ 0x00, 0x06, 0x23, 0x0b, 0x01, 0x10, 0x10, 0x00,\ +/* 136 */ 0x01, 0x04, 0x03, 0x1a, 0x03, 0x03, 0x03, 0x00,\ +/* 144 */ 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\ +/* 152 */ 0x00, 0x00, 0x01, 0x00, 0x10, 0x10, 0x01, 0x00,\ +/* 160 */ 0x00, 0x00,} /************** End of opcodes.h *********************************************/ /************** Continuing where we left off in vdbe.h ***********************/ @@ -10907,7 +10994,13 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp3(Vdbe*,int,int,int,int); SQLITE_PRIVATE int sqlite3VdbeAddOp4(Vdbe*,int,int,int,int,const char *zP4,int); SQLITE_PRIVATE int sqlite3VdbeAddOp4Dup8(Vdbe*,int,int,int,int,const u8*,int); SQLITE_PRIVATE int sqlite3VdbeAddOp4Int(Vdbe*,int,int,int,int,int); -SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp, int iLineno); +SQLITE_PRIVATE void sqlite3VdbeEndCoroutine(Vdbe*,int); +#if defined(SQLITE_DEBUG) && !defined(SQLITE_TEST_REALLOC_STRESS) +SQLITE_PRIVATE void sqlite3VdbeVerifyNoMallocRequired(Vdbe *p, int N); +#else +# define sqlite3VdbeVerifyNoMallocRequired(A,B) +#endif +SQLITE_PRIVATE VdbeOp *sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp, int iLineno); SQLITE_PRIVATE void sqlite3VdbeAddParseSchemaOp(Vdbe*,int,char*); SQLITE_PRIVATE void sqlite3VdbeChangeOpcode(Vdbe*, u32 addr, u8); SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe*, u32 addr, int P1); @@ -10915,7 +11008,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe*, u32 addr, int P2); SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe*, u32 addr, int P3); SQLITE_PRIVATE void sqlite3VdbeChangeP5(Vdbe*, u8 P5); SQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe*, int addr); -SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe*, int addr); +SQLITE_PRIVATE int sqlite3VdbeChangeToNoop(Vdbe*, int addr); SQLITE_PRIVATE int sqlite3VdbeDeletePriorOpcode(Vdbe*, u8 op); SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe*, int addr, const char *zP4, int N); SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse*, Index*); @@ -11125,11 +11218,12 @@ typedef struct PgHdr DbPage; #define PAGER_SYNCHRONOUS_OFF 0x01 /* PRAGMA synchronous=OFF */ #define PAGER_SYNCHRONOUS_NORMAL 0x02 /* PRAGMA synchronous=NORMAL */ #define PAGER_SYNCHRONOUS_FULL 0x03 /* PRAGMA synchronous=FULL */ -#define PAGER_SYNCHRONOUS_MASK 0x03 /* Mask for three values above */ -#define PAGER_FULLFSYNC 0x04 /* PRAGMA fullfsync=ON */ -#define PAGER_CKPT_FULLFSYNC 0x08 /* PRAGMA checkpoint_fullfsync=ON */ -#define PAGER_CACHESPILL 0x10 /* PRAGMA cache_spill=ON */ -#define PAGER_FLAGS_MASK 0x1c /* All above except SYNCHRONOUS */ +#define PAGER_SYNCHRONOUS_EXTRA 0x04 /* PRAGMA synchronous=EXTRA */ +#define PAGER_SYNCHRONOUS_MASK 0x07 /* Mask for four values above */ +#define PAGER_FULLFSYNC 0x08 /* PRAGMA fullfsync=ON */ +#define PAGER_CKPT_FULLFSYNC 0x10 /* PRAGMA checkpoint_fullfsync=ON */ +#define PAGER_CACHESPILL 0x20 /* PRAGMA cache_spill=ON */ +#define PAGER_FLAGS_MASK 0x38 /* All above except SYNCHRONOUS */ /* ** The remainder of this file contains the declarations of the functions @@ -11319,6 +11413,8 @@ struct PgHdr { #define PGHDR_DONT_WRITE 0x020 /* Do not write content to disk */ #define PGHDR_MMAP 0x040 /* This is an mmap page object */ +#define PGHDR_WAL_APPEND 0x080 /* Appended to wal file */ + /* Initialize and shutdown the page cache subsystem */ SQLITE_PRIVATE int sqlite3PcacheInitialize(void); SQLITE_PRIVATE void sqlite3PcacheShutdown(void); @@ -11887,8 +11983,8 @@ struct Schema { ** lookaside allocations are not used to construct the schema objects. */ struct Lookaside { + u32 bDisable; /* Only operate the lookaside when zero */ u16 sz; /* Size of each buffer in bytes */ - u8 bEnabled; /* False to disable new lookaside allocations */ u8 bMalloced; /* True if pStart obtained from sqlite3_malloc() */ int nOut; /* Number of buffers currently checked out */ int mxOut; /* Highwater mark for nOut */ @@ -11971,6 +12067,7 @@ struct sqlite3 { u8 autoCommit; /* The auto-commit flag. */ u8 temp_store; /* 1: file 2: memory 0: default */ u8 mallocFailed; /* True if we have seen a malloc failure */ + u8 bBenignMalloc; /* Do not require OOMs if true */ u8 dfltLockMode; /* Default locking-mode for attached dbs */ signed char nextAutovac; /* Autovac setting after VACUUM if >=0 */ u8 suppressErr; /* Do not issue error messages if true */ @@ -12079,10 +12176,10 @@ struct sqlite3 { */ #define SQLITE_VdbeTrace 0x00000001 /* True to trace VDBE execution */ #define SQLITE_InternChanges 0x00000002 /* Uncommitted Hash table changes */ -#define SQLITE_FullFSync 0x00000004 /* Use full fsync on the backend */ -#define SQLITE_CkptFullFSync 0x00000008 /* Use full fsync for checkpoint */ -#define SQLITE_CacheSpill 0x00000010 /* OK to spill pager cache */ -#define SQLITE_FullColNames 0x00000020 /* Show full column names on SELECT */ +#define SQLITE_FullColNames 0x00000004 /* Show full column names on SELECT */ +#define SQLITE_FullFSync 0x00000008 /* Use full fsync on the backend */ +#define SQLITE_CkptFullFSync 0x00000010 /* Use full fsync for checkpoint */ +#define SQLITE_CacheSpill 0x00000020 /* OK to spill pager cache */ #define SQLITE_ShortColNames 0x00000040 /* Show short columns names */ #define SQLITE_CountRows 0x00000080 /* Count rows changed by INSERT, */ /* DELETE, or UPDATE and return */ @@ -12171,9 +12268,8 @@ struct FuncDef { u16 funcFlags; /* Some combination of SQLITE_FUNC_* */ void *pUserData; /* User data parameter */ FuncDef *pNext; /* Next function with same name */ - void (*xFunc)(sqlite3_context*,int,sqlite3_value**); /* Regular function */ - void (*xStep)(sqlite3_context*,int,sqlite3_value**); /* Aggregate step */ - void (*xFinalize)(sqlite3_context*); /* Aggregate finalizer */ + void (*xSFunc)(sqlite3_context*,int,sqlite3_value**); /* func or agg-step */ + void (*xFinalize)(sqlite3_context*); /* Agg finalizer */ char *zName; /* SQL name of the function. */ FuncDef *pHash; /* Next with a different name but the same hash */ FuncDestructor *pDestructor; /* Reference counted destructor function */ @@ -12256,28 +12352,28 @@ struct FuncDestructor { */ #define FUNCTION(zName, nArg, iArg, bNC, xFunc) \ {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|(bNC*SQLITE_FUNC_NEEDCOLL), \ - SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, #zName, 0, 0} + SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, #zName, 0, 0} #define VFUNCTION(zName, nArg, iArg, bNC, xFunc) \ {nArg, SQLITE_UTF8|(bNC*SQLITE_FUNC_NEEDCOLL), \ - SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, #zName, 0, 0} + SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, #zName, 0, 0} #define DFUNCTION(zName, nArg, iArg, bNC, xFunc) \ {nArg, SQLITE_FUNC_SLOCHNG|SQLITE_UTF8|(bNC*SQLITE_FUNC_NEEDCOLL), \ - SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, #zName, 0, 0} + SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, #zName, 0, 0} #define FUNCTION2(zName, nArg, iArg, bNC, xFunc, extraFlags) \ {nArg,SQLITE_FUNC_CONSTANT|SQLITE_UTF8|(bNC*SQLITE_FUNC_NEEDCOLL)|extraFlags,\ - SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, #zName, 0, 0} + SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, #zName, 0, 0} #define STR_FUNCTION(zName, nArg, pArg, bNC, xFunc) \ {nArg, SQLITE_FUNC_SLOCHNG|SQLITE_UTF8|(bNC*SQLITE_FUNC_NEEDCOLL), \ - pArg, 0, xFunc, 0, 0, #zName, 0, 0} + pArg, 0, xFunc, 0, #zName, 0, 0} #define LIKEFUNC(zName, nArg, arg, flags) \ {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|flags, \ - (void *)arg, 0, likeFunc, 0, 0, #zName, 0, 0} + (void *)arg, 0, likeFunc, 0, #zName, 0, 0} #define AGGREGATE(zName, nArg, arg, nc, xStep, xFinal) \ {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL), \ - SQLITE_INT_TO_PTR(arg), 0, 0, xStep,xFinal,#zName,0,0} + SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,#zName,0,0} #define AGGREGATE2(zName, nArg, arg, nc, xStep, xFinal, extraFlags) \ {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|extraFlags, \ - SQLITE_INT_TO_PTR(arg), 0, 0, xStep,xFinal,#zName,0,0} + SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,#zName,0,0} /* ** All current savepoints are stored in a linked list starting at @@ -13435,7 +13531,7 @@ struct SelectDest { ** tables, the following information is attached to the Table.u.autoInc.p ** pointer of each autoincrement table to record some side information that ** the code generator needs. We have to keep per-table autoincrement -** information in case inserts are down within triggers. Triggers do not +** information in case inserts are done within triggers. Triggers do not ** normally coordinate their activities, but we do need to coordinate the ** loading and saving of autoincrement information. */ @@ -13527,6 +13623,7 @@ struct Parse { u8 mayAbort; /* True if statement may throw an ABORT exception */ u8 hasCompound; /* Need to invoke convertCompoundSelectToSubquery() */ u8 okConstFactor; /* OK to factor out constants */ + u8 disableLookaside; /* Number of times lookaside has been disabled */ int aTempReg[8]; /* Holding area for temporary registers */ int nRangeReg; /* Size of the temporary register block */ int iRangeReg; /* First register in temporary register block */ @@ -13588,7 +13685,7 @@ struct Parse { ** in the recursive region. ************************************************************************/ - int nVar; /* Number of '?' variables seen in the SQL so far */ + ynVar nVar; /* Number of '?' variables seen in the SQL so far */ int nzVar; /* Number of available slots in azVar[] */ u8 iPkSortOrder; /* ASC or DESC for INTEGER PRIMARY KEY */ u8 explain; /* True if the EXPLAIN flag is found on the query */ @@ -13641,7 +13738,8 @@ struct AuthContext { /* ** Bitfield flags for P5 value in various opcodes. */ -#define OPFLAG_NCHANGE 0x01 /* Set to update db->nChange */ +#define OPFLAG_NCHANGE 0x01 /* OP_Insert: Set to update db->nChange */ + /* Also used in P2 (not P5) of OP_Delete */ #define OPFLAG_EPHEM 0x01 /* OP_Column: Ephemeral output is ok */ #define OPFLAG_LASTROWID 0x02 /* Set to update db->lastRowid */ #define OPFLAG_ISUPDATE 0x04 /* This OP_Insert is an sql UPDATE */ @@ -13651,9 +13749,11 @@ struct AuthContext { #define OPFLAG_TYPEOFARG 0x80 /* OP_Column only used for typeof() */ #define OPFLAG_BULKCSR 0x01 /* OP_Open** used to open bulk cursor */ #define OPFLAG_SEEKEQ 0x02 /* OP_Open** cursor uses EQ seek only */ -#define OPFLAG_FORDELETE 0x08 /* OP_Open is opening for-delete csr */ +#define OPFLAG_FORDELETE 0x08 /* OP_Open should use BTREE_FORDELETE */ #define OPFLAG_P2ISREG 0x10 /* P2 to OP_Open** is a register number */ #define OPFLAG_PERMUTE 0x01 /* OP_Compare: use the permutation */ +#define OPFLAG_SAVEPOSITION 0x02 /* OP_Delete: keep cursor position */ +#define OPFLAG_AUXDELETE 0x04 /* OP_Delete: index in a DELETE op */ /* * Each trigger present in the database schema is stored as an instance of @@ -13772,10 +13872,16 @@ struct StrAccum { u32 nAlloc; /* Amount of space allocated in zText */ u32 mxAlloc; /* Maximum allowed allocation. 0 for no malloc usage */ u8 accError; /* STRACCUM_NOMEM or STRACCUM_TOOBIG */ - u8 bMalloced; /* zText points to allocated space */ + u8 printfFlags; /* SQLITE_PRINTF flags below */ }; #define STRACCUM_NOMEM 1 #define STRACCUM_TOOBIG 2 +#define SQLITE_PRINTF_INTERNAL 0x01 /* Internal-use-only converters allowed */ +#define SQLITE_PRINTF_SQLFUNC 0x02 /* SQL function arguments to VXPrintf */ +#define SQLITE_PRINTF_MALLOCED 0x04 /* True if xText is allocated space */ + +#define isMalloced(X) (((X)->printfFlags & SQLITE_PRINTF_MALLOCED)!=0) + /* ** A pointer to this structure is used to communicate information @@ -13870,10 +13976,10 @@ struct Sqlite3Config { ** Context pointer passed down through the tree-walk. */ struct Walker { + Parse *pParse; /* Parser context. */ int (*xExprCallback)(Walker*, Expr*); /* Callback for expressions */ int (*xSelectCallback)(Walker*,Select*); /* Callback for SELECTs */ void (*xSelectCallback2)(Walker*,Select*);/* Second callback for SELECTs */ - Parse *pParse; /* Parser context. */ int walkerDepth; /* Number of subqueries */ u8 eCode; /* A small processing code */ union { /* Extra data for callback */ @@ -13883,6 +13989,7 @@ struct Walker { SrcList *pSrcList; /* FROM clause */ struct SrcCount *pSrcCount; /* Counting column references */ struct CCurHint *pCCurHint; /* Used by codeCursorHint() */ + int *aiCol; /* array of column indexes */ } u; }; @@ -13952,6 +14059,13 @@ SQLITE_PRIVATE int sqlite3CantopenError(int); #define SQLITE_MISUSE_BKPT sqlite3MisuseError(__LINE__) #define SQLITE_CANTOPEN_BKPT sqlite3CantopenError(__LINE__) +/* +** FTS3 and FTS4 both require virtual table support +*/ +#if defined(SQLITE_OMIT_VIRTUALTABLE) +# undef SQLITE_ENABLE_FTS3 +# undef SQLITE_ENABLE_FTS4 +#endif /* ** FTS4 is really an extension for FTS3. It is enabled using the @@ -14010,6 +14124,7 @@ SQLITE_PRIVATE void *sqlite3Malloc(u64); SQLITE_PRIVATE void *sqlite3MallocZero(u64); SQLITE_PRIVATE void *sqlite3DbMallocZero(sqlite3*, u64); SQLITE_PRIVATE void *sqlite3DbMallocRaw(sqlite3*, u64); +SQLITE_PRIVATE void *sqlite3DbMallocRawNN(sqlite3*, u64); SQLITE_PRIVATE char *sqlite3DbStrDup(sqlite3*,const char*); SQLITE_PRIVATE char *sqlite3DbStrNDup(sqlite3*,const char*, u64); SQLITE_PRIVATE void *sqlite3Realloc(void*, u64); @@ -14092,10 +14207,8 @@ struct PrintfArguments { sqlite3_value **apArg; /* The argument values */ }; -#define SQLITE_PRINTF_INTERNAL 0x01 -#define SQLITE_PRINTF_SQLFUNC 0x02 -SQLITE_PRIVATE void sqlite3VXPrintf(StrAccum*, u32, const char*, va_list); -SQLITE_PRIVATE void sqlite3XPrintf(StrAccum*, u32, const char*, ...); +SQLITE_PRIVATE void sqlite3VXPrintf(StrAccum*, const char*, va_list); +SQLITE_PRIVATE void sqlite3XPrintf(StrAccum*, const char*, ...); SQLITE_PRIVATE char *sqlite3MPrintf(sqlite3*,const char*, ...); SQLITE_PRIVATE char *sqlite3VMPrintf(sqlite3*,const char*, va_list); #if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) @@ -14116,6 +14229,7 @@ SQLITE_PRIVATE void sqlite3TreeViewWith(TreeView*, const With*, u8); SQLITE_PRIVATE void sqlite3SetString(char **, sqlite3*, const char*); SQLITE_PRIVATE void sqlite3ErrorMsg(Parse*, const char*, ...); SQLITE_PRIVATE int sqlite3Dequote(char*); +SQLITE_PRIVATE void sqlite3TokenInit(Token*,char*); SQLITE_PRIVATE int sqlite3KeywordCode(const unsigned char*, int); SQLITE_PRIVATE int sqlite3RunParser(Parse*, const char*, char **); SQLITE_PRIVATE void sqlite3FinishCoding(Parse*); @@ -14144,7 +14258,6 @@ SQLITE_PRIVATE void sqlite3Pragma(Parse*,Token*,Token*,Token*,int); SQLITE_PRIVATE void sqlite3ResetAllSchemasOfConnection(sqlite3*); SQLITE_PRIVATE void sqlite3ResetOneSchema(sqlite3*,int); SQLITE_PRIVATE void sqlite3CollapseDatabaseArray(sqlite3*); -SQLITE_PRIVATE void sqlite3BeginParse(Parse*,int); SQLITE_PRIVATE void sqlite3CommitInternalChanges(sqlite3*); SQLITE_PRIVATE void sqlite3DeleteColumnNames(sqlite3*,Table*); SQLITE_PRIVATE int sqlite3ColumnsFromExprList(Parse*,ExprList*,i16*,Column**); @@ -14329,7 +14442,7 @@ SQLITE_PRIVATE void sqlite3GenerateRowIndexDelete(Parse*, Table*, int, int, int* SQLITE_PRIVATE int sqlite3GenerateIndexKey(Parse*, Index*, int, int, int, int*,Index*,int); SQLITE_PRIVATE void sqlite3ResolvePartIdxLabel(Parse*,int); SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(Parse*,Table*,int*,int,int,int,int, - u8,u8,int,int*); + u8,u8,int,int*,int*); SQLITE_PRIVATE void sqlite3CompleteInsertion(Parse*,Table*,int,int,int,int*,int,int,int); SQLITE_PRIVATE int sqlite3OpenTableAndIndices(Parse*, Table*, int, u8, int, u8*, int*, int*); SQLITE_PRIVATE void sqlite3BeginWriteOperation(Parse*, int, int); @@ -14548,7 +14661,6 @@ SQLITE_PRIVATE void sqlite3DeleteIndexSamples(sqlite3*,Index*); SQLITE_PRIVATE void sqlite3DefaultRowEst(Index*); SQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3*, int); SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3*,Expr*,int*,char*); -SQLITE_PRIVATE void sqlite3MinimumFileFormat(Parse*, int, int); SQLITE_PRIVATE void sqlite3SchemaClear(void *); SQLITE_PRIVATE Schema *sqlite3SchemaGet(sqlite3 *, Btree *); SQLITE_PRIVATE int sqlite3SchemaToIndex(sqlite3 *db, Schema *); @@ -14564,6 +14676,8 @@ SQLITE_PRIVATE int sqlite3CreateFunc(sqlite3 *, const char *, int, int, void *, void (*)(sqlite3_context*,int,sqlite3_value **), void (*)(sqlite3_context*), FuncDestructor *pDestructor ); +SQLITE_PRIVATE void sqlite3OomFault(sqlite3*); +SQLITE_PRIVATE void sqlite3OomClear(sqlite3*); SQLITE_PRIVATE int sqlite3ApiExit(sqlite3 *db, int); SQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *); @@ -15660,6 +15774,7 @@ typedef struct AuxData AuxData; ** * A virtual table ** * A one-row "pseudotable" stored in a single register */ +typedef struct VdbeCursor VdbeCursor; struct VdbeCursor { u8 eCurType; /* One of the CURTYPE_* values above */ i8 iDb; /* Index of cursor database in db->aDb[] (or -1) */ @@ -15668,6 +15783,7 @@ struct VdbeCursor { u8 isTable; /* True for rowid tables. False for indexes */ #ifdef SQLITE_DEBUG u8 seekOp; /* Most recent seek operation on this cursor */ + u8 wrFlag; /* The wrFlag argument to sqlite3BtreeCursor() */ #endif Bool isEphemeral:1; /* True for an ephemeral table */ Bool useRandomRowid:1;/* Generate new record numbers semi-randomly */ @@ -15686,6 +15802,8 @@ struct VdbeCursor { int seekResult; /* Result of previous sqlite3BtreeMoveto() */ i64 seqCount; /* Sequence counter */ i64 movetoTarget; /* Argument to the deferred sqlite3BtreeMoveto() */ + VdbeCursor *pAltCursor; /* Associated index cursor from which to read */ + int *aAltMap; /* Mapping from table to index column numbers */ #ifdef SQLITE_ENABLE_COLUMN_USED_MASK u64 maskUsed; /* Mask of columns used by this cursor */ #endif @@ -15710,7 +15828,6 @@ struct VdbeCursor { ** static element declared in the structure. nField total array slots for ** aType[] and nField+1 array slots for aOffset[] */ }; -typedef struct VdbeCursor VdbeCursor; /* ** When a sub-program is executed (OP_Program), a structure of this type @@ -15821,7 +15938,7 @@ struct Mem { #define MEM_Frame 0x0040 /* Value is a VdbeFrame object */ #define MEM_Undefined 0x0080 /* Value is undefined */ #define MEM_Cleared 0x0100 /* NULL set by OP_Null, not from data */ -#define MEM_TypeMask 0x01ff /* Mask of type bits */ +#define MEM_TypeMask 0x81ff /* Mask of type bits */ /* Whenever Mem contains a valid string or blob representation, one of @@ -15835,11 +15952,18 @@ struct Mem { #define MEM_Ephem 0x1000 /* Mem.z points to an ephemeral string */ #define MEM_Agg 0x2000 /* Mem.z points to an agg function context */ #define MEM_Zero 0x4000 /* Mem.i contains count of 0s appended to blob */ +#define MEM_Subtype 0x8000 /* Mem.eSubtype is valid */ #ifdef SQLITE_OMIT_INCRBLOB #undef MEM_Zero #define MEM_Zero 0x0000 #endif +/* Return TRUE if Mem X contains dynamically allocated content - anything +** that needs to be deallocated to avoid a leak. +*/ +#define VdbeMemDynamic(X) \ + (((X)->flags&(MEM_Agg|MEM_Dyn|MEM_RowSet|MEM_Frame))!=0) + /* ** Clear any existing type flags from a Mem and replace them with f */ @@ -16009,7 +16133,7 @@ struct Vdbe { SQLITE_PRIVATE void sqlite3VdbeError(Vdbe*, const char *, ...); SQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *, VdbeCursor*); void sqliteVdbePopStack(Vdbe*,int); -SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor*); +SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor**, int*); SQLITE_PRIVATE int sqlite3VdbeCursorRestore(VdbeCursor*); #if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE) SQLITE_PRIVATE void sqlite3VdbePrintOp(FILE*, int, Op*); @@ -16055,8 +16179,6 @@ SQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem*); SQLITE_PRIVATE void sqlite3VdbeMemCast(Mem*,u8,u8); SQLITE_PRIVATE int sqlite3VdbeMemFromBtree(BtCursor*,u32,u32,int,Mem*); SQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p); -#define VdbeMemDynamic(X) \ - (((X)->flags&(MEM_Agg|MEM_Dyn|MEM_RowSet|MEM_Frame))!=0) SQLITE_PRIVATE int sqlite3VdbeMemFinalize(Mem*, FuncDef*); SQLITE_PRIVATE const char *sqlite3OpcodeName(int); SQLITE_PRIVATE int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve); @@ -16075,11 +16197,15 @@ SQLITE_PRIVATE int sqlite3VdbeSorterRewind(const VdbeCursor *, int *); SQLITE_PRIVATE int sqlite3VdbeSorterWrite(const VdbeCursor *, Mem *); SQLITE_PRIVATE int sqlite3VdbeSorterCompare(const VdbeCursor *, Mem *, int, int *); -#if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE>0 +#if !defined(SQLITE_OMIT_SHARED_CACHE) SQLITE_PRIVATE void sqlite3VdbeEnter(Vdbe*); -SQLITE_PRIVATE void sqlite3VdbeLeave(Vdbe*); #else # define sqlite3VdbeEnter(X) +#endif + +#if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE>0 +SQLITE_PRIVATE void sqlite3VdbeLeave(Vdbe*); +#else # define sqlite3VdbeLeave(X) #endif @@ -16517,34 +16643,49 @@ struct DateTime { /* -** Convert zDate into one or more integers. Additional arguments -** come in groups of 5 as follows: +** Convert zDate into one or more integers according to the conversion +** specifier zFormat. ** -** N number of digits in the integer -** min minimum allowed value of the integer -** max maximum allowed value of the integer -** nextC first character after the integer -** pVal where to write the integers value. +** zFormat[] contains 4 characters for each integer converted, except for +** the last integer which is specified by three characters. The meaning +** of a four-character format specifiers ABCD is: +** +** A: number of digits to convert. Always "2" or "4". +** B: minimum value. Always "0" or "1". +** C: maximum value, decoded as: +** a: 12 +** b: 14 +** c: 24 +** d: 31 +** e: 59 +** f: 9999 +** D: the separator character, or \000 to indicate this is the +** last number to convert. +** +** Example: To translate an ISO-8601 date YYYY-MM-DD, the format would +** be "40f-21a-20c". The "40f-" indicates the 4-digit year followed by "-". +** The "21a-" indicates the 2-digit month followed by "-". The "20c" indicates +** the 2-digit day which is the last integer in the set. ** -** Conversions continue until one with nextC==0 is encountered. ** The function returns the number of successful conversions. */ -static int getDigits(const char *zDate, ...){ +static int getDigits(const char *zDate, const char *zFormat, ...){ + /* The aMx[] array translates the 3rd character of each format + ** spec into a max size: a b c d e f */ + static const u16 aMx[] = { 12, 14, 24, 31, 59, 9999 }; va_list ap; - int val; - int N; - int min; - int max; - int nextC; - int *pVal; int cnt = 0; - va_start(ap, zDate); + char nextC; + va_start(ap, zFormat); do{ - N = va_arg(ap, int); - min = va_arg(ap, int); - max = va_arg(ap, int); - nextC = va_arg(ap, int); - pVal = va_arg(ap, int*); + char N = zFormat[0] - '0'; + char min = zFormat[1] - '0'; + int val = 0; + u16 max; + + assert( zFormat[2]>='a' && zFormat[2]<='f' ); + max = aMx[zFormat[2] - 'a']; + nextC = zFormat[3]; val = 0; while( N-- ){ if( !sqlite3Isdigit(*zDate) ){ @@ -16553,12 +16694,13 @@ static int getDigits(const char *zDate, ...){ val = val*10 + *zDate - '0'; zDate++; } - if( valmax || (nextC!=0 && nextC!=*zDate) ){ + if( val<(int)min || val>(int)max || (nextC!=0 && nextC!=*zDate) ){ goto end_getDigits; } - *pVal = val; + *va_arg(ap,int*) = val; zDate++; cnt++; + zFormat += 4; }while( nextC ); end_getDigits: va_end(ap); @@ -16599,7 +16741,7 @@ static int parseTimezone(const char *zDate, DateTime *p){ return c!=0; } zDate++; - if( getDigits(zDate, 2, 0, 14, ':', &nHr, 2, 0, 59, 0, &nMn)!=2 ){ + if( getDigits(zDate, "20b:20e", &nHr, &nMn)!=2 ){ return 1; } zDate += 5; @@ -16620,13 +16762,13 @@ zulu_time: static int parseHhMmSs(const char *zDate, DateTime *p){ int h, m, s; double ms = 0.0; - if( getDigits(zDate, 2, 0, 24, ':', &h, 2, 0, 59, 0, &m)!=2 ){ + if( getDigits(zDate, "20c:20e", &h, &m)!=2 ){ return 1; } zDate += 5; if( *zDate==':' ){ zDate++; - if( getDigits(zDate, 2, 0, 59, 0, &s)!=1 ){ + if( getDigits(zDate, "20e", &s)!=1 ){ return 1; } zDate += 2; @@ -16714,7 +16856,7 @@ static int parseYyyyMmDd(const char *zDate, DateTime *p){ }else{ neg = 0; } - if( getDigits(zDate,4,0,9999,'-',&Y,2,1,12,'-',&M,2,1,31,0,&D)!=3 ){ + if( getDigits(zDate, "40f-21a-21d", &Y, &M, &D)!=3 ){ return 1; } zDate += 10; @@ -17398,7 +17540,7 @@ static void strftimeFunc( sqlite3_result_error_toobig(context); return; }else{ - z = sqlite3DbMallocRaw(db, (int)n); + z = sqlite3DbMallocRawNN(db, (int)n); if( z==0 ){ sqlite3_result_error_nomem(context); return; @@ -17613,6 +17755,28 @@ SQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(void){ /* #include "sqliteInt.h" */ #undef _SQLITE_OS_C_ +/* +** If we compile with the SQLITE_TEST macro set, then the following block +** of code will give us the ability to simulate a disk I/O error. This +** is used for testing the I/O recovery logic. +*/ +#if defined(SQLITE_TEST) +SQLITE_API int sqlite3_io_error_hit = 0; /* Total number of I/O Errors */ +SQLITE_API int sqlite3_io_error_hardhit = 0; /* Number of non-benign errors */ +SQLITE_API int sqlite3_io_error_pending = 0; /* Count down to first I/O error */ +SQLITE_API int sqlite3_io_error_persist = 0; /* True if I/O errors persist */ +SQLITE_API int sqlite3_io_error_benign = 0; /* True if errors are benign */ +SQLITE_API int sqlite3_diskfull_pending = 0; +SQLITE_API int sqlite3_diskfull = 0; +#endif /* defined(SQLITE_TEST) */ + +/* +** When testing, also keep a count of the number of open files. +*/ +#if defined(SQLITE_TEST) +SQLITE_API int sqlite3_open_file_count = 0; +#endif /* defined(SQLITE_TEST) */ + /* ** The default SQLite sqlite3_vfs implementations do not allocate ** memory (actually, os_unix.c allocates a small amount of memory @@ -17620,7 +17784,7 @@ SQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(void){ ** So we test the effects of a malloc() failing and the sqlite3OsXXX() ** function returning SQLITE_IOERR_NOMEM using the DO_OS_MALLOC_TEST macro. ** -** The following functions are instrumented for malloc() failure +** The following functions are instrumented for malloc() failure ** testing: ** ** sqlite3OsRead() @@ -17706,8 +17870,8 @@ SQLITE_PRIVATE int sqlite3OsFileControl(sqlite3_file *id, int op, void *pArg){ #ifdef SQLITE_TEST if( op!=SQLITE_FCNTL_COMMIT_PHASETWO ){ /* Faults are not injected into COMMIT_PHASETWO because, assuming SQLite - ** is using a regular VFS, it is called after the corresponding - ** transaction has been committed. Injecting a fault at this point + ** is using a regular VFS, it is called after the corresponding + ** transaction has been committed. Injecting a fault at this point ** confuses the test scripts - the COMMIT comand returns SQLITE_NOMEM ** but the transaction is committed anyway. ** @@ -17776,10 +17940,10 @@ SQLITE_PRIVATE int sqlite3OsUnfetch(sqlite3_file *id, i64 iOff, void *p){ ** VFS methods. */ SQLITE_PRIVATE int sqlite3OsOpen( - sqlite3_vfs *pVfs, - const char *zPath, - sqlite3_file *pFile, - int flags, + sqlite3_vfs *pVfs, + const char *zPath, + sqlite3_file *pFile, + int flags, int *pFlagsOut ){ int rc; @@ -17798,18 +17962,18 @@ SQLITE_PRIVATE int sqlite3OsDelete(sqlite3_vfs *pVfs, const char *zPath, int dir return pVfs->xDelete(pVfs, zPath, dirSync); } SQLITE_PRIVATE int sqlite3OsAccess( - sqlite3_vfs *pVfs, - const char *zPath, - int flags, + sqlite3_vfs *pVfs, + const char *zPath, + int flags, int *pResOut ){ DO_OS_MALLOC_TEST(0); return pVfs->xAccess(pVfs, zPath, flags, pResOut); } SQLITE_PRIVATE int sqlite3OsFullPathname( - sqlite3_vfs *pVfs, - const char *zPath, - int nPathOut, + sqlite3_vfs *pVfs, + const char *zPath, + int nPathOut, char *zPathOut ){ DO_OS_MALLOC_TEST(0); @@ -17855,9 +18019,9 @@ SQLITE_PRIVATE int sqlite3OsCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *p } SQLITE_PRIVATE int sqlite3OsOpenMalloc( - sqlite3_vfs *pVfs, - const char *zFile, - sqlite3_file **ppFile, + sqlite3_vfs *pVfs, + const char *zFile, + sqlite3_file **ppFile, int flags, int *pOutFlags ){ @@ -19767,6 +19931,7 @@ static SQLITE_WSD struct Mem5Global { */ sqlite3_mutex *mutex; +#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) /* ** Performance statistics */ @@ -19778,6 +19943,7 @@ static SQLITE_WSD struct Mem5Global { u32 maxOut; /* Maximum instantaneous currentOut */ u32 maxCount; /* Maximum instantaneous currentCount */ u32 maxRequest; /* Largest allocation (exclusive of internal frag) */ +#endif /* ** Lists of free blocks. aiFreelist[0] is a list of free blocks of @@ -19889,14 +20055,17 @@ static void *memsys5MallocUnsafe(int nByte){ /* nByte must be a positive */ assert( nByte>0 ); + /* No more than 1GiB per allocation */ + if( nByte > 0x40000000 ) return 0; + +#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) /* Keep track of the maximum allocation request. Even unfulfilled ** requests are counted */ if( (u32)nByte>mem5.maxRequest ){ - /* Abort if the requested allocation size is larger than the largest - ** power of two that we can represent using 32-bit signed integers. */ - if( nByte > 0x40000000 ) return 0; mem5.maxRequest = nByte; } +#endif + /* Round nByte up to the next valid power of two */ for(iFullSz=mem5.szAtom,iLogsize=0; iFullSz0 ); assert( mem5.currentOut>=(size*mem5.szAtom) ); mem5.currentCount--; mem5.currentOut -= size*mem5.szAtom; assert( mem5.currentOut>0 || mem5.currentCount==0 ); assert( mem5.currentCount>0 || mem5.currentOut==0 ); +#endif mem5.aCtrl[iBlock] = CTRL_FREE | iLogsize; while( ALWAYS(iLogsize>iLogsize) & 1 ){ iBuddy = iBlock - size; + assert( iBuddy>=0 ); }else{ iBuddy = iBlock + size; + if( iBuddy>=mem5.nBlock ) break; } - assert( iBuddy>=0 ); - if( (iBuddy+(1<mem5.nBlock ) break; if( mem5.aCtrl[iBuddy]!=(CTRL_FREE | iLogsize) ) break; memsys5Unlink(iBuddy, iLogsize); iLogsize++; @@ -21070,8 +21244,8 @@ SQLITE_PRIVATE sqlite3_mutex_methods const *sqlite3DefaultMutex(void){ */ #ifdef SQLITE_PERFORMANCE_TRACE -/* -** hwtime.h contains inline assembler code for implementing +/* +** hwtime.h contains inline assembler code for implementing ** high-performance timing routines. */ /************** Include hwtime.h in the middle of os_common.h ****************/ @@ -21181,14 +21355,14 @@ static sqlite_uint64 g_elapsed; ** of code will give us the ability to simulate a disk I/O error. This ** is used for testing the I/O recovery logic. */ -#ifdef SQLITE_TEST -SQLITE_API int sqlite3_io_error_hit = 0; /* Total number of I/O Errors */ -SQLITE_API int sqlite3_io_error_hardhit = 0; /* Number of non-benign errors */ -SQLITE_API int sqlite3_io_error_pending = 0; /* Count down to first I/O error */ -SQLITE_API int sqlite3_io_error_persist = 0; /* True if I/O errors persist */ -SQLITE_API int sqlite3_io_error_benign = 0; /* True if errors are benign */ -SQLITE_API int sqlite3_diskfull_pending = 0; -SQLITE_API int sqlite3_diskfull = 0; +#if defined(SQLITE_TEST) +SQLITE_API extern int sqlite3_io_error_hit; +SQLITE_API extern int sqlite3_io_error_hardhit; +SQLITE_API extern int sqlite3_io_error_pending; +SQLITE_API extern int sqlite3_io_error_persist; +SQLITE_API extern int sqlite3_io_error_benign; +SQLITE_API extern int sqlite3_diskfull_pending; +SQLITE_API extern int sqlite3_diskfull; #define SimulateIOErrorBenign(X) sqlite3_io_error_benign=(X) #define SimulateIOError(CODE) \ if( (sqlite3_io_error_persist && sqlite3_io_error_hit) \ @@ -21214,17 +21388,17 @@ static void local_ioerr(){ #define SimulateIOErrorBenign(X) #define SimulateIOError(A) #define SimulateDiskfullError(A) -#endif +#endif /* defined(SQLITE_TEST) */ /* ** When testing, keep a count of the number of open files. */ -#ifdef SQLITE_TEST -SQLITE_API int sqlite3_open_file_count = 0; +#if defined(SQLITE_TEST) +SQLITE_API extern int sqlite3_open_file_count; #define OpenCounter(X) sqlite3_open_file_count+=(X) #else #define OpenCounter(X) -#endif +#endif /* defined(SQLITE_TEST) */ #endif /* !defined(_OS_COMMON_H_) */ @@ -22282,16 +22456,31 @@ SQLITE_PRIVATE void *sqlite3MallocZero(u64 n){ ** the mallocFailed flag in the connection pointer. */ SQLITE_PRIVATE void *sqlite3DbMallocZero(sqlite3 *db, u64 n){ - void *p = sqlite3DbMallocRaw(db, n); - if( p ){ - memset(p, 0, (size_t)n); - } + void *p; + testcase( db==0 ); + p = sqlite3DbMallocRaw(db, n); + if( p ) memset(p, 0, (size_t)n); + return p; +} + + +/* Finish the work of sqlite3DbMallocRawNN for the unusual and +** slower case when the allocation cannot be fulfilled using lookaside. +*/ +static SQLITE_NOINLINE void *dbMallocRawFinish(sqlite3 *db, u64 n){ + void *p; + assert( db!=0 ); + p = sqlite3Malloc(n); + if( !p ) sqlite3OomFault(db); + sqlite3MemdebugSetType(p, + (db->lookaside.bDisable==0) ? MEMTYPE_LOOKASIDE : MEMTYPE_HEAP); return p; } /* -** Allocate and zero memory. If the allocation fails, make -** the mallocFailed flag in the connection pointer. +** Allocate memory, either lookaside (if possible) or heap. +** If the allocation fails, set the mallocFailed flag in +** the connection pointer. ** ** If db!=0 and db->mallocFailed is true (indicating a prior malloc ** failure on the same database connection) then always return 0. @@ -22306,64 +22495,73 @@ SQLITE_PRIVATE void *sqlite3DbMallocZero(sqlite3 *db, u64 n){ ** ** In other words, if a subsequent malloc (ex: "b") worked, it is assumed ** that all prior mallocs (ex: "a") worked too. +** +** The sqlite3MallocRawNN() variant guarantees that the "db" parameter is +** not a NULL pointer. */ SQLITE_PRIVATE void *sqlite3DbMallocRaw(sqlite3 *db, u64 n){ void *p; - assert( db==0 || sqlite3_mutex_held(db->mutex) ); - assert( db==0 || db->pnBytesFreed==0 ); + if( db ) return sqlite3DbMallocRawNN(db, n); + p = sqlite3Malloc(n); + sqlite3MemdebugSetType(p, MEMTYPE_HEAP); + return p; +} +SQLITE_PRIVATE void *sqlite3DbMallocRawNN(sqlite3 *db, u64 n){ #ifndef SQLITE_OMIT_LOOKASIDE - if( db ){ - LookasideSlot *pBuf; - if( db->mallocFailed ){ - return 0; - } - if( db->lookaside.bEnabled ){ - if( n>db->lookaside.sz ){ - db->lookaside.anStat[1]++; - }else if( (pBuf = db->lookaside.pFree)==0 ){ - db->lookaside.anStat[2]++; - }else{ - db->lookaside.pFree = pBuf->pNext; - db->lookaside.nOut++; - db->lookaside.anStat[0]++; - if( db->lookaside.nOut>db->lookaside.mxOut ){ - db->lookaside.mxOut = db->lookaside.nOut; - } - return (void*)pBuf; + LookasideSlot *pBuf; + assert( db!=0 ); + assert( sqlite3_mutex_held(db->mutex) ); + assert( db->pnBytesFreed==0 ); + if( db->lookaside.bDisable==0 ){ + assert( db->mallocFailed==0 ); + if( n>db->lookaside.sz ){ + db->lookaside.anStat[1]++; + }else if( (pBuf = db->lookaside.pFree)==0 ){ + db->lookaside.anStat[2]++; + }else{ + db->lookaside.pFree = pBuf->pNext; + db->lookaside.nOut++; + db->lookaside.anStat[0]++; + if( db->lookaside.nOut>db->lookaside.mxOut ){ + db->lookaside.mxOut = db->lookaside.nOut; } + return (void*)pBuf; } + }else if( db->mallocFailed ){ + return 0; } #else - if( db && db->mallocFailed ){ + assert( db!=0 ); + assert( sqlite3_mutex_held(db->mutex) ); + assert( db->pnBytesFreed==0 ); + if( db->mallocFailed ){ return 0; } #endif - p = sqlite3Malloc(n); - if( !p && db ){ - db->mallocFailed = 1; - } - sqlite3MemdebugSetType(p, - (db && db->lookaside.bEnabled) ? MEMTYPE_LOOKASIDE : MEMTYPE_HEAP); - return p; + return dbMallocRawFinish(db, n); } +/* Forward declaration */ +static SQLITE_NOINLINE void *dbReallocFinish(sqlite3 *db, void *p, u64 n); + /* ** Resize the block of memory pointed to by p to n bytes. If the ** resize fails, set the mallocFailed flag in the connection object. */ SQLITE_PRIVATE void *sqlite3DbRealloc(sqlite3 *db, void *p, u64 n){ + assert( db!=0 ); + if( p==0 ) return sqlite3DbMallocRawNN(db, n); + assert( sqlite3_mutex_held(db->mutex) ); + if( isLookaside(db,p) && n<=db->lookaside.sz ) return p; + return dbReallocFinish(db, p, n); +} +static SQLITE_NOINLINE void *dbReallocFinish(sqlite3 *db, void *p, u64 n){ void *pNew = 0; assert( db!=0 ); - assert( sqlite3_mutex_held(db->mutex) ); + assert( p!=0 ); if( db->mallocFailed==0 ){ - if( p==0 ){ - return sqlite3DbMallocRaw(db, n); - } if( isLookaside(db, p) ){ - if( n<=db->lookaside.sz ){ - return p; - } - pNew = sqlite3DbMallocRaw(db, n); + pNew = sqlite3DbMallocRawNN(db, n); if( pNew ){ memcpy(pNew, p, db->lookaside.sz); sqlite3DbFree(db, p); @@ -22374,10 +22572,10 @@ SQLITE_PRIVATE void *sqlite3DbRealloc(sqlite3 *db, void *p, u64 n){ sqlite3MemdebugSetType(p, MEMTYPE_HEAP); pNew = sqlite3_realloc64(p, n); if( !pNew ){ - db->mallocFailed = 1; + sqlite3OomFault(db); } sqlite3MemdebugSetType(pNew, - (db->lookaside.bEnabled ? MEMTYPE_LOOKASIDE : MEMTYPE_HEAP)); + (db->lookaside.bDisable==0 ? MEMTYPE_LOOKASIDE : MEMTYPE_HEAP)); } } return pNew; @@ -22419,11 +22617,12 @@ SQLITE_PRIVATE char *sqlite3DbStrDup(sqlite3 *db, const char *z){ } SQLITE_PRIVATE char *sqlite3DbStrNDup(sqlite3 *db, const char *z, u64 n){ char *zNew; + assert( db!=0 ); if( z==0 ){ return 0; } assert( (n&0x7fffffff)==n ); - zNew = sqlite3DbMallocRaw(db, n+1); + zNew = sqlite3DbMallocRawNN(db, n+1); if( zNew ){ memcpy(zNew, z, (size_t)n); zNew[n] = 0; @@ -22439,11 +22638,43 @@ SQLITE_PRIVATE void sqlite3SetString(char **pz, sqlite3 *db, const char *zNew){ *pz = sqlite3DbStrDup(db, zNew); } +/* +** Call this routine to record the fact that an OOM (out-of-memory) error +** has happened. This routine will set db->mallocFailed, and also +** temporarily disable the lookaside memory allocator and interrupt +** any running VDBEs. +*/ +SQLITE_PRIVATE void sqlite3OomFault(sqlite3 *db){ + if( db->mallocFailed==0 && db->bBenignMalloc==0 ){ + db->mallocFailed = 1; + if( db->nVdbeExec>0 ){ + db->u1.isInterrupted = 1; + } + db->lookaside.bDisable++; + } +} + +/* +** This routine reactivates the memory allocator and clears the +** db->mallocFailed flag as necessary. +** +** The memory allocator is not restarted if there are running +** VDBEs. +*/ +SQLITE_PRIVATE void sqlite3OomClear(sqlite3 *db){ + if( db->mallocFailed && db->nVdbeExec==0 ){ + db->mallocFailed = 0; + db->u1.isInterrupted = 0; + assert( db->lookaside.bDisable>0 ); + db->lookaside.bDisable--; + } +} + /* ** Take actions at the end of an API call to indicate an OOM error */ static SQLITE_NOINLINE int apiOomError(sqlite3 *db){ - db->mallocFailed = 0; + sqlite3OomClear(db); sqlite3Error(db, SQLITE_NOMEM); return SQLITE_NOMEM; } @@ -22648,7 +22879,6 @@ static char *getTextArg(PrintfArguments *p){ */ SQLITE_PRIVATE void sqlite3VXPrintf( StrAccum *pAccum, /* Accumulate results here */ - u32 bFlags, /* SQLITE_PRINTF_* flags */ const char *fmt, /* Format string */ va_list ap /* arguments */ ){ @@ -22688,11 +22918,11 @@ SQLITE_PRIVATE void sqlite3VXPrintf( char buf[etBUFSIZE]; /* Conversion buffer */ bufpt = 0; - if( bFlags ){ - if( (bArgList = (bFlags & SQLITE_PRINTF_SQLFUNC))!=0 ){ + if( pAccum->printfFlags ){ + if( (bArgList = (pAccum->printfFlags & SQLITE_PRINTF_SQLFUNC))!=0 ){ pArgList = va_arg(ap, PrintfArguments*); } - useIntern = bFlags & SQLITE_PRINTF_INTERNAL; + useIntern = pAccum->printfFlags & SQLITE_PRINTF_INTERNAL; }else{ bArgList = useIntern = 0; } @@ -23243,9 +23473,9 @@ static int sqlite3StrAccumEnlarge(StrAccum *p, int N){ setStrAccumError(p, STRACCUM_TOOBIG); return N; }else{ - char *zOld = p->bMalloced ? p->zText : 0; + char *zOld = isMalloced(p) ? p->zText : 0; i64 szNew = p->nChar; - assert( (p->zText==0 || p->zText==p->zBase)==(p->bMalloced==0) ); + assert( (p->zText==0 || p->zText==p->zBase)==!isMalloced(p) ); szNew += N + 1; if( szNew+p->nChar<=p->mxAlloc ){ /* Force exponential buffer size growth as long as it does not overflow, @@ -23266,10 +23496,10 @@ static int sqlite3StrAccumEnlarge(StrAccum *p, int N){ } if( zNew ){ assert( p->zText!=0 || p->nChar==0 ); - if( !p->bMalloced && p->nChar>0 ) memcpy(zNew, p->zText, p->nChar); + if( !isMalloced(p) && p->nChar>0 ) memcpy(zNew, p->zText, p->nChar); p->zText = zNew; p->nAlloc = sqlite3DbMallocSize(p->db, zNew); - p->bMalloced = 1; + p->printfFlags |= SQLITE_PRINTF_MALLOCED; }else{ sqlite3StrAccumReset(p); setStrAccumError(p, STRACCUM_NOMEM); @@ -23287,7 +23517,7 @@ SQLITE_PRIVATE void sqlite3AppendChar(StrAccum *p, int N, char c){ if( p->nChar+(i64)N >= p->nAlloc && (N = sqlite3StrAccumEnlarge(p, N))<=0 ){ return; } - assert( (p->zText==p->zBase)==(p->bMalloced==0) ); + assert( (p->zText==p->zBase)==!isMalloced(p) ); while( (N--)>0 ) p->zText[p->nChar++] = c; } @@ -23305,7 +23535,7 @@ static void SQLITE_NOINLINE enlargeAndAppend(StrAccum *p, const char *z, int N){ memcpy(&p->zText[p->nChar], z, N); p->nChar += N; } - assert( (p->zText==0 || p->zText==p->zBase)==(p->bMalloced==0) ); + assert( (p->zText==0 || p->zText==p->zBase)==!isMalloced(p) ); } /* @@ -23341,13 +23571,13 @@ SQLITE_PRIVATE void sqlite3StrAccumAppendAll(StrAccum *p, const char *z){ */ SQLITE_PRIVATE char *sqlite3StrAccumFinish(StrAccum *p){ if( p->zText ){ - assert( (p->zText==p->zBase)==(p->bMalloced==0) ); + assert( (p->zText==p->zBase)==!isMalloced(p) ); p->zText[p->nChar] = 0; - if( p->mxAlloc>0 && p->bMalloced==0 ){ + if( p->mxAlloc>0 && !isMalloced(p) ){ p->zText = sqlite3DbMallocRaw(p->db, p->nChar+1 ); if( p->zText ){ memcpy(p->zText, p->zBase, p->nChar+1); - p->bMalloced = 1; + p->printfFlags |= SQLITE_PRINTF_MALLOCED; }else{ setStrAccumError(p, STRACCUM_NOMEM); } @@ -23360,10 +23590,10 @@ SQLITE_PRIVATE char *sqlite3StrAccumFinish(StrAccum *p){ ** Reset an StrAccum string. Reclaim all malloced memory. */ SQLITE_PRIVATE void sqlite3StrAccumReset(StrAccum *p){ - assert( (p->zText==0 || p->zText==p->zBase)==(p->bMalloced==0) ); - if( p->bMalloced ){ + assert( (p->zText==0 || p->zText==p->zBase)==!isMalloced(p) ); + if( isMalloced(p) ){ sqlite3DbFree(p->db, p->zText); - p->bMalloced = 0; + p->printfFlags &= ~SQLITE_PRINTF_MALLOCED; } p->zText = 0; } @@ -23389,7 +23619,7 @@ SQLITE_PRIVATE void sqlite3StrAccumInit(StrAccum *p, sqlite3 *db, char *zBase, i p->nAlloc = n; p->mxAlloc = mx; p->accError = 0; - p->bMalloced = 0; + p->printfFlags = 0; } /* @@ -23403,10 +23633,11 @@ SQLITE_PRIVATE char *sqlite3VMPrintf(sqlite3 *db, const char *zFormat, va_list a assert( db!=0 ); sqlite3StrAccumInit(&acc, db, zBase, sizeof(zBase), db->aLimit[SQLITE_LIMIT_LENGTH]); - sqlite3VXPrintf(&acc, SQLITE_PRINTF_INTERNAL, zFormat, ap); + acc.printfFlags = SQLITE_PRINTF_INTERNAL; + sqlite3VXPrintf(&acc, zFormat, ap); z = sqlite3StrAccumFinish(&acc); if( acc.accError==STRACCUM_NOMEM ){ - db->mallocFailed = 1; + sqlite3OomFault(db); } return z; } @@ -23443,7 +23674,7 @@ SQLITE_API char *SQLITE_STDCALL sqlite3_vmprintf(const char *zFormat, va_list ap if( sqlite3_initialize() ) return 0; #endif sqlite3StrAccumInit(&acc, 0, zBase, sizeof(zBase), SQLITE_MAX_LENGTH); - sqlite3VXPrintf(&acc, 0, zFormat, ap); + sqlite3VXPrintf(&acc, zFormat, ap); z = sqlite3StrAccumFinish(&acc); return z; } @@ -23488,7 +23719,7 @@ SQLITE_API char *SQLITE_STDCALL sqlite3_vsnprintf(int n, char *zBuf, const char } #endif sqlite3StrAccumInit(&acc, 0, zBuf, n, 0); - sqlite3VXPrintf(&acc, 0, zFormat, ap); + sqlite3VXPrintf(&acc, zFormat, ap); return sqlite3StrAccumFinish(&acc); } SQLITE_API char *SQLITE_CDECL sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){ @@ -23519,7 +23750,7 @@ static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){ char zMsg[SQLITE_PRINT_BUF_SIZE*3]; /* Complete log message */ sqlite3StrAccumInit(&acc, 0, zMsg, sizeof(zMsg), 0); - sqlite3VXPrintf(&acc, 0, zFormat, ap); + sqlite3VXPrintf(&acc, zFormat, ap); sqlite3GlobalConfig.xLog(sqlite3GlobalConfig.pLogArg, iErrCode, sqlite3StrAccumFinish(&acc)); } @@ -23548,7 +23779,7 @@ SQLITE_PRIVATE void sqlite3DebugPrintf(const char *zFormat, ...){ char zBuf[500]; sqlite3StrAccumInit(&acc, 0, zBuf, sizeof(zBuf), 0); va_start(ap,zFormat); - sqlite3VXPrintf(&acc, 0, zFormat, ap); + sqlite3VXPrintf(&acc, zFormat, ap); va_end(ap); sqlite3StrAccumFinish(&acc); fprintf(stdout,"%s", zBuf); @@ -23561,10 +23792,10 @@ SQLITE_PRIVATE void sqlite3DebugPrintf(const char *zFormat, ...){ ** variable-argument wrapper around sqlite3VXPrintf(). The bFlags argument ** can contain the bit SQLITE_PRINTF_INTERNAL enable internal formats. */ -SQLITE_PRIVATE void sqlite3XPrintf(StrAccum *p, u32 bFlags, const char *zFormat, ...){ +SQLITE_PRIVATE void sqlite3XPrintf(StrAccum *p, const char *zFormat, ...){ va_list ap; va_start(ap,zFormat); - sqlite3VXPrintf(p, bFlags, zFormat, ap); + sqlite3VXPrintf(p, zFormat, ap); va_end(ap); } @@ -23635,7 +23866,7 @@ static void sqlite3TreeViewLine(TreeView *p, const char *zFormat, ...){ sqlite3StrAccumAppend(&acc, p->bLine[i] ? "|-- " : "'-- ", 4); } va_start(ap, zFormat); - sqlite3VXPrintf(&acc, 0, zFormat, ap); + sqlite3VXPrintf(&acc, zFormat, ap); va_end(ap); if( zBuf[acc.nChar-1]!='\n' ) sqlite3StrAccumAppend(&acc, "\n", 1); sqlite3StrAccumFinish(&acc); @@ -23670,17 +23901,17 @@ SQLITE_PRIVATE void sqlite3TreeViewWith(TreeView *pView, const With *pWith, u8 m char zLine[1000]; const struct Cte *pCte = &pWith->a[i]; sqlite3StrAccumInit(&x, 0, zLine, sizeof(zLine), 0); - sqlite3XPrintf(&x, 0, "%s", pCte->zName); + sqlite3XPrintf(&x, "%s", pCte->zName); if( pCte->pCols && pCte->pCols->nExpr>0 ){ char cSep = '('; int j; for(j=0; jpCols->nExpr; j++){ - sqlite3XPrintf(&x, 0, "%c%s", cSep, pCte->pCols->a[j].zName); + sqlite3XPrintf(&x, "%c%s", cSep, pCte->pCols->a[j].zName); cSep = ','; } - sqlite3XPrintf(&x, 0, ")"); + sqlite3XPrintf(&x, ")"); } - sqlite3XPrintf(&x, 0, " AS"); + sqlite3XPrintf(&x, " AS"); sqlite3StrAccumFinish(&x); sqlite3TreeViewItem(pView, zLine, inCte-1); sqlite3TreeViewSelect(pView, pCte->pSelect, 0); @@ -23731,20 +23962,20 @@ SQLITE_PRIVATE void sqlite3TreeViewSelect(TreeView *pView, const Select *p, u8 m StrAccum x; char zLine[100]; sqlite3StrAccumInit(&x, 0, zLine, sizeof(zLine), 0); - sqlite3XPrintf(&x, 0, "{%d,*}", pItem->iCursor); + sqlite3XPrintf(&x, "{%d,*}", pItem->iCursor); if( pItem->zDatabase ){ - sqlite3XPrintf(&x, 0, " %s.%s", pItem->zDatabase, pItem->zName); + sqlite3XPrintf(&x, " %s.%s", pItem->zDatabase, pItem->zName); }else if( pItem->zName ){ - sqlite3XPrintf(&x, 0, " %s", pItem->zName); + sqlite3XPrintf(&x, " %s", pItem->zName); } if( pItem->pTab ){ - sqlite3XPrintf(&x, 0, " tabname=%Q", pItem->pTab->zName); + sqlite3XPrintf(&x, " tabname=%Q", pItem->pTab->zName); } if( pItem->zAlias ){ - sqlite3XPrintf(&x, 0, " (AS %s)", pItem->zAlias); + sqlite3XPrintf(&x, " (AS %s)", pItem->zAlias); } if( pItem->fg.jointype & JT_LEFT ){ - sqlite3XPrintf(&x, 0, " LEFT-JOIN"); + sqlite3XPrintf(&x, " LEFT-JOIN"); } sqlite3StrAccumFinish(&x); sqlite3TreeViewItem(pView, zLine, ipSrc->nSrc-1); @@ -24791,7 +25022,7 @@ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desired c = pMem->flags; sqlite3VdbeMemRelease(pMem); - pMem->flags = MEM_Str|MEM_Term|(c&MEM_AffMask); + pMem->flags = MEM_Str|MEM_Term|(c&(MEM_AffMask|MEM_Subtype)); pMem->enc = desiredEnc; pMem->z = (char*)zOut; pMem->zMalloc = pMem->z; @@ -25242,6 +25473,14 @@ SQLITE_PRIVATE int sqlite3Dequote(char *z){ return j; } +/* +** Generate a Token object from a string +*/ +SQLITE_PRIVATE void sqlite3TokenInit(Token *p, char *z){ + p->z = z; + p->n = sqlite3Strlen30(z); +} + /* Convenient short-hand */ #define UpperToLower sqlite3UpperToLower @@ -26150,7 +26389,7 @@ SQLITE_PRIVATE void *sqlite3HexToBlob(sqlite3 *db, const char *z, int n){ char *zBlob; int i; - zBlob = (char *)sqlite3DbMallocRaw(db, n/2 + 1); + zBlob = (char *)sqlite3DbMallocRawNN(db, n/2 + 1); n--; if( zBlob ){ for(i=0; i r[P2@P3]"), - /* 44 */ "Jump" OpHelp(""), - /* 45 */ "Once" OpHelp(""), - /* 46 */ "If" OpHelp(""), - /* 47 */ "IfNot" OpHelp(""), - /* 48 */ "Column" OpHelp("r[P3]=PX"), - /* 49 */ "Affinity" OpHelp("affinity(r[P1@P2])"), - /* 50 */ "MakeRecord" OpHelp("r[P3]=mkrec(r[P1@P2])"), - /* 51 */ "Count" OpHelp("r[P2]=count()"), - /* 52 */ "ReadCookie" OpHelp(""), - /* 53 */ "SetCookie" OpHelp(""), - /* 54 */ "ReopenIdx" OpHelp("root=P2 iDb=P3"), - /* 55 */ "OpenRead" OpHelp("root=P2 iDb=P3"), - /* 56 */ "OpenWrite" OpHelp("root=P2 iDb=P3"), - /* 57 */ "OpenAutoindex" OpHelp("nColumn=P2"), - /* 58 */ "OpenEphemeral" OpHelp("nColumn=P2"), - /* 59 */ "SorterOpen" OpHelp(""), - /* 60 */ "SequenceTest" OpHelp("if( cursor[P1].ctr++ ) pc = P2"), - /* 61 */ "OpenPseudo" OpHelp("P3 columns in r[P2]"), - /* 62 */ "Close" OpHelp(""), - /* 63 */ "ColumnsUsed" OpHelp(""), - /* 64 */ "SeekLT" OpHelp("key=r[P3@P4]"), - /* 65 */ "SeekLE" OpHelp("key=r[P3@P4]"), - /* 66 */ "SeekGE" OpHelp("key=r[P3@P4]"), - /* 67 */ "SeekGT" OpHelp("key=r[P3@P4]"), - /* 68 */ "Seek" OpHelp("intkey=r[P2]"), - /* 69 */ "NoConflict" OpHelp("key=r[P3@P4]"), - /* 70 */ "NotFound" OpHelp("key=r[P3@P4]"), + /* 20 */ "HaltIfNull" OpHelp("if r[P3]=null halt"), + /* 21 */ "Halt" OpHelp(""), + /* 22 */ "Integer" OpHelp("r[P2]=P1"), + /* 23 */ "Int64" OpHelp("r[P2]=P4"), + /* 24 */ "String" OpHelp("r[P2]='P4' (len=P1)"), + /* 25 */ "Null" OpHelp("r[P2..P3]=NULL"), + /* 26 */ "SoftNull" OpHelp("r[P1]=NULL"), + /* 27 */ "Blob" OpHelp("r[P2]=P4 (len=P1)"), + /* 28 */ "Variable" OpHelp("r[P2]=parameter(P1,P4)"), + /* 29 */ "Move" OpHelp("r[P2@P3]=r[P1@P3]"), + /* 30 */ "Copy" OpHelp("r[P2@P3+1]=r[P1@P3+1]"), + /* 31 */ "SCopy" OpHelp("r[P2]=r[P1]"), + /* 32 */ "IntCopy" OpHelp("r[P2]=r[P1]"), + /* 33 */ "ResultRow" OpHelp("output=r[P1@P2]"), + /* 34 */ "CollSeq" OpHelp(""), + /* 35 */ "Function0" OpHelp("r[P3]=func(r[P2@P5])"), + /* 36 */ "Function" OpHelp("r[P3]=func(r[P2@P5])"), + /* 37 */ "AddImm" OpHelp("r[P1]=r[P1]+P2"), + /* 38 */ "MustBeInt" OpHelp(""), + /* 39 */ "RealAffinity" OpHelp(""), + /* 40 */ "Cast" OpHelp("affinity(r[P1])"), + /* 41 */ "Permutation" OpHelp(""), + /* 42 */ "Compare" OpHelp("r[P1@P3] <-> r[P2@P3]"), + /* 43 */ "Jump" OpHelp(""), + /* 44 */ "Once" OpHelp(""), + /* 45 */ "If" OpHelp(""), + /* 46 */ "IfNot" OpHelp(""), + /* 47 */ "Column" OpHelp("r[P3]=PX"), + /* 48 */ "Affinity" OpHelp("affinity(r[P1@P2])"), + /* 49 */ "MakeRecord" OpHelp("r[P3]=mkrec(r[P1@P2])"), + /* 50 */ "Count" OpHelp("r[P2]=count()"), + /* 51 */ "ReadCookie" OpHelp(""), + /* 52 */ "SetCookie" OpHelp(""), + /* 53 */ "ReopenIdx" OpHelp("root=P2 iDb=P3"), + /* 54 */ "OpenRead" OpHelp("root=P2 iDb=P3"), + /* 55 */ "OpenWrite" OpHelp("root=P2 iDb=P3"), + /* 56 */ "OpenAutoindex" OpHelp("nColumn=P2"), + /* 57 */ "OpenEphemeral" OpHelp("nColumn=P2"), + /* 58 */ "SorterOpen" OpHelp(""), + /* 59 */ "SequenceTest" OpHelp("if( cursor[P1].ctr++ ) pc = P2"), + /* 60 */ "OpenPseudo" OpHelp("P3 columns in r[P2]"), + /* 61 */ "Close" OpHelp(""), + /* 62 */ "ColumnsUsed" OpHelp(""), + /* 63 */ "SeekLT" OpHelp("key=r[P3@P4]"), + /* 64 */ "SeekLE" OpHelp("key=r[P3@P4]"), + /* 65 */ "SeekGE" OpHelp("key=r[P3@P4]"), + /* 66 */ "SeekGT" OpHelp("key=r[P3@P4]"), + /* 67 */ "NoConflict" OpHelp("key=r[P3@P4]"), + /* 68 */ "NotFound" OpHelp("key=r[P3@P4]"), + /* 69 */ "Found" OpHelp("key=r[P3@P4]"), + /* 70 */ "NotExists" OpHelp("intkey=r[P3]"), /* 71 */ "Or" OpHelp("r[P3]=(r[P1] || r[P2])"), /* 72 */ "And" OpHelp("r[P3]=(r[P1] && r[P2])"), - /* 73 */ "Found" OpHelp("key=r[P3@P4]"), - /* 74 */ "NotExists" OpHelp("intkey=r[P3]"), - /* 75 */ "Sequence" OpHelp("r[P2]=cursor[P1].ctr++"), + /* 73 */ "Sequence" OpHelp("r[P2]=cursor[P1].ctr++"), + /* 74 */ "NewRowid" OpHelp("r[P2]=rowid"), + /* 75 */ "Insert" OpHelp("intkey=r[P3] data=r[P2]"), /* 76 */ "IsNull" OpHelp("if r[P1]==NULL goto P2"), /* 77 */ "NotNull" OpHelp("if r[P1]!=NULL goto P2"), /* 78 */ "Ne" OpHelp("if r[P1]!=r[P3] goto P2"), @@ -26772,7 +27012,7 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){ /* 81 */ "Le" OpHelp("if r[P1]<=r[P3] goto P2"), /* 82 */ "Lt" OpHelp("if r[P1]=r[P3] goto P2"), - /* 84 */ "NewRowid" OpHelp("r[P2]=rowid"), + /* 84 */ "InsertInt" OpHelp("intkey=P3 data=r[P2]"), /* 85 */ "BitAnd" OpHelp("r[P3]=r[P1]&r[P2]"), /* 86 */ "BitOr" OpHelp("r[P3]=r[P1]|r[P2]"), /* 87 */ "ShiftLeft" OpHelp("r[P3]=r[P2]<0 then r[P1]-=P3, goto P2"), - /* 140 */ "SetIfNotPos" OpHelp("if r[P1]<=0 then r[P2]=P3"), - /* 141 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]-=P3, goto P2"), - /* 142 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"), - /* 143 */ "JumpZeroIncr" OpHelp("if (r[P1]++)==0 ) goto P2"), - /* 144 */ "AggStep0" OpHelp("accum=r[P3] step(r[P2@P5])"), - /* 145 */ "AggStep" OpHelp("accum=r[P3] step(r[P2@P5])"), - /* 146 */ "AggFinal" OpHelp("accum=r[P1] N=P2"), - /* 147 */ "IncrVacuum" OpHelp(""), - /* 148 */ "Expire" OpHelp(""), - /* 149 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"), - /* 150 */ "VBegin" OpHelp(""), - /* 151 */ "VCreate" OpHelp(""), - /* 152 */ "VDestroy" OpHelp(""), - /* 153 */ "VOpen" OpHelp(""), - /* 154 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"), - /* 155 */ "VNext" OpHelp(""), - /* 156 */ "VRename" OpHelp(""), - /* 157 */ "Pagecount" OpHelp(""), - /* 158 */ "MaxPgcnt" OpHelp(""), - /* 159 */ "Init" OpHelp("Start at P2"), - /* 160 */ "CursorHint" OpHelp(""), - /* 161 */ "Noop" OpHelp(""), - /* 162 */ "Explain" OpHelp(""), + /* 134 */ "Param" OpHelp(""), + /* 135 */ "FkCounter" OpHelp("fkctr[P1]+=P2"), + /* 136 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"), + /* 137 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"), + /* 138 */ "IfPos" OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"), + /* 139 */ "OffsetLimit" OpHelp("if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1)"), + /* 140 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]-=P3, goto P2"), + /* 141 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"), + /* 142 */ "JumpZeroIncr" OpHelp("if (r[P1]++)==0 ) goto P2"), + /* 143 */ "AggStep0" OpHelp("accum=r[P3] step(r[P2@P5])"), + /* 144 */ "AggStep" OpHelp("accum=r[P3] step(r[P2@P5])"), + /* 145 */ "AggFinal" OpHelp("accum=r[P1] N=P2"), + /* 146 */ "IncrVacuum" OpHelp(""), + /* 147 */ "Expire" OpHelp(""), + /* 148 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"), + /* 149 */ "VBegin" OpHelp(""), + /* 150 */ "VCreate" OpHelp(""), + /* 151 */ "VDestroy" OpHelp(""), + /* 152 */ "VOpen" OpHelp(""), + /* 153 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"), + /* 154 */ "VNext" OpHelp(""), + /* 155 */ "VRename" OpHelp(""), + /* 156 */ "Pagecount" OpHelp(""), + /* 157 */ "MaxPgcnt" OpHelp(""), + /* 158 */ "Init" OpHelp("Start at P2"), + /* 159 */ "CursorHint" OpHelp(""), + /* 160 */ "Noop" OpHelp(""), + /* 161 */ "Explain" OpHelp(""), }; return azName[i]; } @@ -27009,6 +27248,11 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){ */ #define MAX_PATHNAME 512 +/* +** Maximum supported symbolic links +*/ +#define SQLITE_MAX_SYMLINKS 100 + /* Always cast the getpid() return type for compatibility with ** kernel modules in VxWorks. */ #define osGetpid(X) (pid_t)getpid() @@ -27161,8 +27405,8 @@ static pid_t randomnessPid = 0; */ #ifdef SQLITE_PERFORMANCE_TRACE -/* -** hwtime.h contains inline assembler code for implementing +/* +** hwtime.h contains inline assembler code for implementing ** high-performance timing routines. */ /************** Include hwtime.h in the middle of os_common.h ****************/ @@ -27272,14 +27516,14 @@ static sqlite_uint64 g_elapsed; ** of code will give us the ability to simulate a disk I/O error. This ** is used for testing the I/O recovery logic. */ -#ifdef SQLITE_TEST -SQLITE_API int sqlite3_io_error_hit = 0; /* Total number of I/O Errors */ -SQLITE_API int sqlite3_io_error_hardhit = 0; /* Number of non-benign errors */ -SQLITE_API int sqlite3_io_error_pending = 0; /* Count down to first I/O error */ -SQLITE_API int sqlite3_io_error_persist = 0; /* True if I/O errors persist */ -SQLITE_API int sqlite3_io_error_benign = 0; /* True if errors are benign */ -SQLITE_API int sqlite3_diskfull_pending = 0; -SQLITE_API int sqlite3_diskfull = 0; +#if defined(SQLITE_TEST) +SQLITE_API extern int sqlite3_io_error_hit; +SQLITE_API extern int sqlite3_io_error_hardhit; +SQLITE_API extern int sqlite3_io_error_pending; +SQLITE_API extern int sqlite3_io_error_persist; +SQLITE_API extern int sqlite3_io_error_benign; +SQLITE_API extern int sqlite3_diskfull_pending; +SQLITE_API extern int sqlite3_diskfull; #define SimulateIOErrorBenign(X) sqlite3_io_error_benign=(X) #define SimulateIOError(CODE) \ if( (sqlite3_io_error_persist && sqlite3_io_error_hit) \ @@ -27305,17 +27549,17 @@ static void local_ioerr(){ #define SimulateIOErrorBenign(X) #define SimulateIOError(A) #define SimulateDiskfullError(A) -#endif +#endif /* defined(SQLITE_TEST) */ /* ** When testing, keep a count of the number of open files. */ -#ifdef SQLITE_TEST -SQLITE_API int sqlite3_open_file_count = 0; +#if defined(SQLITE_TEST) +SQLITE_API extern int sqlite3_open_file_count; #define OpenCounter(X) sqlite3_open_file_count+=(X) #else #define OpenCounter(X) -#endif +#endif /* defined(SQLITE_TEST) */ #endif /* !defined(_OS_COMMON_H_) */ @@ -27488,33 +27732,57 @@ static struct unix_syscall { { "rmdir", (sqlite3_syscall_ptr)rmdir, 0 }, #define osRmdir ((int(*)(const char*))aSyscall[19].pCurrent) +#if defined(HAVE_FCHOWN) { "fchown", (sqlite3_syscall_ptr)fchown, 0 }, +#else + { "fchown", (sqlite3_syscall_ptr)0, 0 }, +#endif #define osFchown ((int(*)(int,uid_t,gid_t))aSyscall[20].pCurrent) { "geteuid", (sqlite3_syscall_ptr)geteuid, 0 }, #define osGeteuid ((uid_t(*)(void))aSyscall[21].pCurrent) #if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 - { "mmap", (sqlite3_syscall_ptr)mmap, 0 }, + { "mmap", (sqlite3_syscall_ptr)mmap, 0 }, +#else + { "mmap", (sqlite3_syscall_ptr)0, 0 }, +#endif #define osMmap ((void*(*)(void*,size_t,int,int,int,off_t))aSyscall[22].pCurrent) +#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 { "munmap", (sqlite3_syscall_ptr)munmap, 0 }, +#else + { "munmap", (sqlite3_syscall_ptr)0, 0 }, +#endif #define osMunmap ((void*(*)(void*,size_t))aSyscall[23].pCurrent) -#if HAVE_MREMAP +#if HAVE_MREMAP && (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0) { "mremap", (sqlite3_syscall_ptr)mremap, 0 }, #else { "mremap", (sqlite3_syscall_ptr)0, 0 }, #endif #define osMremap ((void*(*)(void*,size_t,size_t,int,...))aSyscall[24].pCurrent) +#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 { "getpagesize", (sqlite3_syscall_ptr)unixGetpagesize, 0 }, +#else + { "getpagesize", (sqlite3_syscall_ptr)0, 0 }, +#endif #define osGetpagesize ((int(*)(void))aSyscall[25].pCurrent) +#if defined(HAVE_READLINK) { "readlink", (sqlite3_syscall_ptr)readlink, 0 }, +#else + { "readlink", (sqlite3_syscall_ptr)0, 0 }, +#endif #define osReadlink ((ssize_t(*)(const char*,char*,size_t))aSyscall[26].pCurrent) +#if defined(HAVE_LSTAT) + { "lstat", (sqlite3_syscall_ptr)lstat, 0 }, +#else + { "lstat", (sqlite3_syscall_ptr)0, 0 }, #endif +#define osLstat ((int(*)(const char*,struct stat*))aSyscall[27].pCurrent) }; /* End of the overrideable system calls */ @@ -27525,10 +27793,10 @@ static struct unix_syscall { ** we are not running as root. */ static int robustFchown(int fd, uid_t uid, gid_t gid){ -#if OS_VXWORKS - return 0; -#else +#if defined(HAVE_FCHOWN) return osGeteuid() ? 0 : osFchown(fd,uid,gid); +#else + return 0; #endif } @@ -32916,12 +33184,7 @@ static int unixDelete( int fd; rc = osOpenDirectory(zPath, &fd); if( rc==SQLITE_OK ){ -#if OS_VXWORKS - if( fsync(fd)==-1 ) -#else - if( fsync(fd) ) -#endif - { + if( full_fsync(fd,0,0) ){ rc = unixLogError(SQLITE_IOERR_DIR_FSYNC, "fsync", zPath); } robust_close(0, fd, __LINE__); @@ -32967,6 +33230,32 @@ static int unixAccess( return SQLITE_OK; } +/* +** +*/ +static int mkFullPathname( + const char *zPath, /* Input path */ + char *zOut, /* Output buffer */ + int nOut /* Allocated size of buffer zOut */ +){ + int nPath = sqlite3Strlen30(zPath); + int iOff = 0; + if( zPath[0]!='/' ){ + if( osGetcwd(zOut, nOut-2)==0 ){ + return unixLogError(SQLITE_CANTOPEN_BKPT, "getcwd", zPath); + } + iOff = sqlite3Strlen30(zOut); + zOut[iOff++] = '/'; + } + if( (iOff+nPath+1)>nOut ){ + /* SQLite assumes that xFullPathname() nul-terminates the output buffer + ** even if it returns an error. */ + zOut[iOff] = '\0'; + return SQLITE_CANTOPEN_BKPT; + } + sqlite3_snprintf(nOut-iOff, &zOut[iOff], "%s", zPath); + return SQLITE_OK; +} /* ** Turn a relative pathname into a full pathname. The relative path @@ -32983,7 +33272,17 @@ static int unixFullPathname( int nOut, /* Size of output buffer in bytes */ char *zOut /* Output buffer */ ){ +#if !defined(HAVE_READLINK) || !defined(HAVE_LSTAT) + return mkFullPathname(zPath, zOut, nOut); +#else + int rc = SQLITE_OK; int nByte; + int nLink = 1; /* Number of symbolic links followed so far */ + const char *zIn = zPath; /* Input path for each iteration of loop */ + char *zDel = 0; + + assert( pVfs->mxPathname==MAX_PATHNAME ); + UNUSED_PARAMETER(pVfs); /* It's odd to simulate an io-error here, but really this is just ** using the io-error infrastructure to test that SQLite handles this @@ -32992,58 +33291,62 @@ static int unixFullPathname( */ SimulateIOError( return SQLITE_ERROR ); - assert( pVfs->mxPathname==MAX_PATHNAME ); - UNUSED_PARAMETER(pVfs); + do { - /* Attempt to resolve the path as if it were a symbolic link. If it is - ** a symbolic link, the resolved path is stored in buffer zOut[]. Or, if - ** the identified file is not a symbolic link or does not exist, then - ** zPath is copied directly into zOut. Either way, nByte is left set to - ** the size of the string copied into zOut[] in bytes. */ - nByte = osReadlink(zPath, zOut, nOut-1); - if( nByte<0 ){ - if( errno!=EINVAL && errno!=ENOENT ){ - return unixLogError(SQLITE_CANTOPEN_BKPT, "readlink", zPath); + /* Call stat() on path zIn. Set bLink to true if the path is a symbolic + ** link, or false otherwise. */ + int bLink = 0; + struct stat buf; + if( osLstat(zIn, &buf)!=0 ){ + if( errno!=ENOENT ){ + rc = unixLogError(SQLITE_CANTOPEN_BKPT, "lstat", zIn); + } + }else{ + bLink = S_ISLNK(buf.st_mode); } - sqlite3_snprintf(nOut, zOut, "%s", zPath); - nByte = sqlite3Strlen30(zOut); - }else{ - zOut[nByte] = '\0'; - } - /* If buffer zOut[] now contains an absolute path there is nothing more - ** to do. If it contains a relative path, do the following: - ** - ** * move the relative path string so that it is at the end of th - ** zOut[] buffer. - ** * Call getcwd() to read the path of the current working directory - ** into the start of the zOut[] buffer. - ** * Append a '/' character to the cwd string and move the - ** relative path back within the buffer so that it immediately - ** follows the '/'. - ** - ** This code is written so that if the combination of the CWD and relative - ** path are larger than the allocated size of zOut[] the CWD is silently - ** truncated to make it fit. This is Ok, as SQLite refuses to open any - ** file for which this function returns a full path larger than (nOut-8) - ** bytes in size. */ - testcase( nByte==nOut-5 ); - testcase( nByte==nOut-4 ); - if( zOut[0]!='/' && nByteSQLITE_MAX_SYMLINKS ){ + rc = SQLITE_CANTOPEN_BKPT; + } + + if( rc==SQLITE_OK ){ + nByte = osReadlink(zIn, zDel, nOut-1); + if( nByte<0 ){ + rc = unixLogError(SQLITE_CANTOPEN_BKPT, "readlink", zIn); + }else{ + if( zDel[0]!='/' ){ + int n; + for(n = sqlite3Strlen30(zIn); n>0 && zIn[n-1]!='/'; n--); + if( nByte+n+1>nOut ){ + rc = SQLITE_CANTOPEN_BKPT; + }else{ + memmove(&zDel[n], zDel, nByte+1); + memcpy(zDel, zIn, n); + nByte += n; + } + } + zDel[nByte] = '\0'; + } + } + + zIn = zDel; } - nCwd = sqlite3Strlen30(zOut); - assert( nCwd<=nRem-1 ); - zOut[nCwd] = '/'; - memmove(&zOut[nCwd+1], &zOut[nRem], nByte+1); - } - return SQLITE_OK; + assert( rc!=SQLITE_OK || zIn!=zOut || zIn[0]=='/' ); + if( rc==SQLITE_OK && zIn!=zOut ){ + rc = mkFullPathname(zIn, zOut, nOut); + } + if( bLink==0 ) break; + zIn = zOut; + }while( rc==SQLITE_OK ); + + sqlite3_free(zDel); + return rc; +#endif /* HAVE_READLINK && HAVE_LSTAT */ } @@ -33225,7 +33528,7 @@ static int unixCurrentTimeInt64(sqlite3_vfs *NotUsed, sqlite3_int64 *piNow){ return rc; } -#if 0 /* Not used */ +#ifndef SQLITE_OMIT_DEPRECATED /* ** Find the current time (in Universal Coordinated Time). Write the ** current time and date as a Julian Day number into *prNow and @@ -33243,7 +33546,7 @@ static int unixCurrentTime(sqlite3_vfs *NotUsed, double *prNow){ # define unixCurrentTime 0 #endif -#if 0 /* Not used */ +#ifndef SQLITE_OMIT_DEPRECATED /* ** We added the xGetLastError() method with the intention of providing ** better low-level error messages when operating-system problems come up @@ -33925,7 +34228,7 @@ static int proxyTakeConch(unixFile *pFile){ writeSize = PROXY_PATHINDEX + strlen(&writeBuffer[PROXY_PATHINDEX]); robust_ftruncate(conchFile->h, writeSize); rc = unixWrite((sqlite3_file *)conchFile, writeBuffer, writeSize, 0); - fsync(conchFile->h); + full_fsync(conchFile->h,0,0); /* If we created a new conch file (not just updated the contents of a ** valid conch file), try to match the permissions of the database */ @@ -34542,7 +34845,7 @@ SQLITE_API int SQLITE_STDCALL sqlite3_os_init(void){ /* Double-check that the aSyscall[] array has been constructed ** correctly. See ticket [bb3a86e890c8e96ab] */ - assert( ArraySize(aSyscall)==27 ); + assert( ArraySize(aSyscall)==28 ); /* Register all VFSes defined in the aVfs[] array */ for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){ @@ -34625,8 +34928,8 @@ SQLITE_API int SQLITE_STDCALL sqlite3_os_end(void){ */ #ifdef SQLITE_PERFORMANCE_TRACE -/* -** hwtime.h contains inline assembler code for implementing +/* +** hwtime.h contains inline assembler code for implementing ** high-performance timing routines. */ /************** Include hwtime.h in the middle of os_common.h ****************/ @@ -34736,14 +35039,14 @@ static sqlite_uint64 g_elapsed; ** of code will give us the ability to simulate a disk I/O error. This ** is used for testing the I/O recovery logic. */ -#ifdef SQLITE_TEST -SQLITE_API int sqlite3_io_error_hit = 0; /* Total number of I/O Errors */ -SQLITE_API int sqlite3_io_error_hardhit = 0; /* Number of non-benign errors */ -SQLITE_API int sqlite3_io_error_pending = 0; /* Count down to first I/O error */ -SQLITE_API int sqlite3_io_error_persist = 0; /* True if I/O errors persist */ -SQLITE_API int sqlite3_io_error_benign = 0; /* True if errors are benign */ -SQLITE_API int sqlite3_diskfull_pending = 0; -SQLITE_API int sqlite3_diskfull = 0; +#if defined(SQLITE_TEST) +SQLITE_API extern int sqlite3_io_error_hit; +SQLITE_API extern int sqlite3_io_error_hardhit; +SQLITE_API extern int sqlite3_io_error_pending; +SQLITE_API extern int sqlite3_io_error_persist; +SQLITE_API extern int sqlite3_io_error_benign; +SQLITE_API extern int sqlite3_diskfull_pending; +SQLITE_API extern int sqlite3_diskfull; #define SimulateIOErrorBenign(X) sqlite3_io_error_benign=(X) #define SimulateIOError(CODE) \ if( (sqlite3_io_error_persist && sqlite3_io_error_hit) \ @@ -34769,17 +35072,17 @@ static void local_ioerr(){ #define SimulateIOErrorBenign(X) #define SimulateIOError(A) #define SimulateDiskfullError(A) -#endif +#endif /* defined(SQLITE_TEST) */ /* ** When testing, keep a count of the number of open files. */ -#ifdef SQLITE_TEST -SQLITE_API int sqlite3_open_file_count = 0; +#if defined(SQLITE_TEST) +SQLITE_API extern int sqlite3_open_file_count; #define OpenCounter(X) sqlite3_open_file_count+=(X) #else #define OpenCounter(X) -#endif +#endif /* defined(SQLITE_TEST) */ #endif /* !defined(_OS_COMMON_H_) */ @@ -34842,6 +35145,10 @@ SQLITE_API int sqlite3_open_file_count = 0; # define NTDDI_WINBLUE 0x06030000 #endif +#ifndef NTDDI_WINTHRESHOLD +# define NTDDI_WINTHRESHOLD 0x06040000 +#endif + /* ** Check to see if the GetVersionEx[AW] functions are deprecated on the ** target system. GetVersionEx was first deprecated in Win8.1. @@ -34854,6 +35161,19 @@ SQLITE_API int sqlite3_open_file_count = 0; # endif #endif +/* +** Check to see if the CreateFileMappingA function is supported on the +** target system. It is unavailable when using "mincore.lib" on Win10. +** When compiling for Windows 10, always assume "mincore.lib" is in use. +*/ +#ifndef SQLITE_WIN32_CREATEFILEMAPPINGA +# if defined(NTDDI_VERSION) && NTDDI_VERSION >= NTDDI_WINTHRESHOLD +# define SQLITE_WIN32_CREATEFILEMAPPINGA 0 +# else +# define SQLITE_WIN32_CREATEFILEMAPPINGA 1 +# endif +#endif + /* ** This constant should already be defined (in the "WinDef.h" SDK file). */ @@ -35260,8 +35580,9 @@ static struct win_syscall { #define osCreateFileW ((HANDLE(WINAPI*)(LPCWSTR,DWORD,DWORD, \ LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE))aSyscall[5].pCurrent) -#if (!SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_ANSI) && \ - (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0)) +#if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_ANSI) && \ + (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0) && \ + SQLITE_WIN32_CREATEFILEMAPPINGA { "CreateFileMappingA", (SYSCALL)CreateFileMappingA, 0 }, #else { "CreateFileMappingA", (SYSCALL)0, 0 }, @@ -35491,8 +35812,7 @@ static struct win_syscall { #define osGetTickCount ((DWORD(WINAPI*)(VOID))aSyscall[33].pCurrent) -#if defined(SQLITE_WIN32_HAS_ANSI) && defined(SQLITE_WIN32_GETVERSIONEX) && \ - SQLITE_WIN32_GETVERSIONEX +#if defined(SQLITE_WIN32_HAS_ANSI) && SQLITE_WIN32_GETVERSIONEX { "GetVersionExA", (SYSCALL)GetVersionExA, 0 }, #else { "GetVersionExA", (SYSCALL)0, 0 }, @@ -35502,7 +35822,7 @@ static struct win_syscall { LPOSVERSIONINFOA))aSyscall[34].pCurrent) #if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE) && \ - defined(SQLITE_WIN32_GETVERSIONEX) && SQLITE_WIN32_GETVERSIONEX + SQLITE_WIN32_GETVERSIONEX { "GetVersionExW", (SYSCALL)GetVersionExW, 0 }, #else { "GetVersionExW", (SYSCALL)0, 0 }, @@ -36113,7 +36433,7 @@ SQLITE_PRIVATE DWORD sqlite3Win32Wait(HANDLE hObject){ ** the LockFileEx() API. */ -#if !defined(SQLITE_WIN32_GETVERSIONEX) || !SQLITE_WIN32_GETVERSIONEX +#if !SQLITE_WIN32_GETVERSIONEX # define osIsNT() (1) #elif SQLITE_OS_WINCE || SQLITE_OS_WINRT || !defined(SQLITE_WIN32_HAS_ANSI) # define osIsNT() (1) @@ -36134,7 +36454,7 @@ SQLITE_API int SQLITE_STDCALL sqlite3_win32_is_nt(void){ ** kernel. */ return 1; -#elif defined(SQLITE_WIN32_GETVERSIONEX) && SQLITE_WIN32_GETVERSIONEX +#elif SQLITE_WIN32_GETVERSIONEX if( osInterlockedCompareExchange(&sqlite3_os_type, 0, 0)==0 ){ #if defined(SQLITE_WIN32_HAS_ANSI) OSVERSIONINFOA sInfo; @@ -38718,7 +39038,7 @@ static int winShmMap( hMap = osCreateFileMappingW(pShmNode->hFile.h, NULL, PAGE_READWRITE, 0, nByte, NULL ); -#elif defined(SQLITE_WIN32_HAS_ANSI) +#elif defined(SQLITE_WIN32_HAS_ANSI) && SQLITE_WIN32_CREATEFILEMAPPINGA hMap = osCreateFileMappingA(pShmNode->hFile.h, NULL, PAGE_READWRITE, 0, nByte, NULL ); @@ -38874,7 +39194,7 @@ static int winMapfile(winFile *pFd, sqlite3_int64 nByte){ pFd->hMap = osCreateFileMappingW(pFd->h, NULL, protect, (DWORD)((nMap>>32) & 0xffffffff), (DWORD)(nMap & 0xffffffff), NULL); -#elif defined(SQLITE_WIN32_HAS_ANSI) +#elif defined(SQLITE_WIN32_HAS_ANSI) && SQLITE_WIN32_CREATEFILEMAPPINGA pFd->hMap = osCreateFileMappingA(pFd->h, NULL, protect, (DWORD)((nMap>>32) & 0xffffffff), (DWORD)(nMap & 0xffffffff), NULL); @@ -42938,7 +43258,7 @@ static struct RowSetEntry *rowSetEntryAlloc(RowSet *p){ assert( p!=0 ); if( p->nFresh==0 ){ struct RowSetChunk *pNew; - pNew = sqlite3DbMallocRaw(p->db, sizeof(*pNew)); + pNew = sqlite3DbMallocRawNN(p->db, sizeof(*pNew)); if( pNew==0 ){ return 0; } @@ -43846,6 +44166,20 @@ int sqlite3PagerTrace=1; /* True to enable tracing */ */ #define MAX_SECTOR_SIZE 0x10000 +/* +** If the option SQLITE_EXTRA_DURABLE option is set at compile-time, then +** SQLite will do extra fsync() operations when synchronous==FULL to help +** ensure that transactions are durable across a power failure. Most +** applications are happy as long as transactions are consistent across +** a power failure, and are perfectly willing to lose the last transaction +** in exchange for the extra performance of avoiding directory syncs. +** And so the default SQLITE_EXTRA_DURABLE setting is off. +*/ +#ifndef SQLITE_EXTRA_DURABLE +# define SQLITE_EXTRA_DURABLE 0 +#endif + + /* ** An instance of the following structure is allocated for each active ** savepoint and statement transaction in the system. All such structures @@ -44041,6 +44375,7 @@ struct Pager { u8 useJournal; /* Use a rollback journal on this file */ u8 noSync; /* Do not sync the journal if true */ u8 fullSync; /* Do extra syncs of the journal for robustness */ + u8 extraSync; /* sync directory after journal delete */ u8 ckptSyncFlags; /* SYNC_NORMAL or SYNC_FULL for checkpoint */ u8 walSyncFlags; /* SYNC_NORMAL or SYNC_FULL for wal writes */ u8 syncFlags; /* SYNC_NORMAL or SYNC_FULL otherwise */ @@ -45401,7 +45736,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){ ); sqlite3OsClose(pPager->jfd); if( bDelete ){ - rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0); + rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, pPager->extraSync); } } } @@ -46907,9 +47242,15 @@ SQLITE_PRIVATE void sqlite3PagerSetFlags( unsigned pgFlags /* Various flags */ ){ unsigned level = pgFlags & PAGER_SYNCHRONOUS_MASK; - assert( level>=1 && level<=3 ); - pPager->noSync = (level==1 || pPager->tempFile) ?1:0; - pPager->fullSync = (level==3 && !pPager->tempFile) ?1:0; + if( pPager->tempFile ){ + pPager->noSync = 1; + pPager->fullSync = 0; + pPager->extraSync = 0; + }else{ + pPager->noSync = level==PAGER_SYNCHRONOUS_OFF ?1:0; + pPager->fullSync = level>=PAGER_SYNCHRONOUS_FULL ?1:0; + pPager->extraSync = level==PAGER_SYNCHRONOUS_EXTRA ?1:0; + } if( pPager->noSync ){ pPager->syncFlags = 0; pPager->ckptSyncFlags = 0; @@ -48214,11 +48555,17 @@ act_like_temp_file: pPager->noSync = pPager->tempFile; if( pPager->noSync ){ assert( pPager->fullSync==0 ); + assert( pPager->extraSync==0 ); assert( pPager->syncFlags==0 ); assert( pPager->walSyncFlags==0 ); assert( pPager->ckptSyncFlags==0 ); }else{ pPager->fullSync = 1; +#if SQLITE_EXTRA_DURABLE + pPager->extraSync = 1; +#else + pPager->extraSync = 0; +#endif pPager->syncFlags = SQLITE_SYNC_NORMAL; pPager->walSyncFlags = SQLITE_SYNC_NORMAL | WAL_SYNC_TRANSACTIONS; pPager->ckptSyncFlags = SQLITE_SYNC_NORMAL; @@ -51227,6 +51574,7 @@ struct Wal { u8 padToSectorBoundary; /* Pad transactions out to the next sector */ WalIndexHdr hdr; /* Wal-index header for current transaction */ u32 minFrame; /* Ignore wal frames before this one */ + u32 iReCksum; /* On commit, recalculate checksums from here */ const char *zWalName; /* Name of WAL file */ u32 nCkpt; /* Checkpoint sequence counter in the wal-header */ #ifdef SQLITE_DEBUG @@ -51480,14 +51828,18 @@ static void walEncodeFrame( assert( WAL_FRAME_HDRSIZE==24 ); sqlite3Put4byte(&aFrame[0], iPage); sqlite3Put4byte(&aFrame[4], nTruncate); - memcpy(&aFrame[8], pWal->hdr.aSalt, 8); + if( pWal->iReCksum==0 ){ + memcpy(&aFrame[8], pWal->hdr.aSalt, 8); - nativeCksum = (pWal->hdr.bigEndCksum==SQLITE_BIGENDIAN); - walChecksumBytes(nativeCksum, aFrame, 8, aCksum, aCksum); - walChecksumBytes(nativeCksum, aData, pWal->szPage, aCksum, aCksum); + nativeCksum = (pWal->hdr.bigEndCksum==SQLITE_BIGENDIAN); + walChecksumBytes(nativeCksum, aFrame, 8, aCksum, aCksum); + walChecksumBytes(nativeCksum, aData, pWal->szPage, aCksum, aCksum); - sqlite3Put4byte(&aFrame[16], aCksum[0]); - sqlite3Put4byte(&aFrame[20], aCksum[1]); + sqlite3Put4byte(&aFrame[16], aCksum[0]); + sqlite3Put4byte(&aFrame[20], aCksum[1]); + }else{ + memset(&aFrame[8], 0, 16); + } } /* @@ -53414,6 +53766,7 @@ SQLITE_PRIVATE int sqlite3WalBeginWriteTransaction(Wal *pWal){ /* Cannot start a write transaction without first holding a read ** transaction. */ assert( pWal->readLock>=0 ); + assert( pWal->writeLock==0 && pWal->iReCksum==0 ); if( pWal->readOnly ){ return SQLITE_READONLY; @@ -53449,6 +53802,7 @@ SQLITE_PRIVATE int sqlite3WalEndWriteTransaction(Wal *pWal){ if( pWal->writeLock ){ walUnlockExclusive(pWal, WAL_WRITE_LOCK, 1); pWal->writeLock = 0; + pWal->iReCksum = 0; pWal->truncateOnCommit = 0; } return SQLITE_OK; @@ -53667,6 +54021,59 @@ static int walWriteOneFrame( return rc; } +/* +** This function is called as part of committing a transaction within which +** one or more frames have been overwritten. It updates the checksums for +** all frames written to the wal file by the current transaction starting +** with the earliest to have been overwritten. +** +** SQLITE_OK is returned if successful, or an SQLite error code otherwise. +*/ +static int walRewriteChecksums(Wal *pWal, u32 iLast){ + const int szPage = pWal->szPage;/* Database page size */ + int rc = SQLITE_OK; /* Return code */ + u8 *aBuf; /* Buffer to load data from wal file into */ + u8 aFrame[WAL_FRAME_HDRSIZE]; /* Buffer to assemble frame-headers in */ + u32 iRead; /* Next frame to read from wal file */ + i64 iCksumOff; + + aBuf = sqlite3_malloc(szPage + WAL_FRAME_HDRSIZE); + if( aBuf==0 ) return SQLITE_NOMEM; + + /* Find the checksum values to use as input for the recalculating the + ** first checksum. If the first frame is frame 1 (implying that the current + ** transaction restarted the wal file), these values must be read from the + ** wal-file header. Otherwise, read them from the frame header of the + ** previous frame. */ + assert( pWal->iReCksum>0 ); + if( pWal->iReCksum==1 ){ + iCksumOff = 24; + }else{ + iCksumOff = walFrameOffset(pWal->iReCksum-1, szPage) + 16; + } + rc = sqlite3OsRead(pWal->pWalFd, aBuf, sizeof(u32)*2, iCksumOff); + pWal->hdr.aFrameCksum[0] = sqlite3Get4byte(aBuf); + pWal->hdr.aFrameCksum[1] = sqlite3Get4byte(&aBuf[sizeof(u32)]); + + iRead = pWal->iReCksum; + pWal->iReCksum = 0; + for(; rc==SQLITE_OK && iRead<=iLast; iRead++){ + i64 iOff = walFrameOffset(iRead, szPage); + rc = sqlite3OsRead(pWal->pWalFd, aBuf, szPage+WAL_FRAME_HDRSIZE, iOff); + if( rc==SQLITE_OK ){ + u32 iPgno, nDbSize; + iPgno = sqlite3Get4byte(aBuf); + nDbSize = sqlite3Get4byte(&aBuf[4]); + + walEncodeFrame(pWal, iPgno, nDbSize, &aBuf[WAL_FRAME_HDRSIZE], aFrame); + rc = sqlite3OsWrite(pWal->pWalFd, aFrame, sizeof(aFrame), iOff); + } + } + + sqlite3_free(aBuf); + return rc; +} + /* ** Write a set of frames to the log. The caller must hold the write-lock ** on the log file (obtained using sqlite3WalBeginWriteTransaction()). @@ -53687,6 +54094,8 @@ SQLITE_PRIVATE int sqlite3WalFrames( int szFrame; /* The size of a single frame */ i64 iOffset; /* Next byte to write in WAL file */ WalWriter w; /* The writer */ + u32 iFirst = 0; /* First frame that may be overwritten */ + WalIndexHdr *pLive; /* Pointer to shared header */ assert( pList ); assert( pWal->writeLock ); @@ -53702,6 +54111,11 @@ SQLITE_PRIVATE int sqlite3WalFrames( } #endif + pLive = (WalIndexHdr*)walIndexHdr(pWal); + if( memcmp(&pWal->hdr, (void *)pLive, sizeof(WalIndexHdr))!=0 ){ + iFirst = pLive->mxFrame+1; + } + /* See if it is possible to write these frames into the start of the ** log file, instead of appending to it at pWal->hdr.mxFrame. */ @@ -53766,6 +54180,33 @@ SQLITE_PRIVATE int sqlite3WalFrames( /* Write all frames into the log file exactly once */ for(p=pList; p; p=p->pDirty){ int nDbSize; /* 0 normally. Positive == commit flag */ + + /* Check if this page has already been written into the wal file by + ** the current transaction. If so, overwrite the existing frame and + ** set Wal.writeLock to WAL_WRITELOCK_RECKSUM - indicating that + ** checksums must be recomputed when the transaction is committed. */ + if( iFirst && (p->pDirty || isCommit==0) ){ + u32 iWrite = 0; + VVA_ONLY(rc =) sqlite3WalFindFrame(pWal, p->pgno, &iWrite); + assert( rc==SQLITE_OK || iWrite==0 ); + if( iWrite>=iFirst ){ + i64 iOff = walFrameOffset(iWrite, szPage) + WAL_FRAME_HDRSIZE; + void *pData; + if( pWal->iReCksum==0 || iWriteiReCksum ){ + pWal->iReCksum = iWrite; + } +#if defined(SQLITE_HAS_CODEC) + if( (pData = sqlite3PagerCodec(p))==0 ) return SQLITE_NOMEM; +#else + pData = p->pData; +#endif + rc = sqlite3OsWrite(pWal->pWalFd, pData, szPage, iOff); + if( rc ) return rc; + p->flags &= ~PGHDR_WAL_APPEND; + continue; + } + } + iFrame++; assert( iOffset==walFrameOffset(iFrame, szPage) ); nDbSize = (isCommit && p->pDirty==0) ? nTruncate : 0; @@ -53773,6 +54214,13 @@ SQLITE_PRIVATE int sqlite3WalFrames( if( rc ) return rc; pLast = p; iOffset += szFrame; + p->flags |= PGHDR_WAL_APPEND; + } + + /* Recalculate checksums within the wal file if required. */ + if( isCommit && pWal->iReCksum ){ + rc = walRewriteChecksums(pWal, iFrame); + if( rc ) return rc; } /* If this is the end of a transaction, then we might need to pad @@ -53824,6 +54272,7 @@ SQLITE_PRIVATE int sqlite3WalFrames( */ iFrame = pWal->hdr.mxFrame; for(p=pList; p && rc==SQLITE_OK; p=p->pDirty){ + if( (p->flags & PGHDR_WAL_APPEND)==0 ) continue; iFrame++; rc = walIndexAppend(pWal, iFrame, p->pgno); } @@ -53936,6 +54385,7 @@ SQLITE_PRIVATE int sqlite3WalCheckpoint( /* Copy data from the log to the database file. */ if( rc==SQLITE_OK ){ + if( pWal->hdr.mxFrame && walPagesize(pWal)!=nBuf ){ rc = SQLITE_CORRUPT_BKPT; }else{ @@ -54399,7 +54849,6 @@ struct MemPage { u8 nOverflow; /* Number of overflow cell bodies in aCell[] */ u8 intKey; /* True if table b-trees. False for index b-trees */ u8 intKeyLeaf; /* True if the leaf of an intKey table */ - u8 noPayload; /* True if internal intKey page (thus w/o data) */ u8 leaf; /* True if a leaf page */ u8 hdrOffset; /* 100 for page 1. 0 otherwise */ u8 childPtrSize; /* 0 if leaf==1. 4 if leaf==0 */ @@ -54987,21 +55436,6 @@ SQLITE_PRIVATE int sqlite3BtreeHoldsMutex(Btree *p){ #endif -#ifndef SQLITE_OMIT_INCRBLOB -/* -** Enter and leave a mutex on a Btree given a cursor owned by that -** Btree. These entry points are used by incremental I/O and can be -** omitted if that module is not used. -*/ -SQLITE_PRIVATE void sqlite3BtreeEnterCursor(BtCursor *pCur){ - sqlite3BtreeEnter(pCur->pBtree); -} -SQLITE_PRIVATE void sqlite3BtreeLeaveCursor(BtCursor *pCur){ - sqlite3BtreeLeave(pCur->pBtree); -} -#endif /* SQLITE_OMIT_INCRBLOB */ - - /* ** Enter the mutex on every Btree associated with a database ** connection. This is needed (for example) prior to parsing @@ -55035,14 +55469,6 @@ SQLITE_PRIVATE void sqlite3BtreeLeaveAll(sqlite3 *db){ } } -/* -** Return true if a particular Btree requires a lock. Return FALSE if -** no lock is ever required since it is not sharable. -*/ -SQLITE_PRIVATE int sqlite3BtreeSharable(Btree *p){ - return p->sharable; -} - #ifndef NDEBUG /* ** Return true if the current thread holds the database connection @@ -55116,6 +55542,25 @@ SQLITE_PRIVATE void sqlite3BtreeEnterAll(sqlite3 *db){ } } #endif /* if SQLITE_THREADSAFE */ + +#ifndef SQLITE_OMIT_INCRBLOB +/* +** Enter a mutex on a Btree given a cursor owned by that Btree. +** +** These entry points are used by incremental I/O only. Enter() is required +** any time OMIT_SHARED_CACHE is not defined, regardless of whether or not +** the build is threadsafe. Leave() is only required by threadsafe builds. +*/ +SQLITE_PRIVATE void sqlite3BtreeEnterCursor(BtCursor *pCur){ + sqlite3BtreeEnter(pCur->pBtree); +} +# if SQLITE_THREADSAFE +SQLITE_PRIVATE void sqlite3BtreeLeaveCursor(BtCursor *pCur){ + sqlite3BtreeLeave(pCur->pBtree); +} +# endif +#endif /* ifndef SQLITE_OMIT_INCRBLOB */ + #endif /* ifndef SQLITE_OMIT_SHARED_CACHE */ /************** End of btmutex.c *********************************************/ @@ -55572,6 +56017,10 @@ static void releasePage(MemPage *pPage); /* Forward reference */ static int cursorHoldsMutex(BtCursor *p){ return sqlite3_mutex_held(p->pBt->mutex); } +static int cursorOwnsBtShared(BtCursor *p){ + assert( cursorHoldsMutex(p) ); + return (p->pBtree->db==p->pBt->db); +} #endif /* @@ -55908,7 +56357,7 @@ static int btreeMoveto( static int btreeRestoreCursorPosition(BtCursor *pCur){ int rc; int skipNext; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pCur->eState>=CURSOR_REQUIRESEEK ); if( pCur->eState==CURSOR_FAULT ){ return pCur->skipNext; @@ -56197,7 +56646,6 @@ static void btreeParseCellPtrNoPayload( ){ assert( sqlite3_mutex_held(pPage->pBt->mutex) ); assert( pPage->leaf==0 ); - assert( pPage->noPayload ); assert( pPage->childPtrSize==4 ); #ifndef SQLITE_DEBUG UNUSED_PARAMETER(pPage); @@ -56219,8 +56667,6 @@ static void btreeParseCellPtr( assert( sqlite3_mutex_held(pPage->pBt->mutex) ); assert( pPage->leaf==0 || pPage->leaf==1 ); - assert( pPage->intKeyLeaf || pPage->noPayload ); - assert( pPage->noPayload==0 ); assert( pPage->intKeyLeaf ); assert( pPage->childPtrSize==0 ); pIter = pCell; @@ -56289,7 +56735,6 @@ static void btreeParseCellPtrIndex( assert( sqlite3_mutex_held(pPage->pBt->mutex) ); assert( pPage->leaf==0 || pPage->leaf==1 ); assert( pPage->intKeyLeaf==0 ); - assert( pPage->noPayload==0 ); pIter = pCell + pPage->childPtrSize; nPayload = *pIter; if( nPayload>=0x80 ){ @@ -56350,7 +56795,6 @@ static u16 cellSizePtr(MemPage *pPage, u8 *pCell){ pPage->xParseCell(pPage, pCell, &debuginfo); #endif - assert( pPage->noPayload==0 ); nSize = *pIter; if( nSize>=0x80 ){ pEnd = &pIter[8]; @@ -56808,11 +57252,9 @@ static int decodeFlags(MemPage *pPage, int flagByte){ pPage->intKey = 1; if( pPage->leaf ){ pPage->intKeyLeaf = 1; - pPage->noPayload = 0; pPage->xParseCell = btreeParseCellPtr; }else{ pPage->intKeyLeaf = 0; - pPage->noPayload = 1; pPage->xCellSize = cellSizePtrNoPayload; pPage->xParseCell = btreeParseCellPtrNoPayload; } @@ -56827,7 +57269,6 @@ static int decodeFlags(MemPage *pPage, int flagByte){ assert( (PTF_ZERODATA|PTF_LEAF)==10 ); pPage->intKey = 0; pPage->intKeyLeaf = 0; - pPage->noPayload = 0; pPage->xParseCell = btreeParseCellPtrIndex; pPage->maxLocal = pBt->maxLocal; pPage->minLocal = pBt->minLocal; @@ -57464,7 +57905,6 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( pBt->mutex = sqlite3MutexAlloc(SQLITE_MUTEX_FAST); if( pBt->mutex==0 ){ rc = SQLITE_NOMEM; - db->mallocFailed = 0; goto btree_open_out; } } @@ -58248,7 +58688,6 @@ SQLITE_PRIVATE int sqlite3BtreeNewDb(Btree *p){ ** proceed. */ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ - sqlite3 *pBlock = 0; BtShared *pBt = p->pBt; int rc = SQLITE_OK; @@ -58271,27 +58710,30 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ } #ifndef SQLITE_OMIT_SHARED_CACHE - /* If another database handle has already opened a write transaction - ** on this shared-btree structure and a second write transaction is - ** requested, return SQLITE_LOCKED. - */ - if( (wrflag && pBt->inTransaction==TRANS_WRITE) - || (pBt->btsFlags & BTS_PENDING)!=0 - ){ - pBlock = pBt->pWriter->db; - }else if( wrflag>1 ){ - BtLock *pIter; - for(pIter=pBt->pLock; pIter; pIter=pIter->pNext){ - if( pIter->pBtree!=p ){ - pBlock = pIter->pBtree->db; - break; + { + sqlite3 *pBlock = 0; + /* If another database handle has already opened a write transaction + ** on this shared-btree structure and a second write transaction is + ** requested, return SQLITE_LOCKED. + */ + if( (wrflag && pBt->inTransaction==TRANS_WRITE) + || (pBt->btsFlags & BTS_PENDING)!=0 + ){ + pBlock = pBt->pWriter->db; + }else if( wrflag>1 ){ + BtLock *pIter; + for(pIter=pBt->pLock; pIter; pIter=pIter->pNext){ + if( pIter->pBtree!=p ){ + pBlock = pIter->pBtree->db; + break; + } } } - } - if( pBlock ){ - sqlite3ConnectionBlocked(p->db, pBlock); - rc = SQLITE_LOCKED_SHAREDCACHE; - goto trans_begun; + if( pBlock ){ + sqlite3ConnectionBlocked(p->db, pBlock); + rc = SQLITE_LOCKED_SHAREDCACHE; + goto trans_begun; + } } #endif @@ -59173,13 +59615,13 @@ SQLITE_PRIVATE int sqlite3BtreeSavepoint(Btree *p, int op, int iSavepoint){ ** on the database already. If a write-cursor is requested, then ** the caller is assumed to have an open write transaction. ** -** If wrFlag==0, then the cursor can only be used for reading. -** If wrFlag==1, then the cursor can be used for reading or for -** writing if other conditions for writing are also met. These -** are the conditions that must be met in order for writing to -** be allowed: +** If the BTREE_WRCSR bit of wrFlag is clear, then the cursor can only +** be used for reading. If the BTREE_WRCSR bit is set, then the cursor +** can be used for reading or for writing if other conditions for writing +** are also met. These are the conditions that must be met in order +** for writing to be allowed: ** -** 1: The cursor must have been opened with wrFlag==1 +** 1: The cursor must have been opened with wrFlag containing BTREE_WRCSR ** ** 2: Other database connections that share the same pager cache ** but which are not in the READ_UNCOMMITTED state may not have @@ -59191,6 +59633,16 @@ SQLITE_PRIVATE int sqlite3BtreeSavepoint(Btree *p, int op, int iSavepoint){ ** ** 4: There must be an active transaction. ** +** The BTREE_FORDELETE bit of wrFlag may optionally be set if BTREE_WRCSR +** is set. If FORDELETE is set, that is a hint to the implementation that +** this cursor will only be used to seek to and delete entries of an index +** as part of a larger DELETE statement. The FORDELETE hint is not used by +** this implementation. But in a hypothetical alternative storage engine +** in which index entries are automatically deleted when corresponding table +** rows are deleted, the FORDELETE flag is a hint that all SEEK and DELETE +** operations on this cursor can be no-ops and all READ operations can +** return a null row (2-bytes: 0x01 0x00). +** ** No checking is done to make sure that page iTable really is the ** root page of a b-tree. If it is not, then the cursor acquired ** will not work correctly. @@ -59408,7 +59860,7 @@ SQLITE_PRIVATE int sqlite3BtreeKeySize(BtCursor *pCur, i64 *pSize){ ** to return an integer result code for historical reasons. */ SQLITE_PRIVATE int sqlite3BtreeDataSize(BtCursor *pCur, u32 *pSize){ - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pCur->eState==CURSOR_VALID ); assert( pCur->iPage>=0 ); assert( pCur->iPageeState==CURSOR_VALID ); @@ -59826,7 +60278,7 @@ static const void *fetchPayload( assert( pCur!=0 && pCur->iPage>=0 && pCur->apPage[pCur->iPage]); assert( pCur->eState==CURSOR_VALID ); assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) ); - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pCur->aiIdx[pCur->iPage]apPage[pCur->iPage]->nCell ); assert( pCur->info.nSize>0 ); assert( pCur->info.pPayload>pCur->apPage[pCur->iPage]->aData || CORRUPT_DB ); @@ -59872,7 +60324,7 @@ SQLITE_PRIVATE const void *sqlite3BtreeDataFetch(BtCursor *pCur, u32 *pAmt){ static int moveToChild(BtCursor *pCur, u32 newPgno){ BtShared *pBt = pCur->pBt; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pCur->eState==CURSOR_VALID ); assert( pCur->iPageiPage>=0 ); @@ -59918,7 +60370,7 @@ static void assertParentIndex(MemPage *pParent, int iIdx, Pgno iChild){ ** the largest cell index. */ static void moveToParent(BtCursor *pCur){ - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pCur->eState==CURSOR_VALID ); assert( pCur->iPage>0 ); assert( pCur->apPage[pCur->iPage] ); @@ -59958,7 +60410,7 @@ static int moveToRoot(BtCursor *pCur){ MemPage *pRoot; int rc = SQLITE_OK; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( CURSOR_INVALID < CURSOR_REQUIRESEEK ); assert( CURSOR_VALID < CURSOR_REQUIRESEEK ); assert( CURSOR_FAULT > CURSOR_REQUIRESEEK ); @@ -60037,7 +60489,7 @@ static int moveToLeftmost(BtCursor *pCur){ int rc = SQLITE_OK; MemPage *pPage; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pCur->eState==CURSOR_VALID ); while( rc==SQLITE_OK && !(pPage = pCur->apPage[pCur->iPage])->leaf ){ assert( pCur->aiIdx[pCur->iPage]nCell ); @@ -60062,7 +60514,7 @@ static int moveToRightmost(BtCursor *pCur){ int rc = SQLITE_OK; MemPage *pPage = 0; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pCur->eState==CURSOR_VALID ); while( !(pPage = pCur->apPage[pCur->iPage])->leaf ){ pgno = get4byte(&pPage->aData[pPage->hdrOffset+8]); @@ -60083,7 +60535,7 @@ static int moveToRightmost(BtCursor *pCur){ SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){ int rc; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) ); rc = moveToRoot(pCur); if( rc==SQLITE_OK ){ @@ -60106,7 +60558,7 @@ SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){ SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor *pCur, int *pRes){ int rc; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) ); /* If the cursor already points to the last entry, this is a no-op. */ @@ -60184,7 +60636,7 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked( int rc; RecordCompare xRecordCompare; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) ); assert( pRes ); assert( (pIdxKey==0)==(pCur->pKeyInfo==0) ); @@ -60432,7 +60884,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur, int *pRes){ int idx; MemPage *pPage; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID ); assert( *pRes==0 ); if( pCur->eState!=CURSOR_VALID ){ @@ -60496,7 +60948,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur, int *pRes){ } SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){ MemPage *pPage; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pRes!=0 ); assert( *pRes==0 || *pRes==1 ); assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID ); @@ -60541,7 +60993,7 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur, int *pRes){ int rc; MemPage *pPage; - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pRes!=0 ); assert( *pRes==0 ); assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID ); @@ -60597,7 +61049,7 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur, int *pRes){ return rc; } SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){ - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pRes!=0 ); assert( *pRes==0 || *pRes==1 ); assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID ); @@ -61263,7 +61715,7 @@ static int fillInCell( { CellInfo info; pPage->xParseCell(pPage, pCell, &info); - assert( nHeader=(int)(info.pPayload - pCell) ); + assert( nHeader==(int)(info.pPayload - pCell) ); assert( info.nKey==nKey ); assert( *pnSize == info.nSize ); assert( spaceLeft == info.nLocal ); @@ -62310,9 +62762,8 @@ static int balance_nonroot( ** long be able to find the cells if a pointer to each cell is not saved ** first. */ - memset(&b.szCell[b.nCell], 0, sizeof(b.szCell[0])*limit); + memset(&b.szCell[b.nCell], 0, sizeof(b.szCell[0])*(limit+pOld->nOverflow)); if( pOld->nOverflow>0 ){ - memset(&b.szCell[b.nCell+limit], 0, sizeof(b.szCell[0])*pOld->nOverflow); limit = pOld->aiOvfl[0]; for(j=0; jiPage; @@ -62937,7 +63388,8 @@ static int balance(BtCursor *pCur){ ** and copy the current contents of the root-page to it. The ** next iteration of the do-loop will balance the child page. */ - assert( (balance_deeper_called++)==0 ); + assert( balance_deeper_called==0 ); + VVA_ONLY( balance_deeper_called++ ); rc = balance_deeper(pPage, &pCur->apPage[1]); if( rc==SQLITE_OK ){ pCur->iPage = 1; @@ -62976,7 +63428,8 @@ static int balance(BtCursor *pCur){ ** function. If this were not verified, a subtle bug involving reuse ** of the aBalanceQuickSpace[] might sneak in. */ - assert( (balance_quick_called++)==0 ); + assert( balance_quick_called==0 ); + VVA_ONLY( balance_quick_called++ ); rc = balance_quick(pParent, pPage, aBalanceQuickSpace); }else #endif @@ -63077,7 +63530,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert( return pCur->skipNext; } - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( (pCur->curFlags & BTCF_WriteFlag)!=0 && pBt->inTransaction==TRANS_WRITE && (pBt->btsFlags & BTS_READ_ONLY)==0 ); @@ -63207,13 +63660,21 @@ end_insert: /* ** Delete the entry that the cursor is pointing to. ** -** If the second parameter is zero, then the cursor is left pointing at an -** arbitrary location after the delete. If it is non-zero, then the cursor -** is left in a state such that the next call to BtreeNext() or BtreePrev() -** moves it to the same row as it would if the call to BtreeDelete() had -** been omitted. +** If the BTREE_SAVEPOSITION bit of the flags parameter is zero, then +** the cursor is left pointing at an arbitrary location after the delete. +** But if that bit is set, then the cursor is left in a state such that +** the next call to BtreeNext() or BtreePrev() moves it to the same row +** as it would have been on if the call to BtreeDelete() had been omitted. +** +** The BTREE_AUXDELETE bit of flags indicates that is one of several deletes +** associated with a single table entry and its indexes. Only one of those +** deletes is considered the "primary" delete. The primary delete occurs +** on a cursor that is not a BTREE_FORDELETE cursor. All but one delete +** operation on non-FORDELETE cursors is tagged with the AUXDELETE flag. +** The BTREE_AUXDELETE bit is a hint that is not used by this implementation, +** but which might be used by alternative storage engines. */ -SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, int bPreserve){ +SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){ Btree *p = pCur->pBtree; BtShared *pBt = p->pBt; int rc; /* Return code */ @@ -63223,8 +63684,9 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, int bPreserve){ int iCellDepth; /* Depth of node containing pCell */ u16 szCell; /* Size of the cell being deleted */ int bSkipnext = 0; /* Leaf cursor in SKIPNEXT state */ + u8 bPreserve = flags & BTREE_SAVEPOSITION; /* Keep cursor valid */ - assert( cursorHoldsMutex(pCur) ); + assert( cursorOwnsBtShared(pCur) ); assert( pBt->inTransaction==TRANS_WRITE ); assert( (pBt->btsFlags & BTS_READ_ONLY)==0 ); assert( pCur->curFlags & BTCF_WriteFlag ); @@ -63232,6 +63694,7 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, int bPreserve){ assert( !hasReadConflicts(p, pCur->pgnoRoot) ); assert( pCur->aiIdx[pCur->iPage]apPage[pCur->iPage]->nCell ); assert( pCur->eState==CURSOR_VALID ); + assert( (flags & ~(BTREE_SAVEPOSITION | BTREE_AUXDELETE))==0 ); iCellDepth = pCur->iPage; iCellIdx = pCur->aiIdx[iCellDepth]; @@ -63344,7 +63807,7 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, int bPreserve){ if( rc==SQLITE_OK ){ if( bSkipnext ){ assert( bPreserve && (pCur->iPage==iCellDepth || CORRUPT_DB) ); - assert( pPage==pCur->apPage[pCur->iPage] ); + assert( pPage==pCur->apPage[pCur->iPage] || CORRUPT_DB ); assert( (pPage->nCell>0 || CORRUPT_DB) && iCellIdx<=pPage->nCell ); pCur->eState = CURSOR_SKIPNEXT; if( iCellIdx>=pPage->nCell ){ @@ -63665,6 +64128,14 @@ static int btreeDropTable(Btree *p, Pgno iTable, int *piMoved){ return SQLITE_LOCKED_SHAREDCACHE; } + /* + ** It is illegal to drop the sqlite_master table on page 1. But again, + ** this error is caught long before reaching this point. + */ + if( NEVER(iTable<2) ){ + return SQLITE_CORRUPT_BKPT; + } + rc = btreeGetPage(pBt, (Pgno)iTable, &pPage, 0); if( rc ) return rc; rc = sqlite3BtreeClearTable(p, iTable, 0); @@ -63675,76 +64146,67 @@ static int btreeDropTable(Btree *p, Pgno iTable, int *piMoved){ *piMoved = 0; - if( iTable>1 ){ #ifdef SQLITE_OMIT_AUTOVACUUM - freePage(pPage, &rc); - releasePage(pPage); + freePage(pPage, &rc); + releasePage(pPage); #else - if( pBt->autoVacuum ){ - Pgno maxRootPgno; - sqlite3BtreeGetMeta(p, BTREE_LARGEST_ROOT_PAGE, &maxRootPgno); + if( pBt->autoVacuum ){ + Pgno maxRootPgno; + sqlite3BtreeGetMeta(p, BTREE_LARGEST_ROOT_PAGE, &maxRootPgno); - if( iTable==maxRootPgno ){ - /* If the table being dropped is the table with the largest root-page - ** number in the database, put the root page on the free list. - */ - freePage(pPage, &rc); - releasePage(pPage); - if( rc!=SQLITE_OK ){ - return rc; - } - }else{ - /* The table being dropped does not have the largest root-page - ** number in the database. So move the page that does into the - ** gap left by the deleted root-page. - */ - MemPage *pMove; - releasePage(pPage); - rc = btreeGetPage(pBt, maxRootPgno, &pMove, 0); - if( rc!=SQLITE_OK ){ - return rc; - } - rc = relocatePage(pBt, pMove, PTRMAP_ROOTPAGE, 0, iTable, 0); - releasePage(pMove); - if( rc!=SQLITE_OK ){ - return rc; - } - pMove = 0; - rc = btreeGetPage(pBt, maxRootPgno, &pMove, 0); - freePage(pMove, &rc); - releasePage(pMove); - if( rc!=SQLITE_OK ){ - return rc; - } - *piMoved = maxRootPgno; - } - - /* Set the new 'max-root-page' value in the database header. This - ** is the old value less one, less one more if that happens to - ** be a root-page number, less one again if that is the - ** PENDING_BYTE_PAGE. + if( iTable==maxRootPgno ){ + /* If the table being dropped is the table with the largest root-page + ** number in the database, put the root page on the free list. */ - maxRootPgno--; - while( maxRootPgno==PENDING_BYTE_PAGE(pBt) - || PTRMAP_ISPAGE(pBt, maxRootPgno) ){ - maxRootPgno--; - } - assert( maxRootPgno!=PENDING_BYTE_PAGE(pBt) ); - - rc = sqlite3BtreeUpdateMeta(p, 4, maxRootPgno); - }else{ freePage(pPage, &rc); releasePage(pPage); + if( rc!=SQLITE_OK ){ + return rc; + } + }else{ + /* The table being dropped does not have the largest root-page + ** number in the database. So move the page that does into the + ** gap left by the deleted root-page. + */ + MemPage *pMove; + releasePage(pPage); + rc = btreeGetPage(pBt, maxRootPgno, &pMove, 0); + if( rc!=SQLITE_OK ){ + return rc; + } + rc = relocatePage(pBt, pMove, PTRMAP_ROOTPAGE, 0, iTable, 0); + releasePage(pMove); + if( rc!=SQLITE_OK ){ + return rc; + } + pMove = 0; + rc = btreeGetPage(pBt, maxRootPgno, &pMove, 0); + freePage(pMove, &rc); + releasePage(pMove); + if( rc!=SQLITE_OK ){ + return rc; + } + *piMoved = maxRootPgno; } -#endif - }else{ - /* If sqlite3BtreeDropTable was called on page 1. - ** This really never should happen except in a corrupt - ** database. + + /* Set the new 'max-root-page' value in the database header. This + ** is the old value less one, less one more if that happens to + ** be a root-page number, less one again if that is the + ** PENDING_BYTE_PAGE. */ - zeroPage(pPage, PTF_INTKEY|PTF_LEAF ); + maxRootPgno--; + while( maxRootPgno==PENDING_BYTE_PAGE(pBt) + || PTRMAP_ISPAGE(pBt, maxRootPgno) ){ + maxRootPgno--; + } + assert( maxRootPgno!=PENDING_BYTE_PAGE(pBt) ); + + rc = sqlite3BtreeUpdateMeta(p, 4, maxRootPgno); + }else{ + freePage(pPage, &rc); releasePage(pPage); } +#endif return rc; } SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree *p, int iTable, int *piMoved){ @@ -63931,9 +64393,9 @@ static void checkAppendMsg( sqlite3StrAccumAppend(&pCheck->errMsg, "\n", 1); } if( pCheck->zPfx ){ - sqlite3XPrintf(&pCheck->errMsg, 0, pCheck->zPfx, pCheck->v1, pCheck->v2); + sqlite3XPrintf(&pCheck->errMsg, pCheck->zPfx, pCheck->v1, pCheck->v2); } - sqlite3VXPrintf(&pCheck->errMsg, 1, zFormat, ap); + sqlite3VXPrintf(&pCheck->errMsg, zFormat, ap); va_end(ap); if( pCheck->errMsg.accError==STRACCUM_NOMEM ){ pCheck->mallocFailed = 1; @@ -64434,7 +64896,8 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck( sqlite3BtreeEnter(p); assert( p->inTrans>TRANS_NONE && pBt->inTransaction>TRANS_NONE ); - assert( (nRef = sqlite3PagerRefcount(pBt->pPager))>=0 ); + VVA_ONLY( nRef = sqlite3PagerRefcount(pBt->pPager) ); + assert( nRef>=0 ); sCheck.pBt = pBt; sCheck.pPager = pBt->pPager; sCheck.nPage = btreePagecount(sCheck.pBt); @@ -64447,6 +64910,7 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck( sCheck.aPgRef = 0; sCheck.heap = 0; sqlite3StrAccumInit(&sCheck.errMsg, 0, zErr, sizeof(zErr), SQLITE_MAX_LENGTH); + sCheck.errMsg.printfFlags = SQLITE_PRINTF_INTERNAL; if( sCheck.nPage==0 ){ goto integrity_ck_cleanup; } @@ -64686,7 +65150,7 @@ SQLITE_PRIVATE int sqlite3BtreeLockTable(Btree *p, int iTab, u8 isWriteLock){ */ SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){ int rc; - assert( cursorHoldsMutex(pCsr) ); + assert( cursorOwnsBtShared(pCsr) ); assert( sqlite3_mutex_held(pCsr->pBtree->db->mutex) ); assert( pCsr->curFlags & BTCF_Incrblob ); @@ -64794,6 +65258,15 @@ SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *p){ */ SQLITE_PRIVATE int sqlite3HeaderSizeBtree(void){ return ROUND8(sizeof(MemPage)); } +#if !defined(SQLITE_OMIT_SHARED_CACHE) +/* +** Return true if the Btree passed as the only argument is sharable. +*/ +SQLITE_PRIVATE int sqlite3BtreeSharable(Btree *p){ + return p->sharable; +} +#endif + /************** End of btree.c ***********************************************/ /************** Begin file backup.c ******************************************/ /* @@ -65714,6 +66187,7 @@ SQLITE_PRIVATE int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3VdbeMemGrow(Mem *pMem, int n, int bPreserve){ assert( sqlite3VdbeCheckMemInvariants(pMem) ); assert( (pMem->flags&MEM_RowSet)==0 ); + testcase( pMem->db==0 ); /* If the bPreserve flag is set to true, then the memory cell must already ** contain a valid string or blob value. */ @@ -66317,7 +66791,7 @@ SQLITE_PRIVATE void sqlite3VdbeMemSetRowSet(Mem *pMem){ assert( db!=0 ); assert( (pMem->flags & MEM_RowSet)==0 ); sqlite3VdbeMemRelease(pMem); - pMem->zMalloc = sqlite3DbMallocRaw(db, 64); + pMem->zMalloc = sqlite3DbMallocRawNN(db, 64); if( db->mallocFailed ){ pMem->flags = MEM_Null; pMem->szMalloc = 0; @@ -66822,7 +67296,7 @@ static int valueFromFunction( memset(&ctx, 0, sizeof(ctx)); ctx.pOut = pVal; ctx.pFunc = pFunc; - pFunc->xFunc(&ctx, nVal, apVal); + pFunc->xSFunc(&ctx, nVal, apVal); if( ctx.isError ){ rc = ctx.isError; sqlite3ErrorMsg(pCtx->pParse, "%s", sqlite3_value_text(pVal)); @@ -66979,7 +67453,7 @@ static int valueFromExpr( return rc; no_mem: - db->mallocFailed = 1; + sqlite3OomFault(db); sqlite3DbFree(db, zVal); assert( *ppVal==0 ); #ifdef SQLITE_ENABLE_STAT3_OR_STAT4 @@ -67038,7 +67512,7 @@ static void recordFunc( db = sqlite3_context_db_handle(context); nRet = 1 + nSerial + nVal; - aRet = sqlite3DbMallocRaw(db, nRet); + aRet = sqlite3DbMallocRawNN(db, nRet); if( aRet==0 ){ sqlite3_result_error_nomem(context); }else{ @@ -67490,7 +67964,7 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp3(Vdbe *p, int op, int p1, int p2, int p3){ i = p->nOp; assert( p->magic==VDBE_MAGIC_INIT ); - assert( op>0 && op<0xff ); + assert( op>=0 && op<0xff ); if( p->pParse->nOpAlloc<=i ){ return growOp3(p, op, p1, p2, p3); } @@ -67569,8 +68043,7 @@ SQLITE_PRIVATE void sqlite3VdbeMultiLoad(Vdbe *p, int iDest, const char *zTypes, for(i=0; (c = zTypes[i])!=0; i++){ if( c=='s' ){ const char *z = va_arg(ap, const char*); - int addr = sqlite3VdbeAddOp2(p, z==0 ? OP_Null : OP_String8, 0, iDest++); - if( z ) sqlite3VdbeChangeP4(p, addr, z, 0); + sqlite3VdbeAddOp4(p, z==0 ? OP_Null : OP_String8, 0, iDest++, 0, z, 0); }else{ assert( c=='i' ); sqlite3VdbeAddOp2(p, OP_Integer, va_arg(ap, int), iDest++); @@ -67609,7 +68082,7 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp4Dup8( const u8 *zP4, /* The P4 operand */ int p4type /* P4 operand type */ ){ - char *p4copy = sqlite3DbMallocRaw(sqlite3VdbeDb(p), 8); + char *p4copy = sqlite3DbMallocRawNN(sqlite3VdbeDb(p), 8); if( p4copy ) memcpy(p4copy, zP4, 8); return sqlite3VdbeAddOp4(p, op, p1, p2, p3, p4copy, p4type); } @@ -67624,8 +68097,7 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp4Dup8( */ SQLITE_PRIVATE void sqlite3VdbeAddParseSchemaOp(Vdbe *p, int iDb, char *zWhere){ int j; - int addr = sqlite3VdbeAddOp3(p, OP_ParseSchema, iDb, 0, 0); - sqlite3VdbeChangeP4(p, addr, zWhere, P4_DYNAMIC); + sqlite3VdbeAddOp4(p, OP_ParseSchema, iDb, 0, 0, zWhere, P4_DYNAMIC); for(j=0; jdb->nDb; j++) sqlite3VdbeUsesBtree(p, j); } @@ -67645,6 +68117,21 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp4Int( return addr; } +/* Insert the end of a co-routine +*/ +SQLITE_PRIVATE void sqlite3VdbeEndCoroutine(Vdbe *v, int regYield){ + sqlite3VdbeAddOp1(v, OP_EndCoroutine, regYield); + + /* Clear the temporary register cache, thereby ensuring that each + ** co-routine has its own independent set of registers, because co-routines + ** might expect their registers to be preserved across an OP_Yield, and + ** that could cause problems if two or more co-routines are using the same + ** temporary register. + */ + v->pParse->nTempReg = 0; + v->pParse->nRangeReg = 0; +} + /* ** Create a new symbolic label for an instruction that has yet to be ** coded. The symbolic label is really just a negative number. The @@ -67855,7 +68342,7 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){ for(pOp=p->aOp, i=p->nOp-1; i>=0; i--, pOp++){ u8 opcode = pOp->opcode; - /* NOTE: Be sure to update mkopcodeh.awk when adding or removing + /* NOTE: Be sure to update mkopcodeh.tcl when adding or removing ** cases from this switch! */ switch( opcode ){ case OP_Transaction: { @@ -67926,6 +68413,20 @@ SQLITE_PRIVATE int sqlite3VdbeCurrentAddr(Vdbe *p){ return p->nOp; } +/* +** Verify that at least N opcode slots are available in p without +** having to malloc for more space (except when compiled using +** SQLITE_TEST_REALLOC_STRESS). This interface is used during testing +** to verify that certain calls to sqlite3VdbeAddOpList() can never +** fail due to a OOM fault and hence that the return value from +** sqlite3VdbeAddOpList() will always be non-NULL. +*/ +#if defined(SQLITE_DEBUG) && !defined(SQLITE_TEST_REALLOC_STRESS) +SQLITE_PRIVATE void sqlite3VdbeVerifyNoMallocRequired(Vdbe *p, int N){ + assert( p->nOp + N <= p->pParse->nOpAlloc ); +} +#endif + /* ** This function returns a pointer to the array of opcodes associated with ** the Vdbe passed as the first argument. It is the callers responsibility @@ -67951,24 +68452,34 @@ SQLITE_PRIVATE VdbeOp *sqlite3VdbeTakeOpArray(Vdbe *p, int *pnOp, int *pnMaxArg) } /* -** Add a whole list of operations to the operation stack. Return the -** address of the first operation added. +** Add a whole list of operations to the operation stack. Return a +** pointer to the first operation inserted. +** +** Non-zero P2 arguments to jump instructions are automatically adjusted +** so that the jump target is relative to the first operation inserted. */ -SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp, int iLineno){ - int addr, i; - VdbeOp *pOut; +SQLITE_PRIVATE VdbeOp *sqlite3VdbeAddOpList( + Vdbe *p, /* Add opcodes to the prepared statement */ + int nOp, /* Number of opcodes to add */ + VdbeOpList const *aOp, /* The opcodes to be added */ + int iLineno /* Source-file line number of first opcode */ +){ + int i; + VdbeOp *pOut, *pFirst; assert( nOp>0 ); assert( p->magic==VDBE_MAGIC_INIT ); if( p->nOp + nOp > p->pParse->nOpAlloc && growOpArray(p, nOp) ){ return 0; } - addr = p->nOp; - pOut = &p->aOp[addr]; + pFirst = pOut = &p->aOp[p->nOp]; for(i=0; iopcode = aOp->opcode; pOut->p1 = aOp->p1; pOut->p2 = aOp->p2; assert( aOp->p2>=0 ); + if( (sqlite3OpcodeProperty[aOp->opcode] & OPFLG_JUMP)!=0 && aOp->p2>0 ){ + pOut->p2 += p->nOp; + } pOut->p3 = aOp->p3; pOut->p4type = P4_NOTUSED; pOut->p4.p = 0; @@ -67983,12 +68494,12 @@ SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp, #endif #ifdef SQLITE_DEBUG if( p->db->flags & SQLITE_VdbeAddopTrace ){ - sqlite3VdbePrintOp(0, i+addr, &p->aOp[i+addr]); + sqlite3VdbePrintOp(0, i+p->nOp, &p->aOp[i+p->nOp]); } #endif } p->nOp += nOp; - return addr; + return pFirst; } #if defined(SQLITE_ENABLE_STMT_SCANSTATUS) @@ -68036,7 +68547,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe *p, u32 addr, int val){ sqlite3VdbeGetOp(p,addr)->p3 = val; } SQLITE_PRIVATE void sqlite3VdbeChangeP5(Vdbe *p, u8 p5){ - sqlite3VdbeGetOp(p,-1)->p5 = p5; + if( !p->db->mallocFailed ) p->aOp[p->nOp-1].p5 = p5; } /* @@ -68124,7 +68635,7 @@ static void vdbeFreeOpArray(sqlite3 *db, Op *aOp, int nOp){ if( aOp ){ Op *pOp; for(pOp=aOp; pOp<&aOp[nOp]; pOp++){ - freeP4(db, pOp->p4type, pOp->p4.p); + if( pOp->p4type ) freeP4(db, pOp->p4type, pOp->p4.p); #ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS sqlite3DbFree(db, pOp->zComment); #endif @@ -68146,14 +68657,16 @@ SQLITE_PRIVATE void sqlite3VdbeLinkSubProgram(Vdbe *pVdbe, SubProgram *p){ /* ** Change the opcode at addr into OP_Noop */ -SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe *p, int addr){ - if( addrnOp ){ - VdbeOp *pOp = &p->aOp[addr]; - sqlite3 *db = p->db; - freeP4(db, pOp->p4type, pOp->p4.p); - memset(pOp, 0, sizeof(pOp[0])); - pOp->opcode = OP_Noop; - } +SQLITE_PRIVATE int sqlite3VdbeChangeToNoop(Vdbe *p, int addr){ + VdbeOp *pOp; + if( p->db->mallocFailed ) return 0; + assert( addr>=0 && addrnOp ); + pOp = &p->aOp[addr]; + freeP4(p->db, pOp->p4type, pOp->p4.p); + pOp->p4type = P4_NOTUSED; + pOp->p4.z = 0; + pOp->opcode = OP_Noop; + return 1; } /* @@ -68162,8 +68675,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe *p, int addr){ */ SQLITE_PRIVATE int sqlite3VdbeDeletePriorOpcode(Vdbe *p, u8 op){ if( (p->nOp-1)>(p->pParse->iFixedOp) && p->aOp[p->nOp-1].opcode==op ){ - sqlite3VdbeChangeToNoop(p, p->nOp-1); - return 1; + return sqlite3VdbeChangeToNoop(p, p->nOp-1); }else{ return 0; } @@ -68186,16 +68698,34 @@ SQLITE_PRIVATE int sqlite3VdbeDeletePriorOpcode(Vdbe *p, u8 op){ ** ** If addr<0 then change P4 on the most recently inserted instruction. */ +static void SQLITE_NOINLINE vdbeChangeP4Full( + Vdbe *p, + Op *pOp, + const char *zP4, + int n +){ + if( pOp->p4type ){ + freeP4(p->db, pOp->p4type, pOp->p4.p); + pOp->p4type = 0; + pOp->p4.p = 0; + } + if( n<0 ){ + sqlite3VdbeChangeP4(p, (int)(pOp - p->aOp), zP4, n); + }else{ + if( n==0 ) n = sqlite3Strlen30(zP4); + pOp->p4.z = sqlite3DbStrNDup(p->db, zP4, n); + pOp->p4type = P4_DYNAMIC; + } +} SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe *p, int addr, const char *zP4, int n){ Op *pOp; sqlite3 *db; assert( p!=0 ); db = p->db; assert( p->magic==VDBE_MAGIC_INIT ); - if( p->aOp==0 || db->mallocFailed ){ - if( n!=P4_VTAB ){ - freeP4(db, n, (void*)*(char**)&zP4); - } + assert( p->aOp!=0 || db->mallocFailed ); + if( db->mallocFailed ){ + if( n!=P4_VTAB ) freeP4(db, n, (void*)*(char**)&zP4); return; } assert( p->nOp>0 ); @@ -68204,43 +68734,20 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe *p, int addr, const char *zP4, int addr = p->nOp - 1; } pOp = &p->aOp[addr]; - assert( pOp->p4type==P4_NOTUSED - || pOp->p4type==P4_INT32 - || pOp->p4type==P4_KEYINFO ); - freeP4(db, pOp->p4type, pOp->p4.p); - pOp->p4.p = 0; + if( n>=0 || pOp->p4type ){ + vdbeChangeP4Full(p, pOp, zP4, n); + return; + } if( n==P4_INT32 ){ /* Note: this cast is safe, because the origin data point was an int ** that was cast to a (const char *). */ pOp->p4.i = SQLITE_PTR_TO_INT(zP4); pOp->p4type = P4_INT32; - }else if( zP4==0 ){ - pOp->p4.p = 0; - pOp->p4type = P4_NOTUSED; - }else if( n==P4_KEYINFO ){ - pOp->p4.p = (void*)zP4; - pOp->p4type = P4_KEYINFO; -#ifdef SQLITE_ENABLE_CURSOR_HINTS - }else if( n==P4_EXPR ){ - /* Responsibility for deleting the Expr tree is handed over to the - ** VDBE by this operation. The caller should have already invoked - ** sqlite3ExprDup() or whatever other routine is needed to make a - ** private copy of the tree. */ - pOp->p4.pExpr = (Expr*)zP4; - pOp->p4type = P4_EXPR; -#endif - }else if( n==P4_VTAB ){ - pOp->p4.p = (void*)zP4; - pOp->p4type = P4_VTAB; - sqlite3VtabLock((VTable *)zP4); - assert( ((VTable *)zP4)->db==p->db ); - }else if( n<0 ){ + }else if( zP4!=0 ){ + assert( n<0 ); pOp->p4.p = (void*)zP4; pOp->p4type = (signed char)n; - }else{ - if( n==0 ) n = sqlite3Strlen30(zP4); - pOp->p4.z = sqlite3DbStrNDup(p->db, zP4, n); - pOp->p4type = P4_DYNAMIC; + if( n==P4_VTAB ) sqlite3VtabLock((VTable*)zP4); } } @@ -68424,28 +68931,27 @@ static int displayComment( ** Translate the P4.pExpr value for an OP_CursorHint opcode into text ** that can be displayed in the P4 column of EXPLAIN output. */ -static int displayP4Expr(int nTemp, char *zTemp, Expr *pExpr){ +static void displayP4Expr(StrAccum *p, Expr *pExpr){ const char *zOp = 0; - int n; switch( pExpr->op ){ case TK_STRING: - sqlite3_snprintf(nTemp, zTemp, "%Q", pExpr->u.zToken); + sqlite3XPrintf(p, "%Q", pExpr->u.zToken); break; case TK_INTEGER: - sqlite3_snprintf(nTemp, zTemp, "%d", pExpr->u.iValue); + sqlite3XPrintf(p, "%d", pExpr->u.iValue); break; case TK_NULL: - sqlite3_snprintf(nTemp, zTemp, "NULL"); + sqlite3XPrintf(p, "NULL"); break; case TK_REGISTER: { - sqlite3_snprintf(nTemp, zTemp, "r[%d]", pExpr->iTable); + sqlite3XPrintf(p, "r[%d]", pExpr->iTable); break; } case TK_COLUMN: { if( pExpr->iColumn<0 ){ - sqlite3_snprintf(nTemp, zTemp, "rowid"); + sqlite3XPrintf(p, "rowid"); }else{ - sqlite3_snprintf(nTemp, zTemp, "c%d", (int)pExpr->iColumn); + sqlite3XPrintf(p, "c%d", (int)pExpr->iColumn); } break; } @@ -68477,21 +68983,19 @@ static int displayP4Expr(int nTemp, char *zTemp, Expr *pExpr){ case TK_NOTNULL: zOp = "NOTNULL"; break; default: - sqlite3_snprintf(nTemp, zTemp, "%s", "expr"); + sqlite3XPrintf(p, "%s", "expr"); break; } if( zOp ){ - sqlite3_snprintf(nTemp, zTemp, "%s(", zOp); - n = sqlite3Strlen30(zTemp); - n += displayP4Expr(nTemp-n, zTemp+n, pExpr->pLeft); - if( npRight ){ - zTemp[n++] = ','; - n += displayP4Expr(nTemp-n, zTemp+n, pExpr->pRight); + sqlite3XPrintf(p, "%s(", zOp); + displayP4Expr(p, pExpr->pLeft); + if( pExpr->pRight ){ + sqlite3StrAccumAppend(p, ",", 1); + displayP4Expr(p, pExpr->pRight); } - sqlite3_snprintf(nTemp-n, zTemp+n, ")"); + sqlite3StrAccumAppend(p, ")", 1); } - return sqlite3Strlen30(zTemp); } #endif /* VDBE_DISPLAY_P4 && defined(SQLITE_ENABLE_CURSOR_HINTS) */ @@ -68503,72 +69007,57 @@ static int displayP4Expr(int nTemp, char *zTemp, Expr *pExpr){ */ static char *displayP4(Op *pOp, char *zTemp, int nTemp){ char *zP4 = zTemp; + StrAccum x; assert( nTemp>=20 ); + sqlite3StrAccumInit(&x, 0, zTemp, nTemp, 0); switch( pOp->p4type ){ case P4_KEYINFO: { - int i, j; + int j; KeyInfo *pKeyInfo = pOp->p4.pKeyInfo; assert( pKeyInfo->aSortOrder!=0 ); - sqlite3_snprintf(nTemp, zTemp, "k(%d", pKeyInfo->nField); - i = sqlite3Strlen30(zTemp); + sqlite3XPrintf(&x, "k(%d", pKeyInfo->nField); for(j=0; jnField; j++){ CollSeq *pColl = pKeyInfo->aColl[j]; - const char *zColl = pColl ? pColl->zName : "nil"; - int n = sqlite3Strlen30(zColl); - if( n==6 && memcmp(zColl,"BINARY",6)==0 ){ - zColl = "B"; - n = 1; - } - if( i+n>nTemp-7 ){ - memcpy(&zTemp[i],",...",4); - i += 4; - break; - } - zTemp[i++] = ','; - if( pKeyInfo->aSortOrder[j] ){ - zTemp[i++] = '-'; - } - memcpy(&zTemp[i], zColl, n+1); - i += n; + const char *zColl = pColl ? pColl->zName : ""; + if( strcmp(zColl, "BINARY")==0 ) zColl = "B"; + sqlite3XPrintf(&x, ",%s%s", pKeyInfo->aSortOrder[j] ? "-" : "", zColl); } - zTemp[i++] = ')'; - zTemp[i] = 0; - assert( ip4.pExpr); + displayP4Expr(&x, pOp->p4.pExpr); break; } #endif case P4_COLLSEQ: { CollSeq *pColl = pOp->p4.pColl; - sqlite3_snprintf(nTemp, zTemp, "(%.20s)", pColl->zName); + sqlite3XPrintf(&x, "(%.20s)", pColl->zName); break; } case P4_FUNCDEF: { FuncDef *pDef = pOp->p4.pFunc; - sqlite3_snprintf(nTemp, zTemp, "%s(%d)", pDef->zName, pDef->nArg); + sqlite3XPrintf(&x, "%s(%d)", pDef->zName, pDef->nArg); break; } #ifdef SQLITE_DEBUG case P4_FUNCCTX: { FuncDef *pDef = pOp->p4.pCtx->pFunc; - sqlite3_snprintf(nTemp, zTemp, "%s(%d)", pDef->zName, pDef->nArg); + sqlite3XPrintf(&x, "%s(%d)", pDef->zName, pDef->nArg); break; } #endif case P4_INT64: { - sqlite3_snprintf(nTemp, zTemp, "%lld", *pOp->p4.pI64); + sqlite3XPrintf(&x, "%lld", *pOp->p4.pI64); break; } case P4_INT32: { - sqlite3_snprintf(nTemp, zTemp, "%d", pOp->p4.i); + sqlite3XPrintf(&x, "%d", pOp->p4.i); break; } case P4_REAL: { - sqlite3_snprintf(nTemp, zTemp, "%.16g", *pOp->p4.pReal); + sqlite3XPrintf(&x, "%.16g", *pOp->p4.pReal); break; } case P4_MEM: { @@ -68576,11 +69065,11 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){ if( pMem->flags & MEM_Str ){ zP4 = pMem->z; }else if( pMem->flags & MEM_Int ){ - sqlite3_snprintf(nTemp, zTemp, "%lld", pMem->u.i); + sqlite3XPrintf(&x, "%lld", pMem->u.i); }else if( pMem->flags & MEM_Real ){ - sqlite3_snprintf(nTemp, zTemp, "%.16g", pMem->u.r); + sqlite3XPrintf(&x, "%.16g", pMem->u.r); }else if( pMem->flags & MEM_Null ){ - sqlite3_snprintf(nTemp, zTemp, "NULL"); + zP4 = "NULL"; }else{ assert( pMem->flags & MEM_Blob ); zP4 = "(blob)"; @@ -68590,16 +69079,24 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){ #ifndef SQLITE_OMIT_VIRTUALTABLE case P4_VTAB: { sqlite3_vtab *pVtab = pOp->p4.pVtab->pVtab; - sqlite3_snprintf(nTemp, zTemp, "vtab:%p", pVtab); + sqlite3XPrintf(&x, "vtab:%p", pVtab); break; } #endif case P4_INTARRAY: { - sqlite3_snprintf(nTemp, zTemp, "intarray"); + int i; + int *ai = pOp->p4.ai; + int n = ai[0]; /* The first element of an INTARRAY is always the + ** count of the number of elements to follow */ + for(i=1; i0 +#if !defined(SQLITE_OMIT_SHARED_CACHE) /* ** If SQLite is compiled to support shared-cache mode and to be threadsafe, ** this routine obtains the mutex associated with each BtShared structure @@ -68733,7 +69231,6 @@ static void releaseMemArray(Mem *p, int N){ if( p && N ){ Mem *pEnd = &p[N]; sqlite3 *db = p->db; - u8 malloc_failed = db->mallocFailed; if( db->pnBytesFreed ){ do{ if( p->szMalloc ) sqlite3DbFree(db, p->zMalloc); @@ -68769,7 +69266,6 @@ static void releaseMemArray(Mem *p, int N){ p->flags = MEM_Undefined; }while( (++p)mallocFailed = malloc_failed; } } @@ -68830,7 +69326,7 @@ SQLITE_PRIVATE int sqlite3VdbeList( if( p->rc==SQLITE_NOMEM ){ /* This happens if a malloc() inside a call to sqlite3_column_text() or ** sqlite3_column_text16() failed. */ - db->mallocFailed = 1; + sqlite3OomFault(db); return SQLITE_ERROR; } @@ -69028,41 +69524,43 @@ SQLITE_PRIVATE void sqlite3VdbeIOTraceSql(Vdbe *p){ } #endif /* !SQLITE_OMIT_TRACE && SQLITE_ENABLE_IOTRACE */ -/* -** Allocate space from a fixed size buffer and return a pointer to -** that space. If insufficient space is available, return NULL. +/* An instance of this object describes bulk memory available for use +** by subcomponents of a prepared statement. Space is allocated out +** of a ReusableSpace object by the allocSpace() routine below. +*/ +struct ReusableSpace { + u8 *pSpace; /* Available memory */ + int nFree; /* Bytes of available memory */ + int nNeeded; /* Total bytes that could not be allocated */ +}; + +/* Try to allocate nByte bytes of 8-byte aligned bulk memory for pBuf +** from the ReusableSpace object. Return a pointer to the allocated +** memory on success. If insufficient memory is available in the +** ReusableSpace object, increase the ReusableSpace.nNeeded +** value by the amount needed and return NULL. ** -** The pBuf parameter is the initial value of a pointer which will -** receive the new memory. pBuf is normally NULL. If pBuf is not -** NULL, it means that memory space has already been allocated and that -** this routine should not allocate any new memory. When pBuf is not -** NULL simply return pBuf. Only allocate new memory space when pBuf -** is NULL. +** If pBuf is not initially NULL, that means that the memory has already +** been allocated by a prior call to this routine, so just return a copy +** of pBuf and leave ReusableSpace unchanged. ** -** nByte is the number of bytes of space needed. -** -** pFrom points to *pnFrom bytes of available space. New space is allocated -** from the end of the pFrom buffer and *pnFrom is decremented. -** -** *pnNeeded is a counter of the number of bytes of space that have failed -** to allocate. If there is insufficient space in pFrom to satisfy the -** request, then increment *pnNeeded by the amount of the request. +** This allocator is employed to repurpose unused slots at the end of the +** opcode array of prepared state for other memory needs of the prepared +** statement. */ static void *allocSpace( - void *pBuf, /* Where return pointer will be stored */ - int nByte, /* Number of bytes to allocate */ - u8 *pFrom, /* Memory available for allocation */ - int *pnFrom, /* IN/OUT: Space available at pFrom */ - int *pnNeeded /* If allocation cannot be made, increment *pnByte */ + struct ReusableSpace *p, /* Bulk memory available for allocation */ + void *pBuf, /* Pointer to a prior allocation */ + int nByte /* Bytes of memory needed */ ){ - assert( EIGHT_BYTE_ALIGNMENT(pFrom) ); + assert( EIGHT_BYTE_ALIGNMENT(p->pSpace) ); if( pBuf==0 ){ nByte = ROUND8(nByte); - if( nByte <= *pnFrom ){ - *pnFrom -= nByte; - pBuf = &pFrom[*pnFrom]; + if( nByte <= p->nFree ){ + p->nFree -= nByte; + pBuf = &p->pSpace[p->nFree]; }else{ - *pnNeeded += nByte; + p->nNeeded += nByte; } } assert( EIGHT_BYTE_ALIGNMENT(pBuf) ); @@ -69095,7 +69593,6 @@ SQLITE_PRIVATE void sqlite3VdbeRewind(Vdbe *p){ p->pc = -1; p->rc = SQLITE_OK; p->errorAction = OE_Abort; - p->magic = VDBE_MAGIC_RUN; p->nChange = 0; p->cacheCtr = 1; p->minWriteFileFormat = 255; @@ -69138,9 +69635,7 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady( int nArg; /* Number of arguments in subprograms */ int nOnce; /* Number of OP_Once instructions */ int n; /* Loop counter */ - int nFree; /* Available free space */ - u8 *zCsr; /* Memory available for allocation */ - int nByte; /* How much extra memory is needed */ + struct ReusableSpace x; /* Reusable bulk memory */ assert( p!=0 ); assert( p->nOp>0 ); @@ -69158,7 +69653,7 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady( /* For each cursor required, also allocate a memory cell. Memory ** cells (nMem+1-nCursor)..nMem, inclusive, will never be used by - ** the vdbe program. Instead they are used to allocate space for + ** the vdbe program. Instead they are used to allocate memory for ** VdbeCursor/BtCursor structures. The blob of memory associated with ** cursor 0 is stored in memory cell nMem. Memory cell (nMem-1) ** stores the blob of memory associated with cursor 1, etc. @@ -69167,20 +69662,18 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady( */ nMem += nCursor; - /* zCsr will initially point to nFree bytes of unused space at the - ** end of the opcode array, p->aOp. The computation of nFree is - ** conservative - it might be smaller than the true number of free - ** bytes, but never larger. nFree must be a multiple of 8 - it is - ** rounded down if is not. + /* Figure out how much reusable memory is available at the end of the + ** opcode array. This extra memory will be reallocated for other elements + ** of the prepared statement. */ - n = ROUND8(sizeof(Op)*p->nOp); /* Bytes of opcode space used */ - zCsr = &((u8*)p->aOp)[n]; /* Unused opcode space */ - assert( EIGHT_BYTE_ALIGNMENT(zCsr) ); - nFree = ROUNDDOWN8(pParse->szOpAlloc - n); /* Bytes of unused space */ - assert( nFree>=0 ); - if( nFree>0 ){ - memset(zCsr, 0, nFree); - assert( EIGHT_BYTE_ALIGNMENT(&zCsr[nFree]) ); + n = ROUND8(sizeof(Op)*p->nOp); /* Bytes of opcode memory used */ + x.pSpace = &((u8*)p->aOp)[n]; /* Unused opcode memory */ + assert( EIGHT_BYTE_ALIGNMENT(x.pSpace) ); + x.nFree = ROUNDDOWN8(pParse->szOpAlloc - n); /* Bytes of unused memory */ + assert( x.nFree>=0 ); + if( x.nFree>0 ){ + memset(x.pSpace, 0, x.nFree); + assert( EIGHT_BYTE_ALIGNMENT(&x.pSpace[x.nFree]) ); } resolveP2Values(p, &nArg); @@ -69190,34 +69683,30 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady( } p->expired = 0; - /* Memory for registers, parameters, cursor, etc, is allocated in two - ** passes. On the first pass, we try to reuse unused space at the + /* Memory for registers, parameters, cursor, etc, is allocated in one or two + ** passes. On the first pass, we try to reuse unused memory at the ** end of the opcode array. If we are unable to satisfy all memory ** requirements by reusing the opcode array tail, then the second - ** pass will fill in the rest using a fresh allocation. + ** pass will fill in the remainder using a fresh memory allocation. ** ** This two-pass approach that reuses as much memory as possible from - ** the leftover space at the end of the opcode array can significantly + ** the leftover memory at the end of the opcode array. This can significantly ** reduce the amount of memory held by a prepared statement. */ do { - nByte = 0; - p->aMem = allocSpace(p->aMem, nMem*sizeof(Mem), zCsr, &nFree, &nByte); - p->aVar = allocSpace(p->aVar, nVar*sizeof(Mem), zCsr, &nFree, &nByte); - p->apArg = allocSpace(p->apArg, nArg*sizeof(Mem*), zCsr, &nFree, &nByte); - p->azVar = allocSpace(p->azVar, nVar*sizeof(char*), zCsr, &nFree, &nByte); - p->apCsr = allocSpace(p->apCsr, nCursor*sizeof(VdbeCursor*), - zCsr, &nFree, &nByte); - p->aOnceFlag = allocSpace(p->aOnceFlag, nOnce, zCsr, &nFree, &nByte); + x.nNeeded = 0; + p->aMem = allocSpace(&x, p->aMem, nMem*sizeof(Mem)); + p->aVar = allocSpace(&x, p->aVar, nVar*sizeof(Mem)); + p->apArg = allocSpace(&x, p->apArg, nArg*sizeof(Mem*)); + p->apCsr = allocSpace(&x, p->apCsr, nCursor*sizeof(VdbeCursor*)); + p->aOnceFlag = allocSpace(&x, p->aOnceFlag, nOnce); #ifdef SQLITE_ENABLE_STMT_SCANSTATUS - p->anExec = allocSpace(p->anExec, p->nOp*sizeof(i64), zCsr, &nFree, &nByte); + p->anExec = allocSpace(&x, p->anExec, p->nOp*sizeof(i64)); #endif - if( nByte ){ - p->pFree = sqlite3DbMallocZero(db, nByte); - } - zCsr = p->pFree; - nFree = nByte; - }while( nByte && !db->mallocFailed ); + if( x.nNeeded==0 ) break; + x.pSpace = p->pFree = sqlite3DbMallocZero(db, x.nNeeded); + x.nFree = x.nNeeded; + }while( !db->mallocFailed ); p->nCursor = nCursor; p->nOnceFlag = nOnce; @@ -69228,11 +69717,10 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady( p->aVar[n].db = db; } } - if( p->azVar && pParse->nzVar>0 ){ - p->nzVar = pParse->nzVar; - memcpy(p->azVar, pParse->azVar, p->nzVar*sizeof(p->azVar[0])); - memset(pParse->azVar, 0, pParse->nzVar*sizeof(pParse->azVar[0])); - } + p->nzVar = pParse->nzVar; + p->azVar = pParse->azVar; + pParse->nzVar = 0; + pParse->azVar = 0; if( p->aMem ){ p->aMem--; /* aMem[] goes from 1..nMem */ p->nMem = nMem; /* not from 0..nMem-1 */ @@ -69831,7 +70319,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ ** one, or the complete transaction if there is no statement transaction. */ - if( p->db->mallocFailed ){ + if( db->mallocFailed ){ p->rc = SQLITE_NOMEM; } if( p->aOnceFlag ) memset(p->aOnceFlag, 0, p->nOnceFlag); @@ -69992,7 +70480,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ } p->magic = VDBE_MAGIC_HALT; checkActiveVdbeCnt(db); - if( p->db->mallocFailed ){ + if( db->mallocFailed ){ p->rc = SQLITE_NOMEM; } @@ -70029,12 +70517,12 @@ SQLITE_PRIVATE int sqlite3VdbeTransferError(Vdbe *p){ sqlite3 *db = p->db; int rc = p->rc; if( p->zErrMsg ){ - u8 mallocFailed = db->mallocFailed; + db->bBenignMalloc++; sqlite3BeginBenignMalloc(); if( db->pErr==0 ) db->pErr = sqlite3ValueNew(db); sqlite3ValueSetStr(db->pErr, -1, p->zErrMsg, SQLITE_UTF8, SQLITE_TRANSIENT); sqlite3EndBenignMalloc(); - db->mallocFailed = mallocFailed; + db->bBenignMalloc--; db->errCode = rc; }else{ sqlite3Error(db, rc); @@ -70219,6 +70707,7 @@ SQLITE_PRIVATE void sqlite3VdbeClearObject(sqlite3 *db, Vdbe *p){ sqlite3DbFree(db, pSub); } for(i=p->nzVar-1; i>=0; i--) sqlite3DbFree(db, p->azVar[i]); + sqlite3DbFree(db, p->azVar); vdbeFreeOpArray(db, p->aOp, p->nOp); sqlite3DbFree(db, p->aColName); sqlite3DbFree(db, p->zSql); @@ -70322,9 +70811,16 @@ SQLITE_PRIVATE int sqlite3VdbeCursorRestore(VdbeCursor *p){ ** If the cursor is already pointing to the correct row and that row has ** not been deleted out from under the cursor, then this routine is a no-op. */ -SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor *p){ +SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor **pp, int *piCol){ + VdbeCursor *p = *pp; if( p->eCurType==CURTYPE_BTREE ){ if( p->deferredMoveto ){ + int iMap; + if( p->aAltMap && (iMap = p->aAltMap[1+*piCol])>0 ){ + *pp = p->pAltCursor; + *piCol = iMap - 1; + return SQLITE_OK; + } return handleDeferredMoveto(p); } if( sqlite3BtreeCursorHasMoved(p->uc.pCursor) ){ @@ -70963,9 +71459,9 @@ static int vdbeCompareMemString( v2 = sqlite3ValueText((sqlite3_value*)&c2, pColl->enc); n2 = v2==0 ? 0 : c2.n; rc = pColl->xCmp(pColl->pUser, n1, v1, n2, v2); + if( (v1==0 || v2==0) && prcErr ) *prcErr = SQLITE_NOMEM; sqlite3VdbeMemRelease(&c1); sqlite3VdbeMemRelease(&c2); - if( (v1==0 || v2==0) && prcErr ) *prcErr = SQLITE_NOMEM; return rc; } } @@ -71753,11 +72249,13 @@ SQLITE_PRIVATE void sqlite3VdbeSetVarmask(Vdbe *v, int iVar){ ** in memory obtained from sqlite3DbMalloc). */ SQLITE_PRIVATE void sqlite3VtabImportErrmsg(Vdbe *p, sqlite3_vtab *pVtab){ - sqlite3 *db = p->db; - sqlite3DbFree(db, p->zErrMsg); - p->zErrMsg = sqlite3DbStrDup(db, pVtab->zErrMsg); - sqlite3_free(pVtab->zErrMsg); - pVtab->zErrMsg = 0; + if( pVtab->zErrMsg ){ + sqlite3 *db = p->db; + sqlite3DbFree(db, p->zErrMsg); + p->zErrMsg = sqlite3DbStrDup(db, pVtab->zErrMsg); + sqlite3_free(pVtab->zErrMsg); + pVtab->zErrMsg = 0; + } } #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -71953,7 +72451,8 @@ SQLITE_API sqlite_int64 SQLITE_STDCALL sqlite3_value_int64(sqlite3_value *pVal){ return sqlite3VdbeIntValue((Mem*)pVal); } SQLITE_API unsigned int SQLITE_STDCALL sqlite3_value_subtype(sqlite3_value *pVal){ - return ((Mem*)pVal)->eSubtype; + Mem *pMem = (Mem*)pVal; + return ((pMem->flags & MEM_Subtype) ? pMem->eSubtype : 0); } SQLITE_API const unsigned char *SQLITE_STDCALL sqlite3_value_text(sqlite3_value *pVal){ return (const unsigned char *)sqlite3ValueText(pVal, SQLITE_UTF8); @@ -72134,8 +72633,10 @@ SQLITE_API void SQLITE_STDCALL sqlite3_result_null(sqlite3_context *pCtx){ sqlite3VdbeMemSetNull(pCtx->pOut); } SQLITE_API void SQLITE_STDCALL sqlite3_result_subtype(sqlite3_context *pCtx, unsigned int eSubtype){ - assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) ); - pCtx->pOut->eSubtype = eSubtype & 0xff; + Mem *pOut = pCtx->pOut; + assert( sqlite3_mutex_held(pOut->db->mutex) ); + pOut->eSubtype = eSubtype & 0xff; + pOut->flags |= MEM_Subtype; } SQLITE_API void SQLITE_STDCALL sqlite3_result_text( sqlite3_context *pCtx, @@ -72235,7 +72736,7 @@ SQLITE_API void SQLITE_STDCALL sqlite3_result_error_nomem(sqlite3_context *pCtx) sqlite3VdbeMemSetNull(pCtx->pOut); pCtx->isError = SQLITE_NOMEM; pCtx->fErrorOrAux = 1; - pCtx->pOut->db->mallocFailed = 1; + sqlite3OomFault(pCtx->pOut->db); } /* @@ -72544,7 +73045,7 @@ static SQLITE_NOINLINE void *createAggContext(sqlite3_context *p, int nByte){ ** same context that was returned on prior calls. */ SQLITE_API void *SQLITE_STDCALL sqlite3_aggregate_context(sqlite3_context *p, int nByte){ - assert( p && p->pFunc && p->pFunc->xStep ); + assert( p && p->pFunc && p->pFunc->xFinalize ); assert( sqlite3_mutex_held(p->pOut->db->mutex) ); testcase( nByte<0 ); if( (p->pMem->flags & MEM_Agg)==0 ){ @@ -72635,7 +73136,7 @@ failed: ** context. */ SQLITE_API int SQLITE_STDCALL sqlite3_aggregate_count(sqlite3_context *p){ - assert( p && p->pMem && p->pFunc && p->pFunc->xStep ); + assert( p && p->pMem && p->pFunc && p->pFunc->xFinalize ); return p->pMem->n; } #endif @@ -72863,7 +73364,7 @@ static const void *columnName( ** is the case, clear the mallocFailed flag and return NULL. */ if( db->mallocFailed ){ - db->mallocFailed = 0; + sqlite3OomClear(db); ret = 0; } sqlite3_mutex_leave(db->mutex); @@ -73564,9 +74065,9 @@ SQLITE_PRIVATE char *sqlite3VdbeExpandSql( if( pVar->flags & MEM_Null ){ sqlite3StrAccumAppend(&out, "NULL", 4); }else if( pVar->flags & MEM_Int ){ - sqlite3XPrintf(&out, 0, "%lld", pVar->u.i); + sqlite3XPrintf(&out, "%lld", pVar->u.i); }else if( pVar->flags & MEM_Real ){ - sqlite3XPrintf(&out, 0, "%!.15g", pVar->u.r); + sqlite3XPrintf(&out, "%!.15g", pVar->u.r); }else if( pVar->flags & MEM_Str ){ int nOut; /* Number of bytes of the string text to include in output */ #ifndef SQLITE_OMIT_UTF16 @@ -73587,17 +74088,17 @@ SQLITE_PRIVATE char *sqlite3VdbeExpandSql( while( nOutn && (pVar->z[nOut]&0xc0)==0x80 ){ nOut++; } } #endif - sqlite3XPrintf(&out, 0, "'%.*q'", nOut, pVar->z); + sqlite3XPrintf(&out, "'%.*q'", nOut, pVar->z); #ifdef SQLITE_TRACE_SIZE_LIMIT if( nOutn ){ - sqlite3XPrintf(&out, 0, "/*+%d bytes*/", pVar->n-nOut); + sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-nOut); } #endif #ifndef SQLITE_OMIT_UTF16 if( enc!=SQLITE_UTF8 ) sqlite3VdbeMemRelease(&utf8); #endif }else if( pVar->flags & MEM_Zero ){ - sqlite3XPrintf(&out, 0, "zeroblob(%d)", pVar->u.nZero); + sqlite3XPrintf(&out, "zeroblob(%d)", pVar->u.nZero); }else{ int nOut; /* Number of bytes of the blob to include in output */ assert( pVar->flags & MEM_Blob ); @@ -73607,12 +74108,12 @@ SQLITE_PRIVATE char *sqlite3VdbeExpandSql( if( nOut>SQLITE_TRACE_SIZE_LIMIT ) nOut = SQLITE_TRACE_SIZE_LIMIT; #endif for(i=0; iz[i]&0xff); + sqlite3XPrintf(&out, "%02x", pVar->z[i]&0xff); } sqlite3StrAccumAppend(&out, "'", 1); #ifdef SQLITE_TRACE_SIZE_LIMIT if( nOutn ){ - sqlite3XPrintf(&out, 0, "/*+%d bytes*/", pVar->n-nOut); + sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-nOut); } #endif } @@ -74098,6 +74599,7 @@ static void memTracePrint(Mem *p){ sqlite3VdbeMemPrettyPrint(p, zBuf); printf(" %s", zBuf); } + if( p->flags & MEM_Subtype ) printf(" subtype=0x%02x", p->eSubtype); } static void registerTrace(int iReg, Mem *p){ printf("REG[%d] = ", iReg); @@ -74267,6 +74769,9 @@ SQLITE_PRIVATE int sqlite3VdbeExec( Op *pOp = aOp; /* Current operation */ #if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE) Op *pOrigOp; /* Value of pOp at the top of the loop */ +#endif +#ifdef SQLITE_DEBUG + int nExtraDelete = 0; /* Verifies FORDELETE and AUXDELETE flags */ #endif int rc = SQLITE_OK; /* Value to return */ sqlite3 *db = p->db; /* The database */ @@ -74341,7 +74846,6 @@ SQLITE_PRIVATE int sqlite3VdbeExec( #endif for(pOp=&aOp[p->pc]; rc==SQLITE_OK; pOp++){ assert( pOp>=aOp && pOp<&aOp[p->nOp]); - if( db->mallocFailed ) goto no_mem; #ifdef VDBE_PROFILE start = sqlite3Hwtime(); #endif @@ -75339,7 +75843,7 @@ case OP_Function0: { assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) ); assert( n==0 || (pOp->p2>0 && pOp->p2+n<=(p->nMem-p->nCursor)+1) ); assert( pOp->p3p2 || pOp->p3>=pOp->p2+n ); - pCtx = sqlite3DbMallocRaw(db, sizeof(*pCtx) + (n-1)*sizeof(sqlite3_value*)); + pCtx = sqlite3DbMallocRawNN(db, sizeof(*pCtx) + (n-1)*sizeof(sqlite3_value*)); if( pCtx==0 ) goto no_mem; pCtx->pOut = 0; pCtx->pFunc = pOp->p4.pFunc; @@ -75378,8 +75882,8 @@ case OP_Function: { MemSetTypeFlag(pCtx->pOut, MEM_Null); pCtx->fErrorOrAux = 0; db->lastRowid = lastRowid; - (*pCtx->pFunc->xFunc)(pCtx, pCtx->argc, pCtx->argv); /* IMP: R-24505-23230 */ - lastRowid = db->lastRowid; /* Remember rowid changes made by xFunc */ + (*pCtx->pFunc->xSFunc)(pCtx, pCtx->argc, pCtx->argv);/* IMP: R-24505-23230 */ + lastRowid = db->lastRowid; /* Remember rowid changes made by xSFunc */ /* If the function returned an error, throw an exception */ if( pCtx->fErrorOrAux ){ @@ -75783,11 +76287,14 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ ** The permutation is only valid until the next OP_Compare that has ** the OPFLAG_PERMUTE bit set in P5. Typically the OP_Permutation should ** occur immediately prior to the OP_Compare. +** +** The first integer in the P4 integer array is the length of the array +** and does not become part of the permutation. */ case OP_Permutation: { assert( pOp->p4type==P4_INTARRAY ); assert( pOp->p4.ai ); - aPermute = pOp->p4.ai; + aPermute = pOp->p4.ai + 1; break; } @@ -76090,15 +76597,18 @@ case OP_Column: { u64 offset64; /* 64-bit offset */ u32 avail; /* Number of bytes of available data */ u32 t; /* A type code from the record header */ - u16 fx; /* pDest->flags value */ Mem *pReg; /* PseudoTable input register */ + pC = p->apCsr[pOp->p1]; p2 = pOp->p2; + + /* If the cursor cache is stale, bring it up-to-date */ + rc = sqlite3VdbeCursorMoveto(&pC, &p2); + assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) ); pDest = &aMem[pOp->p3]; memAboutToChange(p, pDest); assert( pOp->p1>=0 && pOp->p1nCursor ); - pC = p->apCsr[pOp->p1]; assert( pC!=0 ); assert( p2nField ); aOffset = pC->aOffset; @@ -76107,8 +76617,6 @@ case OP_Column: { assert( pC->eCurType!=CURTYPE_SORTER ); pCrsr = pC->uc.pCursor; - /* If the cursor cache is stale, bring it up-to-date */ - rc = sqlite3VdbeCursorMoveto(pC); if( rc ) goto abort_due_to_error; if( pC->cacheStatus!=p->cacheCtr ){ if( pC->nullRow ){ @@ -76268,10 +76776,31 @@ case OP_Column: { assert( sqlite3VdbeCheckMemInvariants(pDest) ); if( VdbeMemDynamic(pDest) ) sqlite3VdbeMemSetNull(pDest); assert( t==pC->aType[p2] ); + pDest->enc = encoding; if( pC->szRow>=aOffset[p2+1] ){ /* This is the common case where the desired content fits on the original ** page - where the content is not on an overflow page */ - sqlite3VdbeSerialGet(pC->aRow+aOffset[p2], t, pDest); + zData = pC->aRow + aOffset[p2]; + if( t<12 ){ + sqlite3VdbeSerialGet(zData, t, pDest); + }else{ + /* If the column value is a string, we need a persistent value, not + ** a MEM_Ephem value. This branch is a fast short-cut that is equivalent + ** to calling sqlite3VdbeSerialGet() and sqlite3VdbeDeephemeralize(). + */ + static const u16 aFlag[] = { MEM_Blob, MEM_Str|MEM_Term }; + pDest->n = len = (t-12)/2; + if( pDest->szMalloc < len+2 ){ + pDest->flags = MEM_Null; + if( sqlite3VdbeMemGrow(pDest, len+2, 0) ) goto no_mem; + }else{ + pDest->z = pDest->zMalloc; + } + memcpy(pDest->z, zData, len); + pDest->z[len] = 0; + pDest->z[len+1] = 0; + pDest->flags = aFlag[t&1]; + } }else{ /* This branch happens only when content is on overflow pages */ if( ((pOp->p5 & (OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))!=0 @@ -76283,38 +76812,20 @@ case OP_Column: { ** 2. the length(X) function if X is a blob, and ** 3. if the content length is zero. ** So we might as well use bogus content rather than reading - ** content from disk. NULL will work for the value for strings - ** and blobs and whatever is in the payloadSize64 variable - ** will work for everything else. */ - sqlite3VdbeSerialGet(t<=13 ? (u8*)&payloadSize64 : 0, t, pDest); + ** content from disk. */ + static u8 aZero[8]; /* This is the bogus content */ + sqlite3VdbeSerialGet(aZero, t, pDest); }else{ rc = sqlite3VdbeMemFromBtree(pCrsr, aOffset[p2], len, !pC->isTable, pDest); - if( rc!=SQLITE_OK ){ - goto op_column_error; + if( rc==SQLITE_OK ){ + sqlite3VdbeSerialGet((const u8*)pDest->z, t, pDest); + pDest->flags &= ~MEM_Ephem; } - sqlite3VdbeSerialGet((const u8*)pDest->z, t, pDest); - pDest->flags &= ~MEM_Ephem; } } - pDest->enc = encoding; op_column_out: - /* If the column value is an ephemeral string, go ahead and persist - ** that string in case the cursor moves before the column value is - ** used. The following code does the equivalent of Deephemeralize() - ** but does it faster. */ - if( (pDest->flags & MEM_Ephem)!=0 && pDest->z ){ - fx = pDest->flags & (MEM_Str|MEM_Blob); - assert( fx!=0 ); - zData = (const u8*)pDest->z; - len = pDest->n; - if( sqlite3VdbeMemClearAndResize(pDest, len+2) ) goto no_mem; - memcpy(pDest->z, zData, len); - pDest->z[len] = 0; - pDest->z[len+1] = 0; - pDest->flags = fx|MEM_Term; - } op_column_error: UPDATE_MAX_BLOBSIZE(pDest); REGISTER_TRACE(pOp->p3, pDest); @@ -76576,7 +77087,7 @@ case OP_Savepoint: { #endif /* Create a new savepoint structure. */ - pNew = sqlite3DbMallocRaw(db, sizeof(Savepoint)+nName+1); + pNew = sqlite3DbMallocRawNN(db, sizeof(Savepoint)+nName+1); if( pNew ){ pNew->zName = (char *)&pNew[1]; memcpy(pNew->zName, zName, nName+1); @@ -76713,28 +77224,27 @@ case OP_Savepoint: { case OP_AutoCommit: { int desiredAutoCommit; int iRollback; - int turnOnAC; desiredAutoCommit = pOp->p1; iRollback = pOp->p2; - turnOnAC = desiredAutoCommit && !db->autoCommit; assert( desiredAutoCommit==1 || desiredAutoCommit==0 ); assert( desiredAutoCommit==1 || iRollback==0 ); assert( db->nVdbeActive>0 ); /* At least this one VM is active */ assert( p->bIsReader ); - if( turnOnAC && !iRollback && db->nVdbeWrite>0 ){ - /* If this instruction implements a COMMIT and other VMs are writing - ** return an error indicating that the other VMs must complete first. - */ - sqlite3VdbeError(p, "cannot commit transaction - " - "SQL statements in progress"); - rc = SQLITE_BUSY; - }else if( desiredAutoCommit!=db->autoCommit ){ + if( desiredAutoCommit!=db->autoCommit ){ if( iRollback ){ assert( desiredAutoCommit==1 ); sqlite3RollbackAll(db, SQLITE_ABORT_ROLLBACK); db->autoCommit = 1; + }else if( desiredAutoCommit && db->nVdbeWrite>0 ){ + /* If this instruction implements a COMMIT and other VMs are writing + ** return an error indicating that the other VMs must complete first. + */ + sqlite3VdbeError(p, "cannot commit transaction - " + "SQL statements in progress"); + rc = SQLITE_BUSY; + break; }else if( (rc = sqlite3VdbeCheckFk(p, 1))!=SQLITE_OK ){ goto vdbe_return; }else{ @@ -76919,15 +77429,15 @@ case OP_ReadCookie: { /* out2 */ /* Opcode: SetCookie P1 P2 P3 * * ** -** Write the content of register P3 (interpreted as an integer) -** into cookie number P2 of database P1. P2==1 is the schema version. -** P2==2 is the database format. P2==3 is the recommended pager cache +** Write the integer value P3 into cookie number P2 of database P1. +** P2==1 is the schema version. P2==2 is the database format. +** P2==3 is the recommended pager cache ** size, and so forth. P1==0 is the main database file and P1==1 is the ** database file used to store temporary tables. ** ** A transaction must be started before executing this opcode. */ -case OP_SetCookie: { /* in3 */ +case OP_SetCookie: { Db *pDb; assert( pOp->p2p1>=0 && pOp->p1nDb ); @@ -76936,17 +77446,15 @@ case OP_SetCookie: { /* in3 */ pDb = &db->aDb[pOp->p1]; assert( pDb->pBt!=0 ); assert( sqlite3SchemaMutexHeld(db, pOp->p1, 0) ); - pIn3 = &aMem[pOp->p3]; - sqlite3VdbeMemIntegerify(pIn3); /* See note about index shifting on OP_ReadCookie */ - rc = sqlite3BtreeUpdateMeta(pDb->pBt, pOp->p2, (int)pIn3->u.i); + rc = sqlite3BtreeUpdateMeta(pDb->pBt, pOp->p2, pOp->p3); if( pOp->p2==BTREE_SCHEMA_VERSION ){ /* When the schema cookie changes, record the new cookie internally */ - pDb->pSchema->schema_cookie = (int)pIn3->u.i; + pDb->pSchema->schema_cookie = pOp->p3; db->flags |= SQLITE_InternChanges; }else if( pOp->p2==BTREE_FILE_FORMAT ){ /* Record changes in the file format */ - pDb->pSchema->file_format = (u8)pIn3->u.i; + pDb->pSchema->file_format = pOp->p3; } if( pOp->p1==1 ){ /* Invalidate all prepared statements whenever the TEMP database @@ -77106,6 +77614,9 @@ case OP_OpenWrite: pCur->nullRow = 1; pCur->isOrdered = 1; pCur->pgnoRoot = p2; +#ifdef SQLITE_DEBUG + pCur->wrFlag = wrFlag; +#endif rc = sqlite3BtreeCursor(pX, p2, wrFlag, pKeyInfo, pCur->uc.pCursor); pCur->pKeyInfo = pKeyInfo; /* Set the VdbeCursor.isTable variable. Previous versions of @@ -77559,32 +78070,6 @@ seek_not_found: } break; } - -/* Opcode: Seek P1 P2 * * * -** Synopsis: intkey=r[P2] -** -** P1 is an open table cursor and P2 is a rowid integer. Arrange -** for P1 to move so that it points to the rowid given by P2. -** -** This is actually a deferred seek. Nothing actually happens until -** the cursor is used to read a record. That way, if no reads -** occur, no unnecessary I/O happens. -*/ -case OP_Seek: { /* in2 */ - VdbeCursor *pC; - - assert( pOp->p1>=0 && pOp->p1nCursor ); - pC = p->apCsr[pOp->p1]; - assert( pC!=0 ); - assert( pC->eCurType==CURTYPE_BTREE ); - assert( pC->uc.pCursor!=0 ); - assert( pC->isTable ); - pC->nullRow = 0; - pIn2 = &aMem[pOp->p2]; - pC->movetoTarget = sqlite3VdbeIntValue(pIn2); - pC->deferredMoveto = 1; - break; -} /* Opcode: Found P1 P2 P3 P4 * @@ -78055,14 +78540,22 @@ case OP_InsertInt: { ** ** Delete the record at which the P1 cursor is currently pointing. ** -** If the P5 parameter is non-zero, the cursor will be left pointing at -** either the next or the previous record in the table. If it is left -** pointing at the next record, then the next Next instruction will be a -** no-op. As a result, in this case it is OK to delete a record from within a -** Next loop. If P5 is zero, then the cursor is left in an undefined state. +** If the OPFLAG_SAVEPOSITION bit of the P5 parameter is set, then +** the cursor will be left pointing at either the next or the previous +** record in the table. If it is left pointing at the next record, then +** the next Next instruction will be a no-op. As a result, in this case +** it is ok to delete a record from within a Next loop. If +** OPFLAG_SAVEPOSITION bit of P5 is clear, then the cursor will be +** left in an undefined state. ** -** If the OPFLAG_NCHANGE flag of P2 is set, then the row change count is -** incremented (otherwise not). +** If the OPFLAG_AUXDELETE bit is set on P5, that indicates that this +** delete one of several associated with deleting a table row and all its +** associated index entries. Exactly one of those deletes is the "primary" +** delete. The others are all on OPFLAG_FORDELETE cursors or else are +** marked with the AUXDELETE flag. +** +** If the OPFLAG_NCHANGE flag of P2 (NB: P2 not P5) is set, then the row +** change count is incremented (otherwise not). ** ** P1 must not be pseudo-table. It has to be a real table with ** multiple rows. @@ -78098,7 +78591,26 @@ case OP_Delete: { assert( pC->movetoTarget==iKey ); } #endif - + + /* Only flags that can be set are SAVEPOISTION and AUXDELETE */ + assert( (pOp->p5 & ~(OPFLAG_SAVEPOSITION|OPFLAG_AUXDELETE))==0 ); + assert( OPFLAG_SAVEPOSITION==BTREE_SAVEPOSITION ); + assert( OPFLAG_AUXDELETE==BTREE_AUXDELETE ); + +#ifdef SQLITE_DEBUG + if( p->pFrame==0 ){ + if( pC->isEphemeral==0 + && (pOp->p5 & OPFLAG_AUXDELETE)==0 + && (pC->wrFlag & OPFLAG_FORDELETE)==0 + ){ + nExtraDelete++; + } + if( pOp->p2 & OPFLAG_NCHANGE ){ + nExtraDelete--; + } + } +#endif + rc = sqlite3BtreeDelete(pC->uc.pCursor, pOp->p5); pC->cacheStatus = CACHE_STALE; @@ -78643,18 +79155,34 @@ case OP_IdxDelete: { r.nField = (u16)pOp->p3; r.default_rc = 0; r.aMem = &aMem[pOp->p2]; -#ifdef SQLITE_DEBUG - { int i; for(i=0; ideferredMoveto==0 ); pC->cacheStatus = CACHE_STALE; break; } +/* Opcode: Seek P1 * P3 P4 * +** Synopsis: Move P3 to P1.rowid +** +** P1 is an open index cursor and P3 is a cursor on the corresponding +** table. This opcode does a deferred seek of the P3 table cursor +** to the row that corresponds to the current row of P1. +** +** This is a deferred seek. Nothing actually happens until +** the cursor is used to read a record. That way, if no reads +** occur, no unnecessary I/O happens. +** +** P4 may be an array of integers (type P4_INTARRAY) containing +** one entry for each column in the P3 table. If array entry a(i) +** is non-zero, then reading column a(i)-1 from cursor P3 is +** equivalent to performing the deferred seek and then reading column i +** from P1. This information is stored in P3 and used to redirect +** reads against P3 over to P1, thus possibly avoiding the need to +** seek and read cursor P3. +*/ /* Opcode: IdxRowid P1 P2 * * * ** Synopsis: r[P2]=rowid ** @@ -78664,37 +79192,57 @@ case OP_IdxDelete: { ** ** See also: Rowid, MakeRecord. */ +case OP_Seek: case OP_IdxRowid: { /* out2 */ - BtCursor *pCrsr; - VdbeCursor *pC; - i64 rowid; + VdbeCursor *pC; /* The P1 index cursor */ + VdbeCursor *pTabCur; /* The P2 table cursor (OP_Seek only) */ + i64 rowid; /* Rowid that P1 current points to */ - pOut = out2Prerelease(p, pOp); assert( pOp->p1>=0 && pOp->p1nCursor ); pC = p->apCsr[pOp->p1]; assert( pC!=0 ); assert( pC->eCurType==CURTYPE_BTREE ); - pCrsr = pC->uc.pCursor; - assert( pCrsr!=0 ); - pOut->flags = MEM_Null; + assert( pC->uc.pCursor!=0 ); assert( pC->isTable==0 ); assert( pC->deferredMoveto==0 ); + assert( !pC->nullRow || pOp->opcode==OP_IdxRowid ); + + /* The IdxRowid and Seek opcodes are combined because of the commonality + ** of sqlite3VdbeCursorRestore() and sqlite3VdbeIdxRowid(). */ + rc = sqlite3VdbeCursorRestore(pC); /* sqlite3VbeCursorRestore() can only fail if the record has been deleted - ** out from under the cursor. That will never happend for an IdxRowid - ** opcode, hence the NEVER() arround the check of the return value. - */ - rc = sqlite3VdbeCursorRestore(pC); + ** out from under the cursor. That will never happens for an IdxRowid + ** or Seek opcode */ if( NEVER(rc!=SQLITE_OK) ) goto abort_due_to_error; if( !pC->nullRow ){ rowid = 0; /* Not needed. Only used to silence a warning. */ - rc = sqlite3VdbeIdxRowid(db, pCrsr, &rowid); + rc = sqlite3VdbeIdxRowid(db, pC->uc.pCursor, &rowid); if( rc!=SQLITE_OK ){ goto abort_due_to_error; } - pOut->u.i = rowid; - pOut->flags = MEM_Int; + if( pOp->opcode==OP_Seek ){ + assert( pOp->p3>=0 && pOp->p3nCursor ); + pTabCur = p->apCsr[pOp->p3]; + assert( pTabCur!=0 ); + assert( pTabCur->eCurType==CURTYPE_BTREE ); + assert( pTabCur->uc.pCursor!=0 ); + assert( pTabCur->isTable ); + pTabCur->nullRow = 0; + pTabCur->movetoTarget = rowid; + pTabCur->deferredMoveto = 1; + assert( pOp->p4type==P4_INTARRAY || pOp->p4.ai==0 ); + pTabCur->aAltMap = pOp->p4.ai; + pTabCur->pAltCursor = pC; + }else{ + pOut = out2Prerelease(p, pOp); + pOut->u.i = rowid; + pOut->flags = MEM_Int; + } + }else{ + assert( pOp->opcode==OP_IdxRowid ); + sqlite3VdbeMemSetNull(&aMem[pOp->p2]); } break; } @@ -78813,6 +79361,7 @@ case OP_Destroy: { /* out2 */ int iDb; assert( p->readOnly==0 ); + assert( pOp->p1>1 ); pOut = out2Prerelease(p, pOp); pOut->flags = MEM_Null; if( db->nVdbeRead > db->nVDestroy+1 ){ @@ -79088,7 +79637,7 @@ case OP_IntegrityCk: { assert( p->bIsReader ); nRoot = pOp->p2; assert( nRoot>0 ); - aRoot = sqlite3DbMallocRaw(db, sizeof(int)*(nRoot+1) ); + aRoot = sqlite3DbMallocRawNN(db, sizeof(int)*(nRoot+1) ); if( aRoot==0 ) goto no_mem; assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) ); pnErr = &aMem[pOp->p3]; @@ -79470,20 +80019,31 @@ case OP_IfPos: { /* jump, in1 */ break; } -/* Opcode: SetIfNotPos P1 P2 P3 * * -** Synopsis: if r[P1]<=0 then r[P2]=P3 +/* Opcode: OffsetLimit P1 P2 P3 * * +** Synopsis: if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1) ** -** Register P1 must contain an integer. -** If the value of register P1 is not positive (if it is less than 1) then -** set the value of register P2 to be the integer P3. +** This opcode performs a commonly used computation associated with +** LIMIT and OFFSET process. r[P1] holds the limit counter. r[P3] +** holds the offset counter. The opcode computes the combined value +** of the LIMIT and OFFSET and stores that value in r[P2]. The r[P2] +** value computed is the total number of rows that will need to be +** visited in order to complete the query. +** +** If r[P3] is zero or negative, that means there is no OFFSET +** and r[P2] is set to be the value of the LIMIT, r[P1]. +** +** if r[P1] is zero or negative, that means there is no LIMIT +** and r[P2] is set to -1. +** +** Otherwise, r[P2] is set to the sum of r[P1] and r[P3]. */ -case OP_SetIfNotPos: { /* in1, in2 */ +case OP_OffsetLimit: { /* in1, out2, in3 */ pIn1 = &aMem[pOp->p1]; - assert( pIn1->flags&MEM_Int ); - if( pIn1->u.i<=0 ){ - pOut = out2Prerelease(p, pOp); - pOut->u.i = pOp->p3; - } + pIn3 = &aMem[pOp->p3]; + pOut = out2Prerelease(p, pOp); + assert( pIn1->flags & MEM_Int ); + assert( pIn3->flags & MEM_Int ); + pOut->u.i = pIn1->u.i<=0 ? -1 : pIn1->u.i+(pIn3->u.i>0?pIn3->u.i:0); break; } @@ -79574,7 +80134,7 @@ case OP_AggStep0: { assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) ); assert( n==0 || (pOp->p2>0 && pOp->p2+n<=(p->nMem-p->nCursor)+1) ); assert( pOp->p3p2 || pOp->p3>=pOp->p2+n ); - pCtx = sqlite3DbMallocRaw(db, sizeof(*pCtx) + (n-1)*sizeof(sqlite3_value*)); + pCtx = sqlite3DbMallocRawNN(db, sizeof(*pCtx) + (n-1)*sizeof(sqlite3_value*)); if( pCtx==0 ) goto no_mem; pCtx->pMem = 0; pCtx->pFunc = pOp->p4.pFunc; @@ -79617,7 +80177,7 @@ case OP_AggStep: { pCtx->pOut = &t; pCtx->fErrorOrAux = 0; pCtx->skipFlag = 0; - (pCtx->pFunc->xStep)(pCtx,pCtx->argc,pCtx->argv); /* IMP: R-24505-23230 */ + (pCtx->pFunc->xSFunc)(pCtx,pCtx->argc,pCtx->argv); /* IMP: R-24505-23230 */ if( pCtx->fErrorOrAux ){ if( pCtx->isError ){ sqlite3VdbeError(p, "%s", sqlite3_value_text(&t)); @@ -80441,7 +81001,7 @@ vdbe_error_halt: sqlite3_log(rc, "statement aborts at %d: [%s] %s", (int)(pOp - aOp), p->zSql, p->zErrMsg); sqlite3VdbeHalt(p); - if( rc==SQLITE_IOERR_NOMEM ) db->mallocFailed = 1; + if( rc==SQLITE_IOERR_NOMEM ) sqlite3OomFault(db); rc = SQLITE_ERROR; if( resetSchemaOnFault>0 ){ sqlite3ResetOneSchema(db, resetSchemaOnFault-1); @@ -80455,6 +81015,9 @@ vdbe_return: testcase( nVmStep>0 ); p->aCounter[SQLITE_STMTSTATUS_VM_STEP] += (int)nVmStep; sqlite3VdbeLeave(p); + assert( rc!=SQLITE_OK || nExtraDelete==0 + || sqlite3_strlike("DELETE%",p->zSql,0)!=0 + ); return rc; /* Jump to here if a string or blob larger than SQLITE_MAX_LENGTH @@ -80468,7 +81031,7 @@ too_big: /* Jump to here if a malloc() fails. */ no_mem: - db->mallocFailed = 1; + sqlite3OomFault(db); sqlite3VdbeError(p, "out of memory"); rc = SQLITE_NOMEM; goto vdbe_error_halt; @@ -80489,7 +81052,7 @@ abort_due_to_error: */ abort_due_to_interrupt: assert( db->u1.isInterrupted ); - rc = SQLITE_INTERRUPT; + rc = db->mallocFailed ? SQLITE_NOMEM : SQLITE_INTERRUPT; p->rc = rc; sqlite3VdbeError(p, "%s", sqlite3ErrStr(rc)); goto vdbe_error_halt; @@ -80615,38 +81178,6 @@ SQLITE_API int SQLITE_STDCALL sqlite3_blob_open( ){ int nAttempt = 0; int iCol; /* Index of zColumn in row-record */ - - /* This VDBE program seeks a btree cursor to the identified - ** db/table/row entry. The reason for using a vdbe program instead - ** of writing code to use the b-tree layer directly is that the - ** vdbe program will take advantage of the various transaction, - ** locking and error handling infrastructure built into the vdbe. - ** - ** After seeking the cursor, the vdbe executes an OP_ResultRow. - ** Code external to the Vdbe then "borrows" the b-tree cursor and - ** uses it to implement the blob_read(), blob_write() and - ** blob_bytes() functions. - ** - ** The sqlite3_blob_close() function finalizes the vdbe program, - ** which closes the b-tree cursor and (possibly) commits the - ** transaction. - */ - static const int iLn = VDBE_OFFSET_LINENO(4); - static const VdbeOpList openBlob[] = { - /* {OP_Transaction, 0, 0, 0}, // 0: Inserted separately */ - {OP_TableLock, 0, 0, 0}, /* 1: Acquire a read or write lock */ - /* One of the following two instructions is replaced by an OP_Noop. */ - {OP_OpenRead, 0, 0, 0}, /* 2: Open cursor 0 for reading */ - {OP_OpenWrite, 0, 0, 0}, /* 3: Open cursor 0 for read/write */ - {OP_Variable, 1, 1, 1}, /* 4: Push the rowid to the stack */ - {OP_NotExists, 0, 10, 1}, /* 5: Seek the cursor */ - {OP_Column, 0, 0, 1}, /* 6 */ - {OP_ResultRow, 1, 0, 0}, /* 7 */ - {OP_Goto, 0, 4, 0}, /* 8 */ - {OP_Close, 0, 0, 0}, /* 9 */ - {OP_Halt, 0, 0, 0}, /* 10 */ - }; - int rc = SQLITE_OK; char *zErr = 0; Table *pTab; @@ -80765,45 +81296,78 @@ SQLITE_API int SQLITE_STDCALL sqlite3_blob_open( pBlob->pStmt = (sqlite3_stmt *)sqlite3VdbeCreate(pParse); assert( pBlob->pStmt || db->mallocFailed ); if( pBlob->pStmt ){ + + /* This VDBE program seeks a btree cursor to the identified + ** db/table/row entry. The reason for using a vdbe program instead + ** of writing code to use the b-tree layer directly is that the + ** vdbe program will take advantage of the various transaction, + ** locking and error handling infrastructure built into the vdbe. + ** + ** After seeking the cursor, the vdbe executes an OP_ResultRow. + ** Code external to the Vdbe then "borrows" the b-tree cursor and + ** uses it to implement the blob_read(), blob_write() and + ** blob_bytes() functions. + ** + ** The sqlite3_blob_close() function finalizes the vdbe program, + ** which closes the b-tree cursor and (possibly) commits the + ** transaction. + */ + static const int iLn = VDBE_OFFSET_LINENO(2); + static const VdbeOpList openBlob[] = { + {OP_TableLock, 0, 0, 0}, /* 0: Acquire a read or write lock */ + {OP_OpenRead, 0, 0, 0}, /* 1: Open a cursor */ + {OP_Variable, 1, 1, 0}, /* 2: Move ?1 into reg[1] */ + {OP_NotExists, 0, 7, 1}, /* 3: Seek the cursor */ + {OP_Column, 0, 0, 1}, /* 4 */ + {OP_ResultRow, 1, 0, 0}, /* 5 */ + {OP_Goto, 0, 2, 0}, /* 6 */ + {OP_Close, 0, 0, 0}, /* 7 */ + {OP_Halt, 0, 0, 0}, /* 8 */ + }; Vdbe *v = (Vdbe *)pBlob->pStmt; int iDb = sqlite3SchemaToIndex(db, pTab->pSchema); - + VdbeOp *aOp; sqlite3VdbeAddOp4Int(v, OP_Transaction, iDb, flags, pTab->pSchema->schema_cookie, pTab->pSchema->iGeneration); sqlite3VdbeChangeP5(v, 1); - sqlite3VdbeAddOpList(v, ArraySize(openBlob), openBlob, iLn); + aOp = sqlite3VdbeAddOpList(v, ArraySize(openBlob), openBlob, iLn); /* Make sure a mutex is held on the table to be accessed */ sqlite3VdbeUsesBtree(v, iDb); - /* Configure the OP_TableLock instruction */ + if( db->mallocFailed==0 ){ + assert( aOp!=0 ); + /* Configure the OP_TableLock instruction */ #ifdef SQLITE_OMIT_SHARED_CACHE - sqlite3VdbeChangeToNoop(v, 1); + aOp[0].opcode = OP_Noop; #else - sqlite3VdbeChangeP1(v, 1, iDb); - sqlite3VdbeChangeP2(v, 1, pTab->tnum); - sqlite3VdbeChangeP3(v, 1, flags); - sqlite3VdbeChangeP4(v, 1, pTab->zName, P4_TRANSIENT); + aOp[0].p1 = iDb; + aOp[0].p2 = pTab->tnum; + aOp[0].p3 = flags; + sqlite3VdbeChangeP4(v, 1, pTab->zName, P4_TRANSIENT); + } + if( db->mallocFailed==0 ){ #endif - /* Remove either the OP_OpenWrite or OpenRead. Set the P2 - ** parameter of the other to pTab->tnum. */ - sqlite3VdbeChangeToNoop(v, 3 - flags); - sqlite3VdbeChangeP2(v, 2 + flags, pTab->tnum); - sqlite3VdbeChangeP3(v, 2 + flags, iDb); + /* Remove either the OP_OpenWrite or OpenRead. Set the P2 + ** parameter of the other to pTab->tnum. */ + if( flags ) aOp[1].opcode = OP_OpenWrite; + aOp[1].p2 = pTab->tnum; + aOp[1].p3 = iDb; + + /* Configure the number of columns. Configure the cursor to + ** think that the table has one more column than it really + ** does. An OP_Column to retrieve this imaginary column will + ** always return an SQL NULL. This is useful because it means + ** we can invoke OP_Column to fill in the vdbe cursors type + ** and offset cache without causing any IO. + */ + aOp[1].p4type = P4_INT32; + aOp[1].p4.i = pTab->nCol+1; + aOp[4].p2 = pTab->nCol; - /* Configure the number of columns. Configure the cursor to - ** think that the table has one more column than it really - ** does. An OP_Column to retrieve this imaginary column will - ** always return an SQL NULL. This is useful because it means - ** we can invoke OP_Column to fill in the vdbe cursors type - ** and offset cache without causing any IO. - */ - sqlite3VdbeChangeP4(v, 2+flags, SQLITE_INT_TO_PTR(pTab->nCol+1),P4_INT32); - sqlite3VdbeChangeP2(v, 6, pTab->nCol); - if( !db->mallocFailed ){ pParse->nVar = 1; pParse->nMem = 1; pParse->nTab = 1; @@ -81716,7 +82280,7 @@ static int vdbePmaReaderInit( rc = vdbePmaReaderSeek(pTask, pReadr, pFile, iStart); if( rc==SQLITE_OK ){ - u64 nByte; /* Size of PMA in bytes */ + u64 nByte = 0; /* Size of PMA in bytes */ rc = vdbePmaReadVarint(pReadr, &nByte); pReadr->iEof = pReadr->iReadOff + nByte; *pnByte += nByte; @@ -82800,6 +83364,7 @@ SQLITE_PRIVATE int sqlite3VdbeSorterWrite( if( nMin>pSorter->nMemory ){ u8 *aNew; + int iListOff = (u8*)pSorter->list.pList - pSorter->list.aMemory; int nNew = pSorter->nMemory * 2; while( nNew < nMin ) nNew = nNew*2; if( nNew > pSorter->mxPmaSize ) nNew = pSorter->mxPmaSize; @@ -82807,16 +83372,16 @@ SQLITE_PRIVATE int sqlite3VdbeSorterWrite( aNew = sqlite3Realloc(pSorter->list.aMemory, nNew); if( !aNew ) return SQLITE_NOMEM; - pSorter->list.pList = (SorterRecord*)( - aNew + ((u8*)pSorter->list.pList - pSorter->list.aMemory) - ); + pSorter->list.pList = (SorterRecord*)&aNew[iListOff]; pSorter->list.aMemory = aNew; pSorter->nMemory = nNew; } pNew = (SorterRecord*)&pSorter->list.aMemory[pSorter->iMemory]; pSorter->iMemory += ROUND8(nReq); - pNew->u.iNext = (int)((u8*)(pSorter->list.pList) - pSorter->list.aMemory); + if( pSorter->list.pList ){ + pNew->u.iNext = (int)((u8*)(pSorter->list.pList) - pSorter->list.aMemory); + } }else{ pNew = (SorterRecord *)sqlite3Malloc(nReq); if( pNew==0 ){ @@ -84274,9 +84839,8 @@ SQLITE_PRIVATE int sqlite3MemJournalSize(void){ ** The return value from this routine is WRC_Abort to abandon the tree walk ** and WRC_Continue to continue. */ -SQLITE_PRIVATE int sqlite3WalkExpr(Walker *pWalker, Expr *pExpr){ +static SQLITE_NOINLINE int walkExpr(Walker *pWalker, Expr *pExpr){ int rc; - if( pExpr==0 ) return WRC_Continue; testcase( ExprHasProperty(pExpr, EP_TokenOnly) ); testcase( ExprHasProperty(pExpr, EP_Reduced) ); rc = pWalker->xExprCallback(pWalker, pExpr); @@ -84292,6 +84856,9 @@ SQLITE_PRIVATE int sqlite3WalkExpr(Walker *pWalker, Expr *pExpr){ } return rc & WRC_Abort; } +SQLITE_PRIVATE int sqlite3WalkExpr(Walker *pWalker, Expr *pExpr){ + return pExpr ? walkExpr(pWalker,pExpr) : WRC_Continue; +} /* ** Call sqlite3WalkExpr() for every expression in list p or until @@ -85065,7 +85632,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ wrong_num_args = 1; } }else{ - is_agg = pDef->xFunc==0; + is_agg = pDef->xFinalize!=0; if( pDef->funcFlags & SQLITE_FUNC_UNLIKELY ){ ExprSetProperty(pExpr, EP_Unlikely|EP_Skip); if( n==2 ){ @@ -85793,10 +86360,12 @@ SQLITE_PRIVATE int sqlite3ResolveExprNames( #endif savedHasAgg = pNC->ncFlags & (NC_HasAgg|NC_MinMaxAgg); pNC->ncFlags &= ~(NC_HasAgg|NC_MinMaxAgg); - memset(&w, 0, sizeof(w)); + w.pParse = pNC->pParse; w.xExprCallback = resolveExprStep; w.xSelectCallback = resolveSelectStep; - w.pParse = pNC->pParse; + w.xSelectCallback2 = 0; + w.walkerDepth = 0; + w.eCode = 0; w.u.pNC = pNC; sqlite3WalkExpr(&w, pExpr); #if SQLITE_MAX_EXPR_DEPTH>0 @@ -85982,8 +86551,7 @@ SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken( SQLITE_PRIVATE Expr *sqlite3ExprAddCollateString(Parse *pParse, Expr *pExpr, const char *zC){ Token s; assert( zC!=0 ); - s.z = zC; - s.n = sqlite3Strlen30(s.z); + sqlite3TokenInit(&s, (char*)zC); return sqlite3ExprAddCollateToken(pParse, pExpr, &s, 0); } @@ -86351,6 +86919,7 @@ SQLITE_PRIVATE Expr *sqlite3ExprAlloc( int nExtra = 0; int iValue = 0; + assert( db!=0 ); if( pToken ){ if( op!=TK_INTEGER || pToken->z==0 || sqlite3GetInt32(pToken->z, &iValue)==0 ){ @@ -86358,8 +86927,9 @@ SQLITE_PRIVATE Expr *sqlite3ExprAlloc( assert( iValue>=0 ); } } - pNew = sqlite3DbMallocZero(db, sizeof(Expr)+nExtra); + pNew = sqlite3DbMallocRawNN(db, sizeof(Expr)+nExtra); if( pNew ){ + memset(pNew, 0, sizeof(Expr)); pNew->op = (u8)op; pNew->iAgg = -1; if( pToken ){ @@ -86596,7 +87166,10 @@ SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){ if( x>pParse->nzVar ){ char **a; a = sqlite3DbRealloc(db, pParse->azVar, x*sizeof(a[0])); - if( a==0 ) return; /* Error reported through db->mallocFailed */ + if( a==0 ){ + assert( db->mallocFailed ); /* Error reported through mallocFailed */ + return; + } pParse->azVar = a; memset(&a[pParse->nzVar], 0, (x-pParse->nzVar)*sizeof(a[0])); pParse->nzVar = x; @@ -86751,6 +87324,7 @@ static int dupedExprSize(Expr *p, int flags){ static Expr *exprDup(sqlite3 *db, Expr *p, int flags, u8 **pzBuffer){ Expr *pNew = 0; /* Value to return */ assert( flags==0 || flags==EXPRDUP_REDUCE ); + assert( db!=0 ); if( p ){ const int isReduced = (flags&EXPRDUP_REDUCE); u8 *zAlloc; @@ -86763,7 +87337,7 @@ static Expr *exprDup(sqlite3 *db, Expr *p, int flags, u8 **pzBuffer){ zAlloc = *pzBuffer; staticFlag = EP_Static; }else{ - zAlloc = sqlite3DbMallocRaw(db, dupedExprSize(p, flags)); + zAlloc = sqlite3DbMallocRawNN(db, dupedExprSize(p, flags)); } pNew = (Expr *)zAlloc; @@ -86886,12 +87460,13 @@ SQLITE_PRIVATE ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags) ExprList *pNew; struct ExprList_item *pItem, *pOldItem; int i; + assert( db!=0 ); if( p==0 ) return 0; - pNew = sqlite3DbMallocRaw(db, sizeof(*pNew) ); + pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) ); if( pNew==0 ) return 0; pNew->nExpr = i = p->nExpr; if( (flags & EXPRDUP_REDUCE)==0 ) for(i=1; inExpr; i+=i){} - pNew->a = pItem = sqlite3DbMallocRaw(db, i*sizeof(p->a[0]) ); + pNew->a = pItem = sqlite3DbMallocRawNN(db, i*sizeof(p->a[0]) ); if( pItem==0 ){ sqlite3DbFree(db, pNew); return 0; @@ -86922,9 +87497,10 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListDup(sqlite3 *db, SrcList *p, int flags){ SrcList *pNew; int i; int nByte; + assert( db!=0 ); if( p==0 ) return 0; nByte = sizeof(*p) + (p->nSrc>0 ? sizeof(p->a[0]) * (p->nSrc-1) : 0); - pNew = sqlite3DbMallocRaw(db, nByte ); + pNew = sqlite3DbMallocRawNN(db, nByte ); if( pNew==0 ) return 0; pNew->nSrc = pNew->nAlloc = p->nSrc; for(i=0; inSrc; i++){ @@ -86961,11 +87537,12 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListDup(sqlite3 *db, SrcList *p, int flags){ SQLITE_PRIVATE IdList *sqlite3IdListDup(sqlite3 *db, IdList *p){ IdList *pNew; int i; + assert( db!=0 ); if( p==0 ) return 0; - pNew = sqlite3DbMallocRaw(db, sizeof(*pNew) ); + pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) ); if( pNew==0 ) return 0; pNew->nId = p->nId; - pNew->a = sqlite3DbMallocRaw(db, p->nId*sizeof(p->a[0]) ); + pNew->a = sqlite3DbMallocRawNN(db, p->nId*sizeof(p->a[0]) ); if( pNew->a==0 ){ sqlite3DbFree(db, pNew); return 0; @@ -86983,8 +87560,9 @@ SQLITE_PRIVATE IdList *sqlite3IdListDup(sqlite3 *db, IdList *p){ } SQLITE_PRIVATE Select *sqlite3SelectDup(sqlite3 *db, Select *p, int flags){ Select *pNew, *pPrior; + assert( db!=0 ); if( p==0 ) return 0; - pNew = sqlite3DbMallocRaw(db, sizeof(*p) ); + pNew = sqlite3DbMallocRawNN(db, sizeof(*p) ); if( pNew==0 ) return 0; pNew->pEList = sqlite3ExprListDup(db, p->pEList, flags); pNew->pSrc = sqlite3SrcListDup(db, p->pSrc, flags); @@ -87030,12 +87608,14 @@ SQLITE_PRIVATE ExprList *sqlite3ExprListAppend( Expr *pExpr /* Expression to be appended. Might be NULL */ ){ sqlite3 *db = pParse->db; + assert( db!=0 ); if( pList==0 ){ - pList = sqlite3DbMallocZero(db, sizeof(ExprList) ); + pList = sqlite3DbMallocRawNN(db, sizeof(ExprList) ); if( pList==0 ){ goto no_mem; } - pList->a = sqlite3DbMallocRaw(db, sizeof(pList->a[0])); + pList->nExpr = 0; + pList->a = sqlite3DbMallocRawNN(db, sizeof(pList->a[0])); if( pList->a==0 ) goto no_mem; }else if( (pList->nExpr & (pList->nExpr-1))==0 ){ struct ExprList_item *a; @@ -88792,7 +89372,7 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target) zId = pExpr->u.zToken; nId = sqlite3Strlen30(zId); pDef = sqlite3FindFunction(db, zId, nId, nFarg, enc, 0); - if( pDef==0 || pDef->xFunc==0 ){ + if( pDef==0 || pDef->xFinalize!=0 ){ sqlite3ErrorMsg(pParse, "unknown function: %.*s()", nId, zId); break; } @@ -90739,33 +91319,6 @@ exit_rename_table: db->flags = savedDbFlags; } - -/* -** Generate code to make sure the file format number is at least minFormat. -** The generated code will increase the file format number if necessary. -*/ -SQLITE_PRIVATE void sqlite3MinimumFileFormat(Parse *pParse, int iDb, int minFormat){ - Vdbe *v; - v = sqlite3GetVdbe(pParse); - /* The VDBE should have been allocated before this routine is called. - ** If that allocation failed, we would have quit before reaching this - ** point */ - if( ALWAYS(v) ){ - int r1 = sqlite3GetTempReg(pParse); - int r2 = sqlite3GetTempReg(pParse); - int addr1; - sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, r1, BTREE_FILE_FORMAT); - sqlite3VdbeUsesBtree(v, iDb); - sqlite3VdbeAddOp2(v, OP_Integer, minFormat, r2); - addr1 = sqlite3VdbeAddOp3(v, OP_Ge, r2, 0, r1); - sqlite3VdbeChangeP5(v, SQLITE_NOTNULL); VdbeCoverage(v); - sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_FILE_FORMAT, r2); - sqlite3VdbeJumpHere(v, addr1); - sqlite3ReleaseTempReg(pParse, r1); - sqlite3ReleaseTempReg(pParse, r2); - } -} - /* ** This function is called after an "ALTER TABLE ... ADD" statement ** has been parsed. Argument pColDef contains the text of the new @@ -90784,9 +91337,11 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ Column *pCol; /* The new column */ Expr *pDflt; /* Default value for the new column */ sqlite3 *db; /* The database connection; */ + Vdbe *v = pParse->pVdbe; /* The prepared statement under construction */ db = pParse->db; if( pParse->nErr || db->mallocFailed ) return; + assert( v!=0 ); pNew = pParse->pNewTable; assert( pNew ); @@ -90846,7 +91401,7 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ rc = sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_BLOB, &pVal); assert( rc==SQLITE_OK || rc==SQLITE_NOMEM ); if( rc!=SQLITE_OK ){ - db->mallocFailed = 1; + assert( db->mallocFailed == 1 ); return; } if( !pVal ){ @@ -90876,11 +91431,16 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ db->flags = savedDbFlags; } - /* If the default value of the new column is NULL, then set the file + /* If the default value of the new column is NULL, then the file ** format to 2. If the default value of the new column is not NULL, - ** the file format becomes 3. + ** the file format be 3. Back when this feature was first added + ** in 2006, we went to the trouble to upgrade the file format to the + ** minimum support values. But 10-years on, we can assume that all + ** extent versions of SQLite support file-format 4, so we always and + ** unconditionally upgrade to 4. */ - sqlite3MinimumFileFormat(pParse, iDb, pDflt ? 3 : 2); + sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_FILE_FORMAT, + SQLITE_MAX_FILE_FORMAT); /* Reload the schema of the modified table. */ reloadTableSchema(pParse, pTab, pTab->zName); @@ -90954,7 +91514,7 @@ SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){ pNew->aCol = (Column*)sqlite3DbMallocZero(db, sizeof(Column)*nAlloc); pNew->zName = sqlite3MPrintf(db, "sqlite_altertab_%s", pTab->zName); if( !pNew->aCol || !pNew->zName ){ - db->mallocFailed = 1; + assert( db->mallocFailed ); goto exit_begin_add_column; } memcpy(pNew->aCol, pTab->aCol, sizeof(Column)*pNew->nCol); @@ -91299,7 +91859,7 @@ static void sampleClear(sqlite3 *db, Stat4Sample *p){ static void sampleSetRowid(sqlite3 *db, Stat4Sample *p, int n, const u8 *pData){ assert( db!=0 ); if( p->nRowid ) sqlite3DbFree(db, p->u.aRowid); - p->u.aRowid = sqlite3DbMallocRaw(db, n); + p->u.aRowid = sqlite3DbMallocRawNN(db, n); if( p->u.aRowid ){ p->nRowid = n; memcpy(p->u.aRowid, pData, n); @@ -91464,8 +92024,7 @@ static const FuncDef statInitFuncdef = { SQLITE_UTF8, /* funcFlags */ 0, /* pUserData */ 0, /* pNext */ - statInit, /* xFunc */ - 0, /* xStep */ + statInit, /* xSFunc */ 0, /* xFinalize */ "stat_init", /* zName */ 0, /* pHash */ @@ -91765,8 +92324,7 @@ static const FuncDef statPushFuncdef = { SQLITE_UTF8, /* funcFlags */ 0, /* pUserData */ 0, /* pNext */ - statPush, /* xFunc */ - 0, /* xStep */ + statPush, /* xSFunc */ 0, /* xFinalize */ "stat_push", /* zName */ 0, /* pHash */ @@ -91912,8 +92470,7 @@ static const FuncDef statGetFuncdef = { SQLITE_UTF8, /* funcFlags */ 0, /* pUserData */ 0, /* pNext */ - statGet, /* xFunc */ - 0, /* xStep */ + statGet, /* xSFunc */ 0, /* xFinalize */ "stat_get", /* zName */ 0, /* pHash */ @@ -91929,8 +92486,8 @@ static void callStatGet(Vdbe *v, int regStat4, int iParam, int regOut){ #else UNUSED_PARAMETER( iParam ); #endif - sqlite3VdbeAddOp3(v, OP_Function0, 0, regStat4, regOut); - sqlite3VdbeChangeP4(v, -1, (char*)&statGetFuncdef, P4_FUNCDEF); + sqlite3VdbeAddOp4(v, OP_Function0, 0, regStat4, regOut, + (char*)&statGetFuncdef, P4_FUNCDEF); sqlite3VdbeChangeP5(v, 1 + IsStat34); } @@ -92084,8 +92641,8 @@ static void analyzeOneTable( #endif sqlite3VdbeAddOp2(v, OP_Integer, nCol, regStat4+1); sqlite3VdbeAddOp2(v, OP_Integer, pIdx->nKeyCol, regStat4+2); - sqlite3VdbeAddOp3(v, OP_Function0, 0, regStat4+1, regStat4); - sqlite3VdbeChangeP4(v, -1, (char*)&statInitFuncdef, P4_FUNCDEF); + sqlite3VdbeAddOp4(v, OP_Function0, 0, regStat4+1, regStat4, + (char*)&statInitFuncdef, P4_FUNCDEF); sqlite3VdbeChangeP5(v, 2+IsStat34); /* Implementation of the following: @@ -92104,7 +92661,7 @@ static void analyzeOneTable( if( nColTest>0 ){ int endDistinctTest = sqlite3VdbeMakeLabel(v); int *aGotoChng; /* Array of jump instruction addresses */ - aGotoChng = sqlite3DbMallocRaw(db, sizeof(int)*nColTest); + aGotoChng = sqlite3DbMallocRawNN(db, sizeof(int)*nColTest); if( aGotoChng==0 ) continue; /* @@ -92181,8 +92738,8 @@ static void analyzeOneTable( } #endif assert( regChng==(regStat4+1) ); - sqlite3VdbeAddOp3(v, OP_Function0, 1, regStat4, regTemp); - sqlite3VdbeChangeP4(v, -1, (char*)&statPushFuncdef, P4_FUNCDEF); + sqlite3VdbeAddOp4(v, OP_Function0, 1, regStat4, regTemp, + (char*)&statPushFuncdef, P4_FUNCDEF); sqlite3VdbeChangeP5(v, 2+IsStat34); sqlite3VdbeAddOp2(v, OP_Next, iIdxCur, addrNextRow); VdbeCoverage(v); @@ -92512,7 +93069,7 @@ static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){ ** the old data with the new instead of allocating a new array. */ if( pIndex->aiRowEst==0 ){ pIndex->aiRowEst = (tRowcnt*)sqlite3MallocZero(sizeof(tRowcnt) * nCol); - if( pIndex->aiRowEst==0 ) pInfo->db->mallocFailed = 1; + if( pIndex->aiRowEst==0 ) sqlite3OomFault(pInfo->db); } aiRowEst = pIndex->aiRowEst; #endif @@ -92659,7 +93216,7 @@ static int loadStatTbl( Index *pPrevIdx = 0; /* Previous index in the loop */ IndexSample *pSample; /* A slot in pIdx->aSample[] */ - assert( db->lookaside.bEnabled==0 ); + assert( db->lookaside.bDisable ); zSql = sqlite3MPrintf(db, zSql1, zDb); if( !zSql ){ return SQLITE_NOMEM; @@ -92773,7 +93330,7 @@ static int loadStatTbl( static int loadStat4(sqlite3 *db, const char *zDb){ int rc = SQLITE_OK; /* Result codes from subroutines */ - assert( db->lookaside.bEnabled==0 ); + assert( db->lookaside.bDisable ); if( sqlite3FindTable(db, "sqlite_stat4", zDb) ){ rc = loadStatTbl(db, 0, "SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx", @@ -92855,10 +93412,9 @@ SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){ /* Load the statistics from the sqlite_stat4 table. */ #ifdef SQLITE_ENABLE_STAT3_OR_STAT4 if( rc==SQLITE_OK && OptimizationEnabled(db, SQLITE_Stat34) ){ - int lookasideEnabled = db->lookaside.bEnabled; - db->lookaside.bEnabled = 0; + db->lookaside.bDisable++; rc = loadStat4(db, sInfo.zDatabase); - db->lookaside.bEnabled = lookasideEnabled; + db->lookaside.bDisable--; } for(i=sqliteHashFirst(&db->aDb[iDb].pSchema->idxHash);i;i=sqliteHashNext(i)){ Index *pIdx = sqliteHashData(i); @@ -92868,7 +93424,7 @@ SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){ #endif if( rc==SQLITE_NOMEM ){ - db->mallocFailed = 1; + sqlite3OomFault(db); } return rc; } @@ -92989,7 +93545,7 @@ static void attachFunc( ** hash tables. */ if( db->aDb==db->aDbStatic ){ - aNew = sqlite3DbMallocRaw(db, sizeof(db->aDb[0])*3 ); + aNew = sqlite3DbMallocRawNN(db, sizeof(db->aDb[0])*3 ); if( aNew==0 ) return; memcpy(aNew, db->aDb, sizeof(db->aDb[0])*2); }else{ @@ -93007,7 +93563,7 @@ static void attachFunc( flags = db->openFlags; rc = sqlite3ParseUri(db->pVfs->zName, zFile, &flags, &pVfs, &zPath, &zErr); if( rc!=SQLITE_OK ){ - if( rc==SQLITE_NOMEM ) db->mallocFailed = 1; + if( rc==SQLITE_NOMEM ) sqlite3OomFault(db); sqlite3_result_error(context, zErr, -1); sqlite3_free(zErr); return; @@ -93036,7 +93592,8 @@ static void attachFunc( sqlite3BtreeSecureDelete(aNew->pBt, sqlite3BtreeSecureDelete(db->aDb[0].pBt,-1) ); #ifndef SQLITE_OMIT_PAGER_PRAGMAS - sqlite3BtreeSetPagerFlags(aNew->pBt, 3 | (db->flags & PAGER_FLAGS_MASK)); + sqlite3BtreeSetPagerFlags(aNew->pBt, + PAGER_SYNCHRONOUS_FULL | (db->flags & PAGER_FLAGS_MASK)); #endif sqlite3BtreeLeave(aNew->pBt); } @@ -93109,7 +93666,7 @@ static void attachFunc( sqlite3ResetAllSchemasOfConnection(db); db->nDb = iDb; if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){ - db->mallocFailed = 1; + sqlite3OomFault(db); sqlite3DbFree(db, zErrDyn); zErrDyn = sqlite3MPrintf(db, "out of memory"); }else if( zErrDyn==0 ){ @@ -93239,11 +93796,11 @@ static void codeAttach( assert( v || db->mallocFailed ); if( v ){ - sqlite3VdbeAddOp3(v, OP_Function0, 0, regArgs+3-pFunc->nArg, regArgs+3); + sqlite3VdbeAddOp4(v, OP_Function0, 0, regArgs+3-pFunc->nArg, regArgs+3, + (char *)pFunc, P4_FUNCDEF); assert( pFunc->nArg==-1 || (pFunc->nArg&0xff)==pFunc->nArg ); sqlite3VdbeChangeP5(v, (u8)(pFunc->nArg)); - sqlite3VdbeChangeP4(v, -1, (char *)pFunc, P4_FUNCDEF); - + /* Code an OP_Expire. For an ATTACH statement, set P1 to true (expire this ** statement only). For DETACH, set it to false (expire all existing ** statements). @@ -93268,8 +93825,7 @@ SQLITE_PRIVATE void sqlite3Detach(Parse *pParse, Expr *pDbname){ SQLITE_UTF8, /* funcFlags */ 0, /* pUserData */ 0, /* pNext */ - detachFunc, /* xFunc */ - 0, /* xStep */ + detachFunc, /* xSFunc */ 0, /* xFinalize */ "sqlite_detach", /* zName */ 0, /* pHash */ @@ -93289,8 +93845,7 @@ SQLITE_PRIVATE void sqlite3Attach(Parse *pParse, Expr *p, Expr *pDbname, Expr *p SQLITE_UTF8, /* funcFlags */ 0, /* pUserData */ 0, /* pNext */ - attachFunc, /* xFunc */ - 0, /* xStep */ + attachFunc, /* xSFunc */ 0, /* xFinalize */ "sqlite_attach", /* zName */ 0, /* pHash */ @@ -93754,15 +94309,6 @@ SQLITE_PRIVATE void sqlite3AuthContextPop(AuthContext *pContext){ */ /* #include "sqliteInt.h" */ -/* -** This routine is called when a new SQL statement is beginning to -** be parsed. Initialize the pParse structure as needed. -*/ -SQLITE_PRIVATE void sqlite3BeginParse(Parse *pParse, int explainFlag){ - pParse->explain = (u8)explainFlag; - pParse->nVar = 0; -} - #ifndef SQLITE_OMIT_SHARED_CACHE /* ** The TableLock structure is only used by the sqlite3TableLock() and @@ -93817,7 +94363,7 @@ SQLITE_PRIVATE void sqlite3TableLock( p->zName = zName; }else{ pToplevel->nTableLock = 0; - pToplevel->db->mallocFailed = 1; + sqlite3OomFault(pToplevel->db); } } @@ -93967,15 +94513,19 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){ if( pParse->pAinc!=0 && pParse->nTab==0 ) pParse->nTab = 1; sqlite3VdbeMakeReady(v, pParse); pParse->rc = SQLITE_DONE; - pParse->colNamesSet = 0; }else{ pParse->rc = SQLITE_ERROR; } + + /* We are done with this Parse object. There is no need to de-initialize it */ +#if 0 + pParse->colNamesSet = 0; pParse->nTab = 0; pParse->nMem = 0; pParse->nSet = 0; pParse->nVar = 0; DbMaskZero(pParse->cookieMask); +#endif } /* @@ -94234,7 +94784,6 @@ SQLITE_PRIVATE void sqlite3CollapseDatabaseArray(sqlite3 *db){ } j++; } - memset(&db->aDb[j], 0, (db->nDb-j)*sizeof(db->aDb[j])); db->nDb = j; if( db->nDb<=2 && db->aDb!=db->aDbStatic ){ memcpy(db->aDbStatic, db->aDb, 2*sizeof(db->aDb[0])); @@ -94497,7 +95046,8 @@ SQLITE_PRIVATE int sqlite3TwoPartName( int iDb; /* Database holding the object */ sqlite3 *db = pParse->db; - if( ALWAYS(pName2!=0) && pName2->n>0 ){ + assert( pName2!=0 ); + if( pName2->n>0 ){ if( db->init.busy ) { sqlite3ErrorMsg(pParse, "corrupt database"); return -1; @@ -94586,62 +95136,46 @@ SQLITE_PRIVATE void sqlite3StartTable( int iDb; /* Database number to create the table in */ Token *pName; /* Unqualified name of the table to create */ - /* The table or view name to create is passed to this routine via tokens - ** pName1 and pName2. If the table name was fully qualified, for example: - ** - ** CREATE TABLE xxx.yyy (...); - ** - ** Then pName1 is set to "xxx" and pName2 "yyy". On the other hand if - ** the table name is not fully qualified, i.e.: - ** - ** CREATE TABLE yyy(...); - ** - ** Then pName1 is set to "yyy" and pName2 is "". - ** - ** The call below sets the pName pointer to point at the token (pName1 or - ** pName2) that stores the unqualified table name. The variable iDb is - ** set to the index of the database that the table or view is to be - ** created in. - */ - iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName); - if( iDb<0 ) return; - if( !OMIT_TEMPDB && isTemp && pName2->n>0 && iDb!=1 ){ - /* If creating a temp table, the name may not be qualified. Unless - ** the database name is "temp" anyway. */ - sqlite3ErrorMsg(pParse, "temporary table name must be unqualified"); - return; + if( db->init.busy && db->init.newTnum==1 ){ + /* Special case: Parsing the sqlite_master or sqlite_temp_master schema */ + iDb = db->init.iDb; + zName = sqlite3DbStrDup(db, SCHEMA_TABLE(iDb)); + pName = pName1; + }else{ + /* The common case */ + iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName); + if( iDb<0 ) return; + if( !OMIT_TEMPDB && isTemp && pName2->n>0 && iDb!=1 ){ + /* If creating a temp table, the name may not be qualified. Unless + ** the database name is "temp" anyway. */ + sqlite3ErrorMsg(pParse, "temporary table name must be unqualified"); + return; + } + if( !OMIT_TEMPDB && isTemp ) iDb = 1; + zName = sqlite3NameFromToken(db, pName); } - if( !OMIT_TEMPDB && isTemp ) iDb = 1; - pParse->sNameToken = *pName; - zName = sqlite3NameFromToken(db, pName); if( zName==0 ) return; if( SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){ goto begin_table_error; } if( db->init.iDb==1 ) isTemp = 1; #ifndef SQLITE_OMIT_AUTHORIZATION - assert( (isTemp & 1)==isTemp ); + assert( isTemp==0 || isTemp==1 ); + assert( isView==0 || isView==1 ); { - int code; + static const u8 aCode[] = { + SQLITE_CREATE_TABLE, + SQLITE_CREATE_TEMP_TABLE, + SQLITE_CREATE_VIEW, + SQLITE_CREATE_TEMP_VIEW + }; char *zDb = db->aDb[iDb].zName; if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(isTemp), 0, zDb) ){ goto begin_table_error; } - if( isView ){ - if( !OMIT_TEMPDB && isTemp ){ - code = SQLITE_CREATE_TEMP_VIEW; - }else{ - code = SQLITE_CREATE_VIEW; - } - }else{ - if( !OMIT_TEMPDB && isTemp ){ - code = SQLITE_CREATE_TEMP_TABLE; - }else{ - code = SQLITE_CREATE_TABLE; - } - } - if( !isVirtual && sqlite3AuthCheck(pParse, code, zName, 0, zDb) ){ + if( !isVirtual && sqlite3AuthCheck(pParse, (int)aCode[isTemp+2*isView], + zName, 0, zDb) ){ goto begin_table_error; } } @@ -94677,7 +95211,7 @@ SQLITE_PRIVATE void sqlite3StartTable( pTable = sqlite3DbMallocZero(db, sizeof(Table)); if( pTable==0 ){ - db->mallocFailed = 1; + assert( db->mallocFailed ); pParse->rc = SQLITE_NOMEM; pParse->nErr++; goto begin_table_error; @@ -94734,10 +95268,8 @@ SQLITE_PRIVATE void sqlite3StartTable( addr1 = sqlite3VdbeAddOp1(v, OP_If, reg3); VdbeCoverage(v); fileFormat = (db->flags & SQLITE_LegacyFileFmt)!=0 ? 1 : SQLITE_MAX_FILE_FORMAT; - sqlite3VdbeAddOp2(v, OP_Integer, fileFormat, reg3); - sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_FILE_FORMAT, reg3); - sqlite3VdbeAddOp2(v, OP_Integer, ENC(db), reg3); - sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_TEXT_ENCODING, reg3); + sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_FILE_FORMAT, fileFormat); + sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_TEXT_ENCODING, ENC(db)); sqlite3VdbeJumpHere(v, addr1); /* This just creates a place-holder record in the sqlite_master table. @@ -95222,13 +95754,11 @@ SQLITE_PRIVATE CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName){ ** 1 chance in 2^32. So we're safe enough. */ SQLITE_PRIVATE void sqlite3ChangeCookie(Parse *pParse, int iDb){ - int r1 = sqlite3GetTempReg(pParse); sqlite3 *db = pParse->db; Vdbe *v = pParse->pVdbe; assert( sqlite3SchemaMutexHeld(db, iDb, 0) ); - sqlite3VdbeAddOp2(v, OP_Integer, db->aDb[iDb].pSchema->schema_cookie+1, r1); - sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_SCHEMA_VERSION, r1); - sqlite3ReleaseTempReg(pParse, r1); + sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_SCHEMA_VERSION, + db->aDb[iDb].pSchema->schema_cookie+1); } /* @@ -95310,7 +95840,7 @@ static char *createTableStmt(sqlite3 *db, Table *p){ n += 35 + 6*p->nCol; zStmt = sqlite3DbMallocRaw(0, n); if( zStmt==0 ){ - db->mallocFailed = 1; + sqlite3OomFault(db); return 0; } sqlite3_snprintf(n, zStmt, "CREATE TABLE "); @@ -95459,8 +95989,7 @@ static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){ if( pTab->iPKey>=0 ){ ExprList *pList; Token ipkToken; - ipkToken.z = pTab->aCol[pTab->iPKey].zName; - ipkToken.n = sqlite3Strlen30(ipkToken.z); + sqlite3TokenInit(&ipkToken, pTab->aCol[pTab->iPKey].zName); pList = sqlite3ExprListAppend(pParse, 0, sqlite3ExprAlloc(db, TK_ID, &ipkToken, 0)); if( pList==0 ) return; @@ -95603,9 +96132,13 @@ SQLITE_PRIVATE void sqlite3EndTable( ** So do not write to the disk again. Extract the root page number ** for the table from the db->init.newTnum field. (The page number ** should have been put there by the sqliteOpenCb routine.) + ** + ** If the root page number is 1, that means this is the sqlite_master + ** table itself. So mark it read-only. */ if( db->init.busy ){ p->tnum = db->init.newTnum; + if( p->tnum==1 ) p->tabFlags |= TF_Readonly; } /* Special processing for WITHOUT ROWID Tables */ @@ -95706,7 +96239,7 @@ SQLITE_PRIVATE void sqlite3EndTable( sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, addrTop); sqlite3SelectDestInit(&dest, SRT_Coroutine, regYield); sqlite3Select(pParse, pSelect, &dest); - sqlite3VdbeAddOp1(v, OP_EndCoroutine, regYield); + sqlite3VdbeEndCoroutine(v, regYield); sqlite3VdbeJumpHere(v, addrTop - 1); if( pParse->nErr ) return; pSelTab = sqlite3ResultSetOfSelect(pParse, pSelect); @@ -95790,7 +96323,7 @@ SQLITE_PRIVATE void sqlite3EndTable( pOld = sqlite3HashInsert(&pSchema->tblHash, p->zName, p); if( pOld ){ assert( p==pOld ); /* Malloc must have failed inside HashInsert() */ - db->mallocFailed = 1; + sqlite3OomFault(db); return; } pParse->pNewTable = 0; @@ -95894,7 +96427,6 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ int n; /* Temporarily holds the number of cursors assigned */ sqlite3 *db = pParse->db; /* Database connection for malloc errors */ sqlite3_xauth xAuth; /* Saved xAuth pointer */ - u8 bEnabledLA; /* Saved db->lookaside.bEnabled state */ assert( pTable ); @@ -95940,18 +96472,18 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ ** statement that defines the view. */ assert( pTable->pSelect ); - bEnabledLA = db->lookaside.bEnabled; if( pTable->pCheck ){ - db->lookaside.bEnabled = 0; + db->lookaside.bDisable++; sqlite3ColumnsFromExprList(pParse, pTable->pCheck, &pTable->nCol, &pTable->aCol); + db->lookaside.bDisable--; }else{ pSel = sqlite3SelectDup(db, pTable->pSelect, 0); if( pSel ){ n = pParse->nTab; sqlite3SrcListAssignCursors(pParse, pSel->pSrc); pTable->nCol = -1; - db->lookaside.bEnabled = 0; + db->lookaside.bDisable++; #ifndef SQLITE_OMIT_AUTHORIZATION xAuth = db->xAuth; db->xAuth = 0; @@ -95960,6 +96492,7 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ #else pSelTab = sqlite3ResultSetOfSelect(pParse, pSel); #endif + db->lookaside.bDisable--; pParse->nTab = n; if( pSelTab ){ assert( pTable->aCol==0 ); @@ -95978,7 +96511,6 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ nErr++; } } - db->lookaside.bEnabled = bEnabledLA; pTable->pSchema->schemaFlags |= DB_UnresetViews; #endif /* SQLITE_OMIT_VIEW */ return nErr; @@ -96058,6 +96590,7 @@ SQLITE_PRIVATE void sqlite3RootPageMoved(sqlite3 *db, int iDb, int iFrom, int iT static void destroyRootPage(Parse *pParse, int iTable, int iDb){ Vdbe *v = sqlite3GetVdbe(pParse); int r1 = sqlite3GetTempReg(pParse); + assert( iTable>1 ); sqlite3VdbeAddOp3(v, OP_Destroy, iTable, r1, iDb); sqlite3MayAbort(pParse); #ifndef SQLITE_OMIT_AUTOVACUUM @@ -96443,7 +96976,7 @@ SQLITE_PRIVATE void sqlite3CreateForeignKey( pFKey->zTo, (void *)pFKey ); if( pNextTo==pFKey ){ - db->mallocFailed = 1; + sqlite3OomFault(db); goto fk_end; } if( pNextTo ){ @@ -96803,8 +97336,7 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex( */ if( pList==0 ){ Token prevCol; - prevCol.z = pTab->aCol[pTab->nCol-1].zName; - prevCol.n = sqlite3Strlen30(prevCol.z); + sqlite3TokenInit(&prevCol, pTab->aCol[pTab->nCol-1].zName); pList = sqlite3ExprListAppend(pParse, 0, sqlite3ExprAlloc(db, TK_ID, &prevCol, 0)); if( pList==0 ) goto exit_create_index; @@ -97026,7 +97558,7 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex( pIndex->zName, pIndex); if( p ){ assert( p==pIndex ); /* Malloc must have failed */ - db->mallocFailed = 1; + sqlite3OomFault(db); goto exit_create_index; } db->flags |= SQLITE_InternChanges; @@ -97455,10 +97987,12 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListAppend( ){ struct SrcList_item *pItem; assert( pDatabase==0 || pTable!=0 ); /* Cannot have C without B */ + assert( db!=0 ); if( pList==0 ){ - pList = sqlite3DbMallocZero(db, sizeof(SrcList) ); + pList = sqlite3DbMallocRawNN(db, sizeof(SrcList) ); if( pList==0 ) return 0; pList->nAlloc = 1; + pList->nSrc = 0; } pList = sqlite3SrcListEnlarge(db, pList, 1, pList->nSrc); if( db->mallocFailed ){ @@ -97639,7 +98173,7 @@ SQLITE_PRIVATE void sqlite3SrcListShiftJoinType(SrcList *p){ } /* -** Begin a transaction +** Generate VDBE code for a BEGIN statement. */ SQLITE_PRIVATE void sqlite3BeginTransaction(Parse *pParse, int type){ sqlite3 *db; @@ -97649,7 +98183,6 @@ SQLITE_PRIVATE void sqlite3BeginTransaction(Parse *pParse, int type){ assert( pParse!=0 ); db = pParse->db; assert( db!=0 ); -/* if( db->aDb[0].pBt==0 ) return; */ if( sqlite3AuthCheck(pParse, SQLITE_TRANSACTION, "BEGIN", 0, 0) ){ return; } @@ -97661,11 +98194,11 @@ SQLITE_PRIVATE void sqlite3BeginTransaction(Parse *pParse, int type){ sqlite3VdbeUsesBtree(v, i); } } - sqlite3VdbeAddOp2(v, OP_AutoCommit, 0, 0); + sqlite3VdbeAddOp0(v, OP_AutoCommit); } /* -** Commit a transaction +** Generate VDBE code for a COMMIT statement. */ SQLITE_PRIVATE void sqlite3CommitTransaction(Parse *pParse){ Vdbe *v; @@ -97677,12 +98210,12 @@ SQLITE_PRIVATE void sqlite3CommitTransaction(Parse *pParse){ } v = sqlite3GetVdbe(pParse); if( v ){ - sqlite3VdbeAddOp2(v, OP_AutoCommit, 1, 0); + sqlite3VdbeAddOp1(v, OP_AutoCommit, 1); } } /* -** Rollback a transaction +** Generate VDBE code for a ROLLBACK statement. */ SQLITE_PRIVATE void sqlite3RollbackTransaction(Parse *pParse){ Vdbe *v; @@ -97744,7 +98277,7 @@ SQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *pParse){ db->aDb[1].pBt = pBt; assert( db->aDb[1].pSchema ); if( SQLITE_NOMEM==sqlite3BtreeSetPageSize(pBt, db->nextPagesize, -1, 0) ){ - db->mallocFailed = 1; + sqlite3OomFault(db); return 1; } } @@ -97861,7 +98394,7 @@ SQLITE_PRIVATE void sqlite3HaltConstraint( sqlite3MayAbort(pParse); } sqlite3VdbeAddOp4(v, OP_Halt, errCode, onError, 0, p4, p4type); - if( p5Errmsg ) sqlite3VdbeChangeP5(v, p5Errmsg); + sqlite3VdbeChangeP5(v, p5Errmsg); } /* @@ -97879,14 +98412,14 @@ SQLITE_PRIVATE void sqlite3UniqueConstraint( sqlite3StrAccumInit(&errMsg, pParse->db, 0, 0, 200); if( pIdx->aColExpr ){ - sqlite3XPrintf(&errMsg, 0, "index '%q'", pIdx->zName); + sqlite3XPrintf(&errMsg, "index '%q'", pIdx->zName); }else{ for(j=0; jnKeyCol; j++){ char *zCol; assert( pIdx->aiColumn[j]>=0 ); zCol = pTab->aCol[pIdx->aiColumn[j]].zName; if( j ) sqlite3StrAccumAppend(&errMsg, ", ", 2); - sqlite3XPrintf(&errMsg, 0, "%s.%s", pTab->zName, zCol); + sqlite3XPrintf(&errMsg, "%s.%s", pTab->zName, zCol); } } zErr = sqlite3StrAccumFinish(&errMsg); @@ -98119,10 +98652,9 @@ SQLITE_PRIVATE With *sqlite3WithAdd( }else{ pNew = sqlite3DbMallocZero(db, sizeof(*pWith)); } - assert( zName!=0 || pNew==0 ); - assert( db->mallocFailed==0 || pNew==0 ); + assert( (pNew!=0 && zName!=0) || db->mallocFailed ); - if( pNew==0 ){ + if( db->mallocFailed ){ sqlite3ExprListDelete(db, pArglist); sqlite3SelectDelete(db, pQuery); sqlite3DbFree(db, zName); @@ -98336,7 +98868,7 @@ static CollSeq *findCollSeqEntry( */ assert( pDel==0 || pDel==pColl ); if( pDel!=0 ){ - db->mallocFailed = 1; + sqlite3OomFault(db); sqlite3DbFree(db, pDel); pColl = 0; } @@ -98402,8 +98934,8 @@ SQLITE_PRIVATE CollSeq *sqlite3FindCollSeq( ** 5: UTF16 byte order conversion required - argument count matches exactly ** 6: Perfect match: encoding and argument count match exactly. ** -** If nArg==(-2) then any function with a non-null xStep or xFunc is -** a perfect match and any function with both xStep and xFunc NULL is +** If nArg==(-2) then any function with a non-null xSFunc is +** a perfect match and any function with xSFunc NULL is ** a non-match. */ #define FUNC_PERFECT_MATCH 6 /* The score for a perfect match */ @@ -98415,7 +98947,7 @@ static int matchQuality( int match; /* nArg of -2 is a special case */ - if( nArg==(-2) ) return (p->xFunc==0 && p->xStep==0) ? 0 : FUNC_PERFECT_MATCH; + if( nArg==(-2) ) return (p->xSFunc==0) ? 0 : FUNC_PERFECT_MATCH; /* Wrong number of arguments means "no match" */ if( p->nArg!=nArg && p->nArg>=0 ) return 0; @@ -98493,7 +99025,7 @@ SQLITE_PRIVATE void sqlite3FuncDefInsert( ** no matching function previously existed. ** ** If nArg is -2, then the first valid function found is returned. A -** function is valid if either xFunc or xStep is non-zero. The nArg==(-2) +** function is valid if xSFunc is non-zero. The nArg==(-2) ** case is used to see if zName is a valid function name for some number ** of arguments. If nArg is -2, then createFlag must be 0. ** @@ -98570,7 +99102,7 @@ SQLITE_PRIVATE FuncDef *sqlite3FindFunction( sqlite3FuncDefInsert(&db->aFunc, pBest); } - if( pBest && (pBest->xStep || pBest->xFunc || createFlag) ){ + if( pBest && (pBest->xSFunc || createFlag) ){ return pBest; } return 0; @@ -98624,7 +99156,7 @@ SQLITE_PRIVATE Schema *sqlite3SchemaGet(sqlite3 *db, Btree *pBt){ p = (Schema *)sqlite3DbMallocZero(0, sizeof(Schema)); } if( !p ){ - db->mallocFailed = 1; + sqlite3OomFault(db); }else if ( 0==p->file_format ){ sqlite3HashInit(&p->tblHash); sqlite3HashInit(&p->idxHash); @@ -99078,7 +99610,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( ** one, so just keep it in its register(s) and fall through to the ** delete code. */ nKey = nPk; /* OP_Found will use an unpacked key */ - aToOpen = sqlite3DbMallocRaw(db, nIdx+2); + aToOpen = sqlite3DbMallocRawNN(db, nIdx+2); if( aToOpen==0 ){ sqlite3WhereEnd(pWInfo); goto delete_from_cleanup; @@ -99118,13 +99650,12 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( */ if( !isView ){ int iAddrOnce = 0; - u8 p5 = (eOnePass==ONEPASS_OFF ? 0 : OPFLAG_FORDELETE); if( eOnePass==ONEPASS_MULTI ){ iAddrOnce = sqlite3CodeOnce(pParse); VdbeCoverage(v); } testcase( IsVirtual(pTab) ); - sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenWrite, p5, iTabCur, - aToOpen, &iDataCur, &iIdxCur); + sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenWrite, OPFLAG_FORDELETE, + iTabCur, aToOpen, &iDataCur, &iIdxCur); assert( pPk || IsVirtual(pTab) || iDataCur==iTabCur ); assert( pPk || IsVirtual(pTab) || iIdxCur==iDataCur+1 ); if( eOnePass==ONEPASS_MULTI ) sqlite3VdbeJumpHere(v, iAddrOnce); @@ -99357,15 +99888,20 @@ SQLITE_PRIVATE void sqlite3GenerateRowDelete( ** a view (in which case the only effect of the DELETE statement is to ** fire the INSTEAD OF triggers). */ if( pTab->pSelect==0 ){ + u8 p5 = 0; sqlite3GenerateRowIndexDelete(pParse, pTab, iDataCur, iIdxCur,0,iIdxNoSeek); sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, (count?OPFLAG_NCHANGE:0)); if( count ){ sqlite3VdbeChangeP4(v, -1, pTab->zName, P4_TRANSIENT); } + if( eMode!=ONEPASS_OFF ){ + sqlite3VdbeChangeP5(v, OPFLAG_AUXDELETE); + } if( iIdxNoSeek>=0 ){ sqlite3VdbeAddOp1(v, OP_Delete, iIdxNoSeek); } - sqlite3VdbeChangeP5(v, eMode==ONEPASS_MULTI); + if( eMode==ONEPASS_MULTI ) p5 |= OPFLAG_SAVEPOSITION; + sqlite3VdbeChangeP5(v, p5); } /* Do any ON CASCADE, SET NULL or SET DEFAULT operations required to @@ -99775,7 +100311,8 @@ static void printfFunc( x.nUsed = 0; x.apArg = argv+1; sqlite3StrAccumInit(&str, db, 0, 0, db->aLimit[SQLITE_LIMIT_LENGTH]); - sqlite3XPrintf(&str, SQLITE_PRINTF_SQLFUNC, zFormat, &x); + str.printfFlags = SQLITE_PRINTF_SQLFUNC; + sqlite3XPrintf(&str, zFormat, &x); n = str.nChar; sqlite3_result_text(context, sqlite3StrAccumFinish(&str), n, SQLITE_DYNAMIC); @@ -100103,10 +100640,10 @@ static void total_changes( ** A structure defining how to do GLOB-style comparisons. */ struct compareInfo { - u8 matchAll; - u8 matchOne; - u8 matchSet; - u8 noCase; + u8 matchAll; /* "*" or "%" */ + u8 matchOne; /* "?" or "_" */ + u8 matchSet; /* "[" or 0 */ + u8 noCase; /* true to ignore case differences */ }; /* @@ -100169,22 +100706,14 @@ static int patternCompare( const u8 *zPattern, /* The glob pattern */ const u8 *zString, /* The string to compare against the glob */ const struct compareInfo *pInfo, /* Information about how to do the compare */ - u32 esc /* The escape character */ + u32 matchOther /* The escape char (LIKE) or '[' (GLOB) */ ){ u32 c, c2; /* Next pattern and input string chars */ u32 matchOne = pInfo->matchOne; /* "?" or "_" */ u32 matchAll = pInfo->matchAll; /* "*" or "%" */ - u32 matchOther; /* "[" or the escape character */ u8 noCase = pInfo->noCase; /* True if uppercase==lowercase */ const u8 *zEscaped = 0; /* One past the last escaped input char */ - /* The GLOB operator does not have an ESCAPE clause. And LIKE does not - ** have the matchSet operator. So we either have to look for one or - ** the other, never both. Hence the single variable matchOther is used - ** to store the one we have to look for. - */ - matchOther = esc ? esc : pInfo->matchSet; - while( (c = Utf8Read(zPattern))!=0 ){ if( c==matchAll ){ /* Match "*" */ /* Skip over multiple "*" characters in the pattern. If there @@ -100198,7 +100727,7 @@ static int patternCompare( if( c==0 ){ return 1; /* "*" at the end of the pattern matches */ }else if( c==matchOther ){ - if( esc ){ + if( pInfo->matchSet==0 ){ c = sqlite3Utf8Read(&zPattern); if( c==0 ) return 0; }else{ @@ -100206,7 +100735,7 @@ static int patternCompare( ** recursive search in this case, but it is an unusual case. */ assert( matchOther<0x80 ); /* '[' is a single-byte character */ while( *zString - && patternCompare(&zPattern[-1],zString,pInfo,esc)==0 ){ + && patternCompare(&zPattern[-1],zString,pInfo,matchOther)==0 ){ SQLITE_SKIP_UTF8(zString); } return *zString!=0; @@ -100232,18 +100761,18 @@ static int patternCompare( } while( (c2 = *(zString++))!=0 ){ if( c2!=c && c2!=cx ) continue; - if( patternCompare(zPattern,zString,pInfo,esc) ) return 1; + if( patternCompare(zPattern,zString,pInfo,matchOther) ) return 1; } }else{ while( (c2 = Utf8Read(zString))!=0 ){ if( c2!=c ) continue; - if( patternCompare(zPattern,zString,pInfo,esc) ) return 1; + if( patternCompare(zPattern,zString,pInfo,matchOther) ) return 1; } } return 0; } if( c==matchOther ){ - if( esc ){ + if( pInfo->matchSet==0 ){ c = sqlite3Utf8Read(&zPattern); if( c==0 ) return 0; zEscaped = zPattern; @@ -100296,7 +100825,7 @@ static int patternCompare( ** The sqlite3_strglob() interface. */ SQLITE_API int SQLITE_STDCALL sqlite3_strglob(const char *zGlobPattern, const char *zString){ - return patternCompare((u8*)zGlobPattern, (u8*)zString, &globInfo, 0)==0; + return patternCompare((u8*)zGlobPattern, (u8*)zString, &globInfo, '[')==0; } /* @@ -100334,9 +100863,10 @@ static void likeFunc( sqlite3_value **argv ){ const unsigned char *zA, *zB; - u32 escape = 0; + u32 escape; int nPat; sqlite3 *db = sqlite3_context_db_handle(context); + struct compareInfo *pInfo = sqlite3_user_data(context); #ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS if( sqlite3_value_type(argv[0])==SQLITE_BLOB @@ -100376,13 +100906,13 @@ static void likeFunc( return; } escape = sqlite3Utf8Read(&zEsc); + }else{ + escape = pInfo->matchSet; } if( zA && zB ){ - struct compareInfo *pInfo = sqlite3_user_data(context); #ifdef SQLITE_TEST sqlite3_like_count++; #endif - sqlite3_result_int(context, patternCompare(zB, zA, pInfo, escape)); } } @@ -101157,7 +101687,7 @@ SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ int rc = sqlite3_overload_function(db, "MATCH", 2); assert( rc==SQLITE_NOMEM || rc==SQLITE_OK ); if( rc==SQLITE_NOMEM ){ - db->mallocFailed = 1; + sqlite3OomFault(db); } } @@ -101572,7 +102102,7 @@ SQLITE_PRIVATE int sqlite3FkLocateIndex( } }else if( paiCol ){ assert( nCol>1 ); - aiCol = (int *)sqlite3DbMallocRaw(pParse->db, nCol*sizeof(int)); + aiCol = (int *)sqlite3DbMallocRawNN(pParse->db, nCol*sizeof(int)); if( !aiCol ) return 1; *paiCol = aiCol; } @@ -102518,7 +103048,6 @@ static Trigger *fkActionTrigger( pTrigger = pFKey->apTrigger[iAction]; if( action!=OE_None && !pTrigger ){ - u8 enableLookaside; /* Copy of db->lookaside.bEnabled */ char const *zFrom; /* Name of child table */ int nFrom; /* Length in bytes of zFrom */ Index *pIdx = 0; /* Parent key index for this FK */ @@ -102545,11 +103074,9 @@ static Trigger *fkActionTrigger( assert( iFromCol>=0 ); assert( pIdx!=0 || (pTab->iPKey>=0 && pTab->iPKeynCol) ); assert( pIdx==0 || pIdx->aiColumn[i]>=0 ); - tToCol.z = pTab->aCol[pIdx ? pIdx->aiColumn[i] : pTab->iPKey].zName; - tFromCol.z = pFKey->pFrom->aCol[iFromCol].zName; - - tToCol.n = sqlite3Strlen30(tToCol.z); - tFromCol.n = sqlite3Strlen30(tFromCol.z); + sqlite3TokenInit(&tToCol, + pTab->aCol[pIdx ? pIdx->aiColumn[i] : pTab->iPKey].zName); + sqlite3TokenInit(&tFromCol, pFKey->pFrom->aCol[iFromCol].zName); /* Create the expression "OLD.zToCol = zFromCol". It is important ** that the "OLD.zToCol" term is on the LHS of the = operator, so @@ -102629,8 +103156,7 @@ static Trigger *fkActionTrigger( } /* Disable lookaside memory allocation */ - enableLookaside = db->lookaside.bEnabled; - db->lookaside.bEnabled = 0; + db->lookaside.bDisable++; pTrigger = (Trigger *)sqlite3DbMallocZero(db, sizeof(Trigger) + /* struct Trigger */ @@ -102652,7 +103178,7 @@ static Trigger *fkActionTrigger( } /* Re-enable the lookaside buffer, if it was disabled earlier. */ - db->lookaside.bEnabled = enableLookaside; + db->lookaside.bDisable--; sqlite3ExprDelete(db, pWhere); sqlite3ExprDelete(db, pWhen); @@ -102847,7 +103373,7 @@ SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){ Table *pTab = pIdx->pTable; pIdx->zColAff = (char *)sqlite3DbMallocRaw(0, pIdx->nColumn+1); if( !pIdx->zColAff ){ - db->mallocFailed = 1; + sqlite3OomFault(db); return 0; } for(n=0; nnColumn; n++){ @@ -102898,7 +103424,7 @@ SQLITE_PRIVATE void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){ sqlite3 *db = sqlite3VdbeDb(v); zColAff = (char *)sqlite3DbMallocRaw(0, pTab->nCol+1); if( !zColAff ){ - db->mallocFailed = 1; + sqlite3OomFault(db); return; } @@ -102994,7 +103520,7 @@ static int autoIncBegin( pInfo = pToplevel->pAinc; while( pInfo && pInfo->pTab!=pTab ){ pInfo = pInfo->pNext; } if( pInfo==0 ){ - pInfo = sqlite3DbMallocRaw(pParse->db, sizeof(*pInfo)); + pInfo = sqlite3DbMallocRawNN(pParse->db, sizeof(*pInfo)); if( pInfo==0 ) return 0; pInfo->pNext = pToplevel->pAinc; pToplevel->pAinc = pInfo; @@ -103018,7 +103544,6 @@ SQLITE_PRIVATE void sqlite3AutoincrementBegin(Parse *pParse){ sqlite3 *db = pParse->db; /* The database connection */ Db *pDb; /* Database only autoinc table */ int memId; /* Register holding max rowid */ - int addr; /* A VDBE address */ Vdbe *v = pParse->pVdbe; /* VDBE under construction */ /* This routine is never called during trigger-generation. It is @@ -103028,33 +103553,46 @@ SQLITE_PRIVATE void sqlite3AutoincrementBegin(Parse *pParse){ assert( v ); /* We failed long ago if this is not so */ for(p = pParse->pAinc; p; p = p->pNext){ + static const int iLn = VDBE_OFFSET_LINENO(2); + static const VdbeOpList autoInc[] = { + /* 0 */ {OP_Null, 0, 0, 0}, + /* 1 */ {OP_Rewind, 0, 9, 0}, + /* 2 */ {OP_Column, 0, 0, 0}, + /* 3 */ {OP_Ne, 0, 7, 0}, + /* 4 */ {OP_Rowid, 0, 0, 0}, + /* 5 */ {OP_Column, 0, 1, 0}, + /* 6 */ {OP_Goto, 0, 9, 0}, + /* 7 */ {OP_Next, 0, 2, 0}, + /* 8 */ {OP_Integer, 0, 0, 0}, + /* 9 */ {OP_Close, 0, 0, 0} + }; + VdbeOp *aOp; pDb = &db->aDb[p->iDb]; memId = p->regCtr; assert( sqlite3SchemaMutexHeld(db, 0, pDb->pSchema) ); sqlite3OpenTable(pParse, 0, p->iDb, pDb->pSchema->pSeqTab, OP_OpenRead); - sqlite3VdbeAddOp3(v, OP_Null, 0, memId, memId+1); - addr = sqlite3VdbeCurrentAddr(v); sqlite3VdbeLoadString(v, memId-1, p->pTab->zName); - sqlite3VdbeAddOp2(v, OP_Rewind, 0, addr+9); VdbeCoverage(v); - sqlite3VdbeAddOp3(v, OP_Column, 0, 0, memId); - sqlite3VdbeAddOp3(v, OP_Ne, memId-1, addr+7, memId); VdbeCoverage(v); - sqlite3VdbeChangeP5(v, SQLITE_JUMPIFNULL); - sqlite3VdbeAddOp2(v, OP_Rowid, 0, memId+1); - sqlite3VdbeAddOp3(v, OP_Column, 0, 1, memId); - sqlite3VdbeGoto(v, addr+9); - sqlite3VdbeAddOp2(v, OP_Next, 0, addr+2); VdbeCoverage(v); - sqlite3VdbeAddOp2(v, OP_Integer, 0, memId); - sqlite3VdbeAddOp0(v, OP_Close); + aOp = sqlite3VdbeAddOpList(v, ArraySize(autoInc), autoInc, iLn); + if( aOp==0 ) break; + aOp[0].p2 = memId; + aOp[0].p3 = memId+1; + aOp[2].p3 = memId; + aOp[3].p1 = memId-1; + aOp[3].p3 = memId; + aOp[3].p5 = SQLITE_JUMPIFNULL; + aOp[4].p2 = memId+1; + aOp[5].p3 = memId; + aOp[8].p2 = memId; } } /* ** Update the maximum rowid for an autoincrement calculation. ** -** This routine should be called when the top of the stack holds a +** This routine should be called when the regRowid register holds a ** new rowid that is about to be inserted. If that new rowid is ** larger than the maximum rowid in the memId memory cell, then the -** memory cell is updated. The stack is unchanged. +** memory cell is updated. */ static void autoIncStep(Parse *pParse, int memId, int regRowid){ if( memId>0 ){ @@ -103069,31 +103607,44 @@ static void autoIncStep(Parse *pParse, int memId, int regRowid){ ** table (either directly or through triggers) needs to call this ** routine just before the "exit" code. */ -SQLITE_PRIVATE void sqlite3AutoincrementEnd(Parse *pParse){ +static SQLITE_NOINLINE void autoIncrementEnd(Parse *pParse){ AutoincInfo *p; Vdbe *v = pParse->pVdbe; sqlite3 *db = pParse->db; assert( v ); for(p = pParse->pAinc; p; p = p->pNext){ + static const int iLn = VDBE_OFFSET_LINENO(2); + static const VdbeOpList autoIncEnd[] = { + /* 0 */ {OP_NotNull, 0, 2, 0}, + /* 1 */ {OP_NewRowid, 0, 0, 0}, + /* 2 */ {OP_MakeRecord, 0, 2, 0}, + /* 3 */ {OP_Insert, 0, 0, 0}, + /* 4 */ {OP_Close, 0, 0, 0} + }; + VdbeOp *aOp; Db *pDb = &db->aDb[p->iDb]; - int addr1; int iRec; int memId = p->regCtr; iRec = sqlite3GetTempReg(pParse); assert( sqlite3SchemaMutexHeld(db, 0, pDb->pSchema) ); sqlite3OpenTable(pParse, 0, p->iDb, pDb->pSchema->pSeqTab, OP_OpenWrite); - addr1 = sqlite3VdbeAddOp1(v, OP_NotNull, memId+1); VdbeCoverage(v); - sqlite3VdbeAddOp2(v, OP_NewRowid, 0, memId+1); - sqlite3VdbeJumpHere(v, addr1); - sqlite3VdbeAddOp3(v, OP_MakeRecord, memId-1, 2, iRec); - sqlite3VdbeAddOp3(v, OP_Insert, 0, iRec, memId+1); - sqlite3VdbeChangeP5(v, OPFLAG_APPEND); - sqlite3VdbeAddOp0(v, OP_Close); + aOp = sqlite3VdbeAddOpList(v, ArraySize(autoIncEnd), autoIncEnd, iLn); + if( aOp==0 ) break; + aOp[0].p1 = memId+1; + aOp[1].p2 = memId+1; + aOp[2].p1 = memId-1; + aOp[2].p3 = iRec; + aOp[3].p2 = iRec; + aOp[3].p3 = memId+1; + aOp[3].p5 = OPFLAG_APPEND; sqlite3ReleaseTempReg(pParse, iRec); } } +SQLITE_PRIVATE void sqlite3AutoincrementEnd(Parse *pParse){ + if( pParse->pAinc ) autoIncrementEnd(pParse); +} #else /* ** If SQLITE_OMIT_AUTOINCREMENT is defined, then the three routines @@ -103424,7 +103975,7 @@ SQLITE_PRIVATE void sqlite3Insert( rc = sqlite3Select(pParse, pSelect, &dest); regFromSelect = dest.iSdst; if( rc || db->mallocFailed || pParse->nErr ) goto insert_cleanup; - sqlite3VdbeAddOp1(v, OP_EndCoroutine, regYield); + sqlite3VdbeEndCoroutine(v, regYield); sqlite3VdbeJumpHere(v, addrTop - 1); /* label B: */ assert( pSelect->pEList ); nColumn = pSelect->pEList->nExpr; @@ -103526,7 +104077,7 @@ SQLITE_PRIVATE void sqlite3Insert( int nIdx; nIdx = sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenWrite, 0, -1, 0, &iDataCur, &iIdxCur); - aRegIdx = sqlite3DbMallocRaw(db, sizeof(int)*(nIdx+1)); + aRegIdx = sqlite3DbMallocRawNN(db, sizeof(int)*(nIdx+1)); if( aRegIdx==0 ){ goto insert_cleanup; } @@ -103734,7 +104285,7 @@ SQLITE_PRIVATE void sqlite3Insert( { int isReplace; /* Set to true if constraints may cause a replace */ sqlite3GenerateConstraintChecks(pParse, pTab, aRegIdx, iDataCur, iIdxCur, - regIns, 0, ipkColumn>=0, onError, endOfLoop, &isReplace + regIns, 0, ipkColumn>=0, onError, endOfLoop, &isReplace, 0 ); sqlite3FkCheck(pParse, pTab, 0, regIns, 0, 0); sqlite3CompleteInsertion(pParse, pTab, iDataCur, iIdxCur, @@ -103816,6 +104367,59 @@ insert_cleanup: #undef tmask #endif +/* +** Meanings of bits in of pWalker->eCode for checkConstraintUnchanged() +*/ +#define CKCNSTRNT_COLUMN 0x01 /* CHECK constraint uses a changing column */ +#define CKCNSTRNT_ROWID 0x02 /* CHECK constraint references the ROWID */ + +/* This is the Walker callback from checkConstraintUnchanged(). Set +** bit 0x01 of pWalker->eCode if +** pWalker->eCode to 0 if this expression node references any of the +** columns that are being modifed by an UPDATE statement. +*/ +static int checkConstraintExprNode(Walker *pWalker, Expr *pExpr){ + if( pExpr->op==TK_COLUMN ){ + assert( pExpr->iColumn>=0 || pExpr->iColumn==-1 ); + if( pExpr->iColumn>=0 ){ + if( pWalker->u.aiCol[pExpr->iColumn]>=0 ){ + pWalker->eCode |= CKCNSTRNT_COLUMN; + } + }else{ + pWalker->eCode |= CKCNSTRNT_ROWID; + } + } + return WRC_Continue; +} + +/* +** pExpr is a CHECK constraint on a row that is being UPDATE-ed. The +** only columns that are modified by the UPDATE are those for which +** aiChng[i]>=0, and also the ROWID is modified if chngRowid is true. +** +** Return true if CHECK constraint pExpr does not use any of the +** changing columns (or the rowid if it is changing). In other words, +** return true if this CHECK constraint can be skipped when validating +** the new row in the UPDATE statement. +*/ +static int checkConstraintUnchanged(Expr *pExpr, int *aiChng, int chngRowid){ + Walker w; + memset(&w, 0, sizeof(w)); + w.eCode = 0; + w.xExprCallback = checkConstraintExprNode; + w.u.aiCol = aiChng; + sqlite3WalkExpr(&w, pExpr); + if( !chngRowid ){ + testcase( (w.eCode & CKCNSTRNT_ROWID)!=0 ); + w.eCode &= ~CKCNSTRNT_ROWID; + } + testcase( w.eCode==0 ); + testcase( w.eCode==CKCNSTRNT_COLUMN ); + testcase( w.eCode==CKCNSTRNT_ROWID ); + testcase( w.eCode==(CKCNSTRNT_ROWID|CKCNSTRNT_COLUMN) ); + return !w.eCode; +} + /* ** Generate code to do constraint checks prior to an INSERT or an UPDATE ** on table pTab. @@ -103910,7 +104514,8 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( u8 pkChng, /* Non-zero if the rowid or PRIMARY KEY changed */ u8 overrideError, /* Override onError to this if not OE_Default */ int ignoreDest, /* Jump to this label on an OE_Ignore resolution */ - int *pbMayReplace /* OUT: Set to true if constraint may cause a replace */ + int *pbMayReplace, /* OUT: Set to true if constraint may cause a replace */ + int *aiChng /* column i is unchanged if aiChng[i]<0 */ ){ Vdbe *v; /* VDBE under constrution */ Index *pIdx; /* Pointer to one of the indices */ @@ -103956,10 +104561,14 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( */ for(i=0; iiPKey ){ + continue; /* ROWID is never NULL */ + } + if( aiChng && aiChng[i]<0 ){ + /* Don't bother checking for NOT NULL on columns that do not change */ continue; } onError = pTab->aCol[i].notNull; - if( onError==OE_None ) continue; + if( onError==OE_None ) continue; /* This column is allowed to be NULL */ if( overrideError!=OE_Default ){ onError = overrideError; }else if( onError==OE_Default ){ @@ -104008,8 +104617,11 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( pParse->ckBase = regNewData+1; onError = overrideError!=OE_Default ? overrideError : OE_Abort; for(i=0; inExpr; i++){ - int allOk = sqlite3VdbeMakeLabel(v); - sqlite3ExprIfTrue(pParse, pCheck->a[i].pExpr, allOk, SQLITE_JUMPIFNULL); + int allOk; + Expr *pExpr = pCheck->a[i].pExpr; + if( aiChng && checkConstraintUnchanged(pExpr, aiChng, pkChng) ) continue; + allOk = sqlite3VdbeMakeLabel(v); + sqlite3ExprIfTrue(pParse, pExpr, allOk, SQLITE_JUMPIFNULL); if( onError==OE_Ignore ){ sqlite3VdbeGoto(v, ignoreDest); }else{ @@ -104359,7 +104971,7 @@ SQLITE_PRIVATE void sqlite3CompleteInsertion( assert( pParse->nested==0 ); pik_flags |= OPFLAG_NCHANGE; } - if( pik_flags ) sqlite3VdbeChangeP5(v, pik_flags); + sqlite3VdbeChangeP5(v, pik_flags); } if( !HasRowid(pTab) ) return; regData = regNewData + 1; @@ -104411,7 +105023,7 @@ SQLITE_PRIVATE int sqlite3OpenTableAndIndices( Parse *pParse, /* Parsing context */ Table *pTab, /* Table to be opened */ int op, /* OP_OpenRead or OP_OpenWrite */ - u8 p5, /* P5 value for OP_Open* instructions */ + u8 p5, /* P5 value for OP_Open* opcodes (except on WITHOUT ROWID) */ int iBase, /* Use this for the table cursor, if there is one */ u8 *aToOpen, /* If not NULL: boolean for each table and index */ int *piDataCur, /* Write the database source cursor number here */ @@ -104446,15 +105058,16 @@ SQLITE_PRIVATE int sqlite3OpenTableAndIndices( for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){ int iIdxCur = iBase++; assert( pIdx->pSchema==pTab->pSchema ); - if( IsPrimaryKeyIndex(pIdx) && !HasRowid(pTab) && piDataCur ){ - *piDataCur = iIdxCur; - } if( aToOpen==0 || aToOpen[i+1] ){ sqlite3VdbeAddOp3(v, op, iIdxCur, pIdx->tnum, iDb); sqlite3VdbeSetP4KeyInfo(pParse, pIdx); - sqlite3VdbeChangeP5(v, p5); VdbeComment((v, "%s", pIdx->zName)); } + if( IsPrimaryKeyIndex(pIdx) && !HasRowid(pTab) ){ + if( piDataCur ) *piDataCur = iIdxCur; + }else{ + sqlite3VdbeChangeP5(v, p5); + } } if( iBase>pParse->nTab ) pParse->nTab = iBase; return i; @@ -104775,9 +105388,9 @@ static int xferOptimization( assert( (pDest->tabFlags & TF_Autoincrement)==0 ); } sqlite3VdbeAddOp2(v, OP_RowData, iSrc, regData); - sqlite3VdbeAddOp3(v, OP_Insert, iDest, regData, regRowid); + sqlite3VdbeAddOp4(v, OP_Insert, iDest, regData, regRowid, + pDest->zName, 0); sqlite3VdbeChangeP5(v, OPFLAG_NCHANGE|OPFLAG_LASTROWID|OPFLAG_APPEND); - sqlite3VdbeChangeP4(v, -1, pDest->zName, 0); sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1); VdbeCoverage(v); sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0); sqlite3VdbeAddOp2(v, OP_Close, iDest, 0); @@ -104944,7 +105557,7 @@ SQLITE_API int SQLITE_STDCALL sqlite3_exec( for(i=0; imallocFailed = 1; + sqlite3OomFault(db); goto exec_out; } } @@ -106832,8 +107445,8 @@ static const struct sPragmaNames { /* ** Interpret the given string as a safety level. Return 0 for OFF, -** 1 for ON or NORMAL and 2 for FULL. Return 1 for an empty or -** unrecognized string argument. The FULL option is disallowed +** 1 for ON or NORMAL, 2 for FULL, and 3 for EXTRA. Return 1 for an empty or +** unrecognized string argument. The FULL and EXTRA option is disallowed ** if the omitFull parameter it 1. ** ** Note that the values returned are one less that the values that @@ -106842,18 +107455,21 @@ static const struct sPragmaNames { ** and older scripts may have used numbers 0 for OFF and 1 for ON. */ static u8 getSafetyLevel(const char *z, int omitFull, u8 dflt){ - /* 123456789 123456789 */ - static const char zText[] = "onoffalseyestruefull"; - static const u8 iOffset[] = {0, 1, 2, 4, 9, 12, 16}; - static const u8 iLength[] = {2, 2, 3, 5, 3, 4, 4}; - static const u8 iValue[] = {1, 0, 0, 0, 1, 1, 2}; + /* 123456789 123456789 123 */ + static const char zText[] = "onoffalseyestruextrafull"; + static const u8 iOffset[] = {0, 1, 2, 4, 9, 12, 15, 20}; + static const u8 iLength[] = {2, 2, 3, 5, 3, 4, 5, 4}; + static const u8 iValue[] = {1, 0, 0, 0, 1, 1, 3, 2}; + /* on no off false yes true extra full */ int i, n; if( sqlite3Isdigit(*z) ){ return (u8)sqlite3Atoi(z); } n = sqlite3Strlen30(z); - for(i=0; inMem += 2; - addr = sqlite3VdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize,iLn); - sqlite3VdbeChangeP1(v, addr, iDb); - sqlite3VdbeChangeP1(v, addr+1, iDb); - sqlite3VdbeChangeP1(v, addr+6, SQLITE_DEFAULT_CACHE_SIZE); + sqlite3VdbeVerifyNoMallocRequired(v, ArraySize(getCacheSize)); + aOp = sqlite3VdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize, iLn); + if( ONLY_IF_REALLOC_STRESS(aOp==0) ) break; + aOp[0].p1 = iDb; + aOp[1].p1 = iDb; + aOp[6].p1 = SQLITE_DEFAULT_CACHE_SIZE; }else{ int size = sqlite3AbsInt32(sqlite3Atoi(zRight)); sqlite3BeginWriteOperation(pParse, 0, iDb); - sqlite3VdbeAddOp2(v, OP_Integer, size, 1); - sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_DEFAULT_CACHE_SIZE, 1); + sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_DEFAULT_CACHE_SIZE, size); assert( sqlite3SchemaMutexHeld(db, iDb, 0) ); pDb->pSchema->cache_size = size; sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size); @@ -107274,7 +107891,7 @@ SQLITE_PRIVATE void sqlite3Pragma( */ db->nextPagesize = sqlite3Atoi(zRight); if( SQLITE_NOMEM==sqlite3BtreeSetPageSize(pBt, db->nextPagesize,-1,0) ){ - db->mallocFailed = 1; + sqlite3OomFault(db); } } break; @@ -107481,16 +108098,18 @@ SQLITE_PRIVATE void sqlite3Pragma( { OP_ReadCookie, 0, 1, BTREE_LARGEST_ROOT_PAGE}, { OP_If, 1, 0, 0}, /* 2 */ { OP_Halt, SQLITE_OK, OE_Abort, 0}, /* 3 */ - { OP_Integer, 0, 1, 0}, /* 4 */ - { OP_SetCookie, 0, BTREE_INCR_VACUUM, 1}, /* 5 */ + { OP_SetCookie, 0, BTREE_INCR_VACUUM, 0}, /* 4 */ }; - int iAddr; - iAddr = sqlite3VdbeAddOpList(v, ArraySize(setMeta6), setMeta6, iLn); - sqlite3VdbeChangeP1(v, iAddr, iDb); - sqlite3VdbeChangeP1(v, iAddr+1, iDb); - sqlite3VdbeChangeP2(v, iAddr+2, iAddr+4); - sqlite3VdbeChangeP1(v, iAddr+4, eAuto-1); - sqlite3VdbeChangeP1(v, iAddr+5, iDb); + VdbeOp *aOp; + int iAddr = sqlite3VdbeCurrentAddr(v); + sqlite3VdbeVerifyNoMallocRequired(v, ArraySize(setMeta6)); + aOp = sqlite3VdbeAddOpList(v, ArraySize(setMeta6), setMeta6, iLn); + if( ONLY_IF_REALLOC_STRESS(aOp==0) ) break; + aOp[0].p1 = iDb; + aOp[1].p1 = iDb; + aOp[2].p2 = iAddr+4; + aOp[4].p1 = iDb; + aOp[4].p3 = eAuto - 1; sqlite3VdbeUsesBtree(v, iDb); } } @@ -107769,7 +108388,7 @@ SQLITE_PRIVATE void sqlite3Pragma( /* ** PRAGMA [schema.]synchronous - ** PRAGMA [schema.]synchronous=OFF|ON|NORMAL|FULL + ** PRAGMA [schema.]synchronous=OFF|ON|NORMAL|FULL|EXTRA ** ** Return or set the local value of the synchronous flag. Changing ** the local value does not make changes to the disk file and the @@ -108196,18 +108815,6 @@ SQLITE_PRIVATE void sqlite3Pragma( case PragTyp_INTEGRITY_CHECK: { int i, j, addr, mxErr; - /* Code that appears at the end of the integrity check. If no error - ** messages have been generated, output OK. Otherwise output the - ** error message - */ - static const int iLn = VDBE_OFFSET_LINENO(2); - static const VdbeOpList endCode[] = { - { OP_AddImm, 1, 0, 0}, /* 0 */ - { OP_If, 1, 0, 0}, /* 1 */ - { OP_String8, 0, 3, 0}, /* 2 */ - { OP_ResultRow, 3, 1, 0}, - }; - int isQuick = (sqlite3Tolower(zLeft[0])=='q'); /* If the PRAGMA command was of the form "PRAGMA .integrity_check", @@ -108404,10 +109011,23 @@ SQLITE_PRIVATE void sqlite3Pragma( #endif /* SQLITE_OMIT_BTREECOUNT */ } } - addr = sqlite3VdbeAddOpList(v, ArraySize(endCode), endCode, iLn); - sqlite3VdbeChangeP2(v, addr, -mxErr); - sqlite3VdbeJumpHere(v, addr+1); - sqlite3VdbeChangeP4(v, addr+2, "ok", P4_STATIC); + { + static const int iLn = VDBE_OFFSET_LINENO(2); + static const VdbeOpList endCode[] = { + { OP_AddImm, 1, 0, 0}, /* 0 */ + { OP_If, 1, 4, 0}, /* 1 */ + { OP_String8, 0, 3, 0}, /* 2 */ + { OP_ResultRow, 3, 1, 0}, /* 3 */ + }; + VdbeOp *aOp; + + aOp = sqlite3VdbeAddOpList(v, ArraySize(endCode), endCode, iLn); + if( aOp ){ + aOp[0].p2 = -mxErr; + aOp[2].p4type = P4_STATIC; + aOp[2].p4.z = "ok"; + } + } } break; #endif /* SQLITE_OMIT_INTEGRITY_CHECK */ @@ -108521,14 +109141,16 @@ SQLITE_PRIVATE void sqlite3Pragma( /* Write the specified cookie value */ static const VdbeOpList setCookie[] = { { OP_Transaction, 0, 1, 0}, /* 0 */ - { OP_Integer, 0, 1, 0}, /* 1 */ - { OP_SetCookie, 0, 0, 1}, /* 2 */ + { OP_SetCookie, 0, 0, 0}, /* 1 */ }; - int addr = sqlite3VdbeAddOpList(v, ArraySize(setCookie), setCookie, 0); - sqlite3VdbeChangeP1(v, addr, iDb); - sqlite3VdbeChangeP1(v, addr+1, sqlite3Atoi(zRight)); - sqlite3VdbeChangeP1(v, addr+2, iDb); - sqlite3VdbeChangeP2(v, addr+2, iCookie); + VdbeOp *aOp; + sqlite3VdbeVerifyNoMallocRequired(v, ArraySize(setCookie)); + aOp = sqlite3VdbeAddOpList(v, ArraySize(setCookie), setCookie, 0); + if( ONLY_IF_REALLOC_STRESS(aOp==0) ) break; + aOp[0].p1 = iDb; + aOp[1].p1 = iDb; + aOp[1].p2 = iCookie; + aOp[1].p3 = sqlite3Atoi(zRight); }else{ /* Read the specified cookie value */ static const VdbeOpList readCookie[] = { @@ -108536,10 +109158,13 @@ SQLITE_PRIVATE void sqlite3Pragma( { OP_ReadCookie, 0, 1, 0}, /* 1 */ { OP_ResultRow, 1, 1, 0} }; - int addr = sqlite3VdbeAddOpList(v, ArraySize(readCookie), readCookie, 0); - sqlite3VdbeChangeP1(v, addr, iDb); - sqlite3VdbeChangeP1(v, addr+1, iDb); - sqlite3VdbeChangeP3(v, addr+1, iCookie); + VdbeOp *aOp; + sqlite3VdbeVerifyNoMallocRequired(v, ArraySize(readCookie)); + aOp = sqlite3VdbeAddOpList(v, ArraySize(readCookie),readCookie,0); + if( ONLY_IF_REALLOC_STRESS(aOp==0) ) break; + aOp[0].p1 = iDb; + aOp[1].p1 = iDb; + aOp[1].p3 = iCookie; sqlite3VdbeSetNumCols(v, 1); sqlite3VdbeSetColName(v, 0, COLNAME_NAME, zLeft, SQLITE_TRANSIENT); } @@ -108797,11 +109422,10 @@ static void corruptSchema( if( !db->mallocFailed && (db->flags & SQLITE_RecoveryMode)==0 ){ char *z; if( zObj==0 ) zObj = "?"; - z = sqlite3_mprintf("malformed database schema (%s)", zObj); - if( z && zExtra ) z = sqlite3_mprintf("%z - %s", z, zExtra); + z = sqlite3MPrintf(db, "malformed database schema (%s)", zObj); + if( zExtra ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra); sqlite3DbFree(db, *pData->pzErrMsg); *pData->pzErrMsg = z; - if( z==0 ) db->mallocFailed = 1; } pData->rc = db->mallocFailed ? SQLITE_NOMEM : SQLITE_CORRUPT_BKPT; } @@ -108860,7 +109484,7 @@ SQLITE_PRIVATE int sqlite3InitCallback(void *pInit, int argc, char **argv, char }else{ pData->rc = rc; if( rc==SQLITE_NOMEM ){ - db->mallocFailed = 1; + sqlite3OomFault(db); }else if( rc!=SQLITE_INTERRUPT && (rc&0xFF)!=SQLITE_LOCKED ){ corruptSchema(pData, argv[0], sqlite3_errmsg(db)); } @@ -108906,61 +109530,27 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ #ifndef SQLITE_OMIT_DEPRECATED int size; #endif - Table *pTab; Db *pDb; char const *azArg[4]; int meta[5]; InitData initData; - char const *zMasterSchema; - char const *zMasterName; + const char *zMasterName; int openedTransaction = 0; - /* - ** The master database table has a structure like this - */ - static const char master_schema[] = - "CREATE TABLE sqlite_master(\n" - " type text,\n" - " name text,\n" - " tbl_name text,\n" - " rootpage integer,\n" - " sql text\n" - ")" - ; -#ifndef SQLITE_OMIT_TEMPDB - static const char temp_master_schema[] = - "CREATE TEMP TABLE sqlite_temp_master(\n" - " type text,\n" - " name text,\n" - " tbl_name text,\n" - " rootpage integer,\n" - " sql text\n" - ")" - ; -#else - #define temp_master_schema 0 -#endif - assert( iDb>=0 && iDbnDb ); assert( db->aDb[iDb].pSchema ); assert( sqlite3_mutex_held(db->mutex) ); assert( iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) ); - /* zMasterSchema and zInitScript are set to point at the master schema - ** and initialisation script appropriate for the database being - ** initialized. zMasterName is the name of the master table. - */ - if( !OMIT_TEMPDB && iDb==1 ){ - zMasterSchema = temp_master_schema; - }else{ - zMasterSchema = master_schema; - } - zMasterName = SCHEMA_TABLE(iDb); - - /* Construct the schema tables. */ - azArg[0] = zMasterName; + /* Construct the in-memory representation schema tables (sqlite_master or + ** sqlite_temp_master) by invoking the parser directly. The appropriate + ** table name will be inserted automatically by the parser so we can just + ** use the abbreviation "x" here. The parser will also automatically tag + ** the schema table as read-only. */ + azArg[0] = zMasterName = SCHEMA_TABLE(iDb); azArg[1] = "1"; - azArg[2] = zMasterSchema; + azArg[2] = "CREATE TABLE x(type text,name text,tbl_name text," + "rootpage integer,sql text)"; azArg[3] = 0; initData.db = db; initData.iDb = iDb; @@ -108971,10 +109561,6 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ rc = initData.rc; goto error_out; } - pTab = sqlite3FindTable(db, zMasterName, db->aDb[iDb].zName); - if( ALWAYS(pTab) ){ - pTab->tabFlags |= TF_Readonly; - } /* Create a cursor to hold the database open */ @@ -109093,7 +109679,7 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ { char *zSql; zSql = sqlite3MPrintf(db, - "SELECT name, rootpage, sql FROM '%q'.%s ORDER BY rowid", + "SELECT name, rootpage, sql FROM \"%w\".%s ORDER BY rowid", db->aDb[iDb].zName, zMasterName); #ifndef SQLITE_OMIT_AUTHORIZATION { @@ -109143,7 +109729,7 @@ initone_error_out: error_out: if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){ - db->mallocFailed = 1; + sqlite3OomFault(db); } return rc; } @@ -109241,7 +109827,7 @@ static void schemaIsValid(Parse *pParse){ if( !sqlite3BtreeIsInReadTrans(pBt) ){ rc = sqlite3BtreeBeginTrans(pBt, 0); if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){ - db->mallocFailed = 1; + sqlite3OomFault(db); } if( rc!=SQLITE_OK ) return; openedTransaction = 1; @@ -109304,6 +109890,11 @@ SQLITE_PRIVATE void sqlite3ParserReset(Parse *pParse){ sqlite3 *db = pParse->db; sqlite3DbFree(db, pParse->aLabel); sqlite3ExprListDelete(db, pParse->pConstExpr); + if( db ){ + assert( db->lookaside.bDisable >= pParse->disableLookaside ); + db->lookaside.bDisable -= pParse->disableLookaside; + } + pParse->disableLookaside = 0; } } @@ -109332,7 +109923,7 @@ static int sqlite3Prepare( } pParse->pReprepare = pReprepare; assert( ppStmt && *ppStmt==0 ); - assert( !db->mallocFailed ); + /* assert( !db->mallocFailed ); // not true with SQLITE_USE_ALLOCA */ assert( sqlite3_mutex_held(db->mutex) ); /* Check to verify that it is possible to get a read lock on all @@ -109389,8 +109980,8 @@ static int sqlite3Prepare( zSqlCopy = sqlite3DbStrNDup(db, zSql, nBytes); if( zSqlCopy ){ sqlite3RunParser(pParse, zSqlCopy, &zErrMsg); - sqlite3DbFree(db, zSqlCopy); pParse->zTail = &zSql[pParse->zTail-zSqlCopy]; + sqlite3DbFree(db, zSqlCopy); }else{ pParse->zTail = &zSql[nBytes]; } @@ -109399,9 +109990,6 @@ static int sqlite3Prepare( } assert( 0==pParse->nQueryLoop ); - if( db->mallocFailed ){ - pParse->rc = SQLITE_NOMEM; - } if( pParse->rc==SQLITE_DONE ) pParse->rc = SQLITE_OK; if( pParse->checkSchema ){ schemaIsValid(pParse); @@ -109523,7 +110111,7 @@ SQLITE_PRIVATE int sqlite3Reprepare(Vdbe *p){ rc = sqlite3LockAndPrepare(db, zSql, -1, 0, p, &pNew, 0); if( rc ){ if( rc==SQLITE_NOMEM ){ - db->mallocFailed = 1; + sqlite3OomFault(db); } assert( pNew==0 ); return rc; @@ -109777,29 +110365,37 @@ SQLITE_PRIVATE Select *sqlite3SelectNew( Select *pNew; Select standin; sqlite3 *db = pParse->db; - pNew = sqlite3DbMallocZero(db, sizeof(*pNew) ); + pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) ); if( pNew==0 ){ assert( db->mallocFailed ); pNew = &standin; - memset(pNew, 0, sizeof(*pNew)); } if( pEList==0 ){ pEList = sqlite3ExprListAppend(pParse, 0, sqlite3Expr(db,TK_ASTERISK,0)); } pNew->pEList = pEList; + pNew->op = TK_SELECT; + pNew->selFlags = selFlags; + pNew->iLimit = 0; + pNew->iOffset = 0; +#if SELECTTRACE_ENABLED + pNew->zSelName[0] = 0; +#endif + pNew->addrOpenEphm[0] = -1; + pNew->addrOpenEphm[1] = -1; + pNew->nSelectRow = 0; if( pSrc==0 ) pSrc = sqlite3DbMallocZero(db, sizeof(*pSrc)); pNew->pSrc = pSrc; pNew->pWhere = pWhere; pNew->pGroupBy = pGroupBy; pNew->pHaving = pHaving; pNew->pOrderBy = pOrderBy; - pNew->selFlags = selFlags; - pNew->op = TK_SELECT; + pNew->pPrior = 0; + pNew->pNext = 0; pNew->pLimit = pLimit; pNew->pOffset = pOffset; + pNew->pWith = 0; assert( pOffset==0 || pLimit!=0 || pParse->nErr>0 || db->mallocFailed!=0 ); - pNew->addrOpenEphm[0] = -1; - pNew->addrOpenEphm[1] = -1; if( db->mallocFailed ) { clearSelect(db, pNew, pNew!=&standin); pNew = 0; @@ -110662,8 +111258,8 @@ static void selectInnerLoop( ** X extra columns. */ SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoAlloc(sqlite3 *db, int N, int X){ - KeyInfo *p = sqlite3DbMallocZero(0, - sizeof(KeyInfo) + (N+X)*(sizeof(CollSeq*)+1)); + int nExtra = (N+X)*(sizeof(CollSeq*)+1); + KeyInfo *p = sqlite3Malloc(sizeof(KeyInfo) + nExtra); if( p ){ p->aSortOrder = (u8*)&p->aColl[N+X]; p->nField = (u16)N; @@ -110671,8 +111267,9 @@ SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoAlloc(sqlite3 *db, int N, int X){ p->enc = ENC(db); p->db = db; p->nRef = 1; + memset(&p[1], 0, nExtra); }else{ - db->mallocFailed = 1; + sqlite3OomFault(db); } return p; } @@ -111333,7 +111930,7 @@ SQLITE_PRIVATE int sqlite3ColumnsFromExprList( pCol->zName = zName; sqlite3ColumnPropertiesFromName(0, pCol); if( zName && sqlite3HashInsert(&ht, zName, pCol)==pCol ){ - db->mallocFailed = 1; + sqlite3OomFault(db); } } sqlite3HashClear(&ht); @@ -111420,7 +112017,7 @@ SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect){ } /* The sqlite3ResultSetOfSelect() is only used n contexts where lookaside ** is disabled */ - assert( db->lookaside.bEnabled==0 ); + assert( db->lookaside.bDisable ); pTab->nRef = 1; pTab->zName = 0; pTab->nRowLogEst = 200; assert( 200==sqlite3LogEst(1048576) ); @@ -111516,10 +112113,8 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){ sqlite3ExprCode(pParse, p->pOffset, iOffset); sqlite3VdbeAddOp1(v, OP_MustBeInt, iOffset); VdbeCoverage(v); VdbeComment((v, "OFFSET counter")); - sqlite3VdbeAddOp3(v, OP_SetIfNotPos, iOffset, iOffset, 0); - sqlite3VdbeAddOp3(v, OP_Add, iLimit, iOffset, iOffset+1); + sqlite3VdbeAddOp3(v, OP_OffsetLimit, iLimit, iOffset+1, iOffset); VdbeComment((v, "LIMIT+OFFSET")); - sqlite3VdbeAddOp3(v, OP_SetIfNotPos, iLimit, iOffset+1, -1); } } } @@ -111936,9 +112531,8 @@ static int multiSelect( addr = sqlite3VdbeAddOp1(v, OP_IfNot, p->iLimit); VdbeCoverage(v); VdbeComment((v, "Jump ahead if LIMIT reached")); if( p->iOffset ){ - sqlite3VdbeAddOp3(v, OP_SetIfNotPos, p->iOffset, p->iOffset, 0); - sqlite3VdbeAddOp3(v, OP_Add, p->iLimit, p->iOffset, p->iOffset+1); - sqlite3VdbeAddOp3(v, OP_SetIfNotPos, p->iLimit, p->iOffset+1, -1); + sqlite3VdbeAddOp3(v, OP_OffsetLimit, + p->iLimit, p->iOffset+1, p->iOffset); } } explainSetInteger(iSub2, pParse->iNextSelectId); @@ -112529,10 +113123,11 @@ static int multiSelectOrderBy( ** to the right and the left are evaluated, they use the correct ** collation. */ - aPermute = sqlite3DbMallocRaw(db, sizeof(int)*nOrderBy); + aPermute = sqlite3DbMallocRawNN(db, sizeof(int)*(nOrderBy + 1)); if( aPermute ){ struct ExprList_item *pItem; - for(i=0, pItem=pOrderBy->a; ia; i<=nOrderBy; i++, pItem++){ assert( pItem->u.x.iOrderByCol>0 ); assert( pItem->u.x.iOrderByCol<=p->pEList->nExpr ); aPermute[i] = pItem->u.x.iOrderByCol - 1; @@ -112610,7 +113205,7 @@ static int multiSelectOrderBy( pPrior->iLimit = regLimitA; explainSetInteger(iSub1, pParse->iNextSelectId); sqlite3Select(pParse, pPrior, &destA); - sqlite3VdbeAddOp1(v, OP_EndCoroutine, regAddrA); + sqlite3VdbeEndCoroutine(v, regAddrA); sqlite3VdbeJumpHere(v, addr1); /* Generate a coroutine to evaluate the SELECT statement on @@ -112627,7 +113222,7 @@ static int multiSelectOrderBy( sqlite3Select(pParse, p, &destB); p->iLimit = savedLimit; p->iOffset = savedOffset; - sqlite3VdbeAddOp1(v, OP_EndCoroutine, regAddrB); + sqlite3VdbeEndCoroutine(v, regAddrB); /* Generate a subroutine that outputs the current row of the A ** select as the next output row of the compound select. @@ -114094,8 +114689,7 @@ static int selectExpander(Walker *pWalker, Select *p){ pExpr = pRight; } pNew = sqlite3ExprListAppend(pParse, pNew, pExpr); - sColname.z = zColname; - sColname.n = sqlite3Strlen30(zColname); + sqlite3TokenInit(&sColname, zColname); sqlite3ExprListSetName(pParse, pNew, &sColname, 0); if( pNew && (p->selFlags & SF_NestedFrom)!=0 ){ struct ExprList_item *pX = &pNew->a[pNew->nExpr-1]; @@ -114649,7 +115243,7 @@ SQLITE_PRIVATE int sqlite3Select( pItem->pTab->nRowLogEst = sqlite3LogEst(pSub->nSelectRow); pItem->fg.viaCoroutine = 1; pItem->regResult = dest.iSdst; - sqlite3VdbeAddOp1(v, OP_EndCoroutine, pItem->regReturn); + sqlite3VdbeEndCoroutine(v, pItem->regReturn); sqlite3VdbeJumpHere(v, addrTop-1); sqlite3ClearTempRegCache(pParse); }else{ @@ -115221,7 +115815,8 @@ SQLITE_PRIVATE int sqlite3Select( if( flag ){ pMinMax = sqlite3ExprListDup(db, pMinMax, 0); pDel = pMinMax; - if( pMinMax && !db->mallocFailed ){ + assert( db->mallocFailed || pMinMax!=0 ); + if( !db->mallocFailed ){ pMinMax->a[0].sortOrder = flag!=WHERE_ORDERBY_MIN ?1:0; pMinMax->a[0].pExpr->op = TK_COLUMN; } @@ -115794,8 +116389,7 @@ SQLITE_PRIVATE void sqlite3FinishTrigger( pStepList->pTrig = pTrig; pStepList = pStepList->pNext; } - nameToken.z = pTrig->zName; - nameToken.n = sqlite3Strlen30(nameToken.z); + sqlite3TokenInit(&nameToken, pTrig->zName); sqlite3FixInit(&sFix, pParse, iDb, "trigger", &nameToken); if( sqlite3FixTriggerStep(&sFix, pTrig->step_list) || sqlite3FixExpr(&sFix, pTrig->pWhen) @@ -115831,7 +116425,7 @@ SQLITE_PRIVATE void sqlite3FinishTrigger( assert( sqlite3SchemaMutexHeld(db, iDb, 0) ); pTrig = sqlite3HashInsert(pHash, zName, pTrig); if( pTrig ){ - db->mallocFailed = 1; + sqlite3OomFault(db); }else if( pLink->pSchema==pLink->pTabSchema ){ Table *pTab; pTab = sqlite3HashFind(&pLink->pTabSchema->tblHash, pLink->table); @@ -116459,8 +117053,8 @@ SQLITE_PRIVATE void sqlite3CodeRowTriggerDirect( if( pPrg ){ int bRecursive = (p->zName && 0==(pParse->db->flags&SQLITE_RecTriggers)); - sqlite3VdbeAddOp3(v, OP_Program, reg, ignoreJump, ++pParse->nMem); - sqlite3VdbeChangeP4(v, -1, (const char *)pPrg->pProgram, P4_SUBPROGRAM); + sqlite3VdbeAddOp4(v, OP_Program, reg, ignoreJump, ++pParse->nMem, + (const char *)pPrg->pProgram, P4_SUBPROGRAM); VdbeComment( (v, "Call: %s.%s", (p->zName?p->zName:"fkey"), onErrorText(orconf))); @@ -116807,7 +117401,7 @@ SQLITE_PRIVATE void sqlite3Update( /* Allocate space for aXRef[], aRegIdx[], and aToOpen[]. ** Initialize aXRef[] and aToOpen[] to their default values. */ - aXRef = sqlite3DbMallocRaw(db, sizeof(int) * (pTab->nCol+nIdx) + nIdx+2 ); + aXRef = sqlite3DbMallocRawNN(db, sizeof(int) * (pTab->nCol+nIdx) + nIdx+2 ); if( aXRef==0 ) goto update_cleanup; aRegIdx = aXRef+pTab->nCol; aToOpen = (u8*)(aRegIdx+nIdx); @@ -117182,7 +117776,8 @@ SQLITE_PRIVATE void sqlite3Update( /* Do constraint checks. */ assert( regOldRowid>0 ); sqlite3GenerateConstraintChecks(pParse, pTab, aRegIdx, iDataCur, iIdxCur, - regNewRowid, regOldRowid, chngKey, onError, labelContinue, &bReplace); + regNewRowid, regOldRowid, chngKey, onError, labelContinue, &bReplace, + aXRef); /* Do FK constraint checks. */ if( hasFK ){ @@ -117847,7 +118442,7 @@ static int createModule( rc = SQLITE_MISUSE_BKPT; }else{ Module *pMod; - pMod = (Module *)sqlite3DbMallocRaw(db, sizeof(Module) + nName + 1); + pMod = (Module *)sqlite3DbMallocRawNN(db, sizeof(Module) + nName + 1); if( pMod ){ Module *pDel; char *zCopy = (char *)(&pMod[1]); @@ -117860,7 +118455,7 @@ static int createModule( pDel = (Module *)sqlite3HashInsert(&db->aModule,zCopy,(void*)pMod); assert( pDel==0 || pDel==pMod ); if( pDel ){ - db->mallocFailed = 1; + sqlite3OomFault(db); sqlite3DbFree(db, pDel); } } @@ -118237,7 +118832,7 @@ SQLITE_PRIVATE void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){ assert( sqlite3SchemaMutexHeld(db, 0, pSchema) ); pOld = sqlite3HashInsert(&pSchema->tblHash, zName, pTab); if( pOld ){ - db->mallocFailed = 1; + sqlite3OomFault(db); assert( pTab==pOld ); /* Malloc must have failed inside HashInsert() */ return; } @@ -118328,7 +118923,7 @@ static int vtabCallConstructor( db->pVtabCtx = &sCtx; rc = xConstruct(db, pMod->pAux, nArg, azArg, &pVTable->pVtab, &zErr); db->pVtabCtx = sCtx.pPrior; - if( rc==SQLITE_NOMEM ) db->mallocFailed = 1; + if( rc==SQLITE_NOMEM ) sqlite3OomFault(db); assert( sCtx.pTab==pTab ); if( SQLITE_OK!=rc ){ @@ -118814,7 +119409,7 @@ SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction( Table *pTab; sqlite3_vtab *pVtab; sqlite3_module *pMod; - void (*xFunc)(sqlite3_context*,int,sqlite3_value**) = 0; + void (*xSFunc)(sqlite3_context*,int,sqlite3_value**) = 0; void *pArg = 0; FuncDef *pNew; int rc = 0; @@ -118842,7 +119437,7 @@ SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction( for(z=(unsigned char*)zLowerName; *z; z++){ *z = sqlite3UpperToLower[*z]; } - rc = pMod->xFindFunction(pVtab, nArg, zLowerName, &xFunc, &pArg); + rc = pMod->xFindFunction(pVtab, nArg, zLowerName, &xSFunc, &pArg); sqlite3DbFree(db, zLowerName); } if( rc==0 ){ @@ -118859,7 +119454,7 @@ SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction( *pNew = *pDef; pNew->zName = (char *)&pNew[1]; memcpy(pNew->zName, pDef->zName, sqlite3Strlen30(pDef->zName)+1); - pNew->xFunc = xFunc; + pNew->xSFunc = xSFunc; pNew->pUserData = pArg; pNew->funcFlags |= SQLITE_FUNC_EPHEM; return pNew; @@ -118886,7 +119481,7 @@ SQLITE_PRIVATE void sqlite3VtabMakeWritable(Parse *pParse, Table *pTab){ pToplevel->apVtabLock = apVtabLock; pToplevel->apVtabLock[pToplevel->nVtabLock++] = pTab; }else{ - pToplevel->db->mallocFailed = 1; + sqlite3OomFault(pToplevel->db); } } @@ -119628,7 +120223,7 @@ static void explainIndexRange(StrAccum *pStr, WhereLoop *pLoop){ for(i=0; i=nSkip ? "%s=?" : "ANY(%s)", z); + sqlite3XPrintf(pStr, i>=nSkip ? "%s=?" : "ANY(%s)", z); } j = i; @@ -119687,13 +120282,13 @@ SQLITE_PRIVATE int sqlite3WhereExplainOneScan( sqlite3StrAccumInit(&str, db, zBuf, sizeof(zBuf), SQLITE_MAX_LENGTH); sqlite3StrAccumAppendAll(&str, isSearch ? "SEARCH" : "SCAN"); if( pItem->pSelect ){ - sqlite3XPrintf(&str, 0, " SUBQUERY %d", pItem->iSelectId); + sqlite3XPrintf(&str, " SUBQUERY %d", pItem->iSelectId); }else{ - sqlite3XPrintf(&str, 0, " TABLE %s", pItem->zName); + sqlite3XPrintf(&str, " TABLE %s", pItem->zName); } if( pItem->zAlias ){ - sqlite3XPrintf(&str, 0, " AS %s", pItem->zAlias); + sqlite3XPrintf(&str, " AS %s", pItem->zAlias); } if( (flags & (WHERE_IPK|WHERE_VIRTUALTABLE))==0 ){ const char *zFmt = 0; @@ -119717,7 +120312,7 @@ SQLITE_PRIVATE int sqlite3WhereExplainOneScan( } if( zFmt ){ sqlite3StrAccumAppend(&str, " USING ", 7); - sqlite3XPrintf(&str, 0, zFmt, pIdx->zName); + sqlite3XPrintf(&str, zFmt, pIdx->zName); explainIndexRange(&str, pLoop); } }else if( (flags & WHERE_IPK)!=0 && (flags & WHERE_CONSTRAINT)!=0 ){ @@ -119732,17 +120327,17 @@ SQLITE_PRIVATE int sqlite3WhereExplainOneScan( assert( flags&WHERE_TOP_LIMIT); zRangeOp = "<"; } - sqlite3XPrintf(&str, 0, " USING INTEGER PRIMARY KEY (rowid%s?)",zRangeOp); + sqlite3XPrintf(&str, " USING INTEGER PRIMARY KEY (rowid%s?)",zRangeOp); } #ifndef SQLITE_OMIT_VIRTUALTABLE else if( (flags & WHERE_VIRTUALTABLE)!=0 ){ - sqlite3XPrintf(&str, 0, " VIRTUAL TABLE INDEX %d:%s", + sqlite3XPrintf(&str, " VIRTUAL TABLE INDEX %d:%s", pLoop->u.vtab.idxNum, pLoop->u.vtab.idxStr); } #endif #ifdef SQLITE_EXPLAIN_ESTIMATED_ROWS if( pLoop->nOut>=10 ){ - sqlite3XPrintf(&str, 0, " (~%llu rows)", sqlite3LogEstToInt(pLoop->nOut)); + sqlite3XPrintf(&str, " (~%llu rows)", sqlite3LogEstToInt(pLoop->nOut)); }else{ sqlite3StrAccumAppend(&str, " (~1 row)", 9); } @@ -119879,8 +120474,7 @@ static void codeApplyAffinity(Parse *pParse, int base, int n, char *zAff){ /* Code the OP_Affinity opcode if there is anything left to do. */ if( n>0 ){ - sqlite3VdbeAddOp2(v, OP_Affinity, base, n); - sqlite3VdbeChangeP4(v, -1, zAff, n); + sqlite3VdbeAddOp4(v, OP_Affinity, base, n, 0, zAff, n); sqlite3ExprCacheAffinityChange(pParse, base, n); } } @@ -120048,9 +120642,7 @@ static int codeAllEqualityTerms( pParse->nMem += nReg; zAff = sqlite3DbStrDup(pParse->db,sqlite3IndexAffinityStr(pParse->db,pIdx)); - if( !zAff ){ - pParse->db->mallocFailed = 1; - } + assert( zAff!=0 || pParse->db->mallocFailed ); if( nSkip ){ int iIdxCur = pLevel->iIdxCur; @@ -120299,6 +120891,54 @@ static void codeCursorHint( # define codeCursorHint(A,B,C) /* No-op */ #endif /* SQLITE_ENABLE_CURSOR_HINTS */ +/* +** Cursor iCur is open on an intkey b-tree (a table). Register iRowid contains +** a rowid value just read from cursor iIdxCur, open on index pIdx. This +** function generates code to do a deferred seek of cursor iCur to the +** rowid stored in register iRowid. +** +** Normally, this is just: +** +** OP_Seek $iCur $iRowid +** +** However, if the scan currently being coded is a branch of an OR-loop and +** the statement currently being coded is a SELECT, then P3 of the OP_Seek +** is set to iIdxCur and P4 is set to point to an array of integers +** containing one entry for each column of the table cursor iCur is open +** on. For each table column, if the column is the i'th column of the +** index, then the corresponding array entry is set to (i+1). If the column +** does not appear in the index at all, the array entry is set to 0. +*/ +static void codeDeferredSeek( + WhereInfo *pWInfo, /* Where clause context */ + Index *pIdx, /* Index scan is using */ + int iCur, /* Cursor for IPK b-tree */ + int iIdxCur /* Index cursor */ +){ + Parse *pParse = pWInfo->pParse; /* Parse context */ + Vdbe *v = pParse->pVdbe; /* Vdbe to generate code within */ + + assert( iIdxCur>0 ); + assert( pIdx->aiColumn[pIdx->nColumn-1]==-1 ); + + sqlite3VdbeAddOp3(v, OP_Seek, iIdxCur, 0, iCur); + if( (pWInfo->wctrlFlags & WHERE_FORCE_TABLE) + && DbMaskAllZero(sqlite3ParseToplevel(pParse)->writeMask) + ){ + int i; + Table *pTab = pIdx->pTable; + int *ai = (int*)sqlite3DbMallocZero(pParse->db, sizeof(int)*(pTab->nCol+1)); + if( ai ){ + ai[0] = pTab->nCol; + for(i=0; inColumn-1; i++){ + assert( pIdx->aiColumn[i]nCol ); + if( pIdx->aiColumn[i]>=0 ) ai[pIdx->aiColumn[i]+1] = i+1; + } + sqlite3VdbeChangeP4(v, -1, (char*)ai, P4_INTARRAY); + } + } +} + /* ** Generate code for the start of the iLevel-th loop in the WHERE clause ** implementation described by pWInfo. @@ -120778,14 +121418,14 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart( if( omitTable ){ /* pIdx is a covering index. No need to access the main table. */ }else if( HasRowid(pIdx->pTable) ){ - iRowidReg = ++pParse->nMem; - sqlite3VdbeAddOp2(v, OP_IdxRowid, iIdxCur, iRowidReg); - sqlite3ExprCacheStore(pParse, iCur, -1, iRowidReg); if( pWInfo->eOnePass!=ONEPASS_OFF ){ + iRowidReg = ++pParse->nMem; + sqlite3VdbeAddOp2(v, OP_IdxRowid, iIdxCur, iRowidReg); + sqlite3ExprCacheStore(pParse, iCur, -1, iRowidReg); sqlite3VdbeAddOp3(v, OP_NotExists, iCur, 0, iRowidReg); VdbeCoverage(v); }else{ - sqlite3VdbeAddOp2(v, OP_Seek, iCur, iRowidReg); /* Deferred seek */ + codeDeferredSeek(pWInfo, pIdx, iCur, iIdxCur); } }else if( iCur!=iIdxCur ){ Index *pPk = sqlite3PrimaryKeyIndex(pIdx->pTable); @@ -120954,7 +121594,9 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart( Expr *pExpr = pWC->a[iTerm].pExpr; if( &pWC->a[iTerm] == pTerm ) continue; if( ExprHasProperty(pExpr, EP_FromJoin) ) continue; - if( (pWC->a[iTerm].wtFlags & TERM_VIRTUAL)!=0 ) continue; + testcase( pWC->a[iTerm].wtFlags & TERM_VIRTUAL ); + testcase( pWC->a[iTerm].wtFlags & TERM_CODED ); + if( (pWC->a[iTerm].wtFlags & (TERM_VIRTUAL|TERM_CODED))!=0 ) continue; if( (pWC->a[iTerm].eOperator & WO_ALL)==0 ) continue; testcase( pWC->a[iTerm].wtFlags & TERM_ORINFO ); pExpr = sqlite3ExprDup(db, pExpr, 0); @@ -121294,7 +121936,7 @@ static int whereClauseInsert(WhereClause *pWC, Expr *p, u16 wtFlags){ if( pWC->nTerm>=pWC->nSlot ){ WhereTerm *pOld = pWC->a; sqlite3 *db = pWC->pWInfo->pParse->db; - pWC->a = sqlite3DbMallocRaw(db, sizeof(pWC->a[0])*pWC->nSlot*2 ); + pWC->a = sqlite3DbMallocRawNN(db, sizeof(pWC->a[0])*pWC->nSlot*2 ); if( pWC->a==0 ){ if( wtFlags & TERM_DYNAMIC ){ sqlite3ExprDelete(db, p); @@ -121432,6 +122074,7 @@ static int isLikeOrGlob( sqlite3 *db = pParse->db; /* Database connection */ sqlite3_value *pVal = 0; int op; /* Opcode of pRight */ + int rc; /* Result code to return */ if( !sqlite3IsLikeFunction(db, pExpr, pnoCase, wc) ){ return 0; @@ -121497,8 +122140,9 @@ static int isLikeOrGlob( } } + rc = (z!=0); sqlite3ValueFree(pVal); - return (z!=0); + return rc; } #endif /* SQLITE_OMIT_LIKE_OPTIMIZATION */ @@ -121777,7 +122421,7 @@ static void exprAnalyzeOrTerm( WhereAndInfo *pAndInfo; assert( (pOrTerm->wtFlags & (TERM_ANDINFO|TERM_ORINFO))==0 ); chngToIN = 0; - pAndInfo = sqlite3DbMallocRaw(db, sizeof(*pAndInfo)); + pAndInfo = sqlite3DbMallocRawNN(db, sizeof(*pAndInfo)); if( pAndInfo ){ WhereClause *pAndWC; WhereTerm *pAndTerm; @@ -121791,7 +122435,6 @@ static void exprAnalyzeOrTerm( sqlite3WhereSplit(pAndWC, pOrTerm->pExpr, TK_AND); sqlite3WhereExprAnalyze(pSrc, pAndWC); pAndWC->pOuter = pWC; - testcase( db->mallocFailed ); if( !db->mallocFailed ){ for(j=0, pAndTerm=pAndWC->a; jnTerm; j++, pAndTerm++){ assert( pAndTerm->pExpr ); @@ -123534,7 +124177,7 @@ static int vtabBestIndex(Parse *pParse, Table *pTab, sqlite3_index_info *p){ if( rc!=SQLITE_OK ){ if( rc==SQLITE_NOMEM ){ - pParse->db->mallocFailed = 1; + sqlite3OomFault(pParse->db); }else if( !pVtab->zErrMsg ){ sqlite3ErrorMsg(pParse, "%s", sqlite3ErrStr(rc)); }else{ @@ -124326,7 +124969,7 @@ static int whereLoopResize(sqlite3 *db, WhereLoop *p, int n){ WhereTerm **paNew; if( p->nLSlot>=n ) return SQLITE_OK; n = (n+7)&~7; - paNew = sqlite3DbMallocRaw(db, sizeof(p->aLTerm[0])*n); + paNew = sqlite3DbMallocRawNN(db, sizeof(p->aLTerm[0])*n); if( paNew==0 ) return SQLITE_NOMEM; memcpy(paNew, p->aLTerm, sizeof(p->aLTerm[0])*p->nLSlot); if( p->aLTerm!=p->aLTermSpace ) sqlite3DbFree(db, p->aLTerm); @@ -124623,7 +125266,7 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){ #endif if( p==0 ){ /* Allocate a new WhereLoop to add to the end of the list */ - *ppPrev = p = sqlite3DbMallocRaw(db, sizeof(WhereLoop)); + *ppPrev = p = sqlite3DbMallocRawNN(db, sizeof(WhereLoop)); if( p==0 ) return SQLITE_NOMEM; whereLoopInit(p); p->pNextLoop = 0; @@ -126029,7 +126672,6 @@ static const char *wherePathName(WherePath *pPath, int nLoop, WhereLoop *pLast){ ** order. */ static LogEst whereSortingCost( - WhereInfo *pWInfo, LogEst nRow, int nOrderBy, int nSorted @@ -126051,14 +126693,6 @@ static LogEst whereSortingCost( assert( nOrderBy>0 && 66==sqlite3LogEst(100) ); rScale = sqlite3LogEst((nOrderBy-nSorted)*100/nOrderBy) - 66; rSortCost = nRow + estLog(nRow) + rScale + 16; - - /* TUNING: The cost of implementing DISTINCT using a B-TREE is - ** similar but with a larger constant of proportionality. - ** Multiply by an additional factor of 3.0. */ - if( pWInfo->wctrlFlags & WHERE_WANT_DISTINCT ){ - rSortCost += 16; - } - return rSortCost; } @@ -126120,7 +126754,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){ /* Allocate and initialize space for aTo, aFrom and aSortCost[] */ nSpace = (sizeof(WherePath)+sizeof(WhereLoop*)*nLoop)*mxChoice*2; nSpace += sizeof(LogEst) * nOrderBy; - pSpace = sqlite3DbMallocRaw(db, nSpace); + pSpace = sqlite3DbMallocRawNN(db, nSpace); if( pSpace==0 ) return SQLITE_NOMEM; aTo = (WherePath*)pSpace; aFrom = aTo+mxChoice; @@ -126192,7 +126826,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){ if( isOrdered>=0 && isOrderednLevel==1 ); if( (wctrlFlags & WHERE_ONEPASS_DESIRED)!=0 ){ int wsFlags = pWInfo->a[0].pWLoop->wsFlags; int bOnerow = (wsFlags & WHERE_ONEROW)!=0; - if( bOnerow || ( (wctrlFlags & WHERE_ONEPASS_MULTIROW) - && 0==(wsFlags & WHERE_VIRTUALTABLE) - )){ + if( bOnerow + || ((wctrlFlags & WHERE_ONEPASS_MULTIROW)!=0 + && 0==(wsFlags & WHERE_VIRTUALTABLE)) + ){ pWInfo->eOnePass = bOnerow ? ONEPASS_SINGLE : ONEPASS_MULTI; if( HasRowid(pTabList->a[0].pTab) && (wsFlags & WHERE_IDX_ONLY) ){ if( wctrlFlags & WHERE_ONEPASS_MULTIROW ){ @@ -126909,8 +127542,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( Bitmask b = pTabItem->colUsed; int n = 0; for(; b; b=b>>1, n++){} - sqlite3VdbeChangeP4(v, sqlite3VdbeCurrentAddr(v)-1, - SQLITE_INT_TO_PTR(n), P4_INT32); + sqlite3VdbeChangeP4(v, -1, SQLITE_INT_TO_PTR(n), P4_INT32); assert( n<=pTab->nCol ); } #ifdef SQLITE_ENABLE_CURSOR_HINTS @@ -127304,6 +127936,15 @@ struct TrigEvent { int a; IdList * b; }; */ struct AttachKey { int type; Token key; }; +/* +** Disable lookaside memory allocation for objects that might be +** shared across database connections. +*/ +static void disableLookaside(Parse *pParse){ + pParse->disableLookaside++; + pParse->db->lookaside.bDisable++; +} + /* ** For a compound SELECT statement, make sure p->pPrior->pNext==p for @@ -127386,7 +128027,7 @@ struct AttachKey { int type; Token key; }; ** unary TK_ISNULL or TK_NOTNULL expression. */ static void binaryToUnaryIfNull(Parse *pParse, Expr *pY, Expr *pA, int op){ sqlite3 *db = pParse->db; - if( pY && pA && pY->op==TK_NULL ){ + if( pA && pY && pY->op==TK_NULL ){ pA->op = (u8)op; sqlite3ExprDelete(db, pA->pRight); pA->pRight = 0; @@ -129377,14 +130018,11 @@ static void yy_reduce( ** break; */ /********** Begin reduce actions **********************************************/ - case 5: /* explain ::= */ -{ sqlite3BeginParse(pParse, 0); } - break; case 6: /* explain ::= EXPLAIN */ -{ sqlite3BeginParse(pParse, 1); } +{ pParse->explain = 1; } break; case 7: /* explain ::= EXPLAIN QUERY PLAN */ -{ sqlite3BeginParse(pParse, 2); } +{ pParse->explain = 2; } break; case 8: /* cmdx ::= cmd */ { sqlite3FinishCoding(pParse); } @@ -129431,7 +130069,7 @@ static void yy_reduce( break; case 27: /* createkw ::= CREATE */ { - pParse->db->lookaside.bEnabled = 0; + disableLookaside(pParse); yygotominor.yy0 = yymsp[0].minor.yy0; } break; @@ -130513,7 +131151,7 @@ static void yy_reduce( break; case 307: /* add_column_fullname ::= fullname */ { - pParse->db->lookaside.bEnabled = 0; + disableLookaside(pParse); sqlite3AlterBeginAddColumn(pParse, yymsp[0].minor.yy259); } break; @@ -130559,6 +131197,7 @@ static void yy_reduce( /* (2) cmdlist ::= ecmd */ yytestcase(yyruleno==2); /* (3) ecmd ::= SEMI */ yytestcase(yyruleno==3); /* (4) ecmd ::= explain cmdx SEMI */ yytestcase(yyruleno==4); + /* (5) explain ::= */ yytestcase(yyruleno==5); /* (10) trans_opt ::= */ yytestcase(yyruleno==10); /* (11) trans_opt ::= TRANSACTION */ yytestcase(yyruleno==11); /* (12) trans_opt ::= TRANSACTION nm */ yytestcase(yyruleno==12); @@ -130892,12 +131531,92 @@ SQLITE_PRIVATE void sqlite3Parser( /* #include "sqliteInt.h" */ /* #include */ +/* Character classes for tokenizing +** +** In the sqlite3GetToken() function, a switch() on aiClass[c] is implemented +** using a lookup table, whereas a switch() directly on c uses a binary search. +** The lookup table is much faster. To maximize speed, and to ensure that +** a lookup table is used, all of the classes need to be small integers and +** all of them need to be used within the switch. +*/ +#define CC_X 0 /* The letter 'x', or start of BLOB literal */ +#define CC_KYWD 1 /* Alphabetics or '_'. Usable in a keyword */ +#define CC_ID 2 /* unicode characters usable in IDs */ +#define CC_DIGIT 3 /* Digits */ +#define CC_DOLLAR 4 /* '$' */ +#define CC_VARALPHA 5 /* '@', '#', ':'. Alphabetic SQL variables */ +#define CC_VARNUM 6 /* '?'. Numeric SQL variables */ +#define CC_SPACE 7 /* Space characters */ +#define CC_QUOTE 8 /* '"', '\'', or '`'. String literals, quoted ids */ +#define CC_QUOTE2 9 /* '['. [...] style quoted ids */ +#define CC_PIPE 10 /* '|'. Bitwise OR or concatenate */ +#define CC_MINUS 11 /* '-'. Minus or SQL-style comment */ +#define CC_LT 12 /* '<'. Part of < or <= or <> */ +#define CC_GT 13 /* '>'. Part of > or >= */ +#define CC_EQ 14 /* '='. Part of = or == */ +#define CC_BANG 15 /* '!'. Part of != */ +#define CC_SLASH 16 /* '/'. / or c-style comment */ +#define CC_LP 17 /* '(' */ +#define CC_RP 18 /* ')' */ +#define CC_SEMI 19 /* ';' */ +#define CC_PLUS 20 /* '+' */ +#define CC_STAR 21 /* '*' */ +#define CC_PERCENT 22 /* '%' */ +#define CC_COMMA 23 /* ',' */ +#define CC_AND 24 /* '&' */ +#define CC_TILDA 25 /* '~' */ +#define CC_DOT 26 /* '.' */ +#define CC_ILLEGAL 27 /* Illegal character */ + +static const unsigned char aiClass[] = { +#ifdef SQLITE_ASCII +/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf */ +/* 0x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 7, 7, 27, 7, 7, 27, 27, +/* 1x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +/* 2x */ 7, 15, 8, 5, 4, 22, 24, 8, 17, 18, 21, 20, 23, 11, 26, 16, +/* 3x */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 19, 12, 14, 13, 6, +/* 4x */ 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +/* 5x */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 9, 27, 27, 27, 1, +/* 6x */ 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +/* 7x */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 27, 10, 27, 25, 27, +/* 8x */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +/* 9x */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +/* Ax */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +/* Bx */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +/* Cx */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +/* Dx */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +/* Ex */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +/* Fx */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 +#endif +#ifdef SQLITE_EBCDIC +/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf */ +/* 0x */ 27, 27, 27, 27, 27, 7, 27, 27, 27, 27, 27, 27, 7, 7, 27, 27, +/* 1x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +/* 2x */ 27, 27, 27, 27, 27, 7, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +/* 3x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +/* 4x */ 7, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 12, 17, 20, 10, +/* 5x */ 24, 27, 27, 27, 27, 27, 27, 27, 27, 27, 15, 4, 21, 18, 19, 27, +/* 6x */ 11, 16, 27, 27, 27, 27, 27, 27, 27, 27, 27, 23, 22, 1, 13, 7, +/* 7x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 8, 5, 5, 5, 8, 14, 8, +/* 8x */ 27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 27, 27, 27, 27, 27, 27, +/* 9x */ 27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 27, 27, 27, 27, 27, 27, +/* 9x */ 25, 1, 1, 1, 1, 1, 1, 0, 1, 1, 27, 27, 27, 27, 27, 27, +/* Bx */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 9, 27, 27, 27, 27, 27, +/* Cx */ 27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 27, 27, 27, 27, 27, 27, +/* Dx */ 27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 27, 27, 27, 27, 27, 27, +/* Ex */ 27, 27, 1, 1, 1, 1, 1, 0, 1, 1, 27, 27, 27, 27, 27, 27, +/* Fx */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 27, 27, 27, 27, 27, 27, +#endif +}; + /* -** The charMap() macro maps alphabetic characters into their +** The charMap() macro maps alphabetic characters (only) into their ** lower-case ASCII equivalent. On ASCII machines, this is just ** an upper-to-lower case map. On EBCDIC machines we also need -** to adjust the encoding. Only alphabetic characters and underscores -** need to be translated. +** to adjust the encoding. The mapping is only valid for alphabetics +** which are the only characters for which this feature is used. +** +** Used by keywordhash.h */ #ifdef SQLITE_ASCII # define charMap(X) sqlite3UpperToLower[(unsigned char)X] @@ -130931,7 +131650,7 @@ const unsigned char ebcdicToAscii[] = { ** returned. If the input is not a keyword, TK_ID is returned. ** ** The implementation of this routine was generated by a program, -** mkkeywordhash.h, located in the tool subdirectory of the distribution. +** mkkeywordhash.c, located in the tool subdirectory of the distribution. ** The output of the mkkeywordhash.c program is written into a file ** named keywordhash.h and then included into this source file by ** the #include below. @@ -131072,138 +131791,147 @@ static int keywordCode(const char *z, int n, int *pType){ TK_JOIN_KW, TK_ROLLBACK, TK_ROW, TK_UNION, TK_USING, TK_VACUUM, TK_VIEW, TK_INITIALLY, TK_ALL, }; - int h, i; + int i, j; + const char *zKW; if( n>=2 ){ - h = ((charMap(z[0])*4) ^ (charMap(z[n-1])*3) ^ n) % 127; - for(i=((int)aHash[h])-1; i>=0; i=((int)aNext[i])-1){ - if( aLen[i]==n && sqlite3StrNICmp(&zText[aOffset[i]],z,n)==0 ){ - testcase( i==0 ); /* REINDEX */ - testcase( i==1 ); /* INDEXED */ - testcase( i==2 ); /* INDEX */ - testcase( i==3 ); /* DESC */ - testcase( i==4 ); /* ESCAPE */ - testcase( i==5 ); /* EACH */ - testcase( i==6 ); /* CHECK */ - testcase( i==7 ); /* KEY */ - testcase( i==8 ); /* BEFORE */ - testcase( i==9 ); /* FOREIGN */ - testcase( i==10 ); /* FOR */ - testcase( i==11 ); /* IGNORE */ - testcase( i==12 ); /* REGEXP */ - testcase( i==13 ); /* EXPLAIN */ - testcase( i==14 ); /* INSTEAD */ - testcase( i==15 ); /* ADD */ - testcase( i==16 ); /* DATABASE */ - testcase( i==17 ); /* AS */ - testcase( i==18 ); /* SELECT */ - testcase( i==19 ); /* TABLE */ - testcase( i==20 ); /* LEFT */ - testcase( i==21 ); /* THEN */ - testcase( i==22 ); /* END */ - testcase( i==23 ); /* DEFERRABLE */ - testcase( i==24 ); /* ELSE */ - testcase( i==25 ); /* EXCEPT */ - testcase( i==26 ); /* TRANSACTION */ - testcase( i==27 ); /* ACTION */ - testcase( i==28 ); /* ON */ - testcase( i==29 ); /* NATURAL */ - testcase( i==30 ); /* ALTER */ - testcase( i==31 ); /* RAISE */ - testcase( i==32 ); /* EXCLUSIVE */ - testcase( i==33 ); /* EXISTS */ - testcase( i==34 ); /* SAVEPOINT */ - testcase( i==35 ); /* INTERSECT */ - testcase( i==36 ); /* TRIGGER */ - testcase( i==37 ); /* REFERENCES */ - testcase( i==38 ); /* CONSTRAINT */ - testcase( i==39 ); /* INTO */ - testcase( i==40 ); /* OFFSET */ - testcase( i==41 ); /* OF */ - testcase( i==42 ); /* SET */ - testcase( i==43 ); /* TEMPORARY */ - testcase( i==44 ); /* TEMP */ - testcase( i==45 ); /* OR */ - testcase( i==46 ); /* UNIQUE */ - testcase( i==47 ); /* QUERY */ - testcase( i==48 ); /* WITHOUT */ - testcase( i==49 ); /* WITH */ - testcase( i==50 ); /* OUTER */ - testcase( i==51 ); /* RELEASE */ - testcase( i==52 ); /* ATTACH */ - testcase( i==53 ); /* HAVING */ - testcase( i==54 ); /* GROUP */ - testcase( i==55 ); /* UPDATE */ - testcase( i==56 ); /* BEGIN */ - testcase( i==57 ); /* INNER */ - testcase( i==58 ); /* RECURSIVE */ - testcase( i==59 ); /* BETWEEN */ - testcase( i==60 ); /* NOTNULL */ - testcase( i==61 ); /* NOT */ - testcase( i==62 ); /* NO */ - testcase( i==63 ); /* NULL */ - testcase( i==64 ); /* LIKE */ - testcase( i==65 ); /* CASCADE */ - testcase( i==66 ); /* ASC */ - testcase( i==67 ); /* DELETE */ - testcase( i==68 ); /* CASE */ - testcase( i==69 ); /* COLLATE */ - testcase( i==70 ); /* CREATE */ - testcase( i==71 ); /* CURRENT_DATE */ - testcase( i==72 ); /* DETACH */ - testcase( i==73 ); /* IMMEDIATE */ - testcase( i==74 ); /* JOIN */ - testcase( i==75 ); /* INSERT */ - testcase( i==76 ); /* MATCH */ - testcase( i==77 ); /* PLAN */ - testcase( i==78 ); /* ANALYZE */ - testcase( i==79 ); /* PRAGMA */ - testcase( i==80 ); /* ABORT */ - testcase( i==81 ); /* VALUES */ - testcase( i==82 ); /* VIRTUAL */ - testcase( i==83 ); /* LIMIT */ - testcase( i==84 ); /* WHEN */ - testcase( i==85 ); /* WHERE */ - testcase( i==86 ); /* RENAME */ - testcase( i==87 ); /* AFTER */ - testcase( i==88 ); /* REPLACE */ - testcase( i==89 ); /* AND */ - testcase( i==90 ); /* DEFAULT */ - testcase( i==91 ); /* AUTOINCREMENT */ - testcase( i==92 ); /* TO */ - testcase( i==93 ); /* IN */ - testcase( i==94 ); /* CAST */ - testcase( i==95 ); /* COLUMN */ - testcase( i==96 ); /* COMMIT */ - testcase( i==97 ); /* CONFLICT */ - testcase( i==98 ); /* CROSS */ - testcase( i==99 ); /* CURRENT_TIMESTAMP */ - testcase( i==100 ); /* CURRENT_TIME */ - testcase( i==101 ); /* PRIMARY */ - testcase( i==102 ); /* DEFERRED */ - testcase( i==103 ); /* DISTINCT */ - testcase( i==104 ); /* IS */ - testcase( i==105 ); /* DROP */ - testcase( i==106 ); /* FAIL */ - testcase( i==107 ); /* FROM */ - testcase( i==108 ); /* FULL */ - testcase( i==109 ); /* GLOB */ - testcase( i==110 ); /* BY */ - testcase( i==111 ); /* IF */ - testcase( i==112 ); /* ISNULL */ - testcase( i==113 ); /* ORDER */ - testcase( i==114 ); /* RESTRICT */ - testcase( i==115 ); /* RIGHT */ - testcase( i==116 ); /* ROLLBACK */ - testcase( i==117 ); /* ROW */ - testcase( i==118 ); /* UNION */ - testcase( i==119 ); /* USING */ - testcase( i==120 ); /* VACUUM */ - testcase( i==121 ); /* VIEW */ - testcase( i==122 ); /* INITIALLY */ - testcase( i==123 ); /* ALL */ - *pType = aCode[i]; - break; - } + i = ((charMap(z[0])*4) ^ (charMap(z[n-1])*3) ^ n) % 127; + for(i=((int)aHash[i])-1; i>=0; i=((int)aNext[i])-1){ + if( aLen[i]!=n ) continue; + j = 0; + zKW = &zText[aOffset[i]]; +#ifdef SQLITE_ASCII + while( j': { + case CC_GT: { if( (c=z[1])=='=' ){ *tokenType = TK_GE; return 2; @@ -131354,7 +132084,7 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ return 1; } } - case '!': { + case CC_BANG: { if( z[1]!='=' ){ *tokenType = TK_ILLEGAL; return 2; @@ -131363,7 +132093,7 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ return 2; } } - case '|': { + case CC_PIPE: { if( z[1]!='|' ){ *tokenType = TK_BITOR; return 1; @@ -131372,21 +132102,19 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ return 2; } } - case ',': { + case CC_COMMA: { *tokenType = TK_COMMA; return 1; } - case '&': { + case CC_AND: { *tokenType = TK_BITAND; return 1; } - case '~': { + case CC_TILDA: { *tokenType = TK_BITNOT; return 1; } - case '`': - case '\'': - case '"': { + case CC_QUOTE: { int delim = z[0]; testcase( delim=='`' ); testcase( delim=='\'' ); @@ -131411,7 +132139,7 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ return i; } } - case '.': { + case CC_DOT: { #ifndef SQLITE_OMIT_FLOATING_POINT if( !sqlite3Isdigit(z[1]) ) #endif @@ -131422,8 +132150,7 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ /* If the next character is a digit, this is a floating point ** number that begins with ".". Fall thru into the next case */ } - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': { + case CC_DIGIT: { testcase( z[0]=='0' ); testcase( z[0]=='1' ); testcase( z[0]=='2' ); testcase( z[0]=='3' ); testcase( z[0]=='4' ); testcase( z[0]=='5' ); testcase( z[0]=='6' ); testcase( z[0]=='7' ); testcase( z[0]=='8' ); @@ -131458,22 +132185,18 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ } return i; } - case '[': { + case CC_QUOTE2: { for(i=1, c=z[0]; c!=']' && (c=z[i])!=0; i++){} *tokenType = c==']' ? TK_ID : TK_ILLEGAL; return i; } - case '?': { + case CC_VARNUM: { *tokenType = TK_VARIABLE; for(i=1; sqlite3Isdigit(z[i]); i++){} return i; } -#ifndef SQLITE_OMIT_TCL_VARIABLE - case '$': -#endif - case '@': /* For compatibility with MS SQL Server */ - case '#': - case ':': { + case CC_DOLLAR: + case CC_VARALPHA: { int n = 0; testcase( z[0]=='$' ); testcase( z[0]=='@' ); testcase( z[0]==':' ); testcase( z[0]=='#' ); @@ -131502,8 +132225,20 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ if( n==0 ) *tokenType = TK_ILLEGAL; return i; } + case CC_KYWD: { + for(i=1; aiClass[z[i]]<=CC_KYWD; i++){} + if( IdChar(z[i]) ){ + /* This token started out using characters that can appear in keywords, + ** but z[i] is a character not allowed within keywords, so this must + ** be an identifier instead */ + i++; + break; + } + *tokenType = TK_ID; + return keywordCode((char*)z, i, tokenType); + } #ifndef SQLITE_OMIT_BLOB_LITERAL - case 'x': case 'X': { + case CC_X: { testcase( z[0]=='x' ); testcase( z[0]=='X' ); if( z[1]=='\'' ){ *tokenType = TK_BLOB; @@ -131515,20 +132250,22 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ if( z[i] ) i++; return i; } - /* Otherwise fall through to the next case */ + /* If it is not a BLOB literal, then it must be an ID, since no + ** SQL keywords start with the letter 'x'. Fall through */ } #endif + case CC_ID: { + i = 1; + break; + } default: { - if( !IdChar(*z) ){ - break; - } - for(i=1; IdChar(z[i]); i++){} - *tokenType = TK_ID; - return keywordCode((char*)z, i, tokenType); + *tokenType = TK_ILLEGAL; + return 1; } } - *tokenType = TK_ILLEGAL; - return 1; + while( IdChar(z[i]) ){ i++; } + *tokenType = TK_ID; + return i; } /* @@ -131544,7 +132281,6 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr void *pEngine; /* The LEMON-generated LALR(1) parser */ int tokenType; /* type of the next token */ int lastTokenParsed = -1; /* type of the previous token */ - u8 enableLookaside; /* Saved value of db->lookaside.bEnabled */ sqlite3 *db = pParse->db; /* The database connection */ int mxSqlLen; /* Max length of an SQL string */ @@ -131560,7 +132296,7 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr /* sqlite3ParserTrace(stdout, "parser: "); */ pEngine = sqlite3ParserAlloc(sqlite3Malloc); if( pEngine==0 ){ - db->mallocFailed = 1; + sqlite3OomFault(db); return SQLITE_NOMEM; } assert( pParse->pNewTable==0 ); @@ -131568,8 +132304,6 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr assert( pParse->nVar==0 ); assert( pParse->nzVar==0 ); assert( pParse->azVar==0 ); - enableLookaside = db->lookaside.bEnabled; - if( db->lookaside.pStart ) db->lookaside.bEnabled = 1; while( zSql[i]!=0 ){ assert( i>=0 ); pParse->sLastToken.z = &zSql[i]; @@ -131582,7 +132316,6 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr if( tokenType>=TK_SPACE ){ assert( tokenType==TK_SPACE || tokenType==TK_ILLEGAL ); if( db->u1.isInterrupted ){ - sqlite3ErrorMsg(pParse, "interrupt"); pParse->rc = SQLITE_INTERRUPT; break; } @@ -131617,7 +132350,6 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr sqlite3_mutex_leave(sqlite3MallocMutex()); #endif /* YYDEBUG */ sqlite3ParserFree(pEngine, sqlite3_free); - db->lookaside.bEnabled = enableLookaside; if( db->mallocFailed ){ pParse->rc = SQLITE_NOMEM; } @@ -132758,12 +133490,12 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){ p = (LookasideSlot*)&((u8*)p)[sz]; } db->lookaside.pEnd = p; - db->lookaside.bEnabled = 1; + db->lookaside.bDisable = 0; db->lookaside.bMalloced = pBuf==0 ?1:0; }else{ db->lookaside.pStart = db; db->lookaside.pEnd = db; - db->lookaside.bEnabled = 0; + db->lookaside.bDisable = 1; db->lookaside.bMalloced = 0; } #endif /* SQLITE_OMIT_LOOKASIDE */ @@ -133635,7 +134367,7 @@ SQLITE_PRIVATE int sqlite3CreateFunc( int nArg, int enc, void *pUserData, - void (*xFunc)(sqlite3_context*,int,sqlite3_value **), + void (*xSFunc)(sqlite3_context*,int,sqlite3_value **), void (*xStep)(sqlite3_context*,int,sqlite3_value **), void (*xFinal)(sqlite3_context*), FuncDestructor *pDestructor @@ -133646,9 +134378,9 @@ SQLITE_PRIVATE int sqlite3CreateFunc( assert( sqlite3_mutex_held(db->mutex) ); if( zFunctionName==0 || - (xFunc && (xFinal || xStep)) || - (!xFunc && (xFinal && !xStep)) || - (!xFunc && (!xFinal && xStep)) || + (xSFunc && (xFinal || xStep)) || + (!xSFunc && (xFinal && !xStep)) || + (!xSFunc && (!xFinal && xStep)) || (nArg<-1 || nArg>SQLITE_MAX_FUNCTION_ARG) || (255<(nName = sqlite3Strlen30( zFunctionName))) ){ return SQLITE_MISUSE_BKPT; @@ -133671,10 +134403,10 @@ SQLITE_PRIVATE int sqlite3CreateFunc( }else if( enc==SQLITE_ANY ){ int rc; rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF8|extraFlags, - pUserData, xFunc, xStep, xFinal, pDestructor); + pUserData, xSFunc, xStep, xFinal, pDestructor); if( rc==SQLITE_OK ){ rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF16LE|extraFlags, - pUserData, xFunc, xStep, xFinal, pDestructor); + pUserData, xSFunc, xStep, xFinal, pDestructor); } if( rc!=SQLITE_OK ){ return rc; @@ -133718,8 +134450,7 @@ SQLITE_PRIVATE int sqlite3CreateFunc( p->pDestructor = pDestructor; p->funcFlags = (p->funcFlags & SQLITE_FUNC_ENCMASK) | extraFlags; testcase( p->funcFlags & SQLITE_DETERMINISTIC ); - p->xFunc = xFunc; - p->xStep = xStep; + p->xSFunc = xSFunc ? xSFunc : xStep; p->xFinalize = xFinal; p->pUserData = pUserData; p->nArg = (u16)nArg; @@ -133735,11 +134466,11 @@ SQLITE_API int SQLITE_STDCALL sqlite3_create_function( int nArg, int enc, void *p, - void (*xFunc)(sqlite3_context*,int,sqlite3_value **), + void (*xSFunc)(sqlite3_context*,int,sqlite3_value **), void (*xStep)(sqlite3_context*,int,sqlite3_value **), void (*xFinal)(sqlite3_context*) ){ - return sqlite3_create_function_v2(db, zFunc, nArg, enc, p, xFunc, xStep, + return sqlite3_create_function_v2(db, zFunc, nArg, enc, p, xSFunc, xStep, xFinal, 0); } @@ -133749,7 +134480,7 @@ SQLITE_API int SQLITE_STDCALL sqlite3_create_function_v2( int nArg, int enc, void *p, - void (*xFunc)(sqlite3_context*,int,sqlite3_value **), + void (*xSFunc)(sqlite3_context*,int,sqlite3_value **), void (*xStep)(sqlite3_context*,int,sqlite3_value **), void (*xFinal)(sqlite3_context*), void (*xDestroy)(void *) @@ -133772,7 +134503,7 @@ SQLITE_API int SQLITE_STDCALL sqlite3_create_function_v2( pArg->xDestroy = xDestroy; pArg->pUserData = p; } - rc = sqlite3CreateFunc(db, zFunc, nArg, enc, p, xFunc, xStep, xFinal, pArg); + rc = sqlite3CreateFunc(db, zFunc, nArg, enc, p, xSFunc, xStep, xFinal, pArg); if( pArg && pArg->nRef==0 ){ assert( rc!=SQLITE_OK ); xDestroy(p); @@ -133792,7 +134523,7 @@ SQLITE_API int SQLITE_STDCALL sqlite3_create_function16( int nArg, int eTextRep, void *p, - void (*xFunc)(sqlite3_context*,int,sqlite3_value**), + void (*xSFunc)(sqlite3_context*,int,sqlite3_value**), void (*xStep)(sqlite3_context*,int,sqlite3_value**), void (*xFinal)(sqlite3_context*) ){ @@ -133805,7 +134536,7 @@ SQLITE_API int SQLITE_STDCALL sqlite3_create_function16( sqlite3_mutex_enter(db->mutex); assert( !db->mallocFailed ); zFunc8 = sqlite3Utf16to8(db, zFunctionName, -1, SQLITE_UTF16NATIVE); - rc = sqlite3CreateFunc(db, zFunc8, nArg, eTextRep, p, xFunc, xStep, xFinal,0); + rc = sqlite3CreateFunc(db, zFunc8, nArg, eTextRep, p, xSFunc,xStep,xFinal,0); sqlite3DbFree(db, zFunc8); rc = sqlite3ApiExit(db, rc); sqlite3_mutex_leave(db->mutex); @@ -134269,7 +135000,7 @@ SQLITE_API const void *SQLITE_STDCALL sqlite3_errmsg16(sqlite3 *db){ ** be cleared before returning. Do this directly, instead of via ** sqlite3ApiExit(), to avoid setting the database handle error message. */ - db->mallocFailed = 0; + sqlite3OomClear(db); } sqlite3_mutex_leave(db->mutex); return z; @@ -134907,7 +135638,7 @@ static int openDatabase( db->openFlags = flags; rc = sqlite3ParseUri(zVfs, zFilename, &flags, &db->pVfs, &zOpen, &zErrMsg); if( rc!=SQLITE_OK ){ - if( rc==SQLITE_NOMEM ) db->mallocFailed = 1; + if( rc==SQLITE_NOMEM ) sqlite3OomFault(db); sqlite3ErrorWithMsg(db, rc, zErrMsg ? "%s" : 0, zErrMsg); sqlite3_free(zErrMsg); goto opendb_out; @@ -135627,7 +136358,7 @@ SQLITE_API int SQLITE_CDECL sqlite3_test_control(int op, ...){ */ case SQLITE_TESTCTRL_ASSERT: { volatile int x = 0; - assert( (x = va_arg(ap,int))!=0 ); + assert( /*side-effects-ok*/ (x = va_arg(ap,int))!=0 ); rc = x; break; } @@ -136661,6 +137392,12 @@ SQLITE_PRIVATE void sqlite3ConnectionClosed(sqlite3 *db){ # define NDEBUG 1 #endif +/* FTS3/FTS4 require virtual tables */ +#ifdef SQLITE_OMIT_VIRTUALTABLE +# undef SQLITE_ENABLE_FTS3 +# undef SQLITE_ENABLE_FTS4 +#endif + /* ** FTS4 is really an extension for FTS3. It is enabled using the ** SQLITE_ENABLE_FTS3 macro. But to avoid confusion we also all @@ -146157,6 +146894,7 @@ static void scalarFunc( nName = sqlite3_value_bytes(argv[0])+1; if( argc==2 ){ +#ifdef SQLITE_ENABLE_FTS3_TOKENIZER void *pOld; int n = sqlite3_value_bytes(argv[1]); if( zName==0 || n!=sizeof(pPtr) ){ @@ -146169,7 +146907,14 @@ static void scalarFunc( sqlite3_result_error(context, "out of memory", -1); return; } - }else{ +#else + sqlite3_result_error(context, "fts3tokenize: " + "disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER", -1 + ); + return; +#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ + }else + { if( zName ){ pPtr = sqlite3Fts3HashFind(pHash, zName, nName); } @@ -146418,6 +147163,7 @@ finish: Tcl_DecrRefCount(pRet); } +#ifdef SQLITE_ENABLE_FTS3_TOKENIZER static int registerTokenizer( sqlite3 *db, @@ -146439,6 +147185,8 @@ int registerTokenizer( return sqlite3_finalize(pStmt); } +#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ + static int queryTokenizer( @@ -146510,11 +147258,13 @@ static void intTestFunc( assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") ); /* Test the storage function */ +#ifdef SQLITE_ENABLE_FTS3_TOKENIZER rc = registerTokenizer(db, "nosuchtokenizer", p1); assert( rc==SQLITE_OK ); rc = queryTokenizer(db, "nosuchtokenizer", &p2); assert( rc==SQLITE_OK ); assert( p2==p1 ); +#endif sqlite3_result_text(context, "ok", -1, SQLITE_STATIC); } @@ -161120,7 +161870,7 @@ static void *rbuMalloc(sqlite3rbu *p, int nByte){ void *pRet = 0; if( p->rc==SQLITE_OK ){ assert( nByte>0 ); - pRet = sqlite3_malloc(nByte); + pRet = sqlite3_malloc64(nByte); if( pRet==0 ){ p->rc = SQLITE_NOMEM; }else{ @@ -161166,8 +161916,8 @@ static char *rbuStrndup(const char *zStr, int *pRc){ assert( *pRc==SQLITE_OK ); if( zStr ){ - int nCopy = strlen(zStr) + 1; - zRet = (char*)sqlite3_malloc(nCopy); + size_t nCopy = strlen(zStr) + 1; + zRet = (char*)sqlite3_malloc64(nCopy); if( zRet ){ memcpy(zRet, zStr, nCopy); }else{ @@ -162515,7 +163265,7 @@ static int rbuCaptureWalRead(sqlite3rbu *pRbu, i64 iOff, int iAmt){ if( pRbu->nFrame==pRbu->nFrameAlloc ){ int nNew = (pRbu->nFrameAlloc ? pRbu->nFrameAlloc : 64) * 2; RbuFrame *aNew; - aNew = (RbuFrame*)sqlite3_realloc(pRbu->aFrame, nNew * sizeof(RbuFrame)); + aNew = (RbuFrame*)sqlite3_realloc64(pRbu->aFrame, nNew * sizeof(RbuFrame)); if( aNew==0 ) return SQLITE_NOMEM; pRbu->aFrame = aNew; pRbu->nFrameAlloc = nNew; @@ -162580,7 +163330,7 @@ static LPWSTR rbuWinUtf8ToUnicode(const char *zFilename){ if( nChar==0 ){ return 0; } - zWideFilename = sqlite3_malloc( nChar*sizeof(zWideFilename[0]) ); + zWideFilename = sqlite3_malloc64( nChar*sizeof(zWideFilename[0]) ); if( zWideFilename==0 ){ return 0; } @@ -163214,11 +163964,12 @@ SQLITE_API sqlite3rbu *SQLITE_STDCALL sqlite3rbu_open( const char *zState ){ sqlite3rbu *p; - int nTarget = strlen(zTarget); - int nRbu = strlen(zRbu); - int nState = zState ? strlen(zState) : 0; + size_t nTarget = strlen(zTarget); + size_t nRbu = strlen(zRbu); + size_t nState = zState ? strlen(zState) : 0; + size_t nByte = sizeof(sqlite3rbu) + nTarget+1 + nRbu+1+ nState+1; - p = (sqlite3rbu*)sqlite3_malloc(sizeof(sqlite3rbu)+nTarget+1+nRbu+1+nState+1); + p = (sqlite3rbu*)sqlite3_malloc64(nByte); if( p ){ RbuState *pState = 0; @@ -163355,7 +164106,7 @@ SQLITE_API sqlite3 *SQLITE_STDCALL sqlite3rbu_db(sqlite3rbu *pRbu, int bRbu){ static void rbuEditErrmsg(sqlite3rbu *p){ if( p->rc==SQLITE_CONSTRAINT && p->zErrmsg ){ int i; - int nErrmsg = strlen(p->zErrmsg); + size_t nErrmsg = strlen(p->zErrmsg); for(i=0; i<(nErrmsg-8); i++){ if( memcmp(&p->zErrmsg[i], "rbu_imp_", 8)==0 ){ int nDel = 8; @@ -163819,7 +164570,7 @@ static int rbuVfsShmMap( if( eStage==RBU_STAGE_OAL || eStage==RBU_STAGE_MOVE ){ if( iRegion<=p->nShm ){ int nByte = (iRegion+1) * sizeof(char*); - char **apNew = (char**)sqlite3_realloc(p->apShm, nByte); + char **apNew = (char**)sqlite3_realloc64(p->apShm, nByte); if( apNew==0 ){ rc = SQLITE_NOMEM; }else{ @@ -163830,7 +164581,7 @@ static int rbuVfsShmMap( } if( rc==SQLITE_OK && p->apShm[iRegion]==0 ){ - char *pNew = (char*)sqlite3_malloc(szRegion); + char *pNew = (char*)sqlite3_malloc64(szRegion); if( pNew==0 ){ rc = SQLITE_NOMEM; }else{ @@ -163940,7 +164691,7 @@ static int rbuVfsOpen( ** the name of the *-wal file this db connection will use. SQLite ** happens to pass a pointer to this buffer when using xAccess() ** or xOpen() to operate on the *-wal file. */ - int n = strlen(zName); + int n = (int)strlen(zName); const char *z = &zName[n]; if( flags & SQLITE_OPEN_URI ){ int odd = 0; @@ -163966,8 +164717,8 @@ static int rbuVfsOpen( ** code ensures that the string passed to xOpen() is terminated by a ** pair of '\0' bytes in case the VFS attempts to extract a URI ** parameter from it. */ - int nCopy = strlen(zName); - char *zCopy = sqlite3_malloc(nCopy+2); + size_t nCopy = strlen(zName); + char *zCopy = sqlite3_malloc64(nCopy+2); if( zCopy ){ memcpy(zCopy, zName, nCopy); zCopy[nCopy-3] = 'o'; @@ -164196,13 +164947,13 @@ SQLITE_API int SQLITE_STDCALL sqlite3rbu_create_vfs(const char *zName, const cha }; rbu_vfs *pNew = 0; /* Newly allocated VFS */ - int nName; int rc = SQLITE_OK; + size_t nName; + size_t nByte; - int nByte; nName = strlen(zName); nByte = sizeof(rbu_vfs) + nName + 1; - pNew = (rbu_vfs*)sqlite3_malloc(nByte); + pNew = (rbu_vfs*)sqlite3_malloc64(nByte); if( pNew==0 ){ rc = SQLITE_NOMEM; }else{ @@ -164396,7 +165147,9 @@ static int statConnect( int iDb; if( argc>=4 ){ - iDb = sqlite3FindDbName(db, argv[3]); + Token nm; + sqlite3TokenInit(&nm, (char*)argv[3]); + iDb = sqlite3FindDb(db, &nm); if( iDb<0 ){ *pzErr = sqlite3_mprintf("no such database: %s", argv[3]); return SQLITE_ERROR; @@ -164981,7 +165734,11 @@ SQLITE_EXTENSION_INIT1 /* #include */ /* #include */ -#define UNUSED_PARAM(X) (void)(X) +/* Mark a function parameter as unused, to suppress nuisance compiler +** warnings. */ +#ifndef UNUSED_PARAM +# define UNUSED_PARAM(X) (void)(X) +#endif #ifndef LARGEST_INT64 # define LARGEST_INT64 (0xffffffff|(((sqlite3_int64)0x7fffffff)<<32)) @@ -165226,10 +165983,33 @@ static void jsonAppendString(JsonString *p, const char *zIn, u32 N){ if( (N+p->nUsed+2 >= p->nAlloc) && jsonGrow(p,N+2)!=0 ) return; p->zBuf[p->nUsed++] = '"'; for(i=0; inUsed+N+3-i > p->nAlloc) && jsonGrow(p,N+3-i)!=0 ) return; p->zBuf[p->nUsed++] = '\\'; + }else if( c<=0x1f ){ + static const char aSpecial[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 'b', 't', 'n', 0, 'f', 'r', 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + assert( sizeof(aSpecial)==32 ); + assert( aSpecial['\b']=='b' ); + assert( aSpecial['\f']=='f' ); + assert( aSpecial['\n']=='n' ); + assert( aSpecial['\r']=='r' ); + assert( aSpecial['\t']=='t' ); + if( aSpecial[c] ){ + c = aSpecial[c]; + goto json_simple_escape; + } + if( (p->nUsed+N+7+i > p->nAlloc) && jsonGrow(p,N+7-i)!=0 ) return; + p->zBuf[p->nUsed++] = '\\'; + p->zBuf[p->nUsed++] = 'u'; + p->zBuf[p->nUsed++] = '0'; + p->zBuf[p->nUsed++] = '0'; + p->zBuf[p->nUsed++] = '0' + (c>>4); + c = "0123456789abcdef"[c&0xf]; } p->zBuf[p->nUsed++] = c; } @@ -165270,7 +166050,7 @@ static void jsonAppendValue( default: { if( p->bErr==0 ){ sqlite3_result_error(p->pCtx, "JSON cannot hold BLOB values", -1); - p->bErr = 1; + p->bErr = 2; jsonReset(p); } break; @@ -166479,6 +167259,7 @@ static void jsonArrayStep( sqlite3_value **argv ){ JsonString *pStr; + UNUSED_PARAM(argc); pStr = (JsonString*)sqlite3_aggregate_context(ctx, sizeof(*pStr)); if( pStr ){ if( pStr->zBuf==0 ){ @@ -166498,7 +167279,7 @@ static void jsonArrayFinal(sqlite3_context *ctx){ pStr->pCtx = ctx; jsonAppendChar(pStr, ']'); if( pStr->bErr ){ - sqlite3_result_error_nomem(ctx); + if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx); assert( pStr->bStatic ); }else{ sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, @@ -166524,6 +167305,7 @@ static void jsonObjectStep( JsonString *pStr; const char *z; u32 n; + UNUSED_PARAM(argc); pStr = (JsonString*)sqlite3_aggregate_context(ctx, sizeof(*pStr)); if( pStr ){ if( pStr->zBuf==0 ){ @@ -166546,7 +167328,7 @@ static void jsonObjectFinal(sqlite3_context *ctx){ if( pStr ){ jsonAppendChar(pStr, '}'); if( pStr->bErr ){ - sqlite3_result_error_nomem(ctx); + if( pStr->bErr==0 ) sqlite3_result_error_nomem(ctx); assert( pStr->bStatic ); }else{ sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, @@ -167211,6 +167993,9 @@ struct Fts5PhraseIter { ** an OOM condition or IO error), an appropriate SQLite error code is ** returned. ** +** This function may be quite inefficient if used with an FTS5 table +** created with the "columnsize=0" option. +** ** xColumnText: ** This function attempts to retrieve the text of column iCol of the ** current document. If successful, (*pz) is set to point to a buffer @@ -167231,15 +168016,29 @@ struct Fts5PhraseIter { ** the query within the current row. Return SQLITE_OK if successful, or ** an error code (i.e. SQLITE_NOMEM) if an error occurs. ** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" or "detail=column" option. If the FTS5 table is created +** with either "detail=none" or "detail=column" and "content=" option +** (i.e. if it is a contentless table), then this API always returns 0. +** ** xInst: ** Query for the details of phrase match iIdx within the current row. ** Phrase matches are numbered starting from zero, so the iIdx argument ** should be greater than or equal to zero and smaller than the value ** output by xInstCount(). ** +** Usually, output parameter *piPhrase is set to the phrase number, *piCol +** to the column in which it occurs and *piOff the token offset of the +** first token of the phrase. The exception is if the table was created +** with the offsets=0 option specified. In this case *piOff is always +** set to -1. +** ** Returns SQLITE_OK if successful, or an error code (i.e. SQLITE_NOMEM) ** if an error occurs. ** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" or "detail=column" option. +** ** xRowid: ** Returns the rowid of the current row. ** @@ -167323,7 +168122,7 @@ struct Fts5PhraseIter { ** Fts5PhraseIter iter; ** int iCol, iOff; ** for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff); -** iOff>=0; +** iCol>=0; ** pApi->xPhraseNext(pFts, &iter, &iCol, &iOff) ** ){ ** // An instance of phrase iPhrase at offset iOff of column iCol @@ -167331,13 +168130,51 @@ struct Fts5PhraseIter { ** ** The Fts5PhraseIter structure is defined above. Applications should not ** modify this structure directly - it should only be used as shown above -** with the xPhraseFirst() and xPhraseNext() API methods. +** with the xPhraseFirst() and xPhraseNext() API methods (and by +** xPhraseFirstColumn() and xPhraseNextColumn() as illustrated below). +** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" or "detail=column" option. If the FTS5 table is created +** with either "detail=none" or "detail=column" and "content=" option +** (i.e. if it is a contentless table), then this API always iterates +** through an empty set (all calls to xPhraseFirst() set iCol to -1). ** ** xPhraseNext() ** See xPhraseFirst above. +** +** xPhraseFirstColumn() +** This function and xPhraseNextColumn() are similar to the xPhraseFirst() +** and xPhraseNext() APIs described above. The difference is that instead +** of iterating through all instances of a phrase in the current row, these +** APIs are used to iterate through the set of columns in the current row +** that contain one or more instances of a specified phrase. For example: +** +** Fts5PhraseIter iter; +** int iCol; +** for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol); +** iCol>=0; +** pApi->xPhraseNextColumn(pFts, &iter, &iCol) +** ){ +** // Column iCol contains at least one instance of phrase iPhrase +** } +** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" option. If the FTS5 table is created with either +** "detail=none" "content=" option (i.e. if it is a contentless table), +** then this API always iterates through an empty set (all calls to +** xPhraseFirstColumn() set iCol to -1). +** +** The information accessed using this API and its companion +** xPhraseFirstColumn() may also be obtained using xPhraseFirst/xPhraseNext +** (or xInst/xInstCount). The chief advantage of this API is that it is +** significantly more efficient than those alternatives when used with +** "detail=column" tables. +** +** xPhraseNextColumn() +** See xPhraseFirstColumn above. */ struct Fts5ExtensionApi { - int iVersion; /* Currently always set to 1 */ + int iVersion; /* Currently always set to 3 */ void *(*xUserData)(Fts5Context*); @@ -167367,8 +168204,11 @@ struct Fts5ExtensionApi { int (*xSetAuxdata)(Fts5Context*, void *pAux, void(*xDelete)(void*)); void *(*xGetAuxdata)(Fts5Context*, int bClear); - void (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*); + int (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*); void (*xPhraseNext)(Fts5Context*, Fts5PhraseIter*, int *piCol, int *piOff); + + int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*); + void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol); }; /* @@ -167674,10 +168514,11 @@ SQLITE_EXTENSION_INIT1 typedef unsigned char u8; typedef unsigned int u32; typedef unsigned short u16; +typedef short i16; typedef sqlite3_int64 i64; typedef sqlite3_uint64 u64; -#define ArraySize(x) (sizeof(x) / sizeof(x[0])) +#define ArraySize(x) ((int)(sizeof(x) / sizeof(x[0]))) #define testcase(x) #define ALWAYS(x) 1 @@ -167728,6 +168569,16 @@ SQLITE_API extern int sqlite3_fts5_may_be_corrupt; # define assert_nc(x) assert(x) #endif +/* Mark a function parameter as unused, to suppress nuisance compiler +** warnings. */ +#ifndef UNUSED_PARAM +# define UNUSED_PARAM(X) (void)(X) +#endif + +#ifndef UNUSED_PARAM2 +# define UNUSED_PARAM2(X, Y) (void)(X), (void)(Y) +#endif + typedef struct Fts5Global Fts5Global; typedef struct Fts5Colset Fts5Colset; @@ -167799,6 +168650,7 @@ struct Fts5Config { char *zContent; /* content table */ char *zContentRowid; /* "content_rowid=" option value */ int bColumnsize; /* "columnsize=" option value (dflt==1) */ + int eDetail; /* FTS5_DETAIL_XXX value */ char *zContentExprlist; Fts5Tokenizer *pTok; fts5_tokenizer *pTokApi; @@ -167827,6 +168679,9 @@ struct Fts5Config { #define FTS5_CONTENT_NONE 1 #define FTS5_CONTENT_EXTERNAL 2 +#define FTS5_DETAIL_FULL 0 +#define FTS5_DETAIL_NONE 1 +#define FTS5_DETAIL_COLUMNS 2 @@ -167873,9 +168728,9 @@ struct Fts5Buffer { int nSpace; }; -static int sqlite3Fts5BufferSize(int*, Fts5Buffer*, int); +static int sqlite3Fts5BufferSize(int*, Fts5Buffer*, u32); static void sqlite3Fts5BufferAppendVarint(int*, Fts5Buffer*, i64); -static void sqlite3Fts5BufferAppendBlob(int*, Fts5Buffer*, int, const u8*); +static void sqlite3Fts5BufferAppendBlob(int*, Fts5Buffer*, u32, const u8*); static void sqlite3Fts5BufferAppendString(int *, Fts5Buffer*, const char*); static void sqlite3Fts5BufferFree(Fts5Buffer*); static void sqlite3Fts5BufferZero(Fts5Buffer*); @@ -167891,7 +168746,7 @@ static char *sqlite3Fts5Mprintf(int *pRc, const char *zFmt, ...); #define fts5BufferSet(a,b,c,d) sqlite3Fts5BufferSet(a,b,c,d) #define fts5BufferGrow(pRc,pBuf,nn) ( \ - (pBuf)->n + (nn) <= (pBuf)->nSpace ? 0 : \ + (u32)((pBuf)->n) + (u32)(nn) <= (u32)((pBuf)->nSpace) ? 0 : \ sqlite3Fts5BufferSize((pRc),(pBuf),(nn)+(pBuf)->n) \ ) @@ -167926,6 +168781,7 @@ struct Fts5PoslistWriter { i64 iPrev; }; static int sqlite3Fts5PoslistWriterAppend(Fts5Buffer*, Fts5PoslistWriter*, i64); +static void sqlite3Fts5PoslistSafeAppend(Fts5Buffer*, i64*, i64); static int sqlite3Fts5PoslistNext64( const u8 *a, int n, /* Buffer containing poslist */ @@ -167940,6 +168796,13 @@ static char *sqlite3Fts5Strndup(int *pRc, const char *pIn, int nIn); /* Character set tests (like isspace(), isalpha() etc.) */ static int sqlite3Fts5IsBareword(char t); + +/* Bucket of terms object used by the integrity-check in offsets=0 mode. */ +typedef struct Fts5Termset Fts5Termset; +static int sqlite3Fts5TermsetNew(Fts5Termset**); +static int sqlite3Fts5TermsetAdd(Fts5Termset*, int, const char*, int, int *pbPresent); +static void sqlite3Fts5TermsetFree(Fts5Termset*); + /* ** End of interface to code in fts5_buffer.c. **************************************************************************/ @@ -167952,6 +168815,15 @@ static int sqlite3Fts5IsBareword(char t); typedef struct Fts5Index Fts5Index; typedef struct Fts5IndexIter Fts5IndexIter; +struct Fts5IndexIter { + i64 iRowid; + const u8 *pData; + int nData; + u8 bEof; +}; + +#define sqlite3Fts5IterEof(x) ((x)->bEof) + /* ** Values used as part of the flags argument passed to IndexQuery(). */ @@ -167960,6 +168832,12 @@ typedef struct Fts5IndexIter Fts5IndexIter; #define FTS5INDEX_QUERY_TEST_NOIDX 0x0004 /* Do not use prefix index */ #define FTS5INDEX_QUERY_SCAN 0x0008 /* Scan query (fts5vocab) */ +/* The following are used internally by the fts5_index.c module. They are +** defined here only to make it easier to avoid clashes with the flags +** above. */ +#define FTS5INDEX_QUERY_SKIPEMPTY 0x0010 +#define FTS5INDEX_QUERY_NOOUTPUT 0x0020 + /* ** Create/destroy an Fts5Index object. */ @@ -167967,14 +168845,27 @@ static int sqlite3Fts5IndexOpen(Fts5Config *pConfig, int bCreate, Fts5Index**, c static int sqlite3Fts5IndexClose(Fts5Index *p); /* -** for( -** sqlite3Fts5IndexQuery(p, "token", 5, 0, 0, &pIter); -** 0==sqlite3Fts5IterEof(pIter); -** sqlite3Fts5IterNext(pIter) -** ){ -** i64 iRowid = sqlite3Fts5IterRowid(pIter); -** } +** Return a simple checksum value based on the arguments. */ +static u64 sqlite3Fts5IndexEntryCksum( + i64 iRowid, + int iCol, + int iPos, + int iIdx, + const char *pTerm, + int nTerm +); + +/* +** Argument p points to a buffer containing utf-8 text that is n bytes in +** size. Return the number of bytes in the nChar character prefix of the +** buffer, or 0 if there are less than nChar characters in total. +*/ +static int sqlite3Fts5IndexCharlenToBytelen( + const char *p, + int nByte, + int nChar +); /* ** Open a new iterator to iterate though all rowids that match the @@ -167992,12 +168883,8 @@ static int sqlite3Fts5IndexQuery( ** The various operations on open token or token prefix iterators opened ** using sqlite3Fts5IndexQuery(). */ -static int sqlite3Fts5IterEof(Fts5IndexIter*); static int sqlite3Fts5IterNext(Fts5IndexIter*); static int sqlite3Fts5IterNextFrom(Fts5IndexIter*, i64 iMatch); -static i64 sqlite3Fts5IterRowid(Fts5IndexIter*); -static int sqlite3Fts5IterPoslist(Fts5IndexIter*,Fts5Colset*, const u8**, int*, i64*); -static int sqlite3Fts5IterPoslistBuffer(Fts5IndexIter *pIter, Fts5Buffer *pBuf); /* ** Close an iterator opened by sqlite3Fts5IndexQuery(). @@ -168061,7 +168948,6 @@ static int sqlite3Fts5IndexSetAverages(Fts5Index *p, const u8*, int); /* ** Functions called by the storage module as part of integrity-check. */ -static u64 sqlite3Fts5IndexCksum(Fts5Config*,i64,int,int,const char*,int); static int sqlite3Fts5IndexIntegrityCheck(Fts5Index*, u64 cksum); /* @@ -168140,7 +169026,7 @@ typedef struct Fts5Hash Fts5Hash; /* ** Create a hash table, free a hash table. */ -static int sqlite3Fts5HashNew(Fts5Hash**, int *pnSize); +static int sqlite3Fts5HashNew(Fts5Config*, Fts5Hash**, int *pnSize); static void sqlite3Fts5HashFree(Fts5Hash*); static int sqlite3Fts5HashWrite( @@ -168199,7 +169085,7 @@ static int sqlite3Fts5StorageRename(Fts5Storage*, const char *zName); static int sqlite3Fts5DropAll(Fts5Config*); static int sqlite3Fts5CreateTable(Fts5Config*, const char*, const char*, int, char **); -static int sqlite3Fts5StorageDelete(Fts5Storage *p, i64); +static int sqlite3Fts5StorageDelete(Fts5Storage *p, i64, sqlite3_value**); static int sqlite3Fts5StorageContentInsert(Fts5Storage *p, sqlite3_value**, i64*); static int sqlite3Fts5StorageIndexInsert(Fts5Storage *p, sqlite3_value**, i64); @@ -168219,8 +169105,6 @@ static int sqlite3Fts5StorageConfigValue( Fts5Storage *p, const char*, sqlite3_value*, int ); -static int sqlite3Fts5StorageSpecialDelete(Fts5Storage *p, i64 iDel, sqlite3_value**); - static int sqlite3Fts5StorageDeleteAll(Fts5Storage *p); static int sqlite3Fts5StorageRebuild(Fts5Storage *p); static int sqlite3Fts5StorageOptimize(Fts5Storage *p); @@ -168277,7 +169161,17 @@ static int sqlite3Fts5ExprPhraseCount(Fts5Expr*); static int sqlite3Fts5ExprPhraseSize(Fts5Expr*, int iPhrase); static int sqlite3Fts5ExprPoslist(Fts5Expr*, int, const u8 **); -static int sqlite3Fts5ExprClonePhrase(Fts5Config*, Fts5Expr*, int, Fts5Expr**); +typedef struct Fts5PoslistPopulator Fts5PoslistPopulator; +static Fts5PoslistPopulator *sqlite3Fts5ExprClearPoslists(Fts5Expr*, int); +static int sqlite3Fts5ExprPopulatePoslists( + Fts5Config*, Fts5Expr*, Fts5PoslistPopulator*, int, const char*, int +); +static void sqlite3Fts5ExprCheckPoslists(Fts5Expr*, i64); +static void sqlite3Fts5ExprClearEof(Fts5Expr*); + +static int sqlite3Fts5ExprClonePhrase(Fts5Expr*, int, Fts5Expr**); + +static int sqlite3Fts5ExprPhraseCollist(Fts5Expr *, int, const u8 **, int *); /******************************************* ** The fts5_expr.c API above this point is used by the other hand-written @@ -169066,7 +169960,8 @@ static void fts5yyStackOverflow(fts5yyParser *fts5yypParser, fts5YYMINORTYPE *ft ** stack every overflows */ /******** Begin %stack_overflow code ******************************************/ - assert( 0 ); + UNUSED_PARAM(fts5yypMinor); /* Silence a compiler warning */ + sqlite3Fts5ParseError(pParse, "fts5: parser stack overflow"); /******** End %stack_overflow code ********************************************/ sqlite3Fts5ParserARG_STORE; /* Suppress warning about unused %extra_argument var */ } @@ -169363,6 +170258,7 @@ static void fts5yy_syntax_error( #define FTS5TOKEN (fts5yyminor.fts5yy0) /************ Begin %syntax_error code ****************************************/ + UNUSED_PARAM(fts5yymajor); /* Silence a compiler warning */ sqlite3Fts5ParseError( pParse, "fts5: syntax error near \"%.*s\"",FTS5TOKEN.n,FTS5TOKEN.p ); @@ -169740,6 +170636,8 @@ static int fts5HighlightCb( int rc = SQLITE_OK; int iPos; + UNUSED_PARAM2(pToken, nToken); + if( tflags & FTS5_TOKEN_COLOCATED ) return SQLITE_OK; iPos = p->iPos++; @@ -169973,6 +170871,7 @@ static int fts5CountCb( void *pUserData /* Pointer to sqlite3_int64 variable */ ){ sqlite3_int64 *pn = (sqlite3_int64*)pUserData; + UNUSED_PARAM2(pApi, pFts); (*pn)++; return SQLITE_OK; } @@ -170126,7 +171025,7 @@ static int sqlite3Fts5AuxInit(fts5_api *pApi){ int rc = SQLITE_OK; /* Return code */ int i; /* To iterate through builtin functions */ - for(i=0; rc==SQLITE_OK && i<(int)ArraySize(aBuiltin); i++){ + for(i=0; rc==SQLITE_OK && ixCreateFunction(pApi, aBuiltin[i].zFunc, aBuiltin[i].pUserData, @@ -170157,19 +171056,21 @@ static int sqlite3Fts5AuxInit(fts5_api *pApi){ /* #include "fts5Int.h" */ -static int sqlite3Fts5BufferSize(int *pRc, Fts5Buffer *pBuf, int nByte){ - int nNew = pBuf->nSpace ? pBuf->nSpace*2 : 64; - u8 *pNew; - while( nNewp, nNew); - if( pNew==0 ){ - *pRc = SQLITE_NOMEM; - return 1; - }else{ - pBuf->nSpace = nNew; - pBuf->p = pNew; +static int sqlite3Fts5BufferSize(int *pRc, Fts5Buffer *pBuf, u32 nByte){ + if( (u32)pBuf->nSpacenSpace ? pBuf->nSpace : 64; + u8 *pNew; + while( nNewp, nNew); + if( pNew==0 ){ + *pRc = SQLITE_NOMEM; + return 1; + }else{ + pBuf->nSpace = nNew; + pBuf->p = pNew; + } } return 0; } @@ -170203,10 +171104,10 @@ static int sqlite3Fts5Get32(const u8 *aBuf){ static void sqlite3Fts5BufferAppendBlob( int *pRc, Fts5Buffer *pBuf, - int nData, + u32 nData, const u8 *pData ){ - assert( *pRc || nData>=0 ); + assert_nc( *pRc || nData>=0 ); if( fts5BufferGrow(pRc, pBuf, nData) ) return; memcpy(&pBuf->p[pBuf->n], pData, nData); pBuf->n += nData; @@ -170350,23 +171251,36 @@ static int sqlite3Fts5PoslistReaderInit( return pIter->bEof; } +/* +** Append position iPos to the position list being accumulated in buffer +** pBuf, which must be already be large enough to hold the new data. +** The previous position written to this list is *piPrev. *piPrev is set +** to iPos before returning. +*/ +static void sqlite3Fts5PoslistSafeAppend( + Fts5Buffer *pBuf, + i64 *piPrev, + i64 iPos +){ + static const i64 colmask = ((i64)(0x7FFFFFFF)) << 32; + if( (iPos & colmask) != (*piPrev & colmask) ){ + pBuf->p[pBuf->n++] = 1; + pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], (iPos>>32)); + *piPrev = (iPos & colmask); + } + pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], (iPos-*piPrev)+2); + *piPrev = iPos; +} + static int sqlite3Fts5PoslistWriterAppend( Fts5Buffer *pBuf, Fts5PoslistWriter *pWriter, i64 iPos ){ - static const i64 colmask = ((i64)(0x7FFFFFFF)) << 32; - int rc = SQLITE_OK; - if( 0==fts5BufferGrow(&rc, pBuf, 5+5+5) ){ - if( (iPos & colmask) != (pWriter->iPrev & colmask) ){ - pBuf->p[pBuf->n++] = 1; - pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], (iPos>>32)); - pWriter->iPrev = (iPos & colmask); - } - pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], (iPos-pWriter->iPrev)+2); - pWriter->iPrev = iPos; - } - return rc; + int rc = 0; /* Initialized only to suppress erroneous warning from Clang */ + if( fts5BufferGrow(&rc, pBuf, 5+5+5) ) return rc; + sqlite3Fts5PoslistSafeAppend(pBuf, &pWriter->iPrev, iPos); + return SQLITE_OK; } static void *sqlite3Fts5MallocZero(int *pRc, int nByte){ @@ -170434,6 +171348,89 @@ static int sqlite3Fts5IsBareword(char t){ } +/************************************************************************* +*/ +typedef struct Fts5TermsetEntry Fts5TermsetEntry; +struct Fts5TermsetEntry { + char *pTerm; + int nTerm; + int iIdx; /* Index (main or aPrefix[] entry) */ + Fts5TermsetEntry *pNext; +}; + +struct Fts5Termset { + Fts5TermsetEntry *apHash[512]; +}; + +static int sqlite3Fts5TermsetNew(Fts5Termset **pp){ + int rc = SQLITE_OK; + *pp = sqlite3Fts5MallocZero(&rc, sizeof(Fts5Termset)); + return rc; +} + +static int sqlite3Fts5TermsetAdd( + Fts5Termset *p, + int iIdx, + const char *pTerm, int nTerm, + int *pbPresent +){ + int rc = SQLITE_OK; + *pbPresent = 0; + if( p ){ + int i; + u32 hash = 13; + Fts5TermsetEntry *pEntry; + + /* Calculate a hash value for this term. This is the same hash checksum + ** used by the fts5_hash.c module. This is not important for correct + ** operation of the module, but is necessary to ensure that some tests + ** designed to produce hash table collisions really do work. */ + for(i=nTerm-1; i>=0; i--){ + hash = (hash << 3) ^ hash ^ pTerm[i]; + } + hash = (hash << 3) ^ hash ^ iIdx; + hash = hash % ArraySize(p->apHash); + + for(pEntry=p->apHash[hash]; pEntry; pEntry=pEntry->pNext){ + if( pEntry->iIdx==iIdx + && pEntry->nTerm==nTerm + && memcmp(pEntry->pTerm, pTerm, nTerm)==0 + ){ + *pbPresent = 1; + break; + } + } + + if( pEntry==0 ){ + pEntry = sqlite3Fts5MallocZero(&rc, sizeof(Fts5TermsetEntry) + nTerm); + if( pEntry ){ + pEntry->pTerm = (char*)&pEntry[1]; + pEntry->nTerm = nTerm; + pEntry->iIdx = iIdx; + memcpy(pEntry->pTerm, pTerm, nTerm); + pEntry->pNext = p->apHash[hash]; + p->apHash[hash] = pEntry; + } + } + } + + return rc; +} + +static void sqlite3Fts5TermsetFree(Fts5Termset *p){ + if( p ){ + u32 i; + for(i=0; iapHash); i++){ + Fts5TermsetEntry *pEntry = p->apHash[i]; + while( pEntry ){ + Fts5TermsetEntry *pDel = pEntry; + pEntry = pEntry->pNext; + sqlite3_free(pDel); + } + } + sqlite3_free(p); + } +} /* ** 2014 Jun 09 @@ -170451,7 +171448,6 @@ static int sqlite3Fts5IsBareword(char t){ */ - /* #include "fts5Int.h" */ #define FTS5_DEFAULT_PAGE_SIZE 4050 @@ -170632,6 +171628,33 @@ static void sqlite3Fts5Dequote(char *z){ } } + +struct Fts5Enum { + const char *zName; + int eVal; +}; +typedef struct Fts5Enum Fts5Enum; + +static int fts5ConfigSetEnum( + const Fts5Enum *aEnum, + const char *zEnum, + int *peVal +){ + int nEnum = (int)strlen(zEnum); + int i; + int iVal = -1; + + for(i=0; aEnum[i].zName; i++){ + if( sqlite3_strnicmp(aEnum[i].zName, zEnum, nEnum)==0 ){ + if( iVal>=0 ) return SQLITE_ERROR; + iVal = aEnum[i].eVal; + } + } + + *peVal = iVal; + return iVal<0 ? SQLITE_ERROR : SQLITE_OK; +} + /* ** Parse a "special" CREATE VIRTUAL TABLE directive and update ** configuration object pConfig as appropriate. @@ -170689,7 +171712,7 @@ static int fts5ConfigParseSpecial( p++; } - if( rc==SQLITE_OK && (nPre<=0 || nPre>=1000) ){ + if( nPre<=0 || nPre>=1000 ){ *pzErr = sqlite3_mprintf("prefix length out of range (max 999)"); rc = SQLITE_ERROR; break; @@ -170782,6 +171805,20 @@ static int fts5ConfigParseSpecial( return rc; } + if( sqlite3_strnicmp("detail", zCmd, nCmd)==0 ){ + const Fts5Enum aDetail[] = { + { "none", FTS5_DETAIL_NONE }, + { "full", FTS5_DETAIL_FULL }, + { "columns", FTS5_DETAIL_COLUMNS }, + { 0, 0 } + }; + + if( (rc = fts5ConfigSetEnum(aDetail, zArg, &pConfig->eDetail)) ){ + *pzErr = sqlite3_mprintf("malformed detail=... directive"); + } + return rc; + } + *pzErr = sqlite3_mprintf("unrecognized option: \"%.*s\"", nCmd, zCmd); return SQLITE_ERROR; } @@ -170937,6 +171974,7 @@ static int sqlite3Fts5ConfigParse( pRet->zDb = sqlite3Fts5Strndup(&rc, azArg[1], -1); pRet->zName = sqlite3Fts5Strndup(&rc, azArg[2], -1); pRet->bColumnsize = 1; + pRet->eDetail = FTS5_DETAIL_FULL; #ifdef SQLITE_DEBUG pRet->bPrefixIndex = 1; #endif @@ -171340,7 +172378,6 @@ static int sqlite3Fts5ConfigLoad(Fts5Config *pConfig, int iCookie){ return rc; } - /* ** 2014 May 31 ** @@ -171383,6 +172420,7 @@ static void sqlite3Fts5ParserTrace(FILE*, char*); struct Fts5Expr { Fts5Index *pIndex; + Fts5Config *pConfig; Fts5ExprNode *pRoot; int bDesc; /* Iterate in descending rowid order */ int nPhrase; /* Number of phrases in expression */ @@ -171404,6 +172442,9 @@ struct Fts5ExprNode { int bEof; /* True at EOF */ int bNomatch; /* True if entry is not a match */ + /* Next method for this node. */ + int (*xNext)(Fts5Expr*, Fts5ExprNode*, int, i64); + i64 iRowid; /* Current rowid */ Fts5ExprNearset *pNear; /* For FTS5_STRING - cluster of phrases */ @@ -171415,6 +172456,12 @@ struct Fts5ExprNode { #define Fts5NodeIsString(p) ((p)->eType==FTS5_TERM || (p)->eType==FTS5_STRING) +/* +** Invoke the xNext method of an Fts5ExprNode object. This macro should be +** used as if it has the same signature as the xNext() methods themselves. +*/ +#define fts5ExprNodeNext(a,b,c,d) (b)->xNext((a), (b), (c), (d)) + /* ** An instance of the following structure represents a single search term ** or term prefix. @@ -171576,8 +172623,17 @@ static int sqlite3Fts5ExprNew( sParse.rc = SQLITE_NOMEM; sqlite3Fts5ParseNodeFree(sParse.pExpr); }else{ - pNew->pRoot = sParse.pExpr; + if( !sParse.pExpr ){ + const int nByte = sizeof(Fts5ExprNode); + pNew->pRoot = (Fts5ExprNode*)sqlite3Fts5MallocZero(&sParse.rc, nByte); + if( pNew->pRoot ){ + pNew->pRoot->bEof = 1; + } + }else{ + pNew->pRoot = sParse.pExpr; + } pNew->pIndex = 0; + pNew->pConfig = pConfig; pNew->apExprPhrase = sParse.apPhrase; pNew->nPhrase = sParse.nPhrase; sParse.apPhrase = 0; @@ -171627,7 +172683,7 @@ static i64 fts5ExprSynonymRowid(Fts5ExprTerm *pTerm, int bDesc, int *pbEof){ assert( bDesc==0 || bDesc==1 ); for(p=pTerm; p; p=p->pSynonym){ if( 0==sqlite3Fts5IterEof(p->pIter) ){ - i64 iRowid = sqlite3Fts5IterRowid(p->pIter); + i64 iRowid = p->pIter->iRowid; if( bRetValid==0 || (bDesc!=(iRowidpSynonym ); for(p=pTerm; p; p=p->pSynonym){ Fts5IndexIter *pIter = p->pIter; - if( sqlite3Fts5IterEof(pIter)==0 && sqlite3Fts5IterRowid(pIter)==iRowid ){ - const u8 *a; - int n; - i64 dummy; - rc = sqlite3Fts5IterPoslist(pIter, pColset, &a, &n, &dummy); - if( rc!=SQLITE_OK ) goto synonym_poslist_out; + if( sqlite3Fts5IterEof(pIter)==0 && pIter->iRowid==iRowid ){ + if( pIter->nData==0 ) continue; if( nIter==nAlloc ){ int nByte = sizeof(Fts5PoslistReader) * nAlloc * 2; Fts5PoslistReader *aNew = (Fts5PoslistReader*)sqlite3_malloc(nByte); @@ -171677,20 +172728,19 @@ static int fts5ExprSynonymPoslist( if( aIter!=aStatic ) sqlite3_free(aIter); aIter = aNew; } - sqlite3Fts5PoslistReaderInit(a, n, &aIter[nIter]); + sqlite3Fts5PoslistReaderInit(pIter->pData, pIter->nData, &aIter[nIter]); assert( aIter[nIter].bEof==0 ); nIter++; } } - assert( *pbDel==0 ); if( nIter==1 ){ *pa = (u8*)aIter[0].a; *pn = aIter[0].n; }else{ Fts5PoslistWriter writer = {0}; - Fts5Buffer buf = {0,0,0}; i64 iPrev = -1; + fts5BufferZero(pBuf); while( 1 ){ int i; i64 iMin = FTS5_LARGEST_INT64; @@ -171705,15 +172755,12 @@ static int fts5ExprSynonymPoslist( } } if( iMin==FTS5_LARGEST_INT64 || rc!=SQLITE_OK ) break; - rc = sqlite3Fts5PoslistWriterAppend(&buf, &writer, iMin); + rc = sqlite3Fts5PoslistWriterAppend(pBuf, &writer, iMin); iPrev = iMin; } - if( rc ){ - sqlite3_free(buf.p); - }else{ - *pa = buf.p; - *pn = buf.n; - *pbDel = 1; + if( rc==SQLITE_OK ){ + *pa = pBuf->p; + *pn = pBuf->n; } } @@ -171736,7 +172783,6 @@ static int fts5ExprSynonymPoslist( */ static int fts5ExprPhraseIsMatch( Fts5ExprNode *pNode, /* Node pPhrase belongs to */ - Fts5Colset *pColset, /* Restrict matches to these columns */ Fts5ExprPhrase *pPhrase, /* Phrase object to initialize */ int *pbMatch /* OUT: Set to true if really a match */ ){ @@ -171750,7 +172796,7 @@ static int fts5ExprPhraseIsMatch( /* If the aStatic[] array is not large enough, allocate a large array ** using sqlite3_malloc(). This approach could be improved upon. */ - if( pPhrase->nTerm>(int)ArraySize(aStatic) ){ + if( pPhrase->nTerm>ArraySize(aStatic) ){ int nByte = sizeof(Fts5PoslistReader) * pPhrase->nTerm; aIter = (Fts5PoslistReader*)sqlite3_malloc(nByte); if( !aIter ) return SQLITE_NOMEM; @@ -171760,18 +172806,21 @@ static int fts5ExprPhraseIsMatch( /* Initialize a term iterator for each term in the phrase */ for(i=0; inTerm; i++){ Fts5ExprTerm *pTerm = &pPhrase->aTerm[i]; - i64 dummy; int n = 0; int bFlag = 0; - const u8 *a = 0; + u8 *a = 0; if( pTerm->pSynonym ){ - rc = fts5ExprSynonymPoslist( - pTerm, pColset, pNode->iRowid, &bFlag, (u8**)&a, &n - ); + Fts5Buffer buf = {0, 0, 0}; + rc = fts5ExprSynonymList(pTerm, pNode->iRowid, &buf, &a, &n); + if( rc ){ + sqlite3_free(a); + goto ismatch_out; + } + if( a==buf.p ) bFlag = 1; }else{ - rc = sqlite3Fts5IterPoslist(pTerm->pIter, pColset, &a, &n, &dummy); + a = (u8*)pTerm->pIter->pData; + n = pTerm->pIter->nData; } - if( rc!=SQLITE_OK ) goto ismatch_out; sqlite3Fts5PoslistReaderInit(a, n, &aIter[i]); aIter[i].bFlag = (u8)bFlag; if( aIter[i].bEof ) goto ismatch_out; @@ -171843,12 +172892,6 @@ static int fts5LookaheadReaderInit( return fts5LookaheadReaderNext(p); } -#if 0 -static int fts5LookaheadReaderEof(Fts5LookaheadReader *p){ - return (p->iPos==FTS5_LOOKAHEAD_EOF); -} -#endif - typedef struct Fts5NearTrimmer Fts5NearTrimmer; struct Fts5NearTrimmer { Fts5LookaheadReader reader; /* Input iterator */ @@ -171886,7 +172929,7 @@ static int fts5ExprNearIsMatch(int *pRc, Fts5ExprNearset *pNear){ /* If the aStatic[] array is not large enough, allocate a large array ** using sqlite3_malloc(). This approach could be improved upon. */ - if( pNear->nPhrase>(int)ArraySize(aStatic) ){ + if( pNear->nPhrase>ArraySize(aStatic) ){ int nByte = sizeof(Fts5NearTrimmer) * pNear->nPhrase; a = (Fts5NearTrimmer*)sqlite3Fts5MallocZero(&rc, nByte); }else{ @@ -171963,71 +173006,6 @@ static int fts5ExprNearIsMatch(int *pRc, Fts5ExprNearset *pNear){ } } -/* -** Advance the first term iterator in the first phrase of pNear. Set output -** variable *pbEof to true if it reaches EOF or if an error occurs. -** -** Return SQLITE_OK if successful, or an SQLite error code if an error -** occurs. -*/ -static int fts5ExprNearAdvanceFirst( - Fts5Expr *pExpr, /* Expression pPhrase belongs to */ - Fts5ExprNode *pNode, /* FTS5_STRING or FTS5_TERM node */ - int bFromValid, - i64 iFrom -){ - Fts5ExprTerm *pTerm = &pNode->pNear->apPhrase[0]->aTerm[0]; - int rc = SQLITE_OK; - - if( pTerm->pSynonym ){ - int bEof = 1; - Fts5ExprTerm *p; - - /* Find the firstest rowid any synonym points to. */ - i64 iRowid = fts5ExprSynonymRowid(pTerm, pExpr->bDesc, 0); - - /* Advance each iterator that currently points to iRowid. Or, if iFrom - ** is valid - each iterator that points to a rowid before iFrom. */ - for(p=pTerm; p; p=p->pSynonym){ - if( sqlite3Fts5IterEof(p->pIter)==0 ){ - i64 ii = sqlite3Fts5IterRowid(p->pIter); - if( ii==iRowid - || (bFromValid && ii!=iFrom && (ii>iFrom)==pExpr->bDesc) - ){ - if( bFromValid ){ - rc = sqlite3Fts5IterNextFrom(p->pIter, iFrom); - }else{ - rc = sqlite3Fts5IterNext(p->pIter); - } - if( rc!=SQLITE_OK ) break; - if( sqlite3Fts5IterEof(p->pIter)==0 ){ - bEof = 0; - } - }else{ - bEof = 0; - } - } - } - - /* Set the EOF flag if either all synonym iterators are at EOF or an - ** error has occurred. */ - pNode->bEof = (rc || bEof); - }else{ - Fts5IndexIter *pIter = pTerm->pIter; - - assert( Fts5NodeIsString(pNode) ); - if( bFromValid ){ - rc = sqlite3Fts5IterNextFrom(pIter, iFrom); - }else{ - rc = sqlite3Fts5IterNext(pIter); - } - - pNode->bEof = (rc || sqlite3Fts5IterEof(pIter)); - } - - return rc; -} - /* ** Advance iterator pIter until it points to a value equal to or laster ** than the initial value of *piLast. If this means the iterator points @@ -172047,7 +173025,7 @@ static int fts5ExprAdvanceto( i64 iLast = *piLast; i64 iRowid; - iRowid = sqlite3Fts5IterRowid(pIter); + iRowid = pIter->iRowid; if( (bDesc==0 && iLast>iRowid) || (bDesc && iLastiRowid; assert( (bDesc==0 && iRowid>=iLast) || (bDesc==1 && iRowid<=iLast) ); } *piLast = iRowid; @@ -172076,7 +173054,7 @@ static int fts5ExprSynonymAdvanceto( for(p=pTerm; rc==SQLITE_OK && p; p=p->pSynonym){ if( sqlite3Fts5IterEof(p->pIter)==0 ){ - i64 iRowid = sqlite3Fts5IterRowid(p->pIter); + i64 iRowid = p->pIter->iRowid; if( (bDesc==0 && iLast>iRowid) || (bDesc && iLastpIter, iLast); } @@ -172100,130 +173078,47 @@ static int fts5ExprNearTest( ){ Fts5ExprNearset *pNear = pNode->pNear; int rc = *pRc; - int i; - /* Check that each phrase in the nearset matches the current row. - ** Populate the pPhrase->poslist buffers at the same time. If any - ** phrase is not a match, break out of the loop early. */ - for(i=0; rc==SQLITE_OK && inPhrase; i++){ - Fts5ExprPhrase *pPhrase = pNear->apPhrase[i]; - if( pPhrase->nTerm>1 || pPhrase->aTerm[0].pSynonym || pNear->pColset ){ - int bMatch = 0; - rc = fts5ExprPhraseIsMatch(pNode, pNear->pColset, pPhrase, &bMatch); - if( bMatch==0 ) break; - }else{ - rc = sqlite3Fts5IterPoslistBuffer( - pPhrase->aTerm[0].pIter, &pPhrase->poslist - ); - } - } - - *pRc = rc; - if( i==pNear->nPhrase && (i==1 || fts5ExprNearIsMatch(pRc, pNear)) ){ - return 1; - } - - return 0; -} - -static int fts5ExprTokenTest( - Fts5Expr *pExpr, /* Expression that pNear is a part of */ - Fts5ExprNode *pNode /* The "NEAR" node (FTS5_TERM) */ -){ - /* As this "NEAR" object is actually a single phrase that consists - ** of a single term only, grab pointers into the poslist managed by the - ** fts5_index.c iterator object. This is much faster than synthesizing - ** a new poslist the way we have to for more complicated phrase or NEAR - ** expressions. */ - Fts5ExprNearset *pNear = pNode->pNear; - Fts5ExprPhrase *pPhrase = pNear->apPhrase[0]; - Fts5IndexIter *pIter = pPhrase->aTerm[0].pIter; - Fts5Colset *pColset = pNear->pColset; - int rc; - - assert( pNode->eType==FTS5_TERM ); - assert( pNear->nPhrase==1 && pPhrase->nTerm==1 ); - assert( pPhrase->aTerm[0].pSynonym==0 ); - - rc = sqlite3Fts5IterPoslist(pIter, pColset, - (const u8**)&pPhrase->poslist.p, &pPhrase->poslist.n, &pNode->iRowid - ); - pNode->bNomatch = (pPhrase->poslist.n==0); - return rc; -} - -/* -** All individual term iterators in pNear are guaranteed to be valid when -** this function is called. This function checks if all term iterators -** point to the same rowid, and if not, advances them until they do. -** If an EOF is reached before this happens, *pbEof is set to true before -** returning. -** -** SQLITE_OK is returned if an error occurs, or an SQLite error code -** otherwise. It is not considered an error code if an iterator reaches -** EOF. -*/ -static int fts5ExprNearNextMatch( - Fts5Expr *pExpr, /* Expression pPhrase belongs to */ - Fts5ExprNode *pNode -){ - Fts5ExprNearset *pNear = pNode->pNear; - Fts5ExprPhrase *pLeft = pNear->apPhrase[0]; - int rc = SQLITE_OK; - i64 iLast; /* Lastest rowid any iterator points to */ - int i, j; /* Phrase and token index, respectively */ - int bMatch; /* True if all terms are at the same rowid */ - const int bDesc = pExpr->bDesc; - - /* Check that this node should not be FTS5_TERM */ - assert( pNear->nPhrase>1 - || pNear->apPhrase[0]->nTerm>1 - || pNear->apPhrase[0]->aTerm[0].pSynonym - ); - - /* Initialize iLast, the "lastest" rowid any iterator points to. If the - ** iterator skips through rowids in the default ascending order, this means - ** the maximum rowid. Or, if the iterator is "ORDER BY rowid DESC", then it - ** means the minimum rowid. */ - if( pLeft->aTerm[0].pSynonym ){ - iLast = fts5ExprSynonymRowid(&pLeft->aTerm[0], bDesc, 0); - }else{ - iLast = sqlite3Fts5IterRowid(pLeft->aTerm[0].pIter); - } - - do { - bMatch = 1; - for(i=0; inPhrase; i++){ - Fts5ExprPhrase *pPhrase = pNear->apPhrase[i]; - for(j=0; jnTerm; j++){ - Fts5ExprTerm *pTerm = &pPhrase->aTerm[j]; - if( pTerm->pSynonym ){ - i64 iRowid = fts5ExprSynonymRowid(pTerm, bDesc, 0); - if( iRowid==iLast ) continue; - bMatch = 0; - if( fts5ExprSynonymAdvanceto(pTerm, bDesc, &iLast, &rc) ){ - pNode->bEof = 1; - return rc; - } - }else{ - Fts5IndexIter *pIter = pPhrase->aTerm[j].pIter; - i64 iRowid = sqlite3Fts5IterRowid(pIter); - if( iRowid==iLast ) continue; - bMatch = 0; - if( fts5ExprAdvanceto(pIter, bDesc, &iLast, &rc, &pNode->bEof) ){ - return rc; - } + if( pExpr->pConfig->eDetail!=FTS5_DETAIL_FULL ){ + Fts5ExprTerm *pTerm; + Fts5ExprPhrase *pPhrase = pNear->apPhrase[0]; + pPhrase->poslist.n = 0; + for(pTerm=&pPhrase->aTerm[0]; pTerm; pTerm=pTerm->pSynonym){ + Fts5IndexIter *pIter = pTerm->pIter; + if( sqlite3Fts5IterEof(pIter)==0 ){ + if( pIter->iRowid==pNode->iRowid && pIter->nData>0 ){ + pPhrase->poslist.n = 1; } } } - }while( bMatch==0 ); + return pPhrase->poslist.n; + }else{ + int i; - pNode->iRowid = iLast; - pNode->bNomatch = (0==fts5ExprNearTest(&rc, pExpr, pNode)); + /* Check that each phrase in the nearset matches the current row. + ** Populate the pPhrase->poslist buffers at the same time. If any + ** phrase is not a match, break out of the loop early. */ + for(i=0; rc==SQLITE_OK && inPhrase; i++){ + Fts5ExprPhrase *pPhrase = pNear->apPhrase[i]; + if( pPhrase->nTerm>1 || pPhrase->aTerm[0].pSynonym || pNear->pColset ){ + int bMatch = 0; + rc = fts5ExprPhraseIsMatch(pNode, pPhrase, &bMatch); + if( bMatch==0 ) break; + }else{ + Fts5IndexIter *pIter = pPhrase->aTerm[0].pIter; + fts5BufferSet(&rc, &pPhrase->poslist, pIter->nData, pIter->pData); + } + } - return rc; + *pRc = rc; + if( i==pNear->nPhrase && (i==1 || fts5ExprNearIsMatch(pRc, pNear)) ){ + return 1; + } + return 0; + } } + /* ** Initialize all term iterators in the pNear object. If any term is found ** to match no documents at all, return immediately without initializing any @@ -172237,6 +173132,7 @@ static int fts5ExprNearInitAll( int i, j; int rc = SQLITE_OK; + assert( pNode->bNomatch==0 ); for(i=0; rc==SQLITE_OK && inPhrase; i++){ Fts5ExprPhrase *pPhrase = pNear->apPhrase[i]; for(j=0; jnTerm; j++){ @@ -172272,10 +173168,6 @@ static int fts5ExprNearInitAll( return rc; } -/* fts5ExprNodeNext() calls fts5ExprNodeNextMatch(). And vice-versa. */ -static int fts5ExprNodeNextMatch(Fts5Expr*, Fts5ExprNode*); - - /* ** If pExpr is an ASC iterator, this function returns a value with the ** same sign as: @@ -172304,6 +173196,7 @@ static int fts5RowidCmp( static void fts5ExprSetEof(Fts5ExprNode *pNode){ int i; pNode->bEof = 1; + pNode->bNomatch = 0; for(i=0; inChild; i++){ fts5ExprSetEof(pNode->apChild[i]); } @@ -172326,12 +173219,275 @@ static void fts5ExprNodeZeroPoslist(Fts5ExprNode *pNode){ } -static int fts5ExprNodeNext(Fts5Expr*, Fts5ExprNode*, int, i64); + +/* +** Compare the values currently indicated by the two nodes as follows: +** +** res = (*p1) - (*p2) +** +** Nodes that point to values that come later in the iteration order are +** considered to be larger. Nodes at EOF are the largest of all. +** +** This means that if the iteration order is ASC, then numerically larger +** rowids are considered larger. Or if it is the default DESC, numerically +** smaller rowids are larger. +*/ +static int fts5NodeCompare( + Fts5Expr *pExpr, + Fts5ExprNode *p1, + Fts5ExprNode *p2 +){ + if( p2->bEof ) return -1; + if( p1->bEof ) return +1; + return fts5RowidCmp(pExpr, p1->iRowid, p2->iRowid); +} + +/* +** All individual term iterators in pNear are guaranteed to be valid when +** this function is called. This function checks if all term iterators +** point to the same rowid, and if not, advances them until they do. +** If an EOF is reached before this happens, *pbEof is set to true before +** returning. +** +** SQLITE_OK is returned if an error occurs, or an SQLite error code +** otherwise. It is not considered an error code if an iterator reaches +** EOF. +*/ +static int fts5ExprNodeTest_STRING( + Fts5Expr *pExpr, /* Expression pPhrase belongs to */ + Fts5ExprNode *pNode +){ + Fts5ExprNearset *pNear = pNode->pNear; + Fts5ExprPhrase *pLeft = pNear->apPhrase[0]; + int rc = SQLITE_OK; + i64 iLast; /* Lastest rowid any iterator points to */ + int i, j; /* Phrase and token index, respectively */ + int bMatch; /* True if all terms are at the same rowid */ + const int bDesc = pExpr->bDesc; + + /* Check that this node should not be FTS5_TERM */ + assert( pNear->nPhrase>1 + || pNear->apPhrase[0]->nTerm>1 + || pNear->apPhrase[0]->aTerm[0].pSynonym + ); + + /* Initialize iLast, the "lastest" rowid any iterator points to. If the + ** iterator skips through rowids in the default ascending order, this means + ** the maximum rowid. Or, if the iterator is "ORDER BY rowid DESC", then it + ** means the minimum rowid. */ + if( pLeft->aTerm[0].pSynonym ){ + iLast = fts5ExprSynonymRowid(&pLeft->aTerm[0], bDesc, 0); + }else{ + iLast = pLeft->aTerm[0].pIter->iRowid; + } + + do { + bMatch = 1; + for(i=0; inPhrase; i++){ + Fts5ExprPhrase *pPhrase = pNear->apPhrase[i]; + for(j=0; jnTerm; j++){ + Fts5ExprTerm *pTerm = &pPhrase->aTerm[j]; + if( pTerm->pSynonym ){ + i64 iRowid = fts5ExprSynonymRowid(pTerm, bDesc, 0); + if( iRowid==iLast ) continue; + bMatch = 0; + if( fts5ExprSynonymAdvanceto(pTerm, bDesc, &iLast, &rc) ){ + pNode->bNomatch = 0; + pNode->bEof = 1; + return rc; + } + }else{ + Fts5IndexIter *pIter = pPhrase->aTerm[j].pIter; + if( pIter->iRowid==iLast ) continue; + bMatch = 0; + if( fts5ExprAdvanceto(pIter, bDesc, &iLast, &rc, &pNode->bEof) ){ + return rc; + } + } + } + } + }while( bMatch==0 ); + + pNode->iRowid = iLast; + pNode->bNomatch = ((0==fts5ExprNearTest(&rc, pExpr, pNode)) && rc==SQLITE_OK); + assert( pNode->bEof==0 || pNode->bNomatch==0 ); + + return rc; +} + +/* +** Advance the first term iterator in the first phrase of pNear. Set output +** variable *pbEof to true if it reaches EOF or if an error occurs. +** +** Return SQLITE_OK if successful, or an SQLite error code if an error +** occurs. +*/ +static int fts5ExprNodeNext_STRING( + Fts5Expr *pExpr, /* Expression pPhrase belongs to */ + Fts5ExprNode *pNode, /* FTS5_STRING or FTS5_TERM node */ + int bFromValid, + i64 iFrom +){ + Fts5ExprTerm *pTerm = &pNode->pNear->apPhrase[0]->aTerm[0]; + int rc = SQLITE_OK; + + pNode->bNomatch = 0; + if( pTerm->pSynonym ){ + int bEof = 1; + Fts5ExprTerm *p; + + /* Find the firstest rowid any synonym points to. */ + i64 iRowid = fts5ExprSynonymRowid(pTerm, pExpr->bDesc, 0); + + /* Advance each iterator that currently points to iRowid. Or, if iFrom + ** is valid - each iterator that points to a rowid before iFrom. */ + for(p=pTerm; p; p=p->pSynonym){ + if( sqlite3Fts5IterEof(p->pIter)==0 ){ + i64 ii = p->pIter->iRowid; + if( ii==iRowid + || (bFromValid && ii!=iFrom && (ii>iFrom)==pExpr->bDesc) + ){ + if( bFromValid ){ + rc = sqlite3Fts5IterNextFrom(p->pIter, iFrom); + }else{ + rc = sqlite3Fts5IterNext(p->pIter); + } + if( rc!=SQLITE_OK ) break; + if( sqlite3Fts5IterEof(p->pIter)==0 ){ + bEof = 0; + } + }else{ + bEof = 0; + } + } + } + + /* Set the EOF flag if either all synonym iterators are at EOF or an + ** error has occurred. */ + pNode->bEof = (rc || bEof); + }else{ + Fts5IndexIter *pIter = pTerm->pIter; + + assert( Fts5NodeIsString(pNode) ); + if( bFromValid ){ + rc = sqlite3Fts5IterNextFrom(pIter, iFrom); + }else{ + rc = sqlite3Fts5IterNext(pIter); + } + + pNode->bEof = (rc || sqlite3Fts5IterEof(pIter)); + } + + if( pNode->bEof==0 ){ + assert( rc==SQLITE_OK ); + rc = fts5ExprNodeTest_STRING(pExpr, pNode); + } + + return rc; +} + + +static int fts5ExprNodeTest_TERM( + Fts5Expr *pExpr, /* Expression that pNear is a part of */ + Fts5ExprNode *pNode /* The "NEAR" node (FTS5_TERM) */ +){ + /* As this "NEAR" object is actually a single phrase that consists + ** of a single term only, grab pointers into the poslist managed by the + ** fts5_index.c iterator object. This is much faster than synthesizing + ** a new poslist the way we have to for more complicated phrase or NEAR + ** expressions. */ + Fts5ExprPhrase *pPhrase = pNode->pNear->apPhrase[0]; + Fts5IndexIter *pIter = pPhrase->aTerm[0].pIter; + + assert( pNode->eType==FTS5_TERM ); + assert( pNode->pNear->nPhrase==1 && pPhrase->nTerm==1 ); + assert( pPhrase->aTerm[0].pSynonym==0 ); + + pPhrase->poslist.n = pIter->nData; + if( pExpr->pConfig->eDetail==FTS5_DETAIL_FULL ){ + pPhrase->poslist.p = (u8*)pIter->pData; + } + pNode->iRowid = pIter->iRowid; + pNode->bNomatch = (pPhrase->poslist.n==0); + return SQLITE_OK; +} + +/* +** xNext() method for a node of type FTS5_TERM. +*/ +static int fts5ExprNodeNext_TERM( + Fts5Expr *pExpr, + Fts5ExprNode *pNode, + int bFromValid, + i64 iFrom +){ + int rc; + Fts5IndexIter *pIter = pNode->pNear->apPhrase[0]->aTerm[0].pIter; + + assert( pNode->bEof==0 ); + if( bFromValid ){ + rc = sqlite3Fts5IterNextFrom(pIter, iFrom); + }else{ + rc = sqlite3Fts5IterNext(pIter); + } + if( rc==SQLITE_OK && sqlite3Fts5IterEof(pIter)==0 ){ + rc = fts5ExprNodeTest_TERM(pExpr, pNode); + }else{ + pNode->bEof = 1; + pNode->bNomatch = 0; + } + return rc; +} + +static void fts5ExprNodeTest_OR( + Fts5Expr *pExpr, /* Expression of which pNode is a part */ + Fts5ExprNode *pNode /* Expression node to test */ +){ + Fts5ExprNode *pNext = pNode->apChild[0]; + int i; + + for(i=1; inChild; i++){ + Fts5ExprNode *pChild = pNode->apChild[i]; + int cmp = fts5NodeCompare(pExpr, pNext, pChild); + if( cmp>0 || (cmp==0 && pChild->bNomatch==0) ){ + pNext = pChild; + } + } + pNode->iRowid = pNext->iRowid; + pNode->bEof = pNext->bEof; + pNode->bNomatch = pNext->bNomatch; +} + +static int fts5ExprNodeNext_OR( + Fts5Expr *pExpr, + Fts5ExprNode *pNode, + int bFromValid, + i64 iFrom +){ + int i; + i64 iLast = pNode->iRowid; + + for(i=0; inChild; i++){ + Fts5ExprNode *p1 = pNode->apChild[i]; + assert( p1->bEof || fts5RowidCmp(pExpr, p1->iRowid, iLast)>=0 ); + if( p1->bEof==0 ){ + if( (p1->iRowid==iLast) + || (bFromValid && fts5RowidCmp(pExpr, p1->iRowid, iFrom)<0) + ){ + int rc = fts5ExprNodeNext(pExpr, p1, bFromValid, iFrom); + if( rc!=SQLITE_OK ) return rc; + } + } + } + + fts5ExprNodeTest_OR(pExpr, pNode); + return SQLITE_OK; +} /* ** Argument pNode is an FTS5_AND node. */ -static int fts5ExprAndNextRowid( +static int fts5ExprNodeTest_AND( Fts5Expr *pExpr, /* Expression pPhrase belongs to */ Fts5ExprNode *pAnd /* FTS5_AND node to advance */ ){ @@ -172346,15 +173502,11 @@ static int fts5ExprAndNextRowid( bMatch = 1; for(iChild=0; iChildnChild; iChild++){ Fts5ExprNode *pChild = pAnd->apChild[iChild]; - if( 0 && pChild->eType==FTS5_STRING ){ - /* TODO */ - }else{ - int cmp = fts5RowidCmp(pExpr, iLast, pChild->iRowid); - if( cmp>0 ){ - /* Advance pChild until it points to iLast or laster */ - rc = fts5ExprNodeNext(pExpr, pChild, 1, iLast); - if( rc!=SQLITE_OK ) return rc; - } + int cmp = fts5RowidCmp(pExpr, iLast, pChild->iRowid); + if( cmp>0 ){ + /* Advance pChild until it points to iLast or laster */ + rc = fts5ExprNodeNext(pExpr, pChild, 1, iLast); + if( rc!=SQLITE_OK ) return rc; } /* If the child node is now at EOF, so is the parent AND node. Otherwise, @@ -172384,126 +173536,66 @@ static int fts5ExprAndNextRowid( return SQLITE_OK; } - -/* -** Compare the values currently indicated by the two nodes as follows: -** -** res = (*p1) - (*p2) -** -** Nodes that point to values that come later in the iteration order are -** considered to be larger. Nodes at EOF are the largest of all. -** -** This means that if the iteration order is ASC, then numerically larger -** rowids are considered larger. Or if it is the default DESC, numerically -** smaller rowids are larger. -*/ -static int fts5NodeCompare( - Fts5Expr *pExpr, - Fts5ExprNode *p1, - Fts5ExprNode *p2 -){ - if( p2->bEof ) return -1; - if( p1->bEof ) return +1; - return fts5RowidCmp(pExpr, p1->iRowid, p2->iRowid); -} - -/* -** Advance node iterator pNode, part of expression pExpr. If argument -** bFromValid is zero, then pNode is advanced exactly once. Or, if argument -** bFromValid is non-zero, then pNode is advanced until it is at or past -** rowid value iFrom. Whether "past" means "less than" or "greater than" -** depends on whether this is an ASC or DESC iterator. -*/ -static int fts5ExprNodeNext( +static int fts5ExprNodeNext_AND( Fts5Expr *pExpr, Fts5ExprNode *pNode, int bFromValid, i64 iFrom ){ - int rc = SQLITE_OK; - - if( pNode->bEof==0 ){ - switch( pNode->eType ){ - case FTS5_STRING: { - rc = fts5ExprNearAdvanceFirst(pExpr, pNode, bFromValid, iFrom); - break; - }; - - case FTS5_TERM: { - Fts5IndexIter *pIter = pNode->pNear->apPhrase[0]->aTerm[0].pIter; - if( bFromValid ){ - rc = sqlite3Fts5IterNextFrom(pIter, iFrom); - }else{ - rc = sqlite3Fts5IterNext(pIter); - } - if( rc==SQLITE_OK && sqlite3Fts5IterEof(pIter)==0 ){ - assert( rc==SQLITE_OK ); - rc = fts5ExprTokenTest(pExpr, pNode); - }else{ - pNode->bEof = 1; - } - return rc; - }; - - case FTS5_AND: { - Fts5ExprNode *pLeft = pNode->apChild[0]; - rc = fts5ExprNodeNext(pExpr, pLeft, bFromValid, iFrom); - break; - } - - case FTS5_OR: { - int i; - i64 iLast = pNode->iRowid; - - for(i=0; rc==SQLITE_OK && inChild; i++){ - Fts5ExprNode *p1 = pNode->apChild[i]; - assert( p1->bEof || fts5RowidCmp(pExpr, p1->iRowid, iLast)>=0 ); - if( p1->bEof==0 ){ - if( (p1->iRowid==iLast) - || (bFromValid && fts5RowidCmp(pExpr, p1->iRowid, iFrom)<0) - ){ - rc = fts5ExprNodeNext(pExpr, p1, bFromValid, iFrom); - } - } - } - - break; - } - - default: assert( pNode->eType==FTS5_NOT ); { - assert( pNode->nChild==2 ); - rc = fts5ExprNodeNext(pExpr, pNode->apChild[0], bFromValid, iFrom); - break; - } - } - - if( rc==SQLITE_OK ){ - rc = fts5ExprNodeNextMatch(pExpr, pNode); - } + int rc = fts5ExprNodeNext(pExpr, pNode->apChild[0], bFromValid, iFrom); + if( rc==SQLITE_OK ){ + rc = fts5ExprNodeTest_AND(pExpr, pNode); } - - /* Assert that if bFromValid was true, either: - ** - ** a) an error occurred, or - ** b) the node is now at EOF, or - ** c) the node is now at or past rowid iFrom. - */ - assert( bFromValid==0 - || rc!=SQLITE_OK /* a */ - || pNode->bEof /* b */ - || pNode->iRowid==iFrom || pExpr->bDesc==(pNode->iRowidapChild[0]; + Fts5ExprNode *p2 = pNode->apChild[1]; + assert( pNode->nChild==2 ); + + while( rc==SQLITE_OK && p1->bEof==0 ){ + int cmp = fts5NodeCompare(pExpr, p1, p2); + if( cmp>0 ){ + rc = fts5ExprNodeNext(pExpr, p2, 1, p1->iRowid); + cmp = fts5NodeCompare(pExpr, p1, p2); + } + assert( rc!=SQLITE_OK || cmp<=0 ); + if( cmp || p2->bNomatch ) break; + rc = fts5ExprNodeNext(pExpr, p1, 0, 0); + } + pNode->bEof = p1->bEof; + pNode->bNomatch = p1->bNomatch; + pNode->iRowid = p1->iRowid; + if( p1->bEof ){ + fts5ExprNodeZeroPoslist(p2); + } + return rc; +} + +static int fts5ExprNodeNext_NOT( + Fts5Expr *pExpr, + Fts5ExprNode *pNode, + int bFromValid, + i64 iFrom +){ + int rc = fts5ExprNodeNext(pExpr, pNode->apChild[0], bFromValid, iFrom); + if( rc==SQLITE_OK ){ + rc = fts5ExprNodeTest_NOT(pExpr, pNode); + } + return rc; +} /* ** If pNode currently points to a match, this function returns SQLITE_OK ** without modifying it. Otherwise, pNode is advanced until it does point ** to a match or EOF is reached. */ -static int fts5ExprNodeNextMatch( +static int fts5ExprNodeTest( Fts5Expr *pExpr, /* Expression of which pNode is a part */ Fts5ExprNode *pNode /* Expression node to test */ ){ @@ -172512,55 +173604,27 @@ static int fts5ExprNodeNextMatch( switch( pNode->eType ){ case FTS5_STRING: { - /* Advance the iterators until they all point to the same rowid */ - rc = fts5ExprNearNextMatch(pExpr, pNode); + rc = fts5ExprNodeTest_STRING(pExpr, pNode); break; } case FTS5_TERM: { - rc = fts5ExprTokenTest(pExpr, pNode); + rc = fts5ExprNodeTest_TERM(pExpr, pNode); break; } case FTS5_AND: { - rc = fts5ExprAndNextRowid(pExpr, pNode); + rc = fts5ExprNodeTest_AND(pExpr, pNode); break; } case FTS5_OR: { - Fts5ExprNode *pNext = pNode->apChild[0]; - int i; - - for(i=1; inChild; i++){ - Fts5ExprNode *pChild = pNode->apChild[i]; - int cmp = fts5NodeCompare(pExpr, pNext, pChild); - if( cmp>0 || (cmp==0 && pChild->bNomatch==0) ){ - pNext = pChild; - } - } - pNode->iRowid = pNext->iRowid; - pNode->bEof = pNext->bEof; - pNode->bNomatch = pNext->bNomatch; + fts5ExprNodeTest_OR(pExpr, pNode); break; } default: assert( pNode->eType==FTS5_NOT ); { - Fts5ExprNode *p1 = pNode->apChild[0]; - Fts5ExprNode *p2 = pNode->apChild[1]; - assert( pNode->nChild==2 ); - - while( rc==SQLITE_OK && p1->bEof==0 ){ - int cmp = fts5NodeCompare(pExpr, p1, p2); - if( cmp>0 ){ - rc = fts5ExprNodeNext(pExpr, p2, 1, p1->iRowid); - cmp = fts5NodeCompare(pExpr, p1, p2); - } - assert( rc!=SQLITE_OK || cmp<=0 ); - if( cmp || p2->bNomatch ) break; - rc = fts5ExprNodeNext(pExpr, p1, 0, 0); - } - pNode->bEof = p1->bEof; - pNode->iRowid = p1->iRowid; + rc = fts5ExprNodeTest_NOT(pExpr, pNode); break; } } @@ -172579,20 +173643,40 @@ static int fts5ExprNodeNextMatch( static int fts5ExprNodeFirst(Fts5Expr *pExpr, Fts5ExprNode *pNode){ int rc = SQLITE_OK; pNode->bEof = 0; + pNode->bNomatch = 0; if( Fts5NodeIsString(pNode) ){ /* Initialize all term iterators in the NEAR object. */ rc = fts5ExprNearInitAll(pExpr, pNode); }else{ int i; + int nEof = 0; for(i=0; inChild && rc==SQLITE_OK; i++){ + Fts5ExprNode *pChild = pNode->apChild[i]; rc = fts5ExprNodeFirst(pExpr, pNode->apChild[i]); + assert( pChild->bEof==0 || pChild->bEof==1 ); + nEof += pChild->bEof; } pNode->iRowid = pNode->apChild[0]->iRowid; + + switch( pNode->eType ){ + case FTS5_AND: + if( nEof>0 ) fts5ExprSetEof(pNode); + break; + + case FTS5_OR: + if( pNode->nChild==nEof ) fts5ExprSetEof(pNode); + break; + + default: + assert( pNode->eType==FTS5_NOT ); + pNode->bEof = pNode->apChild[0]->bEof; + break; + } } if( rc==SQLITE_OK ){ - rc = fts5ExprNodeNextMatch(pExpr, pNode); + rc = fts5ExprNodeTest(pExpr, pNode); } return rc; } @@ -172616,7 +173700,7 @@ static int fts5ExprNodeFirst(Fts5Expr *pExpr, Fts5ExprNode *pNode){ static int sqlite3Fts5ExprFirst(Fts5Expr *p, Fts5Index *pIdx, i64 iFirst, int bDesc){ Fts5ExprNode *pRoot = p->pRoot; int rc = SQLITE_OK; - if( pRoot ){ + if( pRoot->xNext ){ p->pIndex = pIdx; p->bDesc = bDesc; rc = fts5ExprNodeFirst(p, pRoot); @@ -172628,7 +173712,8 @@ static int sqlite3Fts5ExprFirst(Fts5Expr *p, Fts5Index *pIdx, i64 iFirst, int bD } /* If the iterator is not at a real match, skip forward until it is. */ - while( pRoot->bNomatch && rc==SQLITE_OK && pRoot->bEof==0 ){ + while( pRoot->bNomatch ){ + assert( pRoot->bEof==0 && rc==SQLITE_OK ); rc = fts5ExprNodeNext(p, pRoot, 0, 0); } } @@ -172644,9 +173729,11 @@ static int sqlite3Fts5ExprFirst(Fts5Expr *p, Fts5Index *pIdx, i64 iFirst, int bD static int sqlite3Fts5ExprNext(Fts5Expr *p, i64 iLast){ int rc; Fts5ExprNode *pRoot = p->pRoot; + assert( pRoot->bEof==0 && pRoot->bNomatch==0 ); do { rc = fts5ExprNodeNext(p, pRoot, 0, 0); - }while( pRoot->bNomatch && pRoot->bEof==0 && rc==SQLITE_OK ); + assert( pRoot->bNomatch==0 || (rc==SQLITE_OK && pRoot->bEof==0) ); + }while( pRoot->bNomatch ); if( fts5RowidCmp(p, pRoot->iRowid, iLast)>0 ){ pRoot->bEof = 1; } @@ -172654,7 +173741,7 @@ static int sqlite3Fts5ExprNext(Fts5Expr *p, i64 iLast){ } static int sqlite3Fts5ExprEof(Fts5Expr *p){ - return (p->pRoot==0 || p->pRoot->bEof); + return p->pRoot->bEof; } static i64 sqlite3Fts5ExprRowid(Fts5Expr *p){ @@ -172679,10 +173766,10 @@ static void fts5ExprPhraseFree(Fts5ExprPhrase *pPhrase){ Fts5ExprTerm *pTerm = &pPhrase->aTerm[i]; sqlite3_free(pTerm->zTerm); sqlite3Fts5IterClose(pTerm->pIter); - for(pSyn=pTerm->pSynonym; pSyn; pSyn=pNext){ pNext = pSyn->pSynonym; sqlite3Fts5IterClose(pSyn->pIter); + fts5BufferFree((Fts5Buffer*)&pSyn[1]); sqlite3_free(pSyn); } } @@ -172764,19 +173851,21 @@ static int fts5ParseTokenize( TokenCtx *pCtx = (TokenCtx*)pContext; Fts5ExprPhrase *pPhrase = pCtx->pPhrase; + UNUSED_PARAM2(iUnused1, iUnused2); + /* If an error has already occurred, this is a no-op */ if( pCtx->rc!=SQLITE_OK ) return pCtx->rc; assert( pPhrase==0 || pPhrase->nTerm>0 ); if( pPhrase && (tflags & FTS5_TOKEN_COLOCATED) ){ Fts5ExprTerm *pSyn; - int nByte = sizeof(Fts5ExprTerm) + nToken+1; + int nByte = sizeof(Fts5ExprTerm) + sizeof(Fts5Buffer) + nToken+1; pSyn = (Fts5ExprTerm*)sqlite3_malloc(nByte); if( pSyn==0 ){ rc = SQLITE_NOMEM; }else{ memset(pSyn, 0, nByte); - pSyn->zTerm = (char*)&pSyn[1]; + pSyn->zTerm = ((char*)pSyn) + sizeof(Fts5ExprTerm) + sizeof(Fts5Buffer); memcpy(pSyn->zTerm, pToken, nToken); pSyn->pSynonym = pPhrase->aTerm[pPhrase->nTerm-1].pSynonym; pPhrase->aTerm[pPhrase->nTerm-1].pSynonym = pSyn; @@ -172899,7 +173988,6 @@ static Fts5ExprPhrase *sqlite3Fts5ParseTerm( ** expression passed as the second argument. */ static int sqlite3Fts5ExprClonePhrase( - Fts5Config *pConfig, Fts5Expr *pExpr, int iPhrase, Fts5Expr **ppNew @@ -172907,14 +173995,10 @@ static int sqlite3Fts5ExprClonePhrase( int rc = SQLITE_OK; /* Return code */ Fts5ExprPhrase *pOrig; /* The phrase extracted from pExpr */ int i; /* Used to iterate through phrase terms */ - Fts5Expr *pNew = 0; /* Expression to return via *ppNew */ - TokenCtx sCtx = {0,0}; /* Context object for fts5ParseTokenize */ - pOrig = pExpr->apExprPhrase[iPhrase]; - pNew = (Fts5Expr*)sqlite3Fts5MallocZero(&rc, sizeof(Fts5Expr)); if( rc==SQLITE_OK ){ pNew->apExprPhrase = (Fts5ExprPhrase**)sqlite3Fts5MallocZero(&rc, @@ -172946,6 +174030,7 @@ static int sqlite3Fts5ExprClonePhrase( if( rc==SQLITE_OK ){ /* All the allocations succeeded. Put the expression object together. */ pNew->pIndex = pExpr->pIndex; + pNew->pConfig = pExpr->pConfig; pNew->nPhrase = 1; pNew->apExprPhrase[0] = sCtx.pPhrase; pNew->pRoot->pNear->apPhrase[0] = sCtx.pPhrase; @@ -172954,8 +174039,10 @@ static int sqlite3Fts5ExprClonePhrase( if( pOrig->nTerm==1 && pOrig->aTerm[0].pSynonym==0 ){ pNew->pRoot->eType = FTS5_TERM; + pNew->pRoot->xNext = fts5ExprNodeNext_TERM; }else{ pNew->pRoot->eType = FTS5_STRING; + pNew->pRoot->xNext = fts5ExprNodeNext_STRING; } }else{ sqlite3Fts5ExprFree(pNew); @@ -173087,6 +174174,15 @@ static void sqlite3Fts5ParseSetColset( Fts5ExprNearset *pNear, Fts5Colset *pColset ){ + if( pParse->pConfig->eDetail==FTS5_DETAIL_NONE ){ + pParse->rc = SQLITE_ERROR; + pParse->zErr = sqlite3_mprintf( + "fts5: column queries are not supported (detail=none)" + ); + sqlite3_free(pColset); + return; + } + if( pNear ){ pNear->pColset = pColset; }else{ @@ -173094,6 +174190,38 @@ static void sqlite3Fts5ParseSetColset( } } +static void fts5ExprAssignXNext(Fts5ExprNode *pNode){ + switch( pNode->eType ){ + case FTS5_STRING: { + Fts5ExprNearset *pNear = pNode->pNear; + if( pNear->nPhrase==1 && pNear->apPhrase[0]->nTerm==1 + && pNear->apPhrase[0]->aTerm[0].pSynonym==0 + ){ + pNode->eType = FTS5_TERM; + pNode->xNext = fts5ExprNodeNext_TERM; + }else{ + pNode->xNext = fts5ExprNodeNext_STRING; + } + break; + }; + + case FTS5_OR: { + pNode->xNext = fts5ExprNodeNext_OR; + break; + }; + + case FTS5_AND: { + pNode->xNext = fts5ExprNodeNext_AND; + break; + }; + + default: assert( pNode->eType==FTS5_NOT ); { + pNode->xNext = fts5ExprNodeNext_NOT; + break; + }; + } +} + static void fts5ExprAddChildren(Fts5ExprNode *p, Fts5ExprNode *pSub){ if( p->eType!=FTS5_NOT && pSub->eType==p->eType ){ int nByte = sizeof(Fts5ExprNode*) * pSub->nChild; @@ -173143,17 +174271,27 @@ static Fts5ExprNode *sqlite3Fts5ParseNode( if( pRet ){ pRet->eType = eType; pRet->pNear = pNear; + fts5ExprAssignXNext(pRet); if( eType==FTS5_STRING ){ int iPhrase; for(iPhrase=0; iPhrasenPhrase; iPhrase++){ pNear->apPhrase[iPhrase]->pNode = pRet; } - if( pNear->nPhrase==1 - && pNear->apPhrase[0]->nTerm==1 - && pNear->apPhrase[0]->aTerm[0].pSynonym==0 + + if( pParse->pConfig->eDetail!=FTS5_DETAIL_FULL + && (pNear->nPhrase!=1 || pNear->apPhrase[0]->nTerm!=1) ){ - pRet->eType = FTS5_TERM; + assert( pParse->rc==SQLITE_OK ); + pParse->rc = SQLITE_ERROR; + assert( pParse->zErr==0 ); + pParse->zErr = sqlite3_mprintf( + "fts5: %s queries are not supported (detail!=full)", + pNear->nPhrase==1 ? "phrase": "NEAR" + ); + sqlite3_free(pRet); + pRet = 0; } + }else{ fts5ExprAddChildren(pRet, pLeft); fts5ExprAddChildren(pRet, pRight); @@ -173266,6 +174404,9 @@ static char *fts5ExprPrintTcl( for(iTerm=0; zRet && iTermnTerm; iTerm++){ char *zTerm = pPhrase->aTerm[iTerm].zTerm; zRet = fts5PrintfAppend(zRet, "%s%s", iTerm==0?"":" ", zTerm); + if( pPhrase->aTerm[iTerm].bPrefix ){ + zRet = fts5PrintfAppend(zRet, "*"); + } } if( zRet ) zRet = fts5PrintfAppend(zRet, "}"); @@ -173433,7 +174574,7 @@ static void fts5ExprFunction( } if( rc==SQLITE_OK ){ char *zText; - if( pExpr->pRoot==0 ){ + if( pExpr->pRoot->xNext==0 ){ zText = sqlite3_mprintf(""); }else if( bTcl ){ zText = fts5ExprPrintTcl(pConfig, zNearsetCmd, pExpr->pRoot); @@ -173533,7 +174674,7 @@ static int sqlite3Fts5ExprInit(Fts5Global *pGlobal, sqlite3 *db){ int rc = SQLITE_OK; void *pCtx = (void*)pGlobal; - for(i=0; rc==SQLITE_OK && i<(int)ArraySize(aFunc); i++){ + for(i=0; rc==SQLITE_OK && iz, -1, SQLITE_UTF8, pCtx, p->x, 0, 0); } @@ -173579,6 +174720,225 @@ static int sqlite3Fts5ExprPoslist(Fts5Expr *pExpr, int iPhrase, const u8 **pa){ return nRet; } +struct Fts5PoslistPopulator { + Fts5PoslistWriter writer; + int bOk; /* True if ok to populate */ + int bMiss; +}; + +static Fts5PoslistPopulator *sqlite3Fts5ExprClearPoslists(Fts5Expr *pExpr, int bLive){ + Fts5PoslistPopulator *pRet; + pRet = sqlite3_malloc(sizeof(Fts5PoslistPopulator)*pExpr->nPhrase); + if( pRet ){ + int i; + memset(pRet, 0, sizeof(Fts5PoslistPopulator)*pExpr->nPhrase); + for(i=0; inPhrase; i++){ + Fts5Buffer *pBuf = &pExpr->apExprPhrase[i]->poslist; + Fts5ExprNode *pNode = pExpr->apExprPhrase[i]->pNode; + assert( pExpr->apExprPhrase[i]->nTerm==1 ); + if( bLive && + (pBuf->n==0 || pNode->iRowid!=pExpr->pRoot->iRowid || pNode->bEof) + ){ + pRet[i].bMiss = 1; + }else{ + pBuf->n = 0; + } + } + } + return pRet; +} + +struct Fts5ExprCtx { + Fts5Expr *pExpr; + Fts5PoslistPopulator *aPopulator; + i64 iOff; +}; +typedef struct Fts5ExprCtx Fts5ExprCtx; + +/* +** TODO: Make this more efficient! +*/ +static int fts5ExprColsetTest(Fts5Colset *pColset, int iCol){ + int i; + for(i=0; inCol; i++){ + if( pColset->aiCol[i]==iCol ) return 1; + } + return 0; +} + +static int fts5ExprPopulatePoslistsCb( + void *pCtx, /* Copy of 2nd argument to xTokenize() */ + int tflags, /* Mask of FTS5_TOKEN_* flags */ + const char *pToken, /* Pointer to buffer containing token */ + int nToken, /* Size of token in bytes */ + int iUnused1, /* Byte offset of token within input text */ + int iUnused2 /* Byte offset of end of token within input text */ +){ + Fts5ExprCtx *p = (Fts5ExprCtx*)pCtx; + Fts5Expr *pExpr = p->pExpr; + int i; + + UNUSED_PARAM2(iUnused1, iUnused2); + + if( (tflags & FTS5_TOKEN_COLOCATED)==0 ) p->iOff++; + for(i=0; inPhrase; i++){ + Fts5ExprTerm *pTerm; + if( p->aPopulator[i].bOk==0 ) continue; + for(pTerm=&pExpr->apExprPhrase[i]->aTerm[0]; pTerm; pTerm=pTerm->pSynonym){ + int nTerm = strlen(pTerm->zTerm); + if( (nTerm==nToken || (nTermbPrefix)) + && memcmp(pTerm->zTerm, pToken, nTerm)==0 + ){ + int rc = sqlite3Fts5PoslistWriterAppend( + &pExpr->apExprPhrase[i]->poslist, &p->aPopulator[i].writer, p->iOff + ); + if( rc ) return rc; + break; + } + } + } + return SQLITE_OK; +} + +static int sqlite3Fts5ExprPopulatePoslists( + Fts5Config *pConfig, + Fts5Expr *pExpr, + Fts5PoslistPopulator *aPopulator, + int iCol, + const char *z, int n +){ + int i; + Fts5ExprCtx sCtx; + sCtx.pExpr = pExpr; + sCtx.aPopulator = aPopulator; + sCtx.iOff = (((i64)iCol) << 32) - 1; + + for(i=0; inPhrase; i++){ + Fts5ExprNode *pNode = pExpr->apExprPhrase[i]->pNode; + Fts5Colset *pColset = pNode->pNear->pColset; + if( (pColset && 0==fts5ExprColsetTest(pColset, iCol)) + || aPopulator[i].bMiss + ){ + aPopulator[i].bOk = 0; + }else{ + aPopulator[i].bOk = 1; + } + } + + return sqlite3Fts5Tokenize(pConfig, + FTS5_TOKENIZE_DOCUMENT, z, n, (void*)&sCtx, fts5ExprPopulatePoslistsCb + ); +} + +static void fts5ExprClearPoslists(Fts5ExprNode *pNode){ + if( pNode->eType==FTS5_TERM || pNode->eType==FTS5_STRING ){ + pNode->pNear->apPhrase[0]->poslist.n = 0; + }else{ + int i; + for(i=0; inChild; i++){ + fts5ExprClearPoslists(pNode->apChild[i]); + } + } +} + +static int fts5ExprCheckPoslists(Fts5ExprNode *pNode, i64 iRowid){ + pNode->iRowid = iRowid; + pNode->bEof = 0; + switch( pNode->eType ){ + case FTS5_TERM: + case FTS5_STRING: + return (pNode->pNear->apPhrase[0]->poslist.n>0); + + case FTS5_AND: { + int i; + for(i=0; inChild; i++){ + if( fts5ExprCheckPoslists(pNode->apChild[i], iRowid)==0 ){ + fts5ExprClearPoslists(pNode); + return 0; + } + } + break; + } + + case FTS5_OR: { + int i; + int bRet = 0; + for(i=0; inChild; i++){ + if( fts5ExprCheckPoslists(pNode->apChild[i], iRowid) ){ + bRet = 1; + } + } + return bRet; + } + + default: { + assert( pNode->eType==FTS5_NOT ); + if( 0==fts5ExprCheckPoslists(pNode->apChild[0], iRowid) + || 0!=fts5ExprCheckPoslists(pNode->apChild[1], iRowid) + ){ + fts5ExprClearPoslists(pNode); + return 0; + } + break; + } + } + return 1; +} + +static void sqlite3Fts5ExprCheckPoslists(Fts5Expr *pExpr, i64 iRowid){ + fts5ExprCheckPoslists(pExpr->pRoot, iRowid); +} + +static void fts5ExprClearEof(Fts5ExprNode *pNode){ + int i; + for(i=0; inChild; i++){ + fts5ExprClearEof(pNode->apChild[i]); + } + pNode->bEof = 0; +} +static void sqlite3Fts5ExprClearEof(Fts5Expr *pExpr){ + fts5ExprClearEof(pExpr->pRoot); +} + +/* +** This function is only called for detail=columns tables. +*/ +static int sqlite3Fts5ExprPhraseCollist( + Fts5Expr *pExpr, + int iPhrase, + const u8 **ppCollist, + int *pnCollist +){ + Fts5ExprPhrase *pPhrase = pExpr->apExprPhrase[iPhrase]; + Fts5ExprNode *pNode = pPhrase->pNode; + int rc = SQLITE_OK; + + assert( iPhrase>=0 && iPhrasenPhrase ); + assert( pExpr->pConfig->eDetail==FTS5_DETAIL_COLUMNS ); + + if( pNode->bEof==0 + && pNode->iRowid==pExpr->pRoot->iRowid + && pPhrase->poslist.n>0 + ){ + Fts5ExprTerm *pTerm = &pPhrase->aTerm[0]; + if( pTerm->pSynonym ){ + Fts5Buffer *pBuf = (Fts5Buffer*)&pTerm->pSynonym[1]; + rc = fts5ExprSynonymList( + pTerm, pNode->iRowid, pBuf, (u8**)ppCollist, pnCollist + ); + }else{ + *ppCollist = pPhrase->aTerm[0].pIter->pData; + *pnCollist = pPhrase->aTerm[0].pIter->nData; + } + }else{ + *ppCollist = 0; + *pnCollist = 0; + } + + return rc; +} + + /* ** 2014 August 11 ** @@ -173607,6 +174967,7 @@ typedef struct Fts5HashEntry Fts5HashEntry; struct Fts5Hash { + int eDetail; /* Copy of Fts5Config.eDetail */ int *pnByte; /* Pointer to bytes counter */ int nEntry; /* Number of entries currently in hash */ int nSlot; /* Size of aSlot[] array */ @@ -173642,9 +175003,10 @@ struct Fts5HashEntry { int nAlloc; /* Total size of allocation */ int iSzPoslist; /* Offset of space for 4-byte poslist size */ int nData; /* Total bytes of data (incl. structure) */ + int nKey; /* Length of zKey[] in bytes */ u8 bDel; /* Set delete-flag @ iSzPoslist */ - - int iCol; /* Column of last value written */ + u8 bContent; /* Set content-flag (detail=none mode) */ + i16 iCol; /* Column of last value written */ int iPos; /* Position of last value written */ i64 iRowid; /* Rowid of last value written */ char zKey[8]; /* Nul-terminated entry key */ @@ -173660,7 +175022,7 @@ struct Fts5HashEntry { /* ** Allocate a new hash table. */ -static int sqlite3Fts5HashNew(Fts5Hash **ppNew, int *pnByte){ +static int sqlite3Fts5HashNew(Fts5Config *pConfig, Fts5Hash **ppNew, int *pnByte){ int rc = SQLITE_OK; Fts5Hash *pNew; @@ -173671,6 +175033,7 @@ static int sqlite3Fts5HashNew(Fts5Hash **ppNew, int *pnByte){ int nByte; memset(pNew, 0, sizeof(Fts5Hash)); pNew->pnByte = pnByte; + pNew->eDetail = pConfig->eDetail; pNew->nSlot = 1024; nByte = sizeof(Fts5HashEntry*) * pNew->nSlot; @@ -173763,26 +175126,46 @@ static int fts5HashResize(Fts5Hash *pHash){ return SQLITE_OK; } -static void fts5HashAddPoslistSize(Fts5HashEntry *p){ +static void fts5HashAddPoslistSize(Fts5Hash *pHash, Fts5HashEntry *p){ if( p->iSzPoslist ){ u8 *pPtr = (u8*)p; - int nSz = (p->nData - p->iSzPoslist - 1); /* Size in bytes */ - int nPos = nSz*2 + p->bDel; /* Value of nPos field */ - - assert( p->bDel==0 || p->bDel==1 ); - if( nPos<=127 ){ - pPtr[p->iSzPoslist] = (u8)nPos; + if( pHash->eDetail==FTS5_DETAIL_NONE ){ + assert( p->nData==p->iSzPoslist ); + if( p->bDel ){ + pPtr[p->nData++] = 0x00; + if( p->bContent ){ + pPtr[p->nData++] = 0x00; + } + } }else{ - int nByte = sqlite3Fts5GetVarintLen((u32)nPos); - memmove(&pPtr[p->iSzPoslist + nByte], &pPtr[p->iSzPoslist + 1], nSz); - sqlite3Fts5PutVarint(&pPtr[p->iSzPoslist], nPos); - p->nData += (nByte-1); + int nSz = (p->nData - p->iSzPoslist - 1); /* Size in bytes */ + int nPos = nSz*2 + p->bDel; /* Value of nPos field */ + + assert( p->bDel==0 || p->bDel==1 ); + if( nPos<=127 ){ + pPtr[p->iSzPoslist] = (u8)nPos; + }else{ + int nByte = sqlite3Fts5GetVarintLen((u32)nPos); + memmove(&pPtr[p->iSzPoslist + nByte], &pPtr[p->iSzPoslist + 1], nSz); + sqlite3Fts5PutVarint(&pPtr[p->iSzPoslist], nPos); + p->nData += (nByte-1); + } } - p->bDel = 0; + p->iSzPoslist = 0; + p->bDel = 0; + p->bContent = 0; } } +/* +** Add an entry to the in-memory hash table. The key is the concatenation +** of bByte and (pToken/nToken). The value is (iRowid/iCol/iPos). +** +** (bByte || pToken) -> (iRowid,iCol,iPos) +** +** Or, if iCol is negative, then the value is a delete marker. +*/ static int sqlite3Fts5HashWrite( Fts5Hash *pHash, i64 iRowid, /* Rowid for this entry */ @@ -173795,13 +175178,16 @@ static int sqlite3Fts5HashWrite( Fts5HashEntry *p; u8 *pPtr; int nIncr = 0; /* Amount to increment (*pHash->pnByte) by */ + int bNew; /* If non-delete entry should be written */ + + bNew = (pHash->eDetail==FTS5_DETAIL_FULL); /* Attempt to locate an existing hash entry */ iHash = fts5HashKey2(pHash->nSlot, (u8)bByte, (const u8*)pToken, nToken); for(p=pHash->aSlot[iHash]; p; p=p->pHashNext){ if( p->zKey[0]==bByte + && p->nKey==nToken && memcmp(&p->zKey[1], pToken, nToken)==0 - && p->zKey[nToken+1]==0 ){ break; } @@ -173809,15 +175195,18 @@ static int sqlite3Fts5HashWrite( /* If an existing hash entry cannot be found, create a new one. */ if( p==0 ){ + /* Figure out how much space to allocate */ int nByte = FTS5_HASHENTRYSIZE + (nToken+1) + 1 + 64; if( nByte<128 ) nByte = 128; + /* Grow the Fts5Hash.aSlot[] array if necessary. */ if( (pHash->nEntry*2)>=pHash->nSlot ){ int rc = fts5HashResize(pHash); if( rc!=SQLITE_OK ) return rc; iHash = fts5HashKey2(pHash->nSlot, (u8)bByte, (const u8*)pToken, nToken); } + /* Allocate new Fts5HashEntry and add it to the hash table. */ p = (Fts5HashEntry*)sqlite3_malloc(nByte); if( !p ) return SQLITE_NOMEM; memset(p, 0, FTS5_HASHENTRYSIZE); @@ -173825,72 +175214,98 @@ static int sqlite3Fts5HashWrite( p->zKey[0] = bByte; memcpy(&p->zKey[1], pToken, nToken); assert( iHash==fts5HashKey(pHash->nSlot, (u8*)p->zKey, nToken+1) ); + p->nKey = nToken; p->zKey[nToken+1] = '\0'; p->nData = nToken+1 + 1 + FTS5_HASHENTRYSIZE; - p->nData += sqlite3Fts5PutVarint(&((u8*)p)[p->nData], iRowid); - p->iSzPoslist = p->nData; - p->nData += 1; - p->iRowid = iRowid; p->pHashNext = pHash->aSlot[iHash]; pHash->aSlot[iHash] = p; pHash->nEntry++; - nIncr += p->nData; - } - /* Check there is enough space to append a new entry. Worst case scenario - ** is: - ** - ** + 9 bytes for a new rowid, - ** + 4 byte reserved for the "poslist size" varint. - ** + 1 byte for a "new column" byte, - ** + 3 bytes for a new column number (16-bit max) as a varint, - ** + 5 bytes for the new position offset (32-bit max). - */ - if( (p->nAlloc - p->nData) < (9 + 4 + 1 + 3 + 5) ){ - int nNew = p->nAlloc * 2; - Fts5HashEntry *pNew; - Fts5HashEntry **pp; - pNew = (Fts5HashEntry*)sqlite3_realloc(p, nNew); - if( pNew==0 ) return SQLITE_NOMEM; - pNew->nAlloc = nNew; - for(pp=&pHash->aSlot[iHash]; *pp!=p; pp=&(*pp)->pHashNext); - *pp = pNew; - p = pNew; + /* Add the first rowid field to the hash-entry */ + p->nData += sqlite3Fts5PutVarint(&((u8*)p)[p->nData], iRowid); + p->iRowid = iRowid; + + p->iSzPoslist = p->nData; + if( pHash->eDetail!=FTS5_DETAIL_NONE ){ + p->nData += 1; + p->iCol = (pHash->eDetail==FTS5_DETAIL_FULL ? 0 : -1); + } + + nIncr += p->nData; + }else{ + + /* Appending to an existing hash-entry. Check that there is enough + ** space to append the largest possible new entry. Worst case scenario + ** is: + ** + ** + 9 bytes for a new rowid, + ** + 4 byte reserved for the "poslist size" varint. + ** + 1 byte for a "new column" byte, + ** + 3 bytes for a new column number (16-bit max) as a varint, + ** + 5 bytes for the new position offset (32-bit max). + */ + if( (p->nAlloc - p->nData) < (9 + 4 + 1 + 3 + 5) ){ + int nNew = p->nAlloc * 2; + Fts5HashEntry *pNew; + Fts5HashEntry **pp; + pNew = (Fts5HashEntry*)sqlite3_realloc(p, nNew); + if( pNew==0 ) return SQLITE_NOMEM; + pNew->nAlloc = nNew; + for(pp=&pHash->aSlot[iHash]; *pp!=p; pp=&(*pp)->pHashNext); + *pp = pNew; + p = pNew; + } + nIncr -= p->nData; } + assert( (p->nAlloc - p->nData) >= (9 + 4 + 1 + 3 + 5) ); + pPtr = (u8*)p; - nIncr -= p->nData; /* If this is a new rowid, append the 4-byte size field for the previous ** entry, and the new rowid for this entry. */ if( iRowid!=p->iRowid ){ - fts5HashAddPoslistSize(p); + fts5HashAddPoslistSize(pHash, p); p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iRowid - p->iRowid); - p->iSzPoslist = p->nData; - p->nData += 1; - p->iCol = 0; - p->iPos = 0; p->iRowid = iRowid; + bNew = 1; + p->iSzPoslist = p->nData; + if( pHash->eDetail!=FTS5_DETAIL_NONE ){ + p->nData += 1; + p->iCol = (pHash->eDetail==FTS5_DETAIL_FULL ? 0 : -1); + p->iPos = 0; + } } if( iCol>=0 ){ - /* Append a new column value, if necessary */ - assert( iCol>=p->iCol ); - if( iCol!=p->iCol ){ - pPtr[p->nData++] = 0x01; - p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iCol); - p->iCol = iCol; - p->iPos = 0; - } + if( pHash->eDetail==FTS5_DETAIL_NONE ){ + p->bContent = 1; + }else{ + /* Append a new column value, if necessary */ + assert( iCol>=p->iCol ); + if( iCol!=p->iCol ){ + if( pHash->eDetail==FTS5_DETAIL_FULL ){ + pPtr[p->nData++] = 0x01; + p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iCol); + p->iCol = iCol; + p->iPos = 0; + }else{ + bNew = 1; + p->iCol = iPos = iCol; + } + } - /* Append the new position offset */ - p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iPos - p->iPos + 2); - p->iPos = iPos; + /* Append the new position offset, if necessary */ + if( bNew ){ + p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iPos - p->iPos + 2); + p->iPos = iPos; + } + } }else{ /* This is a delete. Set the delete flag. */ p->bDel = 1; } - nIncr += p->nData; + nIncr += p->nData; *pHash->pnByte += nIncr; return SQLITE_OK; } @@ -174004,7 +175419,7 @@ static int sqlite3Fts5HashQuery( } if( p ){ - fts5HashAddPoslistSize(p); + fts5HashAddPoslistSize(pHash, p); *ppDoclist = (const u8*)&p->zKey[nTerm+1]; *pnDoclist = p->nData - (FTS5_HASHENTRYSIZE + nTerm + 1); }else{ @@ -174040,7 +175455,7 @@ static void sqlite3Fts5HashScanEntry( Fts5HashEntry *p; if( (p = pHash->pScan) ){ int nTerm = (int)strlen(p->zKey); - fts5HashAddPoslistSize(p); + fts5HashAddPoslistSize(pHash, p); *pzTerm = p->zKey; *ppDoclist = (const u8*)&p->zKey[nTerm+1]; *pnDoclist = p->nData - (FTS5_HASHENTRYSIZE + nTerm + 1); @@ -174315,6 +175730,7 @@ typedef struct Fts5Data Fts5Data; typedef struct Fts5DlidxIter Fts5DlidxIter; typedef struct Fts5DlidxLvl Fts5DlidxLvl; typedef struct Fts5DlidxWriter Fts5DlidxWriter; +typedef struct Fts5Iter Fts5Iter; typedef struct Fts5PageWriter Fts5PageWriter; typedef struct Fts5SegIter Fts5SegIter; typedef struct Fts5DoclistIter Fts5DoclistIter; @@ -174487,6 +175903,9 @@ struct Fts5SegIter { Fts5Data *pNextLeaf; /* Leaf page (iLeafPgno+1) */ int iLeafOffset; /* Byte offset within current leaf */ + /* Next method */ + void (*xNext)(Fts5Index*, Fts5SegIter*, int*); + /* The page and offset from which the current term was read. The offset ** is the offset of the first rowid in the current doclist. */ int iTermLeafPgno; @@ -174506,7 +175925,7 @@ struct Fts5SegIter { Fts5Buffer term; /* Current term */ i64 iRowid; /* Current rowid */ int nPos; /* Number of bytes in current position list */ - int bDel; /* True if the delete flag is set */ + u8 bDel; /* True if the delete flag is set */ }; /* @@ -174520,7 +175939,6 @@ struct Fts5SegIter { #define FTS5_SEGITER_ONETERM 0x01 #define FTS5_SEGITER_REVERSE 0x02 - /* ** Argument is a pointer to an Fts5Data structure that contains a leaf ** page. This macro evaluates to true if the leaf contains no terms, or @@ -174555,16 +175973,20 @@ struct Fts5SegIter { ** Used by sqlite3Fts5IterPoslist() when the poslist needs to be buffered. ** There is no way to tell if this is populated or not. */ -struct Fts5IndexIter { +struct Fts5Iter { + Fts5IndexIter base; /* Base class containing output vars */ + Fts5Index *pIndex; /* Index that owns this iterator */ Fts5Structure *pStruct; /* Database structure for this iterator */ Fts5Buffer poslist; /* Buffer containing current poslist */ + Fts5Colset *pColset; /* Restrict matches to these columns */ + + /* Invoked to set output variables. */ + void (*xSetOutputs)(Fts5Iter*, Fts5SegIter*); int nSeg; /* Size of aSeg[] array */ int bRev; /* True to iterate in reverse order */ u8 bSkipEmpty; /* True to skip deleted entries */ - u8 bEof; /* True at EOF */ - u8 bFiltered; /* True if column-filter already applied */ i64 iSwitchRowid; /* Firstest rowid of other than aFirst[1] */ Fts5CResult *aFirst; /* Current merge state (see above) */ @@ -174654,17 +176076,6 @@ static int fts5BufferCompare(Fts5Buffer *pLeft, Fts5Buffer *pRight){ return (res==0 ? (pLeft->n - pRight->n) : res); } -#ifdef SQLITE_DEBUG -static int fts5BlobCompare( - const u8 *pLeft, int nLeft, - const u8 *pRight, int nRight -){ - int nCmp = MIN(nLeft, nRight); - int res = memcmp(pLeft, pRight, nCmp); - return (res==0 ? (nLeft - nRight) : res); -} -#endif - static int fts5LeafFirstTermOff(Fts5Data *pLeaf){ int ret; fts5GetVarint32(&pLeaf->p[pLeaf->szLeaf], ret); @@ -174756,6 +176167,7 @@ static Fts5Data *fts5DataRead(Fts5Index *p, i64 iRowid){ return pRet; } + /* ** Release a reference to data record returned by an earlier call to ** fts5DataRead(). @@ -174926,25 +176338,34 @@ static int fts5StructureDecode( int nTotal; int iSeg; - i += fts5GetVarint32(&pData[i], pLvl->nMerge); - i += fts5GetVarint32(&pData[i], nTotal); - assert( nTotal>=pLvl->nMerge ); - pLvl->aSeg = (Fts5StructureSegment*)sqlite3Fts5MallocZero(&rc, - nTotal * sizeof(Fts5StructureSegment) - ); + if( i>=nData ){ + rc = FTS5_CORRUPT; + }else{ + i += fts5GetVarint32(&pData[i], pLvl->nMerge); + i += fts5GetVarint32(&pData[i], nTotal); + assert( nTotal>=pLvl->nMerge ); + pLvl->aSeg = (Fts5StructureSegment*)sqlite3Fts5MallocZero(&rc, + nTotal * sizeof(Fts5StructureSegment) + ); + } if( rc==SQLITE_OK ){ pLvl->nSeg = nTotal; for(iSeg=0; iSeg=nData ){ + rc = FTS5_CORRUPT; + break; + } i += fts5GetVarint32(&pData[i], pLvl->aSeg[iSeg].iSegid); i += fts5GetVarint32(&pData[i], pLvl->aSeg[iSeg].pgnoFirst); i += fts5GetVarint32(&pData[i], pLvl->aSeg[iSeg].pgnoLast); } - }else{ - fts5StructureRelease(pRet); - pRet = 0; } } + if( rc!=SQLITE_OK ){ + fts5StructureRelease(pRet); + pRet = 0; + } } *ppOut = pRet; @@ -175546,13 +176967,29 @@ static int fts5GetPoslistSize(const u8 *p, int *pnSz, int *pbDel){ static void fts5SegIterLoadNPos(Fts5Index *p, Fts5SegIter *pIter){ if( p->rc==SQLITE_OK ){ int iOff = pIter->iLeafOffset; /* Offset to read at */ - int nSz; ASSERT_SZLEAF_OK(pIter->pLeaf); - fts5FastGetVarint32(pIter->pLeaf->p, iOff, nSz); - pIter->bDel = (nSz & 0x0001); - pIter->nPos = nSz>>1; + if( p->pConfig->eDetail==FTS5_DETAIL_NONE ){ + int iEod = MIN(pIter->iEndofDoclist, pIter->pLeaf->szLeaf); + pIter->bDel = 0; + pIter->nPos = 1; + if( iOffpLeaf->p[iOff]==0 ){ + pIter->bDel = 1; + iOff++; + if( iOffpLeaf->p[iOff]==0 ){ + pIter->nPos = 1; + iOff++; + }else{ + pIter->nPos = 0; + } + } + }else{ + int nSz; + fts5FastGetVarint32(pIter->pLeaf->p, iOff, nSz); + pIter->bDel = (nSz & 0x0001); + pIter->nPos = nSz>>1; + assert_nc( pIter->nPos>=0 ); + } pIter->iLeafOffset = iOff; - assert_nc( pIter->nPos>=0 ); } } @@ -175595,6 +177032,10 @@ static void fts5SegIterLoadTerm(Fts5Index *p, Fts5SegIter *pIter, int nKeep){ int nNew; /* Bytes of new data */ iOff += fts5GetVarint32(&a[iOff], nNew); + if( iOff+nNew>pIter->pLeaf->nn ){ + p->rc = FTS5_CORRUPT; + return; + } pIter->term.n = nKeep; fts5BufferAppendBlob(&p->rc, &pIter->term, nNew, &a[iOff]); iOff += nNew; @@ -175613,6 +177054,20 @@ static void fts5SegIterLoadTerm(Fts5Index *p, Fts5SegIter *pIter, int nKeep){ fts5SegIterLoadRowid(p, pIter); } +static void fts5SegIterNext(Fts5Index*, Fts5SegIter*, int*); +static void fts5SegIterNext_Reverse(Fts5Index*, Fts5SegIter*, int*); +static void fts5SegIterNext_None(Fts5Index*, Fts5SegIter*, int*); + +static void fts5SegIterSetNext(Fts5Index *p, Fts5SegIter *pIter){ + if( pIter->flags & FTS5_SEGITER_REVERSE ){ + pIter->xNext = fts5SegIterNext_Reverse; + }else if( p->pConfig->eDetail==FTS5_DETAIL_NONE ){ + pIter->xNext = fts5SegIterNext_None; + }else{ + pIter->xNext = fts5SegIterNext; + } +} + /* ** Initialize the iterator object pIter to iterate through the entries in ** segment pSeg. The iterator is left pointing to the first entry when @@ -175638,6 +177093,7 @@ static void fts5SegIterInit( if( p->rc==SQLITE_OK ){ memset(pIter, 0, sizeof(*pIter)); + fts5SegIterSetNext(p, pIter); pIter->pSeg = pSeg; pIter->iLeafPgno = pSeg->pgnoFirst-1; fts5SegIterNextPage(p, pIter); @@ -175669,6 +177125,7 @@ static void fts5SegIterInit( ** byte of the position list content associated with said rowid. */ static void fts5SegIterReverseInitPage(Fts5Index *p, Fts5SegIter *pIter){ + int eDetail = p->pConfig->eDetail; int n = pIter->pLeaf->szLeaf; int i = pIter->iLeafOffset; u8 *a = pIter->pLeaf->p; @@ -175681,15 +177138,24 @@ static void fts5SegIterReverseInitPage(Fts5Index *p, Fts5SegIter *pIter){ ASSERT_SZLEAF_OK(pIter->pLeaf); while( 1 ){ i64 iDelta = 0; - int nPos; - int bDummy; - i += fts5GetPoslistSize(&a[i], &nPos, &bDummy); - i += nPos; + if( eDetail==FTS5_DETAIL_NONE ){ + /* todo */ + if( i=n ) break; i += fts5GetVarint(&a[i], (u64*)&iDelta); pIter->iRowid += iDelta; + /* If necessary, grow the pIter->aRowidOffset[] array. */ if( iRowidOffset>=pIter->nRowidOffset ){ int nNew = pIter->nRowidOffset + 8; int *aNew = (int*)sqlite3_realloc(pIter->aRowidOffset, nNew*sizeof(int)); @@ -175763,11 +177229,115 @@ static void fts5SegIterReverseNewPage(Fts5Index *p, Fts5SegIter *pIter){ ** points to a delete marker. A delete marker is an entry with a 0 byte ** position-list. */ -static int fts5MultiIterIsEmpty(Fts5Index *p, Fts5IndexIter *pIter){ +static int fts5MultiIterIsEmpty(Fts5Index *p, Fts5Iter *pIter){ Fts5SegIter *pSeg = &pIter->aSeg[pIter->aFirst[1].iFirst]; return (p->rc==SQLITE_OK && pSeg->pLeaf && pSeg->nPos==0); } +/* +** Advance iterator pIter to the next entry. +** +** This version of fts5SegIterNext() is only used by reverse iterators. +*/ +static void fts5SegIterNext_Reverse( + Fts5Index *p, /* FTS5 backend object */ + Fts5SegIter *pIter, /* Iterator to advance */ + int *pbUnused /* Unused */ +){ + assert( pIter->flags & FTS5_SEGITER_REVERSE ); + assert( pIter->pNextLeaf==0 ); + UNUSED_PARAM(pbUnused); + + if( pIter->iRowidOffset>0 ){ + u8 *a = pIter->pLeaf->p; + int iOff; + i64 iDelta; + + pIter->iRowidOffset--; + pIter->iLeafOffset = pIter->aRowidOffset[pIter->iRowidOffset]; + fts5SegIterLoadNPos(p, pIter); + iOff = pIter->iLeafOffset; + if( p->pConfig->eDetail!=FTS5_DETAIL_NONE ){ + iOff += pIter->nPos; + } + fts5GetVarint(&a[iOff], (u64*)&iDelta); + pIter->iRowid -= iDelta; + }else{ + fts5SegIterReverseNewPage(p, pIter); + } +} + +/* +** Advance iterator pIter to the next entry. +** +** This version of fts5SegIterNext() is only used if detail=none and the +** iterator is not a reverse direction iterator. +*/ +static void fts5SegIterNext_None( + Fts5Index *p, /* FTS5 backend object */ + Fts5SegIter *pIter, /* Iterator to advance */ + int *pbNewTerm /* OUT: Set for new term */ +){ + int iOff; + + assert( p->rc==SQLITE_OK ); + assert( (pIter->flags & FTS5_SEGITER_REVERSE)==0 ); + assert( p->pConfig->eDetail==FTS5_DETAIL_NONE ); + + ASSERT_SZLEAF_OK(pIter->pLeaf); + iOff = pIter->iLeafOffset; + + /* Next entry is on the next page */ + if( pIter->pSeg && iOff>=pIter->pLeaf->szLeaf ){ + fts5SegIterNextPage(p, pIter); + if( p->rc || pIter->pLeaf==0 ) return; + pIter->iRowid = 0; + iOff = 4; + } + + if( iOffiEndofDoclist ){ + /* Next entry is on the current page */ + i64 iDelta; + iOff += sqlite3Fts5GetVarint(&pIter->pLeaf->p[iOff], (u64*)&iDelta); + pIter->iLeafOffset = iOff; + pIter->iRowid += iDelta; + }else if( (pIter->flags & FTS5_SEGITER_ONETERM)==0 ){ + if( pIter->pSeg ){ + int nKeep = 0; + if( iOff!=fts5LeafFirstTermOff(pIter->pLeaf) ){ + iOff += fts5GetVarint32(&pIter->pLeaf->p[iOff], nKeep); + } + pIter->iLeafOffset = iOff; + fts5SegIterLoadTerm(p, pIter, nKeep); + }else{ + const u8 *pList = 0; + const char *zTerm = 0; + int nList; + sqlite3Fts5HashScanNext(p->pHash); + sqlite3Fts5HashScanEntry(p->pHash, &zTerm, &pList, &nList); + if( pList==0 ) goto next_none_eof; + pIter->pLeaf->p = (u8*)pList; + pIter->pLeaf->nn = nList; + pIter->pLeaf->szLeaf = nList; + pIter->iEndofDoclist = nList; + sqlite3Fts5BufferSet(&p->rc,&pIter->term, (int)strlen(zTerm), (u8*)zTerm); + pIter->iLeafOffset = fts5GetVarint(pList, (u64*)&pIter->iRowid); + } + + if( pbNewTerm ) *pbNewTerm = 1; + }else{ + goto next_none_eof; + } + + fts5SegIterLoadNPos(p, pIter); + + return; + next_none_eof: + fts5DataRelease(pIter->pLeaf); + pIter->pLeaf = 0; +} + + /* ** Advance iterator pIter to the next entry. ** @@ -175780,141 +177350,132 @@ static void fts5SegIterNext( Fts5SegIter *pIter, /* Iterator to advance */ int *pbNewTerm /* OUT: Set for new term */ ){ - assert( pbNewTerm==0 || *pbNewTerm==0 ); - if( p->rc==SQLITE_OK ){ - if( pIter->flags & FTS5_SEGITER_REVERSE ){ - assert( pIter->pNextLeaf==0 ); - if( pIter->iRowidOffset>0 ){ - u8 *a = pIter->pLeaf->p; - int iOff; - int nPos; - int bDummy; - i64 iDelta; + Fts5Data *pLeaf = pIter->pLeaf; + int iOff; + int bNewTerm = 0; + int nKeep = 0; + u8 *a; + int n; - pIter->iRowidOffset--; - pIter->iLeafOffset = iOff = pIter->aRowidOffset[pIter->iRowidOffset]; - iOff += fts5GetPoslistSize(&a[iOff], &nPos, &bDummy); - iOff += nPos; - fts5GetVarint(&a[iOff], (u64*)&iDelta); - pIter->iRowid -= iDelta; - fts5SegIterLoadNPos(p, pIter); - }else{ - fts5SegIterReverseNewPage(p, pIter); + assert( pbNewTerm==0 || *pbNewTerm==0 ); + assert( p->pConfig->eDetail!=FTS5_DETAIL_NONE ); + + /* Search for the end of the position list within the current page. */ + a = pLeaf->p; + n = pLeaf->szLeaf; + + ASSERT_SZLEAF_OK(pLeaf); + iOff = pIter->iLeafOffset + pIter->nPos; + + if( iOffiEndofDoclist ); + if( iOff>=pIter->iEndofDoclist ){ + bNewTerm = 1; + if( iOff!=fts5LeafFirstTermOff(pLeaf) ){ + iOff += fts5GetVarint32(&a[iOff], nKeep); } }else{ - Fts5Data *pLeaf = pIter->pLeaf; - int iOff; - int bNewTerm = 0; - int nKeep = 0; - - /* Search for the end of the position list within the current page. */ - u8 *a = pLeaf->p; - int n = pLeaf->szLeaf; + u64 iDelta; + iOff += sqlite3Fts5GetVarint(&a[iOff], &iDelta); + pIter->iRowid += iDelta; + assert_nc( iDelta>0 ); + } + pIter->iLeafOffset = iOff; + }else if( pIter->pSeg==0 ){ + const u8 *pList = 0; + const char *zTerm = 0; + int nList = 0; + assert( (pIter->flags & FTS5_SEGITER_ONETERM) || pbNewTerm ); + if( 0==(pIter->flags & FTS5_SEGITER_ONETERM) ){ + sqlite3Fts5HashScanNext(p->pHash); + sqlite3Fts5HashScanEntry(p->pHash, &zTerm, &pList, &nList); + } + if( pList==0 ){ + fts5DataRelease(pIter->pLeaf); + pIter->pLeaf = 0; + }else{ + pIter->pLeaf->p = (u8*)pList; + pIter->pLeaf->nn = nList; + pIter->pLeaf->szLeaf = nList; + pIter->iEndofDoclist = nList+1; + sqlite3Fts5BufferSet(&p->rc, &pIter->term, (int)strlen(zTerm), + (u8*)zTerm); + pIter->iLeafOffset = fts5GetVarint(pList, (u64*)&pIter->iRowid); + *pbNewTerm = 1; + } + }else{ + iOff = 0; + /* Next entry is not on the current page */ + while( iOff==0 ){ + fts5SegIterNextPage(p, pIter); + pLeaf = pIter->pLeaf; + if( pLeaf==0 ) break; ASSERT_SZLEAF_OK(pLeaf); - iOff = pIter->iLeafOffset + pIter->nPos; - - if( iOffiEndofDoclist ); - if( iOff>=pIter->iEndofDoclist ){ - bNewTerm = 1; - if( iOff!=fts5LeafFirstTermOff(pLeaf) ){ - iOff += fts5GetVarint32(&a[iOff], nKeep); - } - }else{ - u64 iDelta; - iOff += sqlite3Fts5GetVarint(&a[iOff], &iDelta); - pIter->iRowid += iDelta; - assert_nc( iDelta>0 ); - } + if( (iOff = fts5LeafFirstRowidOff(pLeaf)) && iOffszLeaf ){ + iOff += sqlite3Fts5GetVarint(&pLeaf->p[iOff], (u64*)&pIter->iRowid); pIter->iLeafOffset = iOff; - }else if( pIter->pSeg==0 ){ - const u8 *pList = 0; - const char *zTerm = 0; - int nList = 0; - assert( (pIter->flags & FTS5_SEGITER_ONETERM) || pbNewTerm ); - if( 0==(pIter->flags & FTS5_SEGITER_ONETERM) ){ - sqlite3Fts5HashScanNext(p->pHash); - sqlite3Fts5HashScanEntry(p->pHash, &zTerm, &pList, &nList); - } - if( pList==0 ){ - fts5DataRelease(pIter->pLeaf); - pIter->pLeaf = 0; - }else{ - pIter->pLeaf->p = (u8*)pList; - pIter->pLeaf->nn = nList; - pIter->pLeaf->szLeaf = nList; - pIter->iEndofDoclist = nList+1; - sqlite3Fts5BufferSet(&p->rc, &pIter->term, (int)strlen(zTerm), - (u8*)zTerm); - pIter->iLeafOffset = fts5GetVarint(pList, (u64*)&pIter->iRowid); - *pbNewTerm = 1; - } - }else{ - iOff = 0; - /* Next entry is not on the current page */ - while( iOff==0 ){ - fts5SegIterNextPage(p, pIter); - pLeaf = pIter->pLeaf; - if( pLeaf==0 ) break; - ASSERT_SZLEAF_OK(pLeaf); - if( (iOff = fts5LeafFirstRowidOff(pLeaf)) && iOffszLeaf ){ - iOff += sqlite3Fts5GetVarint(&pLeaf->p[iOff], (u64*)&pIter->iRowid); - pIter->iLeafOffset = iOff; - - if( pLeaf->nn>pLeaf->szLeaf ){ - pIter->iPgidxOff = pLeaf->szLeaf + fts5GetVarint32( - &pLeaf->p[pLeaf->szLeaf], pIter->iEndofDoclist + if( pLeaf->nn>pLeaf->szLeaf ){ + pIter->iPgidxOff = pLeaf->szLeaf + fts5GetVarint32( + &pLeaf->p[pLeaf->szLeaf], pIter->iEndofDoclist ); - } + } - } - else if( pLeaf->nn>pLeaf->szLeaf ){ - pIter->iPgidxOff = pLeaf->szLeaf + fts5GetVarint32( - &pLeaf->p[pLeaf->szLeaf], iOff + } + else if( pLeaf->nn>pLeaf->szLeaf ){ + pIter->iPgidxOff = pLeaf->szLeaf + fts5GetVarint32( + &pLeaf->p[pLeaf->szLeaf], iOff ); - pIter->iLeafOffset = iOff; - pIter->iEndofDoclist = iOff; - bNewTerm = 1; - } - if( iOff>=pLeaf->szLeaf ){ - p->rc = FTS5_CORRUPT; - return; - } - } + pIter->iLeafOffset = iOff; + pIter->iEndofDoclist = iOff; + bNewTerm = 1; } + assert_nc( iOffszLeaf ); + if( iOff>pLeaf->szLeaf ){ + p->rc = FTS5_CORRUPT; + return; + } + } + } - /* Check if the iterator is now at EOF. If so, return early. */ - if( pIter->pLeaf ){ - if( bNewTerm ){ - if( pIter->flags & FTS5_SEGITER_ONETERM ){ - fts5DataRelease(pIter->pLeaf); - pIter->pLeaf = 0; - }else{ - fts5SegIterLoadTerm(p, pIter, nKeep); - fts5SegIterLoadNPos(p, pIter); - if( pbNewTerm ) *pbNewTerm = 1; - } - }else{ - /* The following could be done by calling fts5SegIterLoadNPos(). But - ** this block is particularly performance critical, so equivalent - ** code is inlined. */ - int nSz; - assert( p->rc==SQLITE_OK ); - fts5FastGetVarint32(pIter->pLeaf->p, pIter->iLeafOffset, nSz); - pIter->bDel = (nSz & 0x0001); - pIter->nPos = nSz>>1; - assert_nc( pIter->nPos>=0 ); - } + /* Check if the iterator is now at EOF. If so, return early. */ + if( pIter->pLeaf ){ + if( bNewTerm ){ + if( pIter->flags & FTS5_SEGITER_ONETERM ){ + fts5DataRelease(pIter->pLeaf); + pIter->pLeaf = 0; + }else{ + fts5SegIterLoadTerm(p, pIter, nKeep); + fts5SegIterLoadNPos(p, pIter); + if( pbNewTerm ) *pbNewTerm = 1; } + }else{ + /* The following could be done by calling fts5SegIterLoadNPos(). But + ** this block is particularly performance critical, so equivalent + ** code is inlined. + ** + ** Later: Switched back to fts5SegIterLoadNPos() because it supports + ** detail=none mode. Not ideal. + */ + int nSz; + assert( p->rc==SQLITE_OK ); + fts5FastGetVarint32(pIter->pLeaf->p, pIter->iLeafOffset, nSz); + pIter->bDel = (nSz & 0x0001); + pIter->nPos = nSz>>1; + assert_nc( pIter->nPos>=0 ); } } } #define SWAPVAL(T, a, b) { T tmp; tmp=a; a=b; b=tmp; } +#define fts5IndexSkipVarint(a, iOff) { \ + int iEnd = iOff+9; \ + while( (a[iOff++] & 0x80) && iOffiLeafOffset -= sqlite3Fts5GetVarintLen(pIter->nPos*2+pIter->bDel); + int iPoslist; + if( pIter->iTermLeafPgno==pIter->iLeafPgno ){ + iPoslist = pIter->iTermLeafOffset; + }else{ + iPoslist = 4; + } + fts5IndexSkipVarint(pLeaf->p, iPoslist); + pIter->iLeafOffset = iPoslist; /* If this condition is true then the largest rowid for the current ** term may not be stored on the current page. So search forward to @@ -176019,11 +177587,6 @@ static void fts5SegIterLoadDlidx(Fts5Index *p, Fts5SegIter *pIter){ pIter->pDlidx = fts5DlidxIterInit(p, bRev, iSeg, pIter->iTermLeafPgno); } -#define fts5IndexSkipVarint(a, iOff) { \ - int iEnd = iOff+9; \ - while( (a[iOff++] & 0x80) && iOffn ){ + p->rc = FTS5_CORRUPT; + return; + } while( 1 ){ @@ -176161,7 +177728,6 @@ static void fts5LeafSeek( */ static void fts5SegIterSeekInit( Fts5Index *p, /* FTS5 backend */ - Fts5Buffer *pBuf, /* Buffer to use for loading pages */ const u8 *pTerm, int nTerm, /* Term to seek to */ int flags, /* Mask of FTS5INDEX_XXX flags */ Fts5StructureSegment *pSeg, /* Description of segment */ @@ -176171,9 +177737,6 @@ static void fts5SegIterSeekInit( int bGe = (flags & FTS5INDEX_QUERY_SCAN); int bDlidx = 0; /* True if there is a doclist-index */ - static int nCall = 0; - nCall++; - assert( bGe==0 || (flags & FTS5INDEX_QUERY_DESC)==0 ); assert( pTerm && nTerm ); memset(pIter, 0, sizeof(*pIter)); @@ -176226,6 +177789,8 @@ static void fts5SegIterSeekInit( } } + fts5SegIterSetNext(p, pIter); + /* Either: ** ** 1) an error has occurred, or @@ -176283,7 +177848,7 @@ static void fts5SegIterHashInit( pLeaf->nn = pLeaf->szLeaf = nList; pIter->pLeaf = pLeaf; pIter->iLeafOffset = fts5GetVarint(pLeaf->p, (u64*)&pIter->iRowid); - pIter->iEndofDoclist = pLeaf->nn+1; + pIter->iEndofDoclist = pLeaf->nn; if( flags & FTS5INDEX_QUERY_DESC ){ pIter->flags |= FTS5_SEGITER_REVERSE; @@ -176292,6 +177857,8 @@ static void fts5SegIterHashInit( fts5SegIterLoadNPos(p, pIter); } } + + fts5SegIterSetNext(p, pIter); } /* @@ -176315,7 +177882,7 @@ static void fts5SegIterClear(Fts5SegIter *pIter){ ** two iterators. */ static void fts5AssertComparisonResult( - Fts5IndexIter *pIter, + Fts5Iter *pIter, Fts5SegIter *p1, Fts5SegIter *p2, Fts5CResult *pRes @@ -176356,12 +177923,12 @@ static void fts5AssertComparisonResult( ** statement used to verify that the contents of the pIter->aFirst[] array ** are correct. */ -static void fts5AssertMultiIterSetup(Fts5Index *p, Fts5IndexIter *pIter){ +static void fts5AssertMultiIterSetup(Fts5Index *p, Fts5Iter *pIter){ if( p->rc==SQLITE_OK ){ Fts5SegIter *pFirst = &pIter->aSeg[ pIter->aFirst[1].iFirst ]; int i; - assert( (pFirst->pLeaf==0)==pIter->bEof ); + assert( (pFirst->pLeaf==0)==pIter->base.bEof ); /* Check that pIter->iSwitchRowid is set correctly. */ for(i=0; inSeg; i++){ @@ -176401,7 +177968,7 @@ static void fts5AssertMultiIterSetup(Fts5Index *p, Fts5IndexIter *pIter){ ** to a key that is a duplicate of another, higher priority, ** segment-iterator in the pSeg->aSeg[] array. */ -static int fts5MultiIterDoCompare(Fts5IndexIter *pIter, int iOut){ +static int fts5MultiIterDoCompare(Fts5Iter *pIter, int iOut){ int i1; /* Index of left-hand Fts5SegIter */ int i2; /* Index of right-hand Fts5SegIter */ int iRes; @@ -176535,7 +178102,7 @@ static void fts5SegIterNextFrom( } do{ - if( bMove ) fts5SegIterNext(p, pIter, 0); + if( bMove && p->rc==SQLITE_OK ) pIter->xNext(p, pIter, 0); if( pIter->pLeaf==0 ) break; if( bRev==0 && pIter->iRowid>=iMatch ) break; if( bRev!=0 && pIter->iRowid<=iMatch ) break; @@ -176547,7 +178114,7 @@ static void fts5SegIterNextFrom( /* ** Free the iterator object passed as the second argument. */ -static void fts5MultiIterFree(Fts5Index *p, Fts5IndexIter *pIter){ +static void fts5MultiIterFree(Fts5Iter *pIter){ if( pIter ){ int i; for(i=0; inSeg; i++){ @@ -176561,7 +178128,7 @@ static void fts5MultiIterFree(Fts5Index *p, Fts5IndexIter *pIter){ static void fts5MultiIterAdvanced( Fts5Index *p, /* FTS5 backend to iterate within */ - Fts5IndexIter *pIter, /* Iterator to update aFirst[] array for */ + Fts5Iter *pIter, /* Iterator to update aFirst[] array for */ int iChanged, /* Index of sub-iterator just advanced */ int iMinset /* Minimum entry in aFirst[] to set */ ){ @@ -176569,7 +178136,9 @@ static void fts5MultiIterAdvanced( for(i=(pIter->nSeg+iChanged)/2; i>=iMinset && p->rc==SQLITE_OK; i=i/2){ int iEq; if( (iEq = fts5MultiIterDoCompare(pIter, i)) ){ - fts5SegIterNext(p, &pIter->aSeg[iEq], 0); + Fts5SegIter *pSeg = &pIter->aSeg[iEq]; + assert( p->rc==SQLITE_OK ); + pSeg->xNext(p, pSeg, 0); i = pIter->nSeg + iEq; } } @@ -176586,9 +178155,9 @@ static void fts5MultiIterAdvanced( ** that it deals with more complicated cases as well. */ static int fts5MultiIterAdvanceRowid( - Fts5Index *p, /* FTS5 backend to iterate within */ - Fts5IndexIter *pIter, /* Iterator to update aFirst[] array for */ - int iChanged /* Index of sub-iterator just advanced */ + Fts5Iter *pIter, /* Iterator to update aFirst[] array for */ + int iChanged, /* Index of sub-iterator just advanced */ + Fts5SegIter **ppFirst ){ Fts5SegIter *pNew = &pIter->aSeg[iChanged]; @@ -176621,15 +178190,16 @@ static int fts5MultiIterAdvanceRowid( } } + *ppFirst = pNew; return 0; } /* ** Set the pIter->bEof variable based on the state of the sub-iterators. */ -static void fts5MultiIterSetEof(Fts5IndexIter *pIter){ +static void fts5MultiIterSetEof(Fts5Iter *pIter){ Fts5SegIter *pSeg = &pIter->aSeg[ pIter->aFirst[1].iFirst ]; - pIter->bEof = pSeg->pLeaf==0; + pIter->base.bEof = pSeg->pLeaf==0; pIter->iSwitchRowid = pSeg->iRowid; } @@ -176642,39 +178212,44 @@ static void fts5MultiIterSetEof(Fts5IndexIter *pIter){ */ static void fts5MultiIterNext( Fts5Index *p, - Fts5IndexIter *pIter, + Fts5Iter *pIter, int bFrom, /* True if argument iFrom is valid */ i64 iFrom /* Advance at least as far as this */ ){ - if( p->rc==SQLITE_OK ){ - int bUseFrom = bFrom; - do { - int iFirst = pIter->aFirst[1].iFirst; - int bNewTerm = 0; - Fts5SegIter *pSeg = &pIter->aSeg[iFirst]; - assert( p->rc==SQLITE_OK ); - if( bUseFrom && pSeg->pDlidx ){ - fts5SegIterNextFrom(p, pSeg, iFrom); - }else{ - fts5SegIterNext(p, pSeg, &bNewTerm); - } + int bUseFrom = bFrom; + while( p->rc==SQLITE_OK ){ + int iFirst = pIter->aFirst[1].iFirst; + int bNewTerm = 0; + Fts5SegIter *pSeg = &pIter->aSeg[iFirst]; + assert( p->rc==SQLITE_OK ); + if( bUseFrom && pSeg->pDlidx ){ + fts5SegIterNextFrom(p, pSeg, iFrom); + }else{ + pSeg->xNext(p, pSeg, &bNewTerm); + } - if( pSeg->pLeaf==0 || bNewTerm - || fts5MultiIterAdvanceRowid(p, pIter, iFirst) - ){ - fts5MultiIterAdvanced(p, pIter, iFirst, 1); - fts5MultiIterSetEof(pIter); - } - fts5AssertMultiIterSetup(p, pIter); + if( pSeg->pLeaf==0 || bNewTerm + || fts5MultiIterAdvanceRowid(pIter, iFirst, &pSeg) + ){ + fts5MultiIterAdvanced(p, pIter, iFirst, 1); + fts5MultiIterSetEof(pIter); + pSeg = &pIter->aSeg[pIter->aFirst[1].iFirst]; + if( pSeg->pLeaf==0 ) return; + } - bUseFrom = 0; - }while( pIter->bSkipEmpty && fts5MultiIterIsEmpty(p, pIter) ); + fts5AssertMultiIterSetup(p, pIter); + assert( pSeg==&pIter->aSeg[pIter->aFirst[1].iFirst] && pSeg->pLeaf ); + if( pIter->bSkipEmpty==0 || pSeg->nPos ){ + pIter->xSetOutputs(pIter, pSeg); + return; + } + bUseFrom = 0; } } static void fts5MultiIterNext2( Fts5Index *p, - Fts5IndexIter *pIter, + Fts5Iter *pIter, int *pbNewTerm /* OUT: True if *might* be new term */ ){ assert( pIter->bSkipEmpty ); @@ -176684,9 +178259,10 @@ static void fts5MultiIterNext2( Fts5SegIter *pSeg = &pIter->aSeg[iFirst]; int bNewTerm = 0; - fts5SegIterNext(p, pSeg, &bNewTerm); + assert( p->rc==SQLITE_OK ); + pSeg->xNext(p, pSeg, &bNewTerm); if( pSeg->pLeaf==0 || bNewTerm - || fts5MultiIterAdvanceRowid(p, pIter, iFirst) + || fts5MultiIterAdvanceRowid(pIter, iFirst, &pSeg) ){ fts5MultiIterAdvanced(p, pIter, iFirst, 1); fts5MultiIterSetEof(pIter); @@ -176700,17 +178276,20 @@ static void fts5MultiIterNext2( } } +static void fts5IterSetOutputs_Noop(Fts5Iter *pUnused1, Fts5SegIter *pUnused2){ + UNUSED_PARAM2(pUnused1, pUnused2); +} -static Fts5IndexIter *fts5MultiIterAlloc( +static Fts5Iter *fts5MultiIterAlloc( Fts5Index *p, /* FTS5 backend to iterate within */ int nSeg ){ - Fts5IndexIter *pNew; + Fts5Iter *pNew; int nSlot; /* Power of two >= nSeg */ for(nSlot=2; nSlotaSeg[] */ sizeof(Fts5CResult) * nSlot /* pNew->aFirst[] */ ); @@ -176718,196 +178297,122 @@ static Fts5IndexIter *fts5MultiIterAlloc( pNew->nSeg = nSlot; pNew->aFirst = (Fts5CResult*)&pNew->aSeg[nSlot]; pNew->pIndex = p; + pNew->xSetOutputs = fts5IterSetOutputs_Noop; } return pNew; } -/* -** Allocate a new Fts5IndexIter object. -** -** The new object will be used to iterate through data in structure pStruct. -** If iLevel is -ve, then all data in all segments is merged. Or, if iLevel -** is zero or greater, data from the first nSegment segments on level iLevel -** is merged. -** -** The iterator initially points to the first term/rowid entry in the -** iterated data. -*/ -static void fts5MultiIterNew( - Fts5Index *p, /* FTS5 backend to iterate within */ - Fts5Structure *pStruct, /* Structure of specific index */ - int bSkipEmpty, /* True to ignore delete-keys */ - int flags, /* FTS5INDEX_QUERY_XXX flags */ - const u8 *pTerm, int nTerm, /* Term to seek to (or NULL/0) */ - int iLevel, /* Level to iterate (-1 for all) */ - int nSegment, /* Number of segments to merge (iLevel>=0) */ - Fts5IndexIter **ppOut /* New object */ +static void fts5PoslistCallback( + Fts5Index *pUnused, + void *pContext, + const u8 *pChunk, int nChunk ){ - int nSeg = 0; /* Number of segment-iters in use */ - int iIter = 0; /* */ - int iSeg; /* Used to iterate through segments */ - Fts5Buffer buf = {0,0,0}; /* Buffer used by fts5SegIterSeekInit() */ - Fts5StructureLevel *pLvl; - Fts5IndexIter *pNew; + UNUSED_PARAM(pUnused); + assert_nc( nChunk>=0 ); + if( nChunk>0 ){ + fts5BufferSafeAppendBlob((Fts5Buffer*)pContext, pChunk, nChunk); + } +} - assert( (pTerm==0 && nTerm==0) || iLevel<0 ); +typedef struct PoslistCallbackCtx PoslistCallbackCtx; +struct PoslistCallbackCtx { + Fts5Buffer *pBuf; /* Append to this buffer */ + Fts5Colset *pColset; /* Restrict matches to this column */ + int eState; /* See above */ +}; - /* Allocate space for the new multi-seg-iterator. */ - if( p->rc==SQLITE_OK ){ - if( iLevel<0 ){ - assert( pStruct->nSegment==fts5StructureCountSegments(pStruct) ); - nSeg = pStruct->nSegment; - nSeg += (p->pHash ? 1 : 0); - }else{ - nSeg = MIN(pStruct->aLevel[iLevel].nSeg, nSegment); +typedef struct PoslistOffsetsCtx PoslistOffsetsCtx; +struct PoslistOffsetsCtx { + Fts5Buffer *pBuf; /* Append to this buffer */ + Fts5Colset *pColset; /* Restrict matches to this column */ + int iRead; + int iWrite; +}; + +/* +** TODO: Make this more efficient! +*/ +static int fts5IndexColsetTest(Fts5Colset *pColset, int iCol){ + int i; + for(i=0; inCol; i++){ + if( pColset->aiCol[i]==iCol ) return 1; + } + return 0; +} + +static void fts5PoslistOffsetsCallback( + Fts5Index *pUnused, + void *pContext, + const u8 *pChunk, int nChunk +){ + PoslistOffsetsCtx *pCtx = (PoslistOffsetsCtx*)pContext; + UNUSED_PARAM(pUnused); + assert_nc( nChunk>=0 ); + if( nChunk>0 ){ + int i = 0; + while( iiRead - 2; + pCtx->iRead = iVal; + if( fts5IndexColsetTest(pCtx->pColset, iVal) ){ + fts5BufferSafeAppendVarint(pCtx->pBuf, iVal + 2 - pCtx->iWrite); + pCtx->iWrite = iVal; + } } } - *ppOut = pNew = fts5MultiIterAlloc(p, nSeg); - if( pNew==0 ) return; - pNew->bRev = (0!=(flags & FTS5INDEX_QUERY_DESC)); - pNew->bSkipEmpty = (u8)bSkipEmpty; - pNew->pStruct = pStruct; - fts5StructureRef(pStruct); +} - /* Initialize each of the component segment iterators. */ - if( iLevel<0 ){ - Fts5StructureLevel *pEnd = &pStruct->aLevel[pStruct->nLevel]; - if( p->pHash ){ - /* Add a segment iterator for the current contents of the hash table. */ - Fts5SegIter *pIter = &pNew->aSeg[iIter++]; - fts5SegIterHashInit(p, pTerm, nTerm, flags, pIter); +static void fts5PoslistFilterCallback( + Fts5Index *pUnused, + void *pContext, + const u8 *pChunk, int nChunk +){ + PoslistCallbackCtx *pCtx = (PoslistCallbackCtx*)pContext; + UNUSED_PARAM(pUnused); + assert_nc( nChunk>=0 ); + if( nChunk>0 ){ + /* Search through to find the first varint with value 1. This is the + ** start of the next columns hits. */ + int i = 0; + int iStart = 0; + + if( pCtx->eState==2 ){ + int iCol; + fts5FastGetVarint32(pChunk, i, iCol); + if( fts5IndexColsetTest(pCtx->pColset, iCol) ){ + pCtx->eState = 1; + fts5BufferSafeAppendVarint(pCtx->pBuf, 1); + }else{ + pCtx->eState = 0; + } } - for(pLvl=&pStruct->aLevel[0]; pLvlnSeg-1; iSeg>=0; iSeg--){ - Fts5StructureSegment *pSeg = &pLvl->aSeg[iSeg]; - Fts5SegIter *pIter = &pNew->aSeg[iIter++]; - if( pTerm==0 ){ - fts5SegIterInit(p, pSeg, pIter); + + do { + while( ieState ){ + fts5BufferSafeAppendBlob(pCtx->pBuf, &pChunk[iStart], i-iStart); + } + if( i=nChunk ){ + pCtx->eState = 2; }else{ - fts5SegIterSeekInit(p, &buf, pTerm, nTerm, flags, pSeg, pIter); + fts5FastGetVarint32(pChunk, i, iCol); + pCtx->eState = fts5IndexColsetTest(pCtx->pColset, iCol); + if( pCtx->eState ){ + fts5BufferSafeAppendBlob(pCtx->pBuf, &pChunk[iStart], i-iStart); + iStart = i; + } } } - } - }else{ - pLvl = &pStruct->aLevel[iLevel]; - for(iSeg=nSeg-1; iSeg>=0; iSeg--){ - fts5SegIterInit(p, &pLvl->aSeg[iSeg], &pNew->aSeg[iIter++]); - } + }while( irc==SQLITE_OK ){ - for(iIter=pNew->nSeg-1; iIter>0; iIter--){ - int iEq; - if( (iEq = fts5MultiIterDoCompare(pNew, iIter)) ){ - fts5SegIterNext(p, &pNew->aSeg[iEq], 0); - fts5MultiIterAdvanced(p, pNew, iEq, iIter); - } - } - fts5MultiIterSetEof(pNew); - fts5AssertMultiIterSetup(p, pNew); - - if( pNew->bSkipEmpty && fts5MultiIterIsEmpty(p, pNew) ){ - fts5MultiIterNext(p, pNew, 0, 0); - } - }else{ - fts5MultiIterFree(p, pNew); - *ppOut = 0; - } - fts5BufferFree(&buf); -} - -/* -** Create an Fts5IndexIter that iterates through the doclist provided -** as the second argument. -*/ -static void fts5MultiIterNew2( - Fts5Index *p, /* FTS5 backend to iterate within */ - Fts5Data *pData, /* Doclist to iterate through */ - int bDesc, /* True for descending rowid order */ - Fts5IndexIter **ppOut /* New object */ -){ - Fts5IndexIter *pNew; - pNew = fts5MultiIterAlloc(p, 2); - if( pNew ){ - Fts5SegIter *pIter = &pNew->aSeg[1]; - - pNew->bFiltered = 1; - pIter->flags = FTS5_SEGITER_ONETERM; - if( pData->szLeaf>0 ){ - pIter->pLeaf = pData; - pIter->iLeafOffset = fts5GetVarint(pData->p, (u64*)&pIter->iRowid); - pIter->iEndofDoclist = pData->nn; - pNew->aFirst[1].iFirst = 1; - if( bDesc ){ - pNew->bRev = 1; - pIter->flags |= FTS5_SEGITER_REVERSE; - fts5SegIterReverseInitPage(p, pIter); - }else{ - fts5SegIterLoadNPos(p, pIter); - } - pData = 0; - }else{ - pNew->bEof = 1; - } - - *ppOut = pNew; - } - - fts5DataRelease(pData); -} - -/* -** Return true if the iterator is at EOF or if an error has occurred. -** False otherwise. -*/ -static int fts5MultiIterEof(Fts5Index *p, Fts5IndexIter *pIter){ - assert( p->rc - || (pIter->aSeg[ pIter->aFirst[1].iFirst ].pLeaf==0)==pIter->bEof - ); - return (p->rc || pIter->bEof); -} - -/* -** Return the rowid of the entry that the iterator currently points -** to. If the iterator points to EOF when this function is called the -** results are undefined. -*/ -static i64 fts5MultiIterRowid(Fts5IndexIter *pIter){ - assert( pIter->aSeg[ pIter->aFirst[1].iFirst ].pLeaf ); - return pIter->aSeg[ pIter->aFirst[1].iFirst ].iRowid; -} - -/* -** Move the iterator to the next entry at or following iMatch. -*/ -static void fts5MultiIterNextFrom( - Fts5Index *p, - Fts5IndexIter *pIter, - i64 iMatch -){ - while( 1 ){ - i64 iRowid; - fts5MultiIterNext(p, pIter, 1, iMatch); - if( fts5MultiIterEof(p, pIter) ) break; - iRowid = fts5MultiIterRowid(pIter); - if( pIter->bRev==0 && iRowid>=iMatch ) break; - if( pIter->bRev!=0 && iRowid<=iMatch ) break; - } -} - -/* -** Return a pointer to a buffer containing the term associated with the -** entry that the iterator currently points to. -*/ -static const u8 *fts5MultiIterTerm(Fts5IndexIter *pIter, int *pn){ - Fts5SegIter *p = &pIter->aSeg[ pIter->aFirst[1].iFirst ]; - *pn = p->term.n; - return p->term.p; } static void fts5ChunkIterate( @@ -176923,6 +178428,9 @@ static void fts5ChunkIterate( int pgno = pSeg->iLeafPgno; int pgnoSave = 0; + /* This function does notmwork with detail=none databases. */ + assert( p->pConfig->eDetail!=FTS5_DETAIL_NONE ); + if( (pSeg->flags & FTS5_SEGITER_REVERSE)==0 ){ pgnoSave = pgno+1; } @@ -176948,7 +178456,455 @@ static void fts5ChunkIterate( } } +/* +** Iterator pIter currently points to a valid entry (not EOF). This +** function appends the position list data for the current entry to +** buffer pBuf. It does not make a copy of the position-list size +** field. +*/ +static void fts5SegiterPoslist( + Fts5Index *p, + Fts5SegIter *pSeg, + Fts5Colset *pColset, + Fts5Buffer *pBuf +){ + if( 0==fts5BufferGrow(&p->rc, pBuf, pSeg->nPos) ){ + if( pColset==0 ){ + fts5ChunkIterate(p, pSeg, (void*)pBuf, fts5PoslistCallback); + }else{ + if( p->pConfig->eDetail==FTS5_DETAIL_FULL ){ + PoslistCallbackCtx sCtx; + sCtx.pBuf = pBuf; + sCtx.pColset = pColset; + sCtx.eState = fts5IndexColsetTest(pColset, 0); + assert( sCtx.eState==0 || sCtx.eState==1 ); + fts5ChunkIterate(p, pSeg, (void*)&sCtx, fts5PoslistFilterCallback); + }else{ + PoslistOffsetsCtx sCtx; + memset(&sCtx, 0, sizeof(sCtx)); + sCtx.pBuf = pBuf; + sCtx.pColset = pColset; + fts5ChunkIterate(p, pSeg, (void*)&sCtx, fts5PoslistOffsetsCallback); + } + } + } +} +/* +** IN/OUT parameter (*pa) points to a position list n bytes in size. If +** the position list contains entries for column iCol, then (*pa) is set +** to point to the sub-position-list for that column and the number of +** bytes in it returned. Or, if the argument position list does not +** contain any entries for column iCol, return 0. +*/ +static int fts5IndexExtractCol( + const u8 **pa, /* IN/OUT: Pointer to poslist */ + int n, /* IN: Size of poslist in bytes */ + int iCol /* Column to extract from poslist */ +){ + int iCurrent = 0; /* Anything before the first 0x01 is col 0 */ + const u8 *p = *pa; + const u8 *pEnd = &p[n]; /* One byte past end of position list */ + + while( iCol>iCurrent ){ + /* Advance pointer p until it points to pEnd or an 0x01 byte that is + ** not part of a varint. Note that it is not possible for a negative + ** or extremely large varint to occur within an uncorrupted position + ** list. So the last byte of each varint may be assumed to have a clear + ** 0x80 bit. */ + while( *p!=0x01 ){ + while( *p++ & 0x80 ); + if( p>=pEnd ) return 0; + } + *pa = p++; + iCurrent = *p++; + if( iCurrent & 0x80 ){ + p--; + p += fts5GetVarint32(p, iCurrent); + } + } + if( iCol!=iCurrent ) return 0; + + /* Advance pointer p until it points to pEnd or an 0x01 byte that is + ** not part of a varint */ + while( pnCol; i++){ + const u8 *pSub = pPos; + int nSub = fts5IndexExtractCol(&pSub, nPos, pColset->aiCol[i]); + if( nSub ){ + fts5BufferAppendBlob(&rc, pBuf, nSub, pSub); + } + } + return rc; +} + +/* +** xSetOutputs callback used by detail=none tables. +*/ +static void fts5IterSetOutputs_None(Fts5Iter *pIter, Fts5SegIter *pSeg){ + assert( pIter->pIndex->pConfig->eDetail==FTS5_DETAIL_NONE ); + pIter->base.iRowid = pSeg->iRowid; + pIter->base.nData = pSeg->nPos; +} + +/* +** xSetOutputs callback used by detail=full and detail=col tables when no +** column filters are specified. +*/ +static void fts5IterSetOutputs_Nocolset(Fts5Iter *pIter, Fts5SegIter *pSeg){ + pIter->base.iRowid = pSeg->iRowid; + pIter->base.nData = pSeg->nPos; + + assert( pIter->pIndex->pConfig->eDetail!=FTS5_DETAIL_NONE ); + assert( pIter->pColset==0 ); + + if( pSeg->iLeafOffset+pSeg->nPos<=pSeg->pLeaf->szLeaf ){ + /* All data is stored on the current page. Populate the output + ** variables to point into the body of the page object. */ + pIter->base.pData = &pSeg->pLeaf->p[pSeg->iLeafOffset]; + }else{ + /* The data is distributed over two or more pages. Copy it into the + ** Fts5Iter.poslist buffer and then set the output pointer to point + ** to this buffer. */ + fts5BufferZero(&pIter->poslist); + fts5SegiterPoslist(pIter->pIndex, pSeg, 0, &pIter->poslist); + pIter->base.pData = pIter->poslist.p; + } +} + +/* +** xSetOutputs callback used by detail=col when there is a column filter +** and there are 100 or more columns. Also called as a fallback from +** fts5IterSetOutputs_Col100 if the column-list spans more than one page. +*/ +static void fts5IterSetOutputs_Col(Fts5Iter *pIter, Fts5SegIter *pSeg){ + fts5BufferZero(&pIter->poslist); + fts5SegiterPoslist(pIter->pIndex, pSeg, pIter->pColset, &pIter->poslist); + pIter->base.iRowid = pSeg->iRowid; + pIter->base.pData = pIter->poslist.p; + pIter->base.nData = pIter->poslist.n; +} + +/* +** xSetOutputs callback used when: +** +** * detail=col, +** * there is a column filter, and +** * the table contains 100 or fewer columns. +** +** The last point is to ensure all column numbers are stored as +** single-byte varints. +*/ +static void fts5IterSetOutputs_Col100(Fts5Iter *pIter, Fts5SegIter *pSeg){ + + assert( pIter->pIndex->pConfig->eDetail==FTS5_DETAIL_COLUMNS ); + assert( pIter->pColset ); + + if( pSeg->iLeafOffset+pSeg->nPos>pSeg->pLeaf->szLeaf ){ + fts5IterSetOutputs_Col(pIter, pSeg); + }else{ + u8 *a = (u8*)&pSeg->pLeaf->p[pSeg->iLeafOffset]; + u8 *pEnd = (u8*)&a[pSeg->nPos]; + int iPrev = 0; + int *aiCol = pIter->pColset->aiCol; + int *aiColEnd = &aiCol[pIter->pColset->nCol]; + + u8 *aOut = pIter->poslist.p; + int iPrevOut = 0; + + pIter->base.iRowid = pSeg->iRowid; + + while( abase.pData = pIter->poslist.p; + pIter->base.nData = aOut - pIter->poslist.p; + } +} + +/* +** xSetOutputs callback used by detail=full when there is a column filter. +*/ +static void fts5IterSetOutputs_Full(Fts5Iter *pIter, Fts5SegIter *pSeg){ + Fts5Colset *pColset = pIter->pColset; + pIter->base.iRowid = pSeg->iRowid; + + assert( pIter->pIndex->pConfig->eDetail==FTS5_DETAIL_FULL ); + assert( pColset ); + + if( pSeg->iLeafOffset+pSeg->nPos<=pSeg->pLeaf->szLeaf ){ + /* All data is stored on the current page. Populate the output + ** variables to point into the body of the page object. */ + const u8 *a = &pSeg->pLeaf->p[pSeg->iLeafOffset]; + if( pColset->nCol==1 ){ + pIter->base.nData = fts5IndexExtractCol(&a, pSeg->nPos,pColset->aiCol[0]); + pIter->base.pData = a; + }else{ + fts5BufferZero(&pIter->poslist); + fts5IndexExtractColset(pColset, a, pSeg->nPos, &pIter->poslist); + pIter->base.pData = pIter->poslist.p; + pIter->base.nData = pIter->poslist.n; + } + }else{ + /* The data is distributed over two or more pages. Copy it into the + ** Fts5Iter.poslist buffer and then set the output pointer to point + ** to this buffer. */ + fts5BufferZero(&pIter->poslist); + fts5SegiterPoslist(pIter->pIndex, pSeg, pColset, &pIter->poslist); + pIter->base.pData = pIter->poslist.p; + pIter->base.nData = pIter->poslist.n; + } +} + +static void fts5IterSetOutputCb(int *pRc, Fts5Iter *pIter){ + if( *pRc==SQLITE_OK ){ + Fts5Config *pConfig = pIter->pIndex->pConfig; + if( pConfig->eDetail==FTS5_DETAIL_NONE ){ + pIter->xSetOutputs = fts5IterSetOutputs_None; + } + + else if( pIter->pColset==0 ){ + pIter->xSetOutputs = fts5IterSetOutputs_Nocolset; + } + + else if( pConfig->eDetail==FTS5_DETAIL_FULL ){ + pIter->xSetOutputs = fts5IterSetOutputs_Full; + } + + else{ + assert( pConfig->eDetail==FTS5_DETAIL_COLUMNS ); + if( pConfig->nCol<=100 ){ + pIter->xSetOutputs = fts5IterSetOutputs_Col100; + sqlite3Fts5BufferSize(pRc, &pIter->poslist, pConfig->nCol); + }else{ + pIter->xSetOutputs = fts5IterSetOutputs_Col; + } + } + } +} + + +/* +** Allocate a new Fts5Iter object. +** +** The new object will be used to iterate through data in structure pStruct. +** If iLevel is -ve, then all data in all segments is merged. Or, if iLevel +** is zero or greater, data from the first nSegment segments on level iLevel +** is merged. +** +** The iterator initially points to the first term/rowid entry in the +** iterated data. +*/ +static void fts5MultiIterNew( + Fts5Index *p, /* FTS5 backend to iterate within */ + Fts5Structure *pStruct, /* Structure of specific index */ + int flags, /* FTS5INDEX_QUERY_XXX flags */ + Fts5Colset *pColset, /* Colset to filter on (or NULL) */ + const u8 *pTerm, int nTerm, /* Term to seek to (or NULL/0) */ + int iLevel, /* Level to iterate (-1 for all) */ + int nSegment, /* Number of segments to merge (iLevel>=0) */ + Fts5Iter **ppOut /* New object */ +){ + int nSeg = 0; /* Number of segment-iters in use */ + int iIter = 0; /* */ + int iSeg; /* Used to iterate through segments */ + Fts5StructureLevel *pLvl; + Fts5Iter *pNew; + + assert( (pTerm==0 && nTerm==0) || iLevel<0 ); + + /* Allocate space for the new multi-seg-iterator. */ + if( p->rc==SQLITE_OK ){ + if( iLevel<0 ){ + assert( pStruct->nSegment==fts5StructureCountSegments(pStruct) ); + nSeg = pStruct->nSegment; + nSeg += (p->pHash ? 1 : 0); + }else{ + nSeg = MIN(pStruct->aLevel[iLevel].nSeg, nSegment); + } + } + *ppOut = pNew = fts5MultiIterAlloc(p, nSeg); + if( pNew==0 ) return; + pNew->bRev = (0!=(flags & FTS5INDEX_QUERY_DESC)); + pNew->bSkipEmpty = (0!=(flags & FTS5INDEX_QUERY_SKIPEMPTY)); + pNew->pStruct = pStruct; + pNew->pColset = pColset; + fts5StructureRef(pStruct); + if( (flags & FTS5INDEX_QUERY_NOOUTPUT)==0 ){ + fts5IterSetOutputCb(&p->rc, pNew); + } + + /* Initialize each of the component segment iterators. */ + if( p->rc==SQLITE_OK ){ + if( iLevel<0 ){ + Fts5StructureLevel *pEnd = &pStruct->aLevel[pStruct->nLevel]; + if( p->pHash ){ + /* Add a segment iterator for the current contents of the hash table. */ + Fts5SegIter *pIter = &pNew->aSeg[iIter++]; + fts5SegIterHashInit(p, pTerm, nTerm, flags, pIter); + } + for(pLvl=&pStruct->aLevel[0]; pLvlnSeg-1; iSeg>=0; iSeg--){ + Fts5StructureSegment *pSeg = &pLvl->aSeg[iSeg]; + Fts5SegIter *pIter = &pNew->aSeg[iIter++]; + if( pTerm==0 ){ + fts5SegIterInit(p, pSeg, pIter); + }else{ + fts5SegIterSeekInit(p, pTerm, nTerm, flags, pSeg, pIter); + } + } + } + }else{ + pLvl = &pStruct->aLevel[iLevel]; + for(iSeg=nSeg-1; iSeg>=0; iSeg--){ + fts5SegIterInit(p, &pLvl->aSeg[iSeg], &pNew->aSeg[iIter++]); + } + } + assert( iIter==nSeg ); + } + + /* If the above was successful, each component iterators now points + ** to the first entry in its segment. In this case initialize the + ** aFirst[] array. Or, if an error has occurred, free the iterator + ** object and set the output variable to NULL. */ + if( p->rc==SQLITE_OK ){ + for(iIter=pNew->nSeg-1; iIter>0; iIter--){ + int iEq; + if( (iEq = fts5MultiIterDoCompare(pNew, iIter)) ){ + Fts5SegIter *pSeg = &pNew->aSeg[iEq]; + if( p->rc==SQLITE_OK ) pSeg->xNext(p, pSeg, 0); + fts5MultiIterAdvanced(p, pNew, iEq, iIter); + } + } + fts5MultiIterSetEof(pNew); + fts5AssertMultiIterSetup(p, pNew); + + if( pNew->bSkipEmpty && fts5MultiIterIsEmpty(p, pNew) ){ + fts5MultiIterNext(p, pNew, 0, 0); + }else if( pNew->base.bEof==0 ){ + Fts5SegIter *pSeg = &pNew->aSeg[pNew->aFirst[1].iFirst]; + pNew->xSetOutputs(pNew, pSeg); + } + + }else{ + fts5MultiIterFree(pNew); + *ppOut = 0; + } +} + +/* +** Create an Fts5Iter that iterates through the doclist provided +** as the second argument. +*/ +static void fts5MultiIterNew2( + Fts5Index *p, /* FTS5 backend to iterate within */ + Fts5Data *pData, /* Doclist to iterate through */ + int bDesc, /* True for descending rowid order */ + Fts5Iter **ppOut /* New object */ +){ + Fts5Iter *pNew; + pNew = fts5MultiIterAlloc(p, 2); + if( pNew ){ + Fts5SegIter *pIter = &pNew->aSeg[1]; + + pIter->flags = FTS5_SEGITER_ONETERM; + if( pData->szLeaf>0 ){ + pIter->pLeaf = pData; + pIter->iLeafOffset = fts5GetVarint(pData->p, (u64*)&pIter->iRowid); + pIter->iEndofDoclist = pData->nn; + pNew->aFirst[1].iFirst = 1; + if( bDesc ){ + pNew->bRev = 1; + pIter->flags |= FTS5_SEGITER_REVERSE; + fts5SegIterReverseInitPage(p, pIter); + }else{ + fts5SegIterLoadNPos(p, pIter); + } + pData = 0; + }else{ + pNew->base.bEof = 1; + } + fts5SegIterSetNext(p, pIter); + + *ppOut = pNew; + } + + fts5DataRelease(pData); +} + +/* +** Return true if the iterator is at EOF or if an error has occurred. +** False otherwise. +*/ +static int fts5MultiIterEof(Fts5Index *p, Fts5Iter *pIter){ + assert( p->rc + || (pIter->aSeg[ pIter->aFirst[1].iFirst ].pLeaf==0)==pIter->base.bEof + ); + return (p->rc || pIter->base.bEof); +} + +/* +** Return the rowid of the entry that the iterator currently points +** to. If the iterator points to EOF when this function is called the +** results are undefined. +*/ +static i64 fts5MultiIterRowid(Fts5Iter *pIter){ + assert( pIter->aSeg[ pIter->aFirst[1].iFirst ].pLeaf ); + return pIter->aSeg[ pIter->aFirst[1].iFirst ].iRowid; +} + +/* +** Move the iterator to the next entry at or following iMatch. +*/ +static void fts5MultiIterNextFrom( + Fts5Index *p, + Fts5Iter *pIter, + i64 iMatch +){ + while( 1 ){ + i64 iRowid; + fts5MultiIterNext(p, pIter, 1, iMatch); + if( fts5MultiIterEof(p, pIter) ) break; + iRowid = fts5MultiIterRowid(pIter); + if( pIter->bRev==0 && iRowid>=iMatch ) break; + if( pIter->bRev!=0 && iRowid<=iMatch ) break; + } +} + +/* +** Return a pointer to a buffer containing the term associated with the +** entry that the iterator currently points to. +*/ +static const u8 *fts5MultiIterTerm(Fts5Iter *pIter, int *pn){ + Fts5SegIter *p = &pIter->aSeg[ pIter->aFirst[1].iFirst ]; + *pn = p->term.n; + return p->term.p; +} /* ** Allocate a new segment-id for the structure pStruct. The new segment @@ -176996,15 +178952,14 @@ static void fts5IndexDiscardData(Fts5Index *p){ } /* -** Return the size of the prefix, in bytes, that buffer (nNew/pNew) shares -** with buffer (nOld/pOld). +** Return the size of the prefix, in bytes, that buffer +** (pNew/) shares with buffer (pOld/nOld). +** +** Buffer (pNew/) is guaranteed to be greater +** than buffer (pOld/nOld). */ -static int fts5PrefixCompress( - int nOld, const u8 *pOld, - int nNew, const u8 *pNew -){ +static int fts5PrefixCompress(int nOld, const u8 *pOld, const u8 *pNew){ int i; - assert( fts5BlobCompare(pOld, nOld, pNew, nNew)<0 ); for(i=0; iterm.n ){ - n = 1 + fts5PrefixCompress(pPage->term.n, pPage->term.p, nTerm, pTerm); + n = 1 + fts5PrefixCompress(pPage->term.n, pPage->term.p, pTerm); } fts5WriteBtreeTerm(p, pWriter, n, pTerm); pPage = &pWriter->writer; } }else{ - nPrefix = fts5PrefixCompress(pPage->term.n, pPage->term.p, nTerm, pTerm); + nPrefix = fts5PrefixCompress(pPage->term.n, pPage->term.p, pTerm); fts5BufferAppendVarint(&p->rc, &pPage->buf, nPrefix); } @@ -177346,8 +179301,7 @@ static void fts5WriteAppendTerm( static void fts5WriteAppendRowid( Fts5Index *p, Fts5SegWriter *pWriter, - i64 iRowid, - int nPos + i64 iRowid ){ if( p->rc==SQLITE_OK ){ Fts5PageWriter *pPage = &pWriter->writer; @@ -177374,8 +179328,6 @@ static void fts5WriteAppendRowid( pWriter->iPrevRowid = iRowid; pWriter->bFirstRowidInDoclist = 0; pWriter->bFirstRowidInPage = 0; - - fts5BufferAppendVarint(&p->rc, &pPage->buf, nPos); } } @@ -177486,7 +179438,7 @@ static void fts5WriteInit( ** incremental merge operation. This function is called if the incremental ** merge step has finished but the input has not been completely exhausted. */ -static void fts5TrimSegments(Fts5Index *p, Fts5IndexIter *pIter){ +static void fts5TrimSegments(Fts5Index *p, Fts5Iter *pIter){ int i; Fts5Buffer buf; memset(&buf, 0, sizeof(Fts5Buffer)); @@ -177564,13 +179516,15 @@ static void fts5IndexMergeLevel( Fts5Structure *pStruct = *ppStruct; Fts5StructureLevel *pLvl = &pStruct->aLevel[iLvl]; Fts5StructureLevel *pLvlOut; - Fts5IndexIter *pIter = 0; /* Iterator to read input data */ + Fts5Iter *pIter = 0; /* Iterator to read input data */ int nRem = pnRem ? *pnRem : 0; /* Output leaf pages left to write */ int nInput; /* Number of input segments */ Fts5SegWriter writer; /* Writer object */ Fts5StructureSegment *pSeg; /* Output segment */ Fts5Buffer term; int bOldest; /* True if the output segment is the oldest */ + int eDetail = p->pConfig->eDetail; + const int flags = FTS5INDEX_QUERY_NOOUTPUT; assert( iLvlnLevel ); assert( pLvl->nMerge<=pLvl->nSeg ); @@ -177615,7 +179569,7 @@ static void fts5IndexMergeLevel( bOldest = (pLvlOut->nSeg==1 && pStruct->nLevel==iLvl+2); assert( iLvl>=0 ); - for(fts5MultiIterNew(p, pStruct, 0, 0, 0, 0, iLvl, nInput, &pIter); + for(fts5MultiIterNew(p, pStruct, flags, 0, 0, 0, iLvl, nInput, &pIter); fts5MultiIterEof(p, pIter)==0; fts5MultiIterNext(p, pIter, 0, 0) ){ @@ -177640,11 +179594,21 @@ static void fts5IndexMergeLevel( /* Append the rowid to the output */ /* WRITEPOSLISTSIZE */ - nPos = pSegIter->nPos*2 + pSegIter->bDel; - fts5WriteAppendRowid(p, &writer, fts5MultiIterRowid(pIter), nPos); + fts5WriteAppendRowid(p, &writer, fts5MultiIterRowid(pIter)); - /* Append the position-list data to the output */ - fts5ChunkIterate(p, pSegIter, (void*)&writer, fts5MergeChunkCallback); + if( eDetail==FTS5_DETAIL_NONE ){ + if( pSegIter->bDel ){ + fts5BufferAppendVarint(&p->rc, &writer.writer.buf, 0); + if( pSegIter->nPos>0 ){ + fts5BufferAppendVarint(&p->rc, &writer.writer.buf, 0); + } + } + }else{ + /* Append the position-list data to the output */ + nPos = pSegIter->nPos*2 + pSegIter->bDel; + fts5BufferAppendVarint(&p->rc, &writer.writer.buf, nPos); + fts5ChunkIterate(p, pSegIter, (void*)&writer, fts5MergeChunkCallback); + } } /* Flush the last leaf page to disk. Set the output segment b-tree height @@ -177677,7 +179641,7 @@ static void fts5IndexMergeLevel( pLvl->nMerge = nInput; } - fts5MultiIterFree(p, pIter); + fts5MultiIterFree(pIter); fts5BufferFree(&term); if( pnRem ) *pnRem -= writer.nLeafWritten; } @@ -177832,7 +179796,7 @@ static void fts5FlushOneHash(Fts5Index *p){ if( iSegid ){ const int pgsz = p->pConfig->pgsz; - + int eDetail = p->pConfig->eDetail; Fts5StructureSegment *pSeg; /* New segment within pStruct */ Fts5Buffer *pBuf; /* Buffer in which to assemble leaf page */ Fts5Buffer *pPgidx; /* Buffer in which to assemble pgidx */ @@ -177875,12 +179839,7 @@ static void fts5FlushOneHash(Fts5Index *p){ ** loop iterates through the poslists that make up the current ** doclist. */ while( p->rc==SQLITE_OK && iOffn<=pBuf->nSpace ); - if( (pBuf->n + pPgidx->n + nCopy) <= pgsz ){ - /* The entire poslist will fit on the current leaf. So copy - ** it in one go. */ - fts5BufferSafeAppendBlob(pBuf, &pDoclist[iOff], nCopy); - }else{ - /* The entire poslist will not fit on this leaf. So it needs - ** to be broken into sections. The only qualification being - ** that each varint must be stored contiguously. */ - const u8 *pPoslist = &pDoclist[iOff]; - int iPos = 0; - while( p->rc==SQLITE_OK ){ - int nSpace = pgsz - pBuf->n - pPgidx->n; - int n = 0; - if( (nCopy - iPos)<=nSpace ){ - n = nCopy - iPos; - }else{ - n = fts5PoslistPrefix(&pPoslist[iPos], nSpace); + if( eDetail==FTS5_DETAIL_NONE ){ + if( iOffp[pBuf->n++] = 0; + iOff++; + if( iOffp[pBuf->n++] = 0; + iOff++; } - assert( n>0 ); - fts5BufferSafeAppendBlob(pBuf, &pPoslist[iPos], n); - iPos += n; - if( (pBuf->n + pPgidx->n)>=pgsz ){ - fts5WriteFlushLeaf(p, &writer); - } - if( iPos>=nCopy ) break; } + if( (pBuf->n + pPgidx->n)>=pgsz ){ + fts5WriteFlushLeaf(p, &writer); + } + }else{ + int bDummy; + int nPos; + int nCopy = fts5GetPoslistSize(&pDoclist[iOff], &nPos, &bDummy); + nCopy += nPos; + if( (pBuf->n + pPgidx->n + nCopy) <= pgsz ){ + /* The entire poslist will fit on the current leaf. So copy + ** it in one go. */ + fts5BufferSafeAppendBlob(pBuf, &pDoclist[iOff], nCopy); + }else{ + /* The entire poslist will not fit on this leaf. So it needs + ** to be broken into sections. The only qualification being + ** that each varint must be stored contiguously. */ + const u8 *pPoslist = &pDoclist[iOff]; + int iPos = 0; + while( p->rc==SQLITE_OK ){ + int nSpace = pgsz - pBuf->n - pPgidx->n; + int n = 0; + if( (nCopy - iPos)<=nSpace ){ + n = nCopy - iPos; + }else{ + n = fts5PoslistPrefix(&pPoslist[iPos], nSpace); + } + assert( n>0 ); + fts5BufferSafeAppendBlob(pBuf, &pPoslist[iPos], n); + iPos += n; + if( (pBuf->n + pPgidx->n)>=pgsz ){ + fts5WriteFlushLeaf(p, &writer); + } + if( iPos>=nCopy ) break; + } + } + iOff += nCopy; } - iOff += nCopy; } } @@ -177996,7 +179973,10 @@ static int sqlite3Fts5IndexOptimize(Fts5Index *p){ if( pLvl->aSeg ){ int iLvl, iSeg; int iSegOut = 0; - for(iLvl=0; iLvlnLevel; iLvl++){ + /* Iterate through all segments, from oldest to newest. Add them to + ** the new Fts5Level object so that pLvl->aSeg[0] is the oldest + ** segment in the data structure. */ + for(iLvl=pStruct->nLevel-1; iLvl>=0; iLvl--){ for(iSeg=0; iSegaLevel[iLvl].nSeg; iSeg++){ pLvl->aSeg[iSegOut] = pStruct->aLevel[iLvl].aSeg[iSeg]; iSegOut++; @@ -178037,230 +180017,32 @@ static int sqlite3Fts5IndexMerge(Fts5Index *p, int nMerge){ return fts5IndexReturn(p); } -static void fts5PoslistCallback( - Fts5Index *p, - void *pContext, - const u8 *pChunk, int nChunk -){ - assert_nc( nChunk>=0 ); - if( nChunk>0 ){ - fts5BufferSafeAppendBlob((Fts5Buffer*)pContext, pChunk, nChunk); - } -} - -typedef struct PoslistCallbackCtx PoslistCallbackCtx; -struct PoslistCallbackCtx { - Fts5Buffer *pBuf; /* Append to this buffer */ - Fts5Colset *pColset; /* Restrict matches to this column */ - int eState; /* See above */ -}; - -/* -** TODO: Make this more efficient! -*/ -static int fts5IndexColsetTest(Fts5Colset *pColset, int iCol){ - int i; - for(i=0; inCol; i++){ - if( pColset->aiCol[i]==iCol ) return 1; - } - return 0; -} - -static void fts5PoslistFilterCallback( - Fts5Index *p, - void *pContext, - const u8 *pChunk, int nChunk -){ - PoslistCallbackCtx *pCtx = (PoslistCallbackCtx*)pContext; - assert_nc( nChunk>=0 ); - if( nChunk>0 ){ - /* Search through to find the first varint with value 1. This is the - ** start of the next columns hits. */ - int i = 0; - int iStart = 0; - - if( pCtx->eState==2 ){ - int iCol; - fts5FastGetVarint32(pChunk, i, iCol); - if( fts5IndexColsetTest(pCtx->pColset, iCol) ){ - pCtx->eState = 1; - fts5BufferSafeAppendVarint(pCtx->pBuf, 1); - }else{ - pCtx->eState = 0; - } - } - - do { - while( ieState ){ - fts5BufferSafeAppendBlob(pCtx->pBuf, &pChunk[iStart], i-iStart); - } - if( i=nChunk ){ - pCtx->eState = 2; - }else{ - fts5FastGetVarint32(pChunk, i, iCol); - pCtx->eState = fts5IndexColsetTest(pCtx->pColset, iCol); - if( pCtx->eState ){ - fts5BufferSafeAppendBlob(pCtx->pBuf, &pChunk[iStart], i-iStart); - iStart = i; - } - } - } - }while( irc, pBuf, pSeg->nPos) ){ - if( pColset==0 ){ - fts5ChunkIterate(p, pSeg, (void*)pBuf, fts5PoslistCallback); - }else{ - PoslistCallbackCtx sCtx; - sCtx.pBuf = pBuf; - sCtx.pColset = pColset; - sCtx.eState = fts5IndexColsetTest(pColset, 0); - assert( sCtx.eState==0 || sCtx.eState==1 ); - fts5ChunkIterate(p, pSeg, (void*)&sCtx, fts5PoslistFilterCallback); - } - } -} - -/* -** IN/OUT parameter (*pa) points to a position list n bytes in size. If -** the position list contains entries for column iCol, then (*pa) is set -** to point to the sub-position-list for that column and the number of -** bytes in it returned. Or, if the argument position list does not -** contain any entries for column iCol, return 0. -*/ -static int fts5IndexExtractCol( - const u8 **pa, /* IN/OUT: Pointer to poslist */ - int n, /* IN: Size of poslist in bytes */ - int iCol /* Column to extract from poslist */ -){ - int iCurrent = 0; /* Anything before the first 0x01 is col 0 */ - const u8 *p = *pa; - const u8 *pEnd = &p[n]; /* One byte past end of position list */ - u8 prev = 0; - - while( iCol>iCurrent ){ - /* Advance pointer p until it points to pEnd or an 0x01 byte that is - ** not part of a varint */ - while( (prev & 0x80) || *p!=0x01 ){ - prev = *p++; - if( p==pEnd ) return 0; - } - *pa = p++; - p += fts5GetVarint32(p, iCurrent); - } - if( iCol!=iCurrent ) return 0; - - /* Advance pointer p until it points to pEnd or an 0x01 byte that is - ** not part of a varint */ - assert( (prev & 0x80)==0 ); - while( prc. -*/ -static int fts5AppendPoslist( +static void fts5AppendRowid( Fts5Index *p, i64 iDelta, - Fts5IndexIter *pMulti, - Fts5Colset *pColset, + Fts5Iter *pUnused, Fts5Buffer *pBuf ){ - if( p->rc==SQLITE_OK ){ - Fts5SegIter *pSeg = &pMulti->aSeg[ pMulti->aFirst[1].iFirst ]; - assert( fts5MultiIterEof(p, pMulti)==0 ); - assert( pSeg->nPos>0 ); - if( 0==fts5BufferGrow(&p->rc, pBuf, pSeg->nPos+9+9) ){ - - if( pSeg->iLeafOffset+pSeg->nPos<=pSeg->pLeaf->szLeaf - && (pColset==0 || pColset->nCol==1) - ){ - const u8 *pPos = &pSeg->pLeaf->p[pSeg->iLeafOffset]; - int nPos; - if( pColset ){ - nPos = fts5IndexExtractCol(&pPos, pSeg->nPos, pColset->aiCol[0]); - if( nPos==0 ) return 1; - }else{ - nPos = pSeg->nPos; - } - assert( nPos>0 ); - fts5BufferSafeAppendVarint(pBuf, iDelta); - fts5BufferSafeAppendVarint(pBuf, nPos*2); - fts5BufferSafeAppendBlob(pBuf, pPos, nPos); - }else{ - int iSv1; - int iSv2; - int iData; - - /* Append iDelta */ - iSv1 = pBuf->n; - fts5BufferSafeAppendVarint(pBuf, iDelta); - - /* WRITEPOSLISTSIZE */ - iSv2 = pBuf->n; - fts5BufferSafeAppendVarint(pBuf, pSeg->nPos*2); - iData = pBuf->n; - - fts5SegiterPoslist(p, pSeg, pColset, pBuf); - - if( pColset ){ - int nActual = pBuf->n - iData; - if( nActual!=pSeg->nPos ){ - if( nActual==0 ){ - pBuf->n = iSv1; - return 1; - }else{ - int nReq = sqlite3Fts5GetVarintLen((u32)(nActual*2)); - while( iSv2<(iData-nReq) ){ pBuf->p[iSv2++] = 0x80; } - sqlite3Fts5PutVarint(&pBuf->p[iSv2], nActual*2); - } - } - } - } - - } - } - - return 0; + UNUSED_PARAM(pUnused); + fts5BufferAppendVarint(&p->rc, pBuf, iDelta); } +static void fts5AppendPoslist( + Fts5Index *p, + i64 iDelta, + Fts5Iter *pMulti, + Fts5Buffer *pBuf +){ + int nData = pMulti->base.nData; + assert( nData>0 ); + if( p->rc==SQLITE_OK && 0==fts5BufferGrow(&p->rc, pBuf, nData+9+9) ){ + fts5BufferSafeAppendVarint(pBuf, iDelta); + fts5BufferSafeAppendVarint(pBuf, nData*2); + fts5BufferSafeAppendBlob(pBuf, pMulti->base.pData, nData); + } +} + + static void fts5DoclistIterNext(Fts5DoclistIter *pIter){ u8 *p = pIter->aPoslist + pIter->nSize + pIter->nPoslist; @@ -178321,6 +180103,69 @@ static void fts5MergeAppendDocid( (iLastRowid) = (iRowid); \ } +/* +** Swap the contents of buffer *p1 with that of *p2. +*/ +static void fts5BufferSwap(Fts5Buffer *p1, Fts5Buffer *p2){ + Fts5Buffer tmp = *p1; + *p1 = *p2; + *p2 = tmp; +} + +static void fts5NextRowid(Fts5Buffer *pBuf, int *piOff, i64 *piRowid){ + int i = *piOff; + if( i>=pBuf->n ){ + *piOff = -1; + }else{ + u64 iVal; + *piOff = i + sqlite3Fts5GetVarint(&pBuf->p[i], &iVal); + *piRowid += iVal; + } +} + +/* +** This is the equivalent of fts5MergePrefixLists() for detail=none mode. +** In this case the buffers consist of a delta-encoded list of rowids only. +*/ +static void fts5MergeRowidLists( + Fts5Index *p, /* FTS5 backend object */ + Fts5Buffer *p1, /* First list to merge */ + Fts5Buffer *p2 /* Second list to merge */ +){ + int i1 = 0; + int i2 = 0; + i64 iRowid1 = 0; + i64 iRowid2 = 0; + i64 iOut = 0; + + Fts5Buffer out; + memset(&out, 0, sizeof(out)); + sqlite3Fts5BufferSize(&p->rc, &out, p1->n + p2->n); + if( p->rc ) return; + + fts5NextRowid(p1, &i1, &iRowid1); + fts5NextRowid(p2, &i2, &iRowid2); + while( i1>=0 || i2>=0 ){ + if( i1>=0 && (i2<0 || iRowid1iOut ); + fts5BufferSafeAppendVarint(&out, iRowid1 - iOut); + iOut = iRowid1; + fts5NextRowid(p1, &i1, &iRowid1); + }else{ + assert( iOut==0 || iRowid2>iOut ); + fts5BufferSafeAppendVarint(&out, iRowid2 - iOut); + iOut = iRowid2; + if( i1>=0 && iRowid1==iRowid2 ){ + fts5NextRowid(p1, &i1, &iRowid1); + } + fts5NextRowid(p2, &i2, &iRowid2); + } + } + + fts5BufferSwap(&out, p1); + fts5BufferFree(&out); +} + /* ** Buffers p1 and p2 contain doclists. This function merges the content ** of the two doclists together and sets buffer p1 to the result before @@ -178338,28 +180183,30 @@ static void fts5MergePrefixLists( i64 iLastRowid = 0; Fts5DoclistIter i1; Fts5DoclistIter i2; - Fts5Buffer out; - Fts5Buffer tmp; - memset(&out, 0, sizeof(out)); - memset(&tmp, 0, sizeof(tmp)); + Fts5Buffer out = {0, 0, 0}; + Fts5Buffer tmp = {0, 0, 0}; - sqlite3Fts5BufferSize(&p->rc, &out, p1->n + p2->n); + if( sqlite3Fts5BufferSize(&p->rc, &out, p1->n + p2->n) ) return; fts5DoclistIterInit(p1, &i1); fts5DoclistIterInit(p2, &i2); - while( p->rc==SQLITE_OK && (i1.aPoslist!=0 || i2.aPoslist!=0) ){ - if( i2.aPoslist==0 || (i1.aPoslist && i1.iRowidrc, &tmp, i1.nPoslist + i2.nPoslist); + if( p->rc ) break; sqlite3Fts5PoslistNext64(a1, i1.nPoslist, &iOff1, &iPos1); sqlite3Fts5PoslistNext64(a2, i2.nPoslist, &iOff2, &iPos2); + assert( iPos1>=0 && iPos2>=0 ); - while( p->rc==SQLITE_OK && (iPos1>=0 || iPos2>=0) ){ - i64 iNew; - if( iPos2<0 || (iPos1>=0 && iPos1=0 && iPos2>=0 ){ + while( 1 ){ + if( iPos1rc = sqlite3Fts5PoslistWriterAppend(&tmp, &writer, iNew); + } + + if( iPos1>=0 ){ + if( iPos1!=iPrev ){ + sqlite3Fts5PoslistSafeAppend(&tmp, &iPrev, iPos1); + } + fts5BufferSafeAppendBlob(&tmp, &a1[iOff1], i1.nPoslist-iOff1); + }else{ + assert( iPos2>=0 && iPos2!=iPrev ); + sqlite3Fts5PoslistSafeAppend(&tmp, &iPrev, iPos2); + fts5BufferSafeAppendBlob(&tmp, &a2[iOff2], i2.nPoslist-iOff2); } /* WRITEPOSLISTSIZE */ @@ -178397,84 +180268,105 @@ static void fts5MergePrefixLists( fts5BufferSafeAppendBlob(&out, tmp.p, tmp.n); fts5DoclistIterNext(&i1); fts5DoclistIterNext(&i2); + if( i1.aPoslist==0 || i2.aPoslist==0 ) break; } } + if( i1.aPoslist ){ + fts5MergeAppendDocid(&out, iLastRowid, i1.iRowid); + fts5BufferSafeAppendBlob(&out, i1.aPoslist, i1.aEof - i1.aPoslist); + } + else if( i2.aPoslist ){ + fts5MergeAppendDocid(&out, iLastRowid, i2.iRowid); + fts5BufferSafeAppendBlob(&out, i2.aPoslist, i2.aEof - i2.aPoslist); + } + fts5BufferSet(&p->rc, p1, out.n, out.p); fts5BufferFree(&tmp); fts5BufferFree(&out); } } -static void fts5BufferSwap(Fts5Buffer *p1, Fts5Buffer *p2){ - Fts5Buffer tmp = *p1; - *p1 = *p2; - *p2 = tmp; -} - static void fts5SetupPrefixIter( Fts5Index *p, /* Index to read from */ int bDesc, /* True for "ORDER BY rowid DESC" */ const u8 *pToken, /* Buffer containing prefix to match */ int nToken, /* Size of buffer pToken in bytes */ Fts5Colset *pColset, /* Restrict matches to these columns */ - Fts5IndexIter **ppIter /* OUT: New iterator */ + Fts5Iter **ppIter /* OUT: New iterator */ ){ Fts5Structure *pStruct; Fts5Buffer *aBuf; const int nBuf = 32; + void (*xMerge)(Fts5Index*, Fts5Buffer*, Fts5Buffer*); + void (*xAppend)(Fts5Index*, i64, Fts5Iter*, Fts5Buffer*); + if( p->pConfig->eDetail==FTS5_DETAIL_NONE ){ + xMerge = fts5MergeRowidLists; + xAppend = fts5AppendRowid; + }else{ + xMerge = fts5MergePrefixLists; + xAppend = fts5AppendPoslist; + } + aBuf = (Fts5Buffer*)fts5IdxMalloc(p, sizeof(Fts5Buffer)*nBuf); pStruct = fts5StructureRead(p); if( aBuf && pStruct ){ - const int flags = FTS5INDEX_QUERY_SCAN; + const int flags = FTS5INDEX_QUERY_SCAN + | FTS5INDEX_QUERY_SKIPEMPTY + | FTS5INDEX_QUERY_NOOUTPUT; int i; i64 iLastRowid = 0; - Fts5IndexIter *p1 = 0; /* Iterator used to gather data from index */ + Fts5Iter *p1 = 0; /* Iterator used to gather data from index */ Fts5Data *pData; Fts5Buffer doclist; int bNewTerm = 1; memset(&doclist, 0, sizeof(doclist)); - for(fts5MultiIterNew(p, pStruct, 1, flags, pToken, nToken, -1, 0, &p1); + fts5MultiIterNew(p, pStruct, flags, pColset, pToken, nToken, -1, 0, &p1); + fts5IterSetOutputCb(&p->rc, p1); + for( /* no-op */ ; fts5MultiIterEof(p, p1)==0; fts5MultiIterNext2(p, p1, &bNewTerm) ){ - i64 iRowid = fts5MultiIterRowid(p1); - int nTerm; - const u8 *pTerm = fts5MultiIterTerm(p1, &nTerm); + Fts5SegIter *pSeg = &p1->aSeg[ p1->aFirst[1].iFirst ]; + int nTerm = pSeg->term.n; + const u8 *pTerm = pSeg->term.p; + p1->xSetOutputs(p1, pSeg); + assert_nc( memcmp(pToken, pTerm, MIN(nToken, nTerm))<=0 ); if( bNewTerm ){ if( nTerm0 && iRowid<=iLastRowid ){ + if( p1->base.nData==0 ) continue; + + if( p1->base.iRowid<=iLastRowid && doclist.n>0 ){ for(i=0; p->rc==SQLITE_OK && doclist.n; i++){ assert( ibase.iRowid-iLastRowid, p1, &doclist); + iLastRowid = p1->base.iRowid; } for(i=0; irc==SQLITE_OK ){ - fts5MergePrefixLists(p, &doclist, &aBuf[i]); + xMerge(p, &doclist, &aBuf[i]); } fts5BufferFree(&aBuf[i]); } - fts5MultiIterFree(p, p1); + fts5MultiIterFree(p1); pData = fts5IdxMalloc(p, sizeof(Fts5Data) + doclist.n); if( pData ){ @@ -178500,7 +180392,7 @@ static int sqlite3Fts5IndexBeginWrite(Fts5Index *p, int bDelete, i64 iRowid){ /* Allocate the hash table if it has not already been allocated */ if( p->pHash==0 ){ - p->rc = sqlite3Fts5HashNew(&p->pHash, &p->nPendingData); + p->rc = sqlite3Fts5HashNew(p->pConfig, &p->pHash, &p->nPendingData); } /* Flush the hash table to disk if required */ @@ -178535,7 +180427,7 @@ static int sqlite3Fts5IndexSync(Fts5Index *p, int bCommit){ static int sqlite3Fts5IndexRollback(Fts5Index *p){ fts5CloseReader(p); fts5IndexDiscardData(p); - assert( p->rc==SQLITE_OK ); + /* assert( p->rc==SQLITE_OK ); */ return SQLITE_OK; } @@ -178621,7 +180513,11 @@ static int sqlite3Fts5IndexClose(Fts5Index *p){ ** size. Return the number of bytes in the nChar character prefix of the ** buffer, or 0 if there are less than nChar characters in total. */ -static int fts5IndexCharlenToBytelen(const char *p, int nByte, int nChar){ +static int sqlite3Fts5IndexCharlenToBytelen( + const char *p, + int nByte, + int nChar +){ int n = 0; int i; for(i=0; inPrefix && rc==SQLITE_OK; i++){ - int nByte = fts5IndexCharlenToBytelen(pToken, nToken, pConfig->aPrefix[i]); + const int nChar = pConfig->aPrefix[i]; + int nByte = sqlite3Fts5IndexCharlenToBytelen(pToken, nToken, nChar); if( nByte ){ rc = sqlite3Fts5HashWrite(p->pHash, p->iWriteRowid, iCol, iPos, (char)(FTS5_MAIN_PREFIX+i+1), pToken, @@ -178702,22 +180599,27 @@ static int sqlite3Fts5IndexQuery( Fts5IndexIter **ppIter /* OUT: New iterator object */ ){ Fts5Config *pConfig = p->pConfig; - Fts5IndexIter *pRet = 0; - int iIdx = 0; + Fts5Iter *pRet = 0; Fts5Buffer buf = {0, 0, 0}; /* If the QUERY_SCAN flag is set, all other flags must be clear. */ assert( (flags & FTS5INDEX_QUERY_SCAN)==0 || flags==FTS5INDEX_QUERY_SCAN ); if( sqlite3Fts5BufferSize(&p->rc, &buf, nToken+1)==0 ){ + int iIdx = 0; /* Index to search */ memcpy(&buf.p[1], pToken, nToken); -#ifdef SQLITE_DEBUG - /* If the QUERY_TEST_NOIDX flag was specified, then this must be a + /* Figure out which index to search and set iIdx accordingly. If this + ** is a prefix query for which there is no prefix index, set iIdx to + ** greater than pConfig->nPrefix to indicate that the query will be + ** satisfied by scanning multiple terms in the main index. + ** + ** If the QUERY_TEST_NOIDX flag was specified, then this must be a ** prefix-query. Instead of using a prefix-index (if one exists), ** evaluate the prefix query using the main FTS index. This is used ** for internal sanity checking by the integrity-check in debug ** mode only. */ +#ifdef SQLITE_DEBUG if( pConfig->bPrefixIndex==0 || (flags & FTS5INDEX_QUERY_TEST_NOIDX) ){ assert( flags & FTS5INDEX_QUERY_PREFIX ); iIdx = 1+pConfig->nPrefix; @@ -178731,24 +180633,35 @@ static int sqlite3Fts5IndexQuery( } if( iIdx<=pConfig->nPrefix ){ + /* Straight index lookup */ Fts5Structure *pStruct = fts5StructureRead(p); buf.p[0] = (u8)(FTS5_MAIN_PREFIX + iIdx); if( pStruct ){ - fts5MultiIterNew(p, pStruct, 1, flags, buf.p, nToken+1, -1, 0, &pRet); + fts5MultiIterNew(p, pStruct, flags | FTS5INDEX_QUERY_SKIPEMPTY, + pColset, buf.p, nToken+1, -1, 0, &pRet + ); fts5StructureRelease(pStruct); } }else{ + /* Scan multiple terms in the main index */ int bDesc = (flags & FTS5INDEX_QUERY_DESC)!=0; buf.p[0] = FTS5_MAIN_PREFIX; fts5SetupPrefixIter(p, bDesc, buf.p, nToken+1, pColset, &pRet); + assert( p->rc!=SQLITE_OK || pRet->pColset==0 ); + fts5IterSetOutputCb(&p->rc, pRet); + if( p->rc==SQLITE_OK ){ + Fts5SegIter *pSeg = &pRet->aSeg[pRet->aFirst[1].iFirst]; + if( pSeg->pLeaf ) pRet->xSetOutputs(pRet, pSeg); + } } if( p->rc ){ - sqlite3Fts5IterClose(pRet); + sqlite3Fts5IterClose(&pRet->base); pRet = 0; fts5CloseReader(p); } - *ppIter = pRet; + + *ppIter = &pRet->base; sqlite3Fts5BufferFree(&buf); } return fts5IndexReturn(p); @@ -178757,15 +180670,11 @@ static int sqlite3Fts5IndexQuery( /* ** Return true if the iterator passed as the only argument is at EOF. */ -static int sqlite3Fts5IterEof(Fts5IndexIter *pIter){ - assert( pIter->pIndex->rc==SQLITE_OK ); - return pIter->bEof; -} - /* ** Move to the next matching rowid. */ -static int sqlite3Fts5IterNext(Fts5IndexIter *pIter){ +static int sqlite3Fts5IterNext(Fts5IndexIter *pIndexIter){ + Fts5Iter *pIter = (Fts5Iter*)pIndexIter; assert( pIter->pIndex->rc==SQLITE_OK ); fts5MultiIterNext(pIter->pIndex, pIter, 0, 0); return fts5IndexReturn(pIter->pIndex); @@ -178774,7 +180683,8 @@ static int sqlite3Fts5IterNext(Fts5IndexIter *pIter){ /* ** Move to the next matching term/rowid. Used by the fts5vocab module. */ -static int sqlite3Fts5IterNextScan(Fts5IndexIter *pIter){ +static int sqlite3Fts5IterNextScan(Fts5IndexIter *pIndexIter){ + Fts5Iter *pIter = (Fts5Iter*)pIndexIter; Fts5Index *p = pIter->pIndex; assert( pIter->pIndex->rc==SQLITE_OK ); @@ -178785,7 +180695,7 @@ static int sqlite3Fts5IterNextScan(Fts5IndexIter *pIter){ if( pSeg->pLeaf && pSeg->term.p[0]!=FTS5_MAIN_PREFIX ){ fts5DataRelease(pSeg->pLeaf); pSeg->pLeaf = 0; - pIter->bEof = 1; + pIter->base.bEof = 1; } } @@ -178797,111 +180707,30 @@ static int sqlite3Fts5IterNextScan(Fts5IndexIter *pIter){ ** definition of "at or after" depends on whether this iterator iterates ** in ascending or descending rowid order. */ -static int sqlite3Fts5IterNextFrom(Fts5IndexIter *pIter, i64 iMatch){ +static int sqlite3Fts5IterNextFrom(Fts5IndexIter *pIndexIter, i64 iMatch){ + Fts5Iter *pIter = (Fts5Iter*)pIndexIter; fts5MultiIterNextFrom(pIter->pIndex, pIter, iMatch); return fts5IndexReturn(pIter->pIndex); } -/* -** Return the current rowid. -*/ -static i64 sqlite3Fts5IterRowid(Fts5IndexIter *pIter){ - return fts5MultiIterRowid(pIter); -} - /* ** Return the current term. */ -static const char *sqlite3Fts5IterTerm(Fts5IndexIter *pIter, int *pn){ +static const char *sqlite3Fts5IterTerm(Fts5IndexIter *pIndexIter, int *pn){ int n; - const char *z = (const char*)fts5MultiIterTerm(pIter, &n); + const char *z = (const char*)fts5MultiIterTerm((Fts5Iter*)pIndexIter, &n); *pn = n-1; return &z[1]; } - -static int fts5IndexExtractColset ( - Fts5Colset *pColset, /* Colset to filter on */ - const u8 *pPos, int nPos, /* Position list */ - Fts5Buffer *pBuf /* Output buffer */ -){ - int rc = SQLITE_OK; - int i; - - fts5BufferZero(pBuf); - for(i=0; inCol; i++){ - const u8 *pSub = pPos; - int nSub = fts5IndexExtractCol(&pSub, nPos, pColset->aiCol[i]); - if( nSub ){ - fts5BufferAppendBlob(&rc, pBuf, nSub, pSub); - } - } - return rc; -} - - -/* -** Return a pointer to a buffer containing a copy of the position list for -** the current entry. Output variable *pn is set to the size of the buffer -** in bytes before returning. -** -** The returned position list does not include the "number of bytes" varint -** field that starts the position list on disk. -*/ -static int sqlite3Fts5IterPoslist( - Fts5IndexIter *pIter, - Fts5Colset *pColset, /* Column filter (or NULL) */ - const u8 **pp, /* OUT: Pointer to position-list data */ - int *pn, /* OUT: Size of position-list in bytes */ - i64 *piRowid /* OUT: Current rowid */ -){ - Fts5SegIter *pSeg = &pIter->aSeg[ pIter->aFirst[1].iFirst ]; - assert( pIter->pIndex->rc==SQLITE_OK ); - *piRowid = pSeg->iRowid; - if( pSeg->iLeafOffset+pSeg->nPos<=pSeg->pLeaf->szLeaf ){ - u8 *pPos = &pSeg->pLeaf->p[pSeg->iLeafOffset]; - if( pColset==0 || pIter->bFiltered ){ - *pn = pSeg->nPos; - *pp = pPos; - }else if( pColset->nCol==1 ){ - *pp = pPos; - *pn = fts5IndexExtractCol(pp, pSeg->nPos, pColset->aiCol[0]); - }else{ - fts5BufferZero(&pIter->poslist); - fts5IndexExtractColset(pColset, pPos, pSeg->nPos, &pIter->poslist); - *pp = pIter->poslist.p; - *pn = pIter->poslist.n; - } - }else{ - fts5BufferZero(&pIter->poslist); - fts5SegiterPoslist(pIter->pIndex, pSeg, pColset, &pIter->poslist); - *pp = pIter->poslist.p; - *pn = pIter->poslist.n; - } - return fts5IndexReturn(pIter->pIndex); -} - -/* -** This function is similar to sqlite3Fts5IterPoslist(), except that it -** copies the position list into the buffer supplied as the second -** argument. -*/ -static int sqlite3Fts5IterPoslistBuffer(Fts5IndexIter *pIter, Fts5Buffer *pBuf){ - Fts5Index *p = pIter->pIndex; - Fts5SegIter *pSeg = &pIter->aSeg[ pIter->aFirst[1].iFirst ]; - assert( p->rc==SQLITE_OK ); - fts5BufferZero(pBuf); - fts5SegiterPoslist(p, pSeg, 0, pBuf); - return fts5IndexReturn(p); -} - /* ** Close an iterator opened by an earlier call to sqlite3Fts5IndexQuery(). */ -static void sqlite3Fts5IterClose(Fts5IndexIter *pIter){ - if( pIter ){ +static void sqlite3Fts5IterClose(Fts5IndexIter *pIndexIter){ + if( pIndexIter ){ + Fts5Iter *pIter = (Fts5Iter*)pIndexIter; Fts5Index *pIndex = pIter->pIndex; - fts5MultiIterFree(pIter->pIndex, pIter); + fts5MultiIterFree(pIter); fts5CloseReader(pIndex); } } @@ -178994,7 +180823,7 @@ static int sqlite3Fts5IndexLoadConfig(Fts5Index *p){ /* ** Return a simple checksum value based on the arguments. */ -static u64 fts5IndexEntryCksum( +static u64 sqlite3Fts5IndexEntryCksum( i64 iRowid, int iCol, int iPos, @@ -179064,30 +180893,32 @@ static int fts5QueryCksum( int flags, /* Flags for Fts5IndexQuery */ u64 *pCksum /* IN/OUT: Checksum value */ ){ + int eDetail = p->pConfig->eDetail; u64 cksum = *pCksum; - Fts5IndexIter *pIdxIter = 0; - int rc = sqlite3Fts5IndexQuery(p, z, n, flags, 0, &pIdxIter); + Fts5IndexIter *pIter = 0; + int rc = sqlite3Fts5IndexQuery(p, z, n, flags, 0, &pIter); - while( rc==SQLITE_OK && 0==sqlite3Fts5IterEof(pIdxIter) ){ - i64 dummy; - const u8 *pPos; - int nPos; - i64 rowid = sqlite3Fts5IterRowid(pIdxIter); - rc = sqlite3Fts5IterPoslist(pIdxIter, 0, &pPos, &nPos, &dummy); - if( rc==SQLITE_OK ){ + while( rc==SQLITE_OK && 0==sqlite3Fts5IterEof(pIter) ){ + i64 rowid = pIter->iRowid; + + if( eDetail==FTS5_DETAIL_NONE ){ + cksum ^= sqlite3Fts5IndexEntryCksum(rowid, 0, 0, iIdx, z, n); + }else{ Fts5PoslistReader sReader; - for(sqlite3Fts5PoslistReaderInit(pPos, nPos, &sReader); + for(sqlite3Fts5PoslistReaderInit(pIter->pData, pIter->nData, &sReader); sReader.bEof==0; sqlite3Fts5PoslistReaderNext(&sReader) ){ int iCol = FTS5_POS2COLUMN(sReader.iPos); int iOff = FTS5_POS2OFFSET(sReader.iPos); - cksum ^= fts5IndexEntryCksum(rowid, iCol, iOff, iIdx, z, n); + cksum ^= sqlite3Fts5IndexEntryCksum(rowid, iCol, iOff, iIdx, z, n); } - rc = sqlite3Fts5IterNext(pIdxIter); + } + if( rc==SQLITE_OK ){ + rc = sqlite3Fts5IterNext(pIter); } } - sqlite3Fts5IterClose(pIdxIter); + sqlite3Fts5IterClose(pIter); *pCksum = cksum; return rc; @@ -179381,7 +181212,7 @@ static void fts5IndexIntegrityCheckSegment( /* ** Run internal checks to ensure that the FTS index (a) is internally ** consistent and (b) contains entries for which the XOR of the checksums -** as calculated by fts5IndexEntryCksum() is cksum. +** as calculated by sqlite3Fts5IndexEntryCksum() is cksum. ** ** Return SQLITE_CORRUPT if any of the internal checks fail, or if the ** checksum does not match. Return SQLITE_OK if all checks pass without @@ -179389,9 +181220,10 @@ static void fts5IndexIntegrityCheckSegment( ** occurs. */ static int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum){ + int eDetail = p->pConfig->eDetail; u64 cksum2 = 0; /* Checksum based on contents of indexes */ Fts5Buffer poslist = {0,0,0}; /* Buffer used to hold a poslist */ - Fts5IndexIter *pIter; /* Used to iterate through entire index */ + Fts5Iter *pIter; /* Used to iterate through entire index */ Fts5Structure *pStruct; /* Index structure */ #ifdef SQLITE_DEBUG @@ -179399,6 +181231,7 @@ static int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum){ u64 cksum3 = 0; /* Checksum based on contents of indexes */ Fts5Buffer term = {0,0,0}; /* Buffer used to hold most recent term */ #endif + const int flags = FTS5INDEX_QUERY_NOOUTPUT; /* Load the FTS index structure */ pStruct = fts5StructureRead(p); @@ -179427,7 +181260,7 @@ static int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum){ ** same term is performed. cksum3 is calculated based on the entries ** extracted by these queries. */ - for(fts5MultiIterNew(p, pStruct, 0, 0, 0, 0, -1, 0, &pIter); + for(fts5MultiIterNew(p, pStruct, flags, 0, 0, 0, -1, 0, &pIter); fts5MultiIterEof(p, pIter)==0; fts5MultiIterNext(p, pIter, 0, 0) ){ @@ -179440,17 +181273,23 @@ static int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum){ /* If this is a new term, query for it. Update cksum3 with the results. */ fts5TestTerm(p, &term, z, n, cksum2, &cksum3); - poslist.n = 0; - fts5SegiterPoslist(p, &pIter->aSeg[pIter->aFirst[1].iFirst] , 0, &poslist); - while( 0==sqlite3Fts5PoslistNext64(poslist.p, poslist.n, &iOff, &iPos) ){ - int iCol = FTS5_POS2COLUMN(iPos); - int iTokOff = FTS5_POS2OFFSET(iPos); - cksum2 ^= fts5IndexEntryCksum(iRowid, iCol, iTokOff, -1, z, n); + if( eDetail==FTS5_DETAIL_NONE ){ + if( 0==fts5MultiIterIsEmpty(p, pIter) ){ + cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, 0, 0, -1, z, n); + } + }else{ + poslist.n = 0; + fts5SegiterPoslist(p, &pIter->aSeg[pIter->aFirst[1].iFirst], 0, &poslist); + while( 0==sqlite3Fts5PoslistNext64(poslist.p, poslist.n, &iOff, &iPos) ){ + int iCol = FTS5_POS2COLUMN(iPos); + int iTokOff = FTS5_POS2OFFSET(iPos); + cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, iCol, iTokOff, -1, z, n); + } } } fts5TestTerm(p, &term, 0, 0, cksum2, &cksum3); - fts5MultiIterFree(p, pIter); + fts5MultiIterFree(pIter); if( p->rc==SQLITE_OK && cksum!=cksum2 ) p->rc = FTS5_CORRUPT; fts5StructureRelease(pStruct); @@ -179461,34 +181300,6 @@ static int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum){ return fts5IndexReturn(p); } - -/* -** Calculate and return a checksum that is the XOR of the index entry -** checksum of all entries that would be generated by the token specified -** by the final 5 arguments. -*/ -static u64 sqlite3Fts5IndexCksum( - Fts5Config *pConfig, /* Configuration object */ - i64 iRowid, /* Document term appears in */ - int iCol, /* Column term appears in */ - int iPos, /* Position term appears in */ - const char *pTerm, int nTerm /* Term at iPos */ -){ - u64 ret = 0; /* Return value */ - int iIdx; /* For iterating through indexes */ - - ret = fts5IndexEntryCksum(iRowid, iCol, iPos, 0, pTerm, nTerm); - - for(iIdx=0; iIdxnPrefix; iIdx++){ - int nByte = fts5IndexCharlenToBytelen(pTerm, nTerm, pConfig->aPrefix[iIdx]); - if( nByte ){ - ret ^= fts5IndexEntryCksum(iRowid, iCol, iPos, iIdx+1, pTerm, nByte); - } - } - - return ret; -} - /************************************************************************* ************************************************************************** ** Below this point is the implementation of the fts5_decode() scalar @@ -179656,6 +181467,47 @@ static int fts5DecodeDoclist(int *pRc, Fts5Buffer *pBuf, const u8 *a, int n){ return iOff; } +/* +** This function is part of the fts5_decode() debugging function. It is +** only ever used with detail=none tables. +** +** Buffer (pData/nData) contains a doclist in the format used by detail=none +** tables. This function appends a human-readable version of that list to +** buffer pBuf. +** +** If *pRc is other than SQLITE_OK when this function is called, it is a +** no-op. If an OOM or other error occurs within this function, *pRc is +** set to an SQLite error code before returning. The final state of buffer +** pBuf is undefined in this case. +*/ +static void fts5DecodeRowidList( + int *pRc, /* IN/OUT: Error code */ + Fts5Buffer *pBuf, /* Buffer to append text to */ + const u8 *pData, int nData /* Data to decode list-of-rowids from */ +){ + int i = 0; + i64 iRowid = 0; + + while( inConstraint; i++){ struct sqlite3_index_constraint *p = &pInfo->aConstraint[i]; int j; - for(j=0; j<(int)ArraySize(aConstraint); j++){ + for(j=0; jiColumn==aColMap[pC->iCol] && p->op & pC->op ){ if( p->usable ){ @@ -180434,7 +182344,7 @@ static int fts5BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){ /* Assign argvIndex values to each constraint in use. */ iNext = 1; - for(i=0; i<(int)ArraySize(aConstraint); i++){ + for(i=0; iiConsIndex>=0 ){ pInfo->aConstraintUsage[pC->iConsIndex].argvIndex = iNext++; @@ -180489,6 +182399,7 @@ static void fts5CsrNewrow(Fts5Cursor *pCsr){ FTS5CSR_REQUIRE_CONTENT | FTS5CSR_REQUIRE_DOCSIZE | FTS5CSR_REQUIRE_INST + | FTS5CSR_REQUIRE_POSLIST ); } @@ -180571,15 +182482,18 @@ static int fts5SorterNext(Fts5Cursor *pCsr){ nBlob = sqlite3_column_bytes(pSorter->pStmt, 1); aBlob = a = sqlite3_column_blob(pSorter->pStmt, 1); - for(i=0; i<(pSorter->nIdx-1); i++){ - int iVal; - a += fts5GetVarint32(a, iVal); - iOff += iVal; - pSorter->aIdx[i] = iOff; + /* nBlob==0 in detail=none mode. */ + if( nBlob>0 ){ + for(i=0; i<(pSorter->nIdx-1); i++){ + int iVal; + a += fts5GetVarint32(a, iVal); + iOff += iVal; + pSorter->aIdx[i] = iOff; + } + pSorter->aIdx[i] = &aBlob[nBlob] - a; + pSorter->aPoslist = a; } - pSorter->aIdx[i] = &aBlob[nBlob] - a; - pSorter->aPoslist = a; fts5CsrNewrow(pCsr); } @@ -180623,7 +182537,7 @@ static int fts5CursorReseek(Fts5Cursor *pCsr, int *pbSkip){ i64 iRowid = sqlite3Fts5ExprRowid(pCsr->pExpr); rc = sqlite3Fts5ExprFirst(pCsr->pExpr, pTab->pIndex, iRowid, bDesc); - if( rc==SQLITE_OK && iRowid!=sqlite3Fts5ExprRowid(pCsr->pExpr) ){ + if( rc==SQLITE_OK && iRowid!=sqlite3Fts5ExprRowid(pCsr->pExpr) ){ *pbSkip = 1; } @@ -180631,6 +182545,7 @@ static int fts5CursorReseek(Fts5Cursor *pCsr, int *pbSkip){ fts5CsrNewrow(pCsr); if( sqlite3Fts5ExprEof(pCsr->pExpr) ){ CsrFlagSet(pCsr, FTS5CSR_EOF); + *pbSkip = 1; } } return rc; @@ -180647,24 +182562,24 @@ static int fts5CursorReseek(Fts5Cursor *pCsr, int *pbSkip){ */ static int fts5NextMethod(sqlite3_vtab_cursor *pCursor){ Fts5Cursor *pCsr = (Fts5Cursor*)pCursor; - int rc = SQLITE_OK; + int rc; assert( (pCsr->ePlan<3)== (pCsr->ePlan==FTS5_PLAN_MATCH || pCsr->ePlan==FTS5_PLAN_SOURCE) ); + assert( !CsrFlagTest(pCsr, FTS5CSR_EOF) ); if( pCsr->ePlan<3 ){ int bSkip = 0; if( (rc = fts5CursorReseek(pCsr, &bSkip)) || bSkip ) return rc; rc = sqlite3Fts5ExprNext(pCsr->pExpr, pCsr->iLastRowid); - if( sqlite3Fts5ExprEof(pCsr->pExpr) ){ - CsrFlagSet(pCsr, FTS5CSR_EOF); - } + CsrFlagSet(pCsr, sqlite3Fts5ExprEof(pCsr->pExpr)); fts5CsrNewrow(pCsr); }else{ switch( pCsr->ePlan ){ case FTS5_PLAN_SPECIAL: { CsrFlagSet(pCsr, FTS5CSR_EOF); + rc = SQLITE_OK; break; } @@ -180689,33 +182604,32 @@ static int fts5NextMethod(sqlite3_vtab_cursor *pCursor){ } -static sqlite3_stmt *fts5PrepareStatement( - int *pRc, +static int fts5PrepareStatement( + sqlite3_stmt **ppStmt, Fts5Config *pConfig, const char *zFmt, ... ){ sqlite3_stmt *pRet = 0; + int rc; + char *zSql; va_list ap; - va_start(ap, zFmt); - if( *pRc==SQLITE_OK ){ - int rc; - char *zSql = sqlite3_vmprintf(zFmt, ap); - if( zSql==0 ){ - rc = SQLITE_NOMEM; - }else{ - rc = sqlite3_prepare_v2(pConfig->db, zSql, -1, &pRet, 0); - if( rc!=SQLITE_OK ){ - *pConfig->pzErrmsg = sqlite3_mprintf("%s", sqlite3_errmsg(pConfig->db)); - } - sqlite3_free(zSql); + va_start(ap, zFmt); + zSql = sqlite3_vmprintf(zFmt, ap); + if( zSql==0 ){ + rc = SQLITE_NOMEM; + }else{ + rc = sqlite3_prepare_v2(pConfig->db, zSql, -1, &pRet, 0); + if( rc!=SQLITE_OK ){ + *pConfig->pzErrmsg = sqlite3_mprintf("%s", sqlite3_errmsg(pConfig->db)); } - *pRc = rc; + sqlite3_free(zSql); } va_end(ap); - return pRet; + *ppStmt = pRet; + return rc; } static int fts5CursorFirstSorted(Fts5Table *pTab, Fts5Cursor *pCsr, int bDesc){ @@ -180723,7 +182637,7 @@ static int fts5CursorFirstSorted(Fts5Table *pTab, Fts5Cursor *pCsr, int bDesc){ Fts5Sorter *pSorter; int nPhrase; int nByte; - int rc = SQLITE_OK; + int rc; const char *zRank = pCsr->zRank; const char *zRankArgs = pCsr->zRankArgs; @@ -180741,7 +182655,7 @@ static int fts5CursorFirstSorted(Fts5Table *pTab, Fts5Cursor *pCsr, int bDesc){ ** table, saving it creates a circular reference. ** ** If SQLite a built-in statement cache, this wouldn't be a problem. */ - pSorter->pStmt = fts5PrepareStatement(&rc, pConfig, + rc = fts5PrepareStatement(&pSorter->pStmt, pConfig, "SELECT rowid, rank FROM %Q.%Q ORDER BY %s(%s%s%s) %s", pConfig->zDb, pConfig->zName, zRank, pConfig->zName, (zRankArgs ? ", " : ""), @@ -180941,7 +182855,7 @@ static i64 fts5GetRowidLimit(sqlite3_value *pVal, i64 iDefault){ static int fts5FilterMethod( sqlite3_vtab_cursor *pCursor, /* The cursor used for this query */ int idxNum, /* Strategy index */ - const char *idxStr, /* Unused */ + const char *zUnused, /* Unused */ int nVal, /* Number of elements in apVal */ sqlite3_value **apVal /* Arguments for the indexing scheme */ ){ @@ -180959,6 +182873,9 @@ static int fts5FilterMethod( sqlite3_value *pRowidGe = 0; /* rowid >= ? expression (or NULL) */ char **pzErrmsg = pConfig->pzErrmsg; + UNUSED_PARAM(zUnused); + UNUSED_PARAM(nVal); + if( pCsr->ePlan ){ fts5FreeCursorComponents(pCsr); memset(&pCsr->ePlan, 0, sizeof(Fts5Cursor) - ((u8*)&pCsr->ePlan-(u8*)pCsr)); @@ -181017,6 +182934,7 @@ static int fts5FilterMethod( pCsr->ePlan = FTS5_PLAN_SOURCE; pCsr->pExpr = pTab->pSortCsr->pExpr; rc = fts5CursorFirst(pTab, pCsr, bDesc); + sqlite3Fts5ExprClearEof(pCsr->pExpr); }else if( pMatch ){ const char *zExpr = (const char*)sqlite3_value_text(apVal[0]); if( zExpr==0 ) zExpr = ""; @@ -181242,14 +183160,13 @@ static int fts5SpecialInsert( static int fts5SpecialDelete( Fts5Table *pTab, - sqlite3_value **apVal, - sqlite3_int64 *piRowid + sqlite3_value **apVal ){ int rc = SQLITE_OK; int eType1 = sqlite3_value_type(apVal[1]); if( eType1==SQLITE_INTEGER ){ sqlite3_int64 iDel = sqlite3_value_int64(apVal[1]); - rc = sqlite3Fts5StorageSpecialDelete(pTab->pStorage, iDel, &apVal[2]); + rc = sqlite3Fts5StorageDelete(pTab->pStorage, iDel, &apVal[2]); } return rc; } @@ -181319,7 +183236,7 @@ static int fts5UpdateMethod( if( pConfig->eContent!=FTS5_CONTENT_NORMAL && 0==sqlite3_stricmp("delete", z) ){ - rc = fts5SpecialDelete(pTab, apVal, pRowid); + rc = fts5SpecialDelete(pTab, apVal); }else{ rc = fts5SpecialInsert(pTab, z, apVal[2 + pConfig->nCol + 1]); } @@ -181356,7 +183273,7 @@ static int fts5UpdateMethod( /* Case 1: DELETE */ else if( nArg==1 ){ i64 iDel = sqlite3_value_int64(apVal[0]); /* Rowid to delete */ - rc = sqlite3Fts5StorageDelete(pTab->pStorage, iDel); + rc = sqlite3Fts5StorageDelete(pTab->pStorage, iDel, 0); } /* Case 2: INSERT */ @@ -181366,7 +183283,7 @@ static int fts5UpdateMethod( && sqlite3_value_type(apVal[1])==SQLITE_INTEGER ){ i64 iNew = sqlite3_value_int64(apVal[1]); /* Rowid to delete */ - rc = sqlite3Fts5StorageDelete(pTab->pStorage, iNew); + rc = sqlite3Fts5StorageDelete(pTab->pStorage, iNew, 0); } fts5StorageInsert(&rc, pTab, apVal, pRowid); } @@ -181377,22 +183294,22 @@ static int fts5UpdateMethod( i64 iNew = sqlite3_value_int64(apVal[1]); /* New rowid */ if( iOld!=iNew ){ if( eConflict==SQLITE_REPLACE ){ - rc = sqlite3Fts5StorageDelete(pTab->pStorage, iOld); + rc = sqlite3Fts5StorageDelete(pTab->pStorage, iOld, 0); if( rc==SQLITE_OK ){ - rc = sqlite3Fts5StorageDelete(pTab->pStorage, iNew); + rc = sqlite3Fts5StorageDelete(pTab->pStorage, iNew, 0); } fts5StorageInsert(&rc, pTab, apVal, pRowid); }else{ rc = sqlite3Fts5StorageContentInsert(pTab->pStorage, apVal, pRowid); if( rc==SQLITE_OK ){ - rc = sqlite3Fts5StorageDelete(pTab->pStorage, iOld); + rc = sqlite3Fts5StorageDelete(pTab->pStorage, iOld, 0); } if( rc==SQLITE_OK ){ rc = sqlite3Fts5StorageIndexInsert(pTab->pStorage, apVal, *pRowid); } } }else{ - rc = sqlite3Fts5StorageDelete(pTab->pStorage, iOld); + rc = sqlite3Fts5StorageDelete(pTab->pStorage, iOld, 0); fts5StorageInsert(&rc, pTab, apVal, pRowid); } } @@ -181420,6 +183337,7 @@ static int fts5SyncMethod(sqlite3_vtab *pVtab){ ** Implementation of xBegin() method. */ static int fts5BeginMethod(sqlite3_vtab *pVtab){ + UNUSED_PARAM(pVtab); /* Call below is a no-op for NDEBUG builds */ fts5CheckTransactionState((Fts5Table*)pVtab, FTS5_BEGIN, 0); return SQLITE_OK; } @@ -181430,6 +183348,7 @@ static int fts5BeginMethod(sqlite3_vtab *pVtab){ ** by fts5SyncMethod(). */ static int fts5CommitMethod(sqlite3_vtab *pVtab){ + UNUSED_PARAM(pVtab); /* Call below is a no-op for NDEBUG builds */ fts5CheckTransactionState((Fts5Table*)pVtab, FTS5_COMMIT, 0); return SQLITE_OK; } @@ -181446,6 +183365,8 @@ static int fts5RollbackMethod(sqlite3_vtab *pVtab){ return rc; } +static int fts5CsrPoslist(Fts5Cursor*, int, const u8**, int*); + static void *fts5ApiUserData(Fts5Context *pCtx){ Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; return pCsr->pAux->pUserData; @@ -181495,17 +183416,72 @@ static int fts5ApiPhraseSize(Fts5Context *pCtx, int iPhrase){ return sqlite3Fts5ExprPhraseSize(pCsr->pExpr, iPhrase); } -static int fts5CsrPoslist(Fts5Cursor *pCsr, int iPhrase, const u8 **pa){ - int n; - if( pCsr->pSorter ){ +static int fts5ApiColumnText( + Fts5Context *pCtx, + int iCol, + const char **pz, + int *pn +){ + int rc = SQLITE_OK; + Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; + if( fts5IsContentless((Fts5Table*)(pCsr->base.pVtab)) ){ + *pz = 0; + *pn = 0; + }else{ + rc = fts5SeekCursor(pCsr, 0); + if( rc==SQLITE_OK ){ + *pz = (const char*)sqlite3_column_text(pCsr->pStmt, iCol+1); + *pn = sqlite3_column_bytes(pCsr->pStmt, iCol+1); + } + } + return rc; +} + +static int fts5CsrPoslist( + Fts5Cursor *pCsr, + int iPhrase, + const u8 **pa, + int *pn +){ + Fts5Config *pConfig = ((Fts5Table*)(pCsr->base.pVtab))->pConfig; + int rc = SQLITE_OK; + int bLive = (pCsr->pSorter==0); + + if( CsrFlagTest(pCsr, FTS5CSR_REQUIRE_POSLIST) ){ + + if( pConfig->eDetail!=FTS5_DETAIL_FULL ){ + Fts5PoslistPopulator *aPopulator; + int i; + aPopulator = sqlite3Fts5ExprClearPoslists(pCsr->pExpr, bLive); + if( aPopulator==0 ) rc = SQLITE_NOMEM; + for(i=0; inCol && rc==SQLITE_OK; i++){ + int n; const char *z; + rc = fts5ApiColumnText((Fts5Context*)pCsr, i, &z, &n); + if( rc==SQLITE_OK ){ + rc = sqlite3Fts5ExprPopulatePoslists( + pConfig, pCsr->pExpr, aPopulator, i, z, n + ); + } + } + sqlite3_free(aPopulator); + + if( pCsr->pSorter ){ + sqlite3Fts5ExprCheckPoslists(pCsr->pExpr, pCsr->pSorter->iRowid); + } + } + CsrFlagClear(pCsr, FTS5CSR_REQUIRE_POSLIST); + } + + if( pCsr->pSorter && pConfig->eDetail==FTS5_DETAIL_FULL ){ Fts5Sorter *pSorter = pCsr->pSorter; int i1 = (iPhrase==0 ? 0 : pSorter->aIdx[iPhrase-1]); - n = pSorter->aIdx[iPhrase] - i1; + *pn = pSorter->aIdx[iPhrase] - i1; *pa = &pSorter->aPoslist[i1]; }else{ - n = sqlite3Fts5ExprPoslist(pCsr->pExpr, iPhrase, pa); + *pn = sqlite3Fts5ExprPoslist(pCsr->pExpr, iPhrase, pa); } - return n; + + return rc; } /* @@ -181530,43 +183506,48 @@ static int fts5CacheInstArray(Fts5Cursor *pCsr){ int i; /* Initialize all iterators */ - for(i=0; i=pCsr->nInstAlloc ){ - pCsr->nInstAlloc = pCsr->nInstAlloc ? pCsr->nInstAlloc*2 : 32; - aInst = (int*)sqlite3_realloc( - pCsr->aInst, pCsr->nInstAlloc*sizeof(int)*3 - ); - if( aInst ){ - pCsr->aInst = aInst; - }else{ - rc = SQLITE_NOMEM; - break; + nInst++; + if( nInst>=pCsr->nInstAlloc ){ + pCsr->nInstAlloc = pCsr->nInstAlloc ? pCsr->nInstAlloc*2 : 32; + aInst = (int*)sqlite3_realloc( + pCsr->aInst, pCsr->nInstAlloc*sizeof(int)*3 + ); + if( aInst ){ + pCsr->aInst = aInst; + }else{ + rc = SQLITE_NOMEM; + break; + } } - } - aInst = &pCsr->aInst[3 * (nInst-1)]; - aInst[0] = iBest; - aInst[1] = FTS5_POS2COLUMN(aIter[iBest].iPos); - aInst[2] = FTS5_POS2OFFSET(aIter[iBest].iPos); - sqlite3Fts5PoslistReaderNext(&aIter[iBest]); + aInst = &pCsr->aInst[3 * (nInst-1)]; + aInst[0] = iBest; + aInst[1] = FTS5_POS2COLUMN(aIter[iBest].iPos); + aInst[2] = FTS5_POS2OFFSET(aIter[iBest].iPos); + sqlite3Fts5PoslistReaderNext(&aIter[iBest]); + } } pCsr->nInstCount = nInst; @@ -181599,6 +183580,12 @@ static int fts5ApiInst( ){ if( iIdx<0 || iIdx>=pCsr->nInstCount ){ rc = SQLITE_RANGE; +#if 0 + }else if( fts5IsOffsetless((Fts5Table*)pCsr->base.pVtab) ){ + *piPhrase = pCsr->aInst[iIdx*3]; + *piCol = pCsr->aInst[iIdx*3 + 2]; + *piOff = -1; +#endif }else{ *piPhrase = pCsr->aInst[iIdx*3]; *piCol = pCsr->aInst[iIdx*3 + 1]; @@ -181612,36 +183599,17 @@ static sqlite3_int64 fts5ApiRowid(Fts5Context *pCtx){ return fts5CursorRowid((Fts5Cursor*)pCtx); } -static int fts5ApiColumnText( - Fts5Context *pCtx, - int iCol, - const char **pz, - int *pn -){ - int rc = SQLITE_OK; - Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; - if( fts5IsContentless((Fts5Table*)(pCsr->base.pVtab)) ){ - *pz = 0; - *pn = 0; - }else{ - rc = fts5SeekCursor(pCsr, 0); - if( rc==SQLITE_OK ){ - *pz = (const char*)sqlite3_column_text(pCsr->pStmt, iCol+1); - *pn = sqlite3_column_bytes(pCsr->pStmt, iCol+1); - } - } - return rc; -} - static int fts5ColumnSizeCb( void *pContext, /* Pointer to int */ int tflags, - const char *pToken, /* Buffer containing token */ - int nToken, /* Size of token in bytes */ - int iStart, /* Start offset of token */ - int iEnd /* End offset of token */ + const char *pUnused, /* Buffer containing token */ + int nUnused, /* Size of token in bytes */ + int iUnused1, /* Start offset of token */ + int iUnused2 /* End offset of token */ ){ int *pCnt = (int*)pContext; + UNUSED_PARAM2(pUnused, nUnused); + UNUSED_PARAM2(iUnused1, iUnused2); if( (tflags & FTS5_TOKEN_COLOCATED)==0 ){ (*pCnt)++; } @@ -181757,10 +183725,11 @@ static void *fts5ApiGetAuxdata(Fts5Context *pCtx, int bClear){ } static void fts5ApiPhraseNext( - Fts5Context *pCtx, + Fts5Context *pUnused, Fts5PhraseIter *pIter, int *piCol, int *piOff ){ + UNUSED_PARAM(pUnused); if( pIter->a>=pIter->b ){ *piCol = -1; *piOff = -1; @@ -181777,20 +183746,98 @@ static void fts5ApiPhraseNext( } } -static void fts5ApiPhraseFirst( +static int fts5ApiPhraseFirst( Fts5Context *pCtx, int iPhrase, Fts5PhraseIter *pIter, int *piCol, int *piOff ){ Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; - int n = fts5CsrPoslist(pCsr, iPhrase, &pIter->a); - pIter->b = &pIter->a[n]; - *piCol = 0; - *piOff = 0; - fts5ApiPhraseNext(pCtx, pIter, piCol, piOff); + int n; + int rc = fts5CsrPoslist(pCsr, iPhrase, &pIter->a, &n); + if( rc==SQLITE_OK ){ + pIter->b = &pIter->a[n]; + *piCol = 0; + *piOff = 0; + fts5ApiPhraseNext(pCtx, pIter, piCol, piOff); + } + return rc; } +static void fts5ApiPhraseNextColumn( + Fts5Context *pCtx, + Fts5PhraseIter *pIter, + int *piCol +){ + Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; + Fts5Config *pConfig = ((Fts5Table*)(pCsr->base.pVtab))->pConfig; + + if( pConfig->eDetail==FTS5_DETAIL_COLUMNS ){ + if( pIter->a>=pIter->b ){ + *piCol = -1; + }else{ + int iIncr; + pIter->a += fts5GetVarint32(&pIter->a[0], iIncr); + *piCol += (iIncr-2); + } + }else{ + while( 1 ){ + int dummy; + if( pIter->a>=pIter->b ){ + *piCol = -1; + return; + } + if( pIter->a[0]==0x01 ) break; + pIter->a += fts5GetVarint32(pIter->a, dummy); + } + pIter->a += 1 + fts5GetVarint32(&pIter->a[1], *piCol); + } +} + +static int fts5ApiPhraseFirstColumn( + Fts5Context *pCtx, + int iPhrase, + Fts5PhraseIter *pIter, + int *piCol +){ + int rc = SQLITE_OK; + Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; + Fts5Config *pConfig = ((Fts5Table*)(pCsr->base.pVtab))->pConfig; + + if( pConfig->eDetail==FTS5_DETAIL_COLUMNS ){ + Fts5Sorter *pSorter = pCsr->pSorter; + int n; + if( pSorter ){ + int i1 = (iPhrase==0 ? 0 : pSorter->aIdx[iPhrase-1]); + n = pSorter->aIdx[iPhrase] - i1; + pIter->a = &pSorter->aPoslist[i1]; + }else{ + rc = sqlite3Fts5ExprPhraseCollist(pCsr->pExpr, iPhrase, &pIter->a, &n); + } + if( rc==SQLITE_OK ){ + pIter->b = &pIter->a[n]; + *piCol = 0; + fts5ApiPhraseNextColumn(pCtx, pIter, piCol); + } + }else{ + int n; + rc = fts5CsrPoslist(pCsr, iPhrase, &pIter->a, &n); + if( rc==SQLITE_OK ){ + pIter->b = &pIter->a[n]; + if( n<=0 ){ + *piCol = -1; + }else if( pIter->a[0]==0x01 ){ + pIter->a += 1 + fts5GetVarint32(&pIter->a[1], *piCol); + }else{ + *piCol = 0; + } + } + } + + return rc; +} + + static int fts5ApiQueryPhrase(Fts5Context*, int, void*, int(*)(const Fts5ExtensionApi*, Fts5Context*, void*) ); @@ -181814,9 +183861,10 @@ static const Fts5ExtensionApi sFts5Api = { fts5ApiGetAuxdata, fts5ApiPhraseFirst, fts5ApiPhraseNext, + fts5ApiPhraseFirstColumn, + fts5ApiPhraseNextColumn, }; - /* ** Implementation of API function xQueryPhrase(). */ @@ -181833,12 +183881,11 @@ static int fts5ApiQueryPhrase( rc = fts5OpenMethod(pCsr->base.pVtab, (sqlite3_vtab_cursor**)&pNew); if( rc==SQLITE_OK ){ - Fts5Config *pConf = pTab->pConfig; pNew->ePlan = FTS5_PLAN_MATCH; pNew->iFirstRowid = SMALLEST_INT64; pNew->iLastRowid = LARGEST_INT64; pNew->base.pVtab = (sqlite3_vtab*)pTab; - rc = sqlite3Fts5ExprClonePhrase(pConf, pCsr->pExpr, iPhrase, &pNew->pExpr); + rc = sqlite3Fts5ExprClonePhrase(pCsr->pExpr, iPhrase, &pNew->pExpr); } if( rc==SQLITE_OK ){ @@ -181948,20 +183995,46 @@ static int fts5PoslistBlob(sqlite3_context *pCtx, Fts5Cursor *pCsr){ Fts5Buffer val; memset(&val, 0, sizeof(Fts5Buffer)); + switch( ((Fts5Table*)(pCsr->base.pVtab))->pConfig->eDetail ){ + case FTS5_DETAIL_FULL: - /* Append the varints */ - for(i=0; i<(nPhrase-1); i++){ - const u8 *dummy; - int nByte = sqlite3Fts5ExprPoslist(pCsr->pExpr, i, &dummy); - sqlite3Fts5BufferAppendVarint(&rc, &val, nByte); - } + /* Append the varints */ + for(i=0; i<(nPhrase-1); i++){ + const u8 *dummy; + int nByte = sqlite3Fts5ExprPoslist(pCsr->pExpr, i, &dummy); + sqlite3Fts5BufferAppendVarint(&rc, &val, nByte); + } - /* Append the position lists */ - for(i=0; ipExpr, i, &pPoslist); - sqlite3Fts5BufferAppendBlob(&rc, &val, nPoslist, pPoslist); + /* Append the position lists */ + for(i=0; ipExpr, i, &pPoslist); + sqlite3Fts5BufferAppendBlob(&rc, &val, nPoslist, pPoslist); + } + break; + + case FTS5_DETAIL_COLUMNS: + + /* Append the varints */ + for(i=0; rc==SQLITE_OK && i<(nPhrase-1); i++){ + const u8 *dummy; + int nByte; + rc = sqlite3Fts5ExprPhraseCollist(pCsr->pExpr, i, &dummy, &nByte); + sqlite3Fts5BufferAppendVarint(&rc, &val, nByte); + } + + /* Append the position lists */ + for(i=0; rc==SQLITE_OK && ipExpr, i, &pPoslist, &nPoslist); + sqlite3Fts5BufferAppendBlob(&rc, &val, nPoslist, pPoslist); + } + break; + + default: + break; } sqlite3_result_blob(pCtx, val.p, val.n, sqlite3_free); @@ -182025,7 +184098,7 @@ static int fts5ColumnMethod( */ static int fts5FindFunctionMethod( sqlite3_vtab *pVtab, /* Virtual table handle */ - int nArg, /* Number of SQL function arguments */ + int nUnused, /* Number of SQL function arguments */ const char *zName, /* Name of SQL function */ void (**pxFunc)(sqlite3_context*,int,sqlite3_value**), /* OUT: Result */ void **ppArg /* OUT: User data for *pxFunc */ @@ -182033,6 +184106,7 @@ static int fts5FindFunctionMethod( Fts5Table *pTab = (Fts5Table*)pVtab; Fts5Auxiliary *pAux; + UNUSED_PARAM(nUnused); pAux = fts5FindAuxiliary(pTab, zName); if( pAux ){ *pxFunc = fts5ApiCallback; @@ -182062,6 +184136,7 @@ static int fts5RenameMethod( */ static int fts5SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){ Fts5Table *pTab = (Fts5Table*)pVtab; + UNUSED_PARAM(iSavepoint); /* Call below is a no-op for NDEBUG builds */ fts5CheckTransactionState(pTab, FTS5_SAVEPOINT, iSavepoint); fts5TripCursors(pTab); return sqlite3Fts5StorageSync(pTab->pStorage, 0); @@ -182074,6 +184149,7 @@ static int fts5SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){ */ static int fts5ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){ Fts5Table *pTab = (Fts5Table*)pVtab; + UNUSED_PARAM(iSavepoint); /* Call below is a no-op for NDEBUG builds */ fts5CheckTransactionState(pTab, FTS5_RELEASE, iSavepoint); fts5TripCursors(pTab); return sqlite3Fts5StorageSync(pTab->pStorage, 0); @@ -182086,6 +184162,7 @@ static int fts5ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){ */ static int fts5RollbackToMethod(sqlite3_vtab *pVtab, int iSavepoint){ Fts5Table *pTab = (Fts5Table*)pVtab; + UNUSED_PARAM(iSavepoint); /* Call below is a no-op for NDEBUG builds */ fts5CheckTransactionState(pTab, FTS5_ROLLBACKTO, iSavepoint); fts5TripCursors(pTab); return sqlite3Fts5StorageRollback(pTab->pStorage); @@ -182265,10 +184342,11 @@ static void fts5ModuleDestroy(void *pCtx){ static void fts5Fts5Func( sqlite3_context *pCtx, /* Function call context */ int nArg, /* Number of args */ - sqlite3_value **apVal /* Function arguments */ + sqlite3_value **apUnused /* Function arguments */ ){ Fts5Global *pGlobal = (Fts5Global*)sqlite3_user_data(pCtx); char buf[8]; + UNUSED_PARAM2(nArg, apUnused); assert( nArg==0 ); assert( sizeof(buf)>=sizeof(pGlobal) ); memcpy(buf, (void*)&pGlobal, sizeof(pGlobal)); @@ -182281,10 +184359,11 @@ static void fts5Fts5Func( static void fts5SourceIdFunc( sqlite3_context *pCtx, /* Function call context */ int nArg, /* Number of args */ - sqlite3_value **apVal /* Function arguments */ + sqlite3_value **apUnused /* Function arguments */ ){ assert( nArg==0 ); - sqlite3_result_text(pCtx, "fts5: 2016-01-20 15:27:19 17efb4209f97fb4971656086b138599a91a75ff9", -1, SQLITE_TRANSIENT); + UNUSED_PARAM2(nArg, apUnused); + sqlite3_result_text(pCtx, "fts5: 2016-03-03 16:17:53 f047920ce16971e573bc6ec9a48b118c9de2b3a7", -1, SQLITE_TRANSIENT); } static int fts5Init(sqlite3 *db){ @@ -182345,6 +184424,17 @@ static int fts5Init(sqlite3 *db){ ); } } + + /* If SQLITE_FTS5_ENABLE_TEST_MI is defined, assume that the file + ** fts5_test_mi.c is compiled and linked into the executable. And call + ** its entry point to enable the matchinfo() demo. */ +#ifdef SQLITE_FTS5_ENABLE_TEST_MI + if( rc==SQLITE_OK ){ + extern int sqlite3Fts5TestRegisterMatchinfo(sqlite3*); + rc = sqlite3Fts5TestRegisterMatchinfo(db); + } +#endif + return rc; } @@ -182729,7 +184819,7 @@ static int sqlite3Fts5StorageClose(Fts5Storage *p){ int i; /* Finalize all SQL statements */ - for(i=0; i<(int)ArraySize(p->aStmt); i++){ + for(i=0; iaStmt); i++){ sqlite3_finalize(p->aStmt[i]); } @@ -182753,11 +184843,12 @@ static int fts5StorageInsertCallback( int tflags, const char *pToken, /* Buffer containing token */ int nToken, /* Size of token in bytes */ - int iStart, /* Start offset of token */ - int iEnd /* End offset of token */ + int iUnused1, /* Start offset of token */ + int iUnused2 /* End offset of token */ ){ Fts5InsertCtx *pCtx = (Fts5InsertCtx*)pContext; Fts5Index *pIdx = pCtx->pStorage->pIndex; + UNUSED_PARAM2(iUnused1, iUnused2); if( (tflags & FTS5_TOKEN_COLOCATED)==0 || pCtx->szCol==0 ){ pCtx->szCol++; } @@ -182769,39 +184860,52 @@ static int fts5StorageInsertCallback( ** delete-markers to the FTS index necessary to delete it. Do not actually ** remove the %_content row at this time though. */ -static int fts5StorageDeleteFromIndex(Fts5Storage *p, i64 iDel){ +static int fts5StorageDeleteFromIndex( + Fts5Storage *p, + i64 iDel, + sqlite3_value **apVal +){ Fts5Config *pConfig = p->pConfig; - sqlite3_stmt *pSeek; /* SELECT to read row iDel from %_data */ + sqlite3_stmt *pSeek = 0; /* SELECT to read row iDel from %_data */ int rc; /* Return code */ + int rc2; /* sqlite3_reset() return code */ + int iCol; + Fts5InsertCtx ctx; - rc = fts5StorageGetStmt(p, FTS5_STMT_LOOKUP, &pSeek, 0); - if( rc==SQLITE_OK ){ - int rc2; + if( apVal==0 ){ + rc = fts5StorageGetStmt(p, FTS5_STMT_LOOKUP, &pSeek, 0); + if( rc!=SQLITE_OK ) return rc; sqlite3_bind_int64(pSeek, 1, iDel); - if( sqlite3_step(pSeek)==SQLITE_ROW ){ - int iCol; - Fts5InsertCtx ctx; - ctx.pStorage = p; - ctx.iCol = -1; - rc = sqlite3Fts5IndexBeginWrite(p->pIndex, 1, iDel); - for(iCol=1; rc==SQLITE_OK && iCol<=pConfig->nCol; iCol++){ - if( pConfig->abUnindexed[iCol-1] ) continue; - ctx.szCol = 0; - rc = sqlite3Fts5Tokenize(pConfig, - FTS5_TOKENIZE_DOCUMENT, - (const char*)sqlite3_column_text(pSeek, iCol), - sqlite3_column_bytes(pSeek, iCol), - (void*)&ctx, - fts5StorageInsertCallback - ); - p->aTotalSize[iCol-1] -= (i64)ctx.szCol; - } - p->nTotalRow--; + if( sqlite3_step(pSeek)!=SQLITE_ROW ){ + return sqlite3_reset(pSeek); } - rc2 = sqlite3_reset(pSeek); - if( rc==SQLITE_OK ) rc = rc2; } + ctx.pStorage = p; + ctx.iCol = -1; + rc = sqlite3Fts5IndexBeginWrite(p->pIndex, 1, iDel); + for(iCol=1; rc==SQLITE_OK && iCol<=pConfig->nCol; iCol++){ + if( pConfig->abUnindexed[iCol-1]==0 ){ + const char *zText; + int nText; + if( pSeek ){ + zText = (const char*)sqlite3_column_text(pSeek, iCol); + nText = sqlite3_column_bytes(pSeek, iCol); + }else{ + zText = (const char*)sqlite3_value_text(apVal[iCol-1]); + nText = sqlite3_value_bytes(apVal[iCol-1]); + } + ctx.szCol = 0; + rc = sqlite3Fts5Tokenize(pConfig, FTS5_TOKENIZE_DOCUMENT, + zText, nText, (void*)&ctx, fts5StorageInsertCallback + ); + p->aTotalSize[iCol-1] -= (i64)ctx.szCol; + } + } + p->nTotalRow--; + + rc2 = sqlite3_reset(pSeek); + if( rc==SQLITE_OK ) rc = rc2; return rc; } @@ -182881,16 +184985,17 @@ static int fts5StorageSaveTotals(Fts5Storage *p){ /* ** Remove a row from the FTS table. */ -static int sqlite3Fts5StorageDelete(Fts5Storage *p, i64 iDel){ +static int sqlite3Fts5StorageDelete(Fts5Storage *p, i64 iDel, sqlite3_value **apVal){ Fts5Config *pConfig = p->pConfig; int rc; sqlite3_stmt *pDel = 0; + assert( pConfig->eContent!=FTS5_CONTENT_NORMAL || apVal==0 ); rc = fts5StorageLoadTotals(p, 1); /* Delete the index records */ if( rc==SQLITE_OK ){ - rc = fts5StorageDeleteFromIndex(p, iDel); + rc = fts5StorageDeleteFromIndex(p, iDel, apVal); } /* Delete the %_docsize record */ @@ -182923,61 +185028,6 @@ static int sqlite3Fts5StorageDelete(Fts5Storage *p, i64 iDel){ return rc; } -static int sqlite3Fts5StorageSpecialDelete( - Fts5Storage *p, - i64 iDel, - sqlite3_value **apVal -){ - Fts5Config *pConfig = p->pConfig; - int rc; - sqlite3_stmt *pDel = 0; - - assert( pConfig->eContent!=FTS5_CONTENT_NORMAL ); - rc = fts5StorageLoadTotals(p, 1); - - /* Delete the index records */ - if( rc==SQLITE_OK ){ - int iCol; - Fts5InsertCtx ctx; - ctx.pStorage = p; - ctx.iCol = -1; - - rc = sqlite3Fts5IndexBeginWrite(p->pIndex, 1, iDel); - for(iCol=0; rc==SQLITE_OK && iColnCol; iCol++){ - if( pConfig->abUnindexed[iCol] ) continue; - ctx.szCol = 0; - rc = sqlite3Fts5Tokenize(pConfig, - FTS5_TOKENIZE_DOCUMENT, - (const char*)sqlite3_value_text(apVal[iCol]), - sqlite3_value_bytes(apVal[iCol]), - (void*)&ctx, - fts5StorageInsertCallback - ); - p->aTotalSize[iCol] -= (i64)ctx.szCol; - } - p->nTotalRow--; - } - - /* Delete the %_docsize record */ - if( pConfig->bColumnsize ){ - if( rc==SQLITE_OK ){ - rc = fts5StorageGetStmt(p, FTS5_STMT_DELETE_DOCSIZE, &pDel, 0); - } - if( rc==SQLITE_OK ){ - sqlite3_bind_int64(pDel, 1, iDel); - sqlite3_step(pDel); - rc = sqlite3_reset(pDel); - } - } - - /* Write the averages record */ - if( rc==SQLITE_OK ){ - rc = fts5StorageSaveTotals(p); - } - - return rc; -} - /* ** Delete all entries in the FTS5 index. */ @@ -183216,28 +185266,75 @@ struct Fts5IntegrityCtx { int iCol; int szCol; u64 cksum; + Fts5Termset *pTermset; Fts5Config *pConfig; }; + /* ** Tokenization callback used by integrity check. */ static int fts5StorageIntegrityCallback( - void *pContext, /* Pointer to Fts5InsertCtx object */ + void *pContext, /* Pointer to Fts5IntegrityCtx object */ int tflags, const char *pToken, /* Buffer containing token */ int nToken, /* Size of token in bytes */ - int iStart, /* Start offset of token */ - int iEnd /* End offset of token */ + int iUnused1, /* Start offset of token */ + int iUnused2 /* End offset of token */ ){ Fts5IntegrityCtx *pCtx = (Fts5IntegrityCtx*)pContext; + Fts5Termset *pTermset = pCtx->pTermset; + int bPresent; + int ii; + int rc = SQLITE_OK; + int iPos; + int iCol; + + UNUSED_PARAM2(iUnused1, iUnused2); + if( (tflags & FTS5_TOKEN_COLOCATED)==0 || pCtx->szCol==0 ){ pCtx->szCol++; } - pCtx->cksum ^= sqlite3Fts5IndexCksum( - pCtx->pConfig, pCtx->iRowid, pCtx->iCol, pCtx->szCol-1, pToken, nToken - ); - return SQLITE_OK; + + switch( pCtx->pConfig->eDetail ){ + case FTS5_DETAIL_FULL: + iPos = pCtx->szCol-1; + iCol = pCtx->iCol; + break; + + case FTS5_DETAIL_COLUMNS: + iPos = pCtx->iCol; + iCol = 0; + break; + + default: + assert( pCtx->pConfig->eDetail==FTS5_DETAIL_NONE ); + iPos = 0; + iCol = 0; + break; + } + + rc = sqlite3Fts5TermsetAdd(pTermset, 0, pToken, nToken, &bPresent); + if( rc==SQLITE_OK && bPresent==0 ){ + pCtx->cksum ^= sqlite3Fts5IndexEntryCksum( + pCtx->iRowid, iCol, iPos, 0, pToken, nToken + ); + } + + for(ii=0; rc==SQLITE_OK && iipConfig->nPrefix; ii++){ + const int nChar = pCtx->pConfig->aPrefix[ii]; + int nByte = sqlite3Fts5IndexCharlenToBytelen(pToken, nToken, nChar); + if( nByte ){ + rc = sqlite3Fts5TermsetAdd(pTermset, ii+1, pToken, nByte, &bPresent); + if( bPresent==0 ){ + pCtx->cksum ^= sqlite3Fts5IndexEntryCksum( + pCtx->iRowid, iCol, iPos, ii+1, pToken, nByte + ); + } + } + } + + return rc; } /* @@ -183273,22 +185370,37 @@ static int sqlite3Fts5StorageIntegrity(Fts5Storage *p){ if( pConfig->bColumnsize ){ rc = sqlite3Fts5StorageDocsize(p, ctx.iRowid, aColSize); } + if( rc==SQLITE_OK && pConfig->eDetail==FTS5_DETAIL_NONE ){ + rc = sqlite3Fts5TermsetNew(&ctx.pTermset); + } for(i=0; rc==SQLITE_OK && inCol; i++){ if( pConfig->abUnindexed[i] ) continue; ctx.iCol = i; ctx.szCol = 0; - rc = sqlite3Fts5Tokenize(pConfig, - FTS5_TOKENIZE_DOCUMENT, - (const char*)sqlite3_column_text(pScan, i+1), - sqlite3_column_bytes(pScan, i+1), - (void*)&ctx, - fts5StorageIntegrityCallback - ); - if( pConfig->bColumnsize && ctx.szCol!=aColSize[i] ){ + if( pConfig->eDetail==FTS5_DETAIL_COLUMNS ){ + rc = sqlite3Fts5TermsetNew(&ctx.pTermset); + } + if( rc==SQLITE_OK ){ + rc = sqlite3Fts5Tokenize(pConfig, + FTS5_TOKENIZE_DOCUMENT, + (const char*)sqlite3_column_text(pScan, i+1), + sqlite3_column_bytes(pScan, i+1), + (void*)&ctx, + fts5StorageIntegrityCallback + ); + } + if( rc==SQLITE_OK && pConfig->bColumnsize && ctx.szCol!=aColSize[i] ){ rc = FTS5_CORRUPT; } aTotalSize[i] += ctx.szCol; + if( pConfig->eDetail==FTS5_DETAIL_COLUMNS ){ + sqlite3Fts5TermsetFree(ctx.pTermset); + ctx.pTermset = 0; + } } + sqlite3Fts5TermsetFree(ctx.pTermset); + ctx.pTermset = 0; + if( rc!=SQLITE_OK ) break; } rc2 = sqlite3_reset(pScan); @@ -183557,12 +185669,13 @@ static void fts5AsciiDelete(Fts5Tokenizer *p){ ** Create an "ascii" tokenizer. */ static int fts5AsciiCreate( - void *pCtx, + void *pUnused, const char **azArg, int nArg, Fts5Tokenizer **ppOut ){ int rc = SQLITE_OK; AsciiTokenizer *p = 0; + UNUSED_PARAM(pUnused); if( nArg%2 ){ rc = SQLITE_ERROR; }else{ @@ -183611,7 +185724,7 @@ static void asciiFold(char *aOut, const char *aIn, int nByte){ static int fts5AsciiTokenize( Fts5Tokenizer *pTokenizer, void *pCtx, - int flags, + int iUnused, const char *pText, int nText, int (*xToken)(void*, int, const char*, int nToken, int iStart, int iEnd) ){ @@ -183625,6 +185738,8 @@ static int fts5AsciiTokenize( char *pFold = aFold; unsigned char *a = p->aTokenChar; + UNUSED_PARAM(iUnused); + while( isnFold; const char *pEnd = &aFold[nFold-6]; + UNUSED_PARAM(iUnused); + /* Each iteration of this loop gobbles up a contiguous run of separators, ** then the next token. */ while( rc==SQLITE_OK ){ @@ -184715,7 +186834,7 @@ static int sqlite3Fts5TokenizerInit(fts5_api *pApi){ int rc = SQLITE_OK; /* Return code */ int i; /* To iterate through builtin functions */ - for(i=0; rc==SQLITE_OK && i<(int)ArraySize(aBuiltin); i++){ + for(i=0; rc==SQLITE_OK && ixCreateTokenizer(pApi, aBuiltin[i].zName, (void*)pApi, @@ -184856,9 +186975,9 @@ static int sqlite3Fts5UnicodeIsalnum(int c){ 0xFFFFFFFF, 0xFC00FFFF, 0xF8000001, 0xF8000001, }; - if( c<128 ){ + if( (unsigned int)c<128 ){ return ( (aAscii[c >> 5] & (1 << (c & 0x001F)))==0 ); - }else if( c<(1<<22) ){ + }else if( (unsigned int)c<(1<<22) ){ unsigned int key = (((unsigned int)c)<<10) | 0x000003FF; int iRes = 0; int iHi = sizeof(aEntry)/sizeof(aEntry[0]) - 1; @@ -185425,7 +187544,10 @@ static int sqlite3Fts5PutVarint(unsigned char *p, u64 v){ static int sqlite3Fts5GetVarintLen(u32 iVal){ +#if 0 if( iVal<(1 << 7 ) ) return 1; +#endif + assert( iVal>=(1 << 7) ); if( iVal<(1 << 14) ) return 2; if( iVal<(1 << 21) ) return 3; if( iVal<(1 << 28) ) return 4; @@ -185619,7 +187741,7 @@ static int fts5VocabInitVtab( rc = fts5VocabTableType(zType, pzErr, &eType); if( rc==SQLITE_OK ){ - assert( eType>=0 && eType=0 && eTypenConstraint; i++){ struct sqlite3_index_constraint *p = &pInfo->aConstraint[i]; if( p->usable==0 ) continue; @@ -185814,7 +187938,7 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){ if( pTab->eType==FTS5_VOCAB_COL ){ for(pCsr->iCol++; pCsr->iColiCol++){ - if( pCsr->aCnt[pCsr->iCol] ) break; + if( pCsr->aDoc[pCsr->iCol] ) break; } } @@ -185842,29 +187966,60 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){ assert( pTab->eType==FTS5_VOCAB_COL || pTab->eType==FTS5_VOCAB_ROW ); while( rc==SQLITE_OK ){ - i64 dummy; const u8 *pPos; int nPos; /* Position list */ i64 iPos = 0; /* 64-bit position read from poslist */ int iOff = 0; /* Current offset within position list */ - rc = sqlite3Fts5IterPoslist(pCsr->pIter, 0, &pPos, &nPos, &dummy); - if( rc==SQLITE_OK ){ - if( pTab->eType==FTS5_VOCAB_ROW ){ - while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff, &iPos) ){ - pCsr->aCnt[0]++; - } - pCsr->aDoc[0]++; - }else{ - int iCol = -1; - while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff, &iPos) ){ - int ii = FTS5_POS2COLUMN(iPos); - pCsr->aCnt[ii]++; - if( iCol!=ii ){ - pCsr->aDoc[ii]++; - iCol = ii; + pPos = pCsr->pIter->pData; + nPos = pCsr->pIter->nData; + switch( pCsr->pConfig->eDetail ){ + case FTS5_DETAIL_FULL: + pPos = pCsr->pIter->pData; + nPos = pCsr->pIter->nData; + if( pTab->eType==FTS5_VOCAB_ROW ){ + while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff, &iPos) ){ + pCsr->aCnt[0]++; + } + pCsr->aDoc[0]++; + }else{ + int iCol = -1; + while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff, &iPos) ){ + int ii = FTS5_POS2COLUMN(iPos); + pCsr->aCnt[ii]++; + if( iCol!=ii ){ + if( ii>=nCol ){ + rc = FTS5_CORRUPT; + break; + } + pCsr->aDoc[ii]++; + iCol = ii; + } } } - } + break; + + case FTS5_DETAIL_COLUMNS: + if( pTab->eType==FTS5_VOCAB_ROW ){ + pCsr->aDoc[0]++; + }else{ + while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff,&iPos) ){ + assert_nc( iPos>=0 && iPos=nCol ){ + rc = FTS5_CORRUPT; + break; + } + pCsr->aDoc[iPos]++; + } + } + break; + + default: + assert( pCsr->pConfig->eDetail==FTS5_DETAIL_NONE ); + pCsr->aDoc[0]++; + break; + } + + if( rc==SQLITE_OK ){ rc = sqlite3Fts5IterNextScan(pCsr->pIter); } @@ -185879,8 +188034,8 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){ } } - if( pCsr->bEof==0 && pTab->eType==FTS5_VOCAB_COL ){ - while( pCsr->aCnt[pCsr->iCol]==0 ) pCsr->iCol++; + if( rc==SQLITE_OK && pCsr->bEof==0 && pTab->eType==FTS5_VOCAB_COL ){ + while( pCsr->aDoc[pCsr->iCol]==0 ) pCsr->iCol++; assert( pCsr->iColpConfig->nCol ); } return rc; @@ -185892,8 +188047,8 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){ static int fts5VocabFilterMethod( sqlite3_vtab_cursor *pCursor, /* The cursor used for this query */ int idxNum, /* Strategy index */ - const char *idxStr, /* Unused */ - int nVal, /* Number of elements in apVal */ + const char *zUnused, /* Unused */ + int nUnused, /* Number of elements in apVal */ sqlite3_value **apVal /* Arguments for the indexing scheme */ ){ Fts5VocabCursor *pCsr = (Fts5VocabCursor*)pCursor; @@ -185908,6 +188063,8 @@ static int fts5VocabFilterMethod( sqlite3_value *pGe = 0; sqlite3_value *pLe = 0; + UNUSED_PARAM2(zUnused, nUnused); + fts5VocabResetCursor(pCsr); if( idxNum & FTS5_VOCAB_TERM_EQ ) pEq = apVal[iVal++]; if( idxNum & FTS5_VOCAB_TERM_GE ) pGe = apVal[iVal++]; @@ -185960,30 +188117,36 @@ static int fts5VocabColumnMethod( int iCol /* Index of column to read value from */ ){ Fts5VocabCursor *pCsr = (Fts5VocabCursor*)pCursor; + int eDetail = pCsr->pConfig->eDetail; + int eType = ((Fts5VocabTable*)(pCursor->pVtab))->eType; + i64 iVal = 0; if( iCol==0 ){ sqlite3_result_text( pCtx, (const char*)pCsr->term.p, pCsr->term.n, SQLITE_TRANSIENT ); - } - else if( ((Fts5VocabTable*)(pCursor->pVtab))->eType==FTS5_VOCAB_COL ){ + }else if( eType==FTS5_VOCAB_COL ){ assert( iCol==1 || iCol==2 || iCol==3 ); if( iCol==1 ){ - const char *z = pCsr->pConfig->azCol[pCsr->iCol]; - sqlite3_result_text(pCtx, z, -1, SQLITE_STATIC); + if( eDetail!=FTS5_DETAIL_NONE ){ + const char *z = pCsr->pConfig->azCol[pCsr->iCol]; + sqlite3_result_text(pCtx, z, -1, SQLITE_STATIC); + } }else if( iCol==2 ){ - sqlite3_result_int64(pCtx, pCsr->aDoc[pCsr->iCol]); + iVal = pCsr->aDoc[pCsr->iCol]; }else{ - sqlite3_result_int64(pCtx, pCsr->aCnt[pCsr->iCol]); + iVal = pCsr->aCnt[pCsr->iCol]; } }else{ assert( iCol==1 || iCol==2 ); if( iCol==1 ){ - sqlite3_result_int64(pCtx, pCsr->aDoc[0]); + iVal = pCsr->aDoc[0]; }else{ - sqlite3_result_int64(pCtx, pCsr->aCnt[0]); + iVal = pCsr->aCnt[0]; } } + + if( iVal>0 ) sqlite3_result_int64(pCtx, iVal); return SQLITE_OK; } diff --git a/Data/SQLite/src/sqlite3.h b/Data/SQLite/src/sqlite3.h index c6d1e0f23..37d102476 100644 --- a/Data/SQLite/src/sqlite3.h +++ b/Data/SQLite/src/sqlite3.h @@ -111,9 +111,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.10.2" -#define SQLITE_VERSION_NUMBER 3010002 -#define SQLITE_SOURCE_ID "2016-01-20 15:27:19 17efb4209f97fb4971656086b138599a91a75ff9" +#define SQLITE_VERSION "3.11.1" +#define SQLITE_VERSION_NUMBER 3011001 +#define SQLITE_SOURCE_ID "2016-03-03 16:17:53 f047920ce16971e573bc6ec9a48b118c9de2b3a7" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -347,7 +347,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** from [sqlite3_malloc()] and passed back through the 5th parameter. ** To avoid memory leaks, the application should invoke [sqlite3_free()] ** on error message strings returned through the 5th parameter of -** of sqlite3_exec() after the error message string is no longer needed. +** sqlite3_exec() after the error message string is no longer needed. ** ^If the 5th parameter to sqlite3_exec() is not NULL and no errors ** occur, then sqlite3_exec() sets the pointer in its 5th parameter to ** NULL before returning. @@ -5697,7 +5697,7 @@ struct sqlite3_index_info { /* Inputs */ int nConstraint; /* Number of entries in aConstraint */ struct sqlite3_index_constraint { - int iColumn; /* Column on left-hand side of constraint */ + int iColumn; /* Column constrained. -1 for ROWID */ unsigned char op; /* Constraint operator */ unsigned char usable; /* True if this constraint is usable */ int iTermOffset; /* Used internally - xBestIndex should ignore */ @@ -8193,6 +8193,9 @@ struct Fts5PhraseIter { ** an OOM condition or IO error), an appropriate SQLite error code is ** returned. ** +** This function may be quite inefficient if used with an FTS5 table +** created with the "columnsize=0" option. +** ** xColumnText: ** This function attempts to retrieve the text of column iCol of the ** current document. If successful, (*pz) is set to point to a buffer @@ -8213,15 +8216,29 @@ struct Fts5PhraseIter { ** the query within the current row. Return SQLITE_OK if successful, or ** an error code (i.e. SQLITE_NOMEM) if an error occurs. ** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" or "detail=column" option. If the FTS5 table is created +** with either "detail=none" or "detail=column" and "content=" option +** (i.e. if it is a contentless table), then this API always returns 0. +** ** xInst: ** Query for the details of phrase match iIdx within the current row. ** Phrase matches are numbered starting from zero, so the iIdx argument ** should be greater than or equal to zero and smaller than the value ** output by xInstCount(). ** +** Usually, output parameter *piPhrase is set to the phrase number, *piCol +** to the column in which it occurs and *piOff the token offset of the +** first token of the phrase. The exception is if the table was created +** with the offsets=0 option specified. In this case *piOff is always +** set to -1. +** ** Returns SQLITE_OK if successful, or an error code (i.e. SQLITE_NOMEM) ** if an error occurs. ** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" or "detail=column" option. +** ** xRowid: ** Returns the rowid of the current row. ** @@ -8305,7 +8322,7 @@ struct Fts5PhraseIter { ** Fts5PhraseIter iter; ** int iCol, iOff; ** for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff); -** iOff>=0; +** iCol>=0; ** pApi->xPhraseNext(pFts, &iter, &iCol, &iOff) ** ){ ** // An instance of phrase iPhrase at offset iOff of column iCol @@ -8313,13 +8330,51 @@ struct Fts5PhraseIter { ** ** The Fts5PhraseIter structure is defined above. Applications should not ** modify this structure directly - it should only be used as shown above -** with the xPhraseFirst() and xPhraseNext() API methods. +** with the xPhraseFirst() and xPhraseNext() API methods (and by +** xPhraseFirstColumn() and xPhraseNextColumn() as illustrated below). +** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" or "detail=column" option. If the FTS5 table is created +** with either "detail=none" or "detail=column" and "content=" option +** (i.e. if it is a contentless table), then this API always iterates +** through an empty set (all calls to xPhraseFirst() set iCol to -1). ** ** xPhraseNext() ** See xPhraseFirst above. +** +** xPhraseFirstColumn() +** This function and xPhraseNextColumn() are similar to the xPhraseFirst() +** and xPhraseNext() APIs described above. The difference is that instead +** of iterating through all instances of a phrase in the current row, these +** APIs are used to iterate through the set of columns in the current row +** that contain one or more instances of a specified phrase. For example: +** +** Fts5PhraseIter iter; +** int iCol; +** for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol); +** iCol>=0; +** pApi->xPhraseNextColumn(pFts, &iter, &iCol) +** ){ +** // Column iCol contains at least one instance of phrase iPhrase +** } +** +** This API can be quite slow if used with an FTS5 table created with the +** "detail=none" option. If the FTS5 table is created with either +** "detail=none" "content=" option (i.e. if it is a contentless table), +** then this API always iterates through an empty set (all calls to +** xPhraseFirstColumn() set iCol to -1). +** +** The information accessed using this API and its companion +** xPhraseFirstColumn() may also be obtained using xPhraseFirst/xPhraseNext +** (or xInst/xInstCount). The chief advantage of this API is that it is +** significantly more efficient than those alternatives when used with +** "detail=column" tables. +** +** xPhraseNextColumn() +** See xPhraseFirstColumn above. */ struct Fts5ExtensionApi { - int iVersion; /* Currently always set to 1 */ + int iVersion; /* Currently always set to 3 */ void *(*xUserData)(Fts5Context*); @@ -8349,8 +8404,11 @@ struct Fts5ExtensionApi { int (*xSetAuxdata)(Fts5Context*, void *pAux, void(*xDelete)(void*)); void *(*xGetAuxdata)(Fts5Context*, int bClear); - void (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*); + int (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*); void (*xPhraseNext)(Fts5Context*, Fts5PhraseIter*, int *piCol, int *piOff); + + int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*); + void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol); }; /* diff --git a/Data/SQLite/testsuite/CMakeLists.txt b/Data/SQLite/testsuite/CMakeLists.txt index 57463122a..8fb0ffb68 100644 --- a/Data/SQLite/testsuite/CMakeLists.txt +++ b/Data/SQLite/testsuite/CMakeLists.txt @@ -18,4 +18,6 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoDataSQLite PocoData PocoFoundation CppUnit ) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} 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/bin/Darwin/x86_64/testrunner b/Data/SQLite/testsuite/bin/Darwin/x86_64/testrunner new file mode 100755 index 000000000..400c3e6b1 Binary files /dev/null and b/Data/SQLite/testsuite/bin/Darwin/x86_64/testrunner differ diff --git a/Data/SQLite/testsuite/bin/Darwin/x86_64/testrunnerd b/Data/SQLite/testsuite/bin/Darwin/x86_64/testrunnerd new file mode 100755 index 000000000..e81f910a1 Binary files /dev/null and b/Data/SQLite/testsuite/bin/Darwin/x86_64/testrunnerd differ 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 acb3d1313..34b225d74 100644 --- a/Data/testsuite/CMakeLists.txt +++ b/Data/testsuite/CMakeLists.txt @@ -23,4 +23,6 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoData PocoUtil PocoXML PocoFoundation CppUnit) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} 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 c1085cfee..fbaa008b5 100644 --- a/Data/testsuite/TestSuite_vs120.vcxproj +++ b/Data/testsuite/TestSuite_vs120.vcxproj @@ -143,7 +143,7 @@ true - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -175,7 +175,7 @@ true - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -205,7 +205,7 @@ true - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -237,7 +237,7 @@ true - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -267,7 +267,7 @@ true - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -299,7 +299,7 @@ true - 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 5880ad1fc..a55f8142f 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/include/Poco/BinaryReader.h b/Foundation/include/Poco/BinaryReader.h index 21f5380c9..a52707388 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 d39e6b8f8..1d87df9ba 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,36 @@ 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); + } + + BinaryWriter& write(const char* value, std::size_t length); + 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/include/Poco/Optional.h b/Foundation/include/Poco/Optional.h index 48cc62e30..d942b5580 100644 --- a/Foundation/include/Poco/Optional.h +++ b/Foundation/include/Poco/Optional.h @@ -62,9 +62,9 @@ public: { } - Optional(const C& value): + Optional(const C& rValue): /// Creates a Optional with the given value. - _value(value), + _value(rValue), _isSpecified(true) { } @@ -81,10 +81,10 @@ public: { } - Optional& assign(const C& value) + Optional& assign(const C& rValue) /// Assigns a value to the Optional. { - _value = value; + _value = rValue; _isSpecified = true; return *this; } @@ -97,9 +97,9 @@ public: return *this; } - Optional& operator = (const C& value) + Optional& operator = (const C& rValue) { - return assign(value); + return assign(rValue); } Optional& operator = (const Optional& other) diff --git a/Foundation/src/BinaryReader.cpp b/Foundation/src/BinaryReader.cpp index b3095df5e..ab4bb2652 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 35c85cc0c..ce5fcab74 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; + return 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; + return write(value, _flipBytes); } @@ -252,56 +153,19 @@ 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 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)); } 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 +174,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); } @@ -350,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 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_CE_vs90.vcproj b/Foundation/testsuite/TestSuite_CE_vs90.vcproj index 2b02aebb7..c8e35f1fa 100644 --- a/Foundation/testsuite/TestSuite_CE_vs90.vcproj +++ b/Foundation/testsuite/TestSuite_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"/> + 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 c975ea8c3..c8de003b1 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,14 +136,14 @@ true true true - + Level3 ProgramDatabase Default true - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -168,13 +168,13 @@ true true true - + Level3 - + Default - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -197,13 +197,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 @@ -228,13 +228,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 @@ -257,14 +257,14 @@ true true true - + Level3 ProgramDatabase Default true - 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 @@ -289,14 +289,14 @@ true true true - + Level3 - + Default true - 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 @@ -307,289 +307,287 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + 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 efafcc8ed..5a2e22604 100644 --- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj @@ -143,7 +143,7 @@ true - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -175,7 +175,7 @@ true - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -204,7 +204,7 @@ 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 @@ -236,7 +236,7 @@ true - 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 @@ -266,7 +266,7 @@ true - 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 @@ -298,7 +298,7 @@ true - 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 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/Foundation/testsuite/src/ActiveDispatcherTest.cpp b/Foundation/testsuite/src/ActiveDispatcherTest.cpp index caa721d67..bf82d7f19 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 15eb7b380..57aec68e6 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 cf67d14d6..621c0444d 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 87102d9a1..db6dc7fcc 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 30e94ca49..5434f6b94 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 7332ffc00..a1150ba5f 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 e3d7934bd..41c130897 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 6fca5e3d6..f044ffa23 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 0d91ebedb..d991709b3 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 ef59f5dc1..0c278a149 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 13bfeb515..1ec3d323f 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 ca789d5b1..d2e16bd32 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" @@ -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; 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 89ec30926..546c0ebee 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 ae683fb1e..8340a4d01 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 98c2fc77b..944e0167c 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 40bc3b186..943a6c4ae 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 160f31d99..5d279da1e 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 66a8a789d..dd95edc54 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 f77ec4cba..aa72d70d4 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 6a695a533..2f5066d6c 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 4b416eed5..35c482777 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 cc7119233..eaf90f44a 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 6ba58e8c7..2a126c65d 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 40b07898c..41a806e58 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 67ce5e0b2..132eb3297 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 1c64a7159..8b3bc6c6d 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 304268dd6..524ecec52 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 dc7ddcb02..4c0053edd 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 a7f039ef2..22306431b 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 1309ead8b..b24658eee 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 ef39c4eb7..be3c748b6 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 77a65fa2a..ce07b4c59 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 7ef5eaeb9..9b818e746 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 3334159b9..045952b4d 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 6560a0492..859bc137f 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 a2620999b..2f4d883ef 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 fdf65cf76..a20e42899 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 9690d987d..089c16d40 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 3f5f0b851..8240e05d1 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 e1cf840c4..f6a2cb6db 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 e7e797f34..97a6348b8 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 29d72ff68..460dfc816 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 da0cc598a..ca2ca5c50 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 ca2412e09..d551110a9 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 6bbc230f2..ed935a12d 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 f0a249f75..194ea9541 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 72dcdfcd2..8c9fccc6a 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 a6b90cd1b..e31a4f181 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 7f4f42e82..d68c53c79 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 955a05e9d..cc1470db7 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 d78144d0c..8aee33681 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 cd7cdb7a8..6e8246884 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 fea34b017..101fc679b 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 6fd666539..a025025ae 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 12d448415..4fc2ba347 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 b823133e5..f2d0d7164 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 ab591ece7..7e89e588f 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 55820f245..aa450a06b 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 87ef29221..690d2f1ae 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 5cb813b18..84381a4d7 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 e35f1b497..6dba626c9 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 ff74da85b..47e82d89f 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 3096603d4..1c2fe5caa 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 150a761b7..3f7f9a8a9 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 eceb41fa4..ec5ddbea5 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 3146e7126..c2a01e654 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 e6e582504..d05344ebd 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 a492b1bff..ba0136dcf 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 7d6e8ca90..c2e07f829 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 f7dc5ca3a..44e092cf4 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 68c03a761..9af24f2ca 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 00df20461..9ad49892a 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 f72dc443d..bf3a8d137 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 7a0e323f1..1d20b3f04 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 b3486ef1a..1a3c110af 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 e0fa559e0..acda506f3 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 1797a0f98..9b944d622 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 fd8aa8d2a..f56f041a9 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 99f47403f..a321de20b 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 f65607927..1083d8a4a 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 fc0b7908b..1201ff1da 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 0cdf925ef..0c4905ceb 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 06ce7eb9a..5c0baa314 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 331d73210..248a10680 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 491dc4a91..28c802f3e 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 0f410e547..e40cb7942 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 707eef5d4..593e01284 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 00bd46f66..c9dd2cf08 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 4890ab8fc..e0427b0ee 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 7d7de2e94..96db8f7a5 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 db8389255..e7f083bba 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 d8f98de45..4888f4cac 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 34d424577..d71cf4f9d 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 c6c44afa4..8836680ad 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 8e6fa8047..a5726550b 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 3fe5d511a..54345da9b 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 b19115473..76b6466e0 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 aa372bfac..61cde30cb 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 d522bd3ba..1c3035437 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 de7f8bd4c..c51d5c23d 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 a6db36a33..e52dcf54b 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 b07cd333c..b1602e1bd 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 49d37a438..c2b08950b 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 887ca9ae6..0ac75f43c 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 c05d2cdd0..3af7608a7 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 4e43a3419..254cad5f9 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 f19b2a4a0..08ffb2dce 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 703d19121..4ff85e9b5 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 6c81f2103..3f22fd994 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 bfb98f98a..575ba6a6f 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 47da518e7..7adf13b67 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 ace9cda1a..dfde0572a 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 25bf41e62..e49922f12 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 4a6b2cb44..9558a76d7 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 db01d83f9..d07d11a9a 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 ddab2cd72..e2d3c82f7 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 253e1ae3d..1a8484730 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 b31c96f01..f473990e0 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 fb81367ba..0579629df 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 e5899d562..8ef4e683e 100644 --- a/JSON/testsuite/CMakeLists.txt +++ b/JSON/testsuite/CMakeLists.txt @@ -18,7 +18,8 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoJSON PocoFoundation CppUnit ) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} 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_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 4d0f4e926..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 @@ -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 @@ -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 777a86080..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 @@ -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 @@ -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"/> diff --git a/Makefile b/Makefile index fd7c9751a..31f2d4ced 100644 --- a/Makefile +++ b/Makefile @@ -79,11 +79,8 @@ 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 -ifneq ($(OSNAME), Cygwin) -COMPONENTS += Data/PostgreSQL -endif +COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL +COMPONENTS += Data Data/ODBC Data/SQLite Data/MySQL Data/PostgreSQL COMPONENTS += MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF cppunit: @@ -108,25 +105,17 @@ 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 \; # ------------------------------------------------------------------------------------------------------------------------------------- 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 += 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/SQLite-tests Data/ODBC-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 # ------------------------------------------------------------------------------------------------------------------------------------- @@ -136,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/SQLite-clean Data/ODBC-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/MongoDB/testsuite/CMakeLists.txt b/MongoDB/testsuite/CMakeLists.txt index c4a4293d3..9b25177dd 100644 --- a/MongoDB/testsuite/CMakeLists.txt +++ b/MongoDB/testsuite/CMakeLists.txt @@ -20,4 +20,6 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoMongoDB PocoFoundation CppUnit ) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} 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_vs100.vcxproj b/MongoDB/testsuite/TestSuite_vs100.vcxproj index 36b00ee05..22781c78e 100644 --- a/MongoDB/testsuite/TestSuite_vs100.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(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 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_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 5d44f6868..ebf68a014 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -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_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"/> diff --git a/Net/src/MailMessage.cpp b/Net/src/MailMessage.cpp index 69a6d88c1..f3edefa66 100644 --- a/Net/src/MailMessage.cpp +++ b/Net/src/MailMessage.cpp @@ -214,9 +214,9 @@ void MailMessage::addRecipient(const MailRecipient& recipient) } -void MailMessage::setRecipients(const Recipients& recipients) +void MailMessage::setRecipients(const Recipients& rRecipients) { - _recipients.assign(recipients.begin(), recipients.end()); + _recipients.assign(rRecipients.begin(), rRecipients.end()); } @@ -326,12 +326,12 @@ void MailMessage::addAttachment(const std::string& name, PartSource* pSource, Co } -void MailMessage::read(std::istream& istr, PartHandler& handler) +void MailMessage::read(std::istream& istr, PartHandler& rHandler) { readHeader(istr); if (isMultipart()) { - readMultipart(istr, handler); + readMultipart(istr, rHandler); } else { diff --git a/Net/testsuite/CMakeLists.txt b/Net/testsuite/CMakeLists.txt index ac0458bcb..a6ab047b1 100644 --- a/Net/testsuite/CMakeLists.txt +++ b/Net/testsuite/CMakeLists.txt @@ -18,4 +18,6 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoNet PocoUtil PocoXML PocoFoundation CppUnit) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} 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_CE_vs90.vcproj b/Net/testsuite/TestSuite_CE_vs90.vcproj index 921069414..16bc2a2f6 100644 --- a/Net/testsuite/TestSuite_CE_vs90.vcproj +++ b/Net/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 - {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 1cb4fe2d9..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 @@ -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 @@ -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 160e63693..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 @@ -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 @@ -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"/> 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 e94e7e8f4..a32fc3da4 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 759d55643..794c88257 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 9838022b3..1bac859af 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/src/Context.cpp b/NetSSL_OpenSSL/src/Context.cpp index aa5e314ab..086ad3248 100644 --- a/NetSSL_OpenSSL/src/Context.cpp +++ b/NetSSL_OpenSSL/src/Context.cpp @@ -41,8 +41,8 @@ Context::Params::Params(): } -Context::Context(Usage usage, const Params& params): - _usage(usage), +Context::Context(Usage contextUsage, const Params& params): + _usage(contextUsage), _mode(params.verificationMode), _pSSLContext(0), _extendedCertificateVerification(true) @@ -52,16 +52,16 @@ Context::Context(Usage usage, const Params& params): Context::Context( - Usage usage, + Usage contextUsage, const std::string& privateKeyFile, const std::string& certificateFile, const std::string& caLocation, - VerificationMode verificationMode, + VerificationMode mode, int verificationDepth, bool loadDefaultCAs, const std::string& cipherList): - _usage(usage), - _mode(verificationMode), + _usage(contextUsage), + _mode(mode), _pSSLContext(0), _extendedCertificateVerification(true) { @@ -69,7 +69,7 @@ Context::Context( params.privateKeyFile = privateKeyFile; params.certificateFile = certificateFile; params.caLocation = caLocation; - params.verificationMode = verificationMode; + params.verificationMode = mode; params.verificationDepth = verificationDepth; params.loadDefaultCAs = loadDefaultCAs; params.cipherList = cipherList; @@ -78,20 +78,20 @@ Context::Context( Context::Context( - Usage usage, + Usage contextUsage, const std::string& caLocation, - VerificationMode verificationMode, + VerificationMode mode, int verificationDepth, bool loadDefaultCAs, const std::string& cipherList): - _usage(usage), - _mode(verificationMode), + _usage(contextUsage), + _mode(mode), _pSSLContext(0), _extendedCertificateVerification(true) { Params params; params.caLocation = caLocation; - params.verificationMode = verificationMode; + params.verificationMode = mode; params.verificationDepth = verificationDepth; params.loadDefaultCAs = loadDefaultCAs; params.cipherList = cipherList; diff --git a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp index d338981d1..110528e51 100644 --- a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp +++ b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp @@ -41,17 +41,17 @@ HTTPSClientSession::HTTPSClientSession(): } -HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& socket): - HTTPClientSession(socket), - _pContext(socket.context()) +HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& rSocket): + HTTPClientSession(rSocket), + _pContext(rSocket.context()) { setPort(HTTPS_PORT); } -HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& socket, Session::Ptr pSession): - HTTPClientSession(socket), - _pContext(socket.context()), +HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& rSocket, Session::Ptr pSession): + HTTPClientSession(rSocket), + _pContext(rSocket.context()), _pSession(pSession) { setPort(HTTPS_PORT); diff --git a/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp b/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp index b441e8184..bee2cbee8 100644 --- a/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp +++ b/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp @@ -24,8 +24,8 @@ namespace Poco { namespace Net { -SecureSMTPClientSession::SecureSMTPClientSession(const StreamSocket& socket): - SMTPClientSession(socket) +SecureSMTPClientSession::SecureSMTPClientSession(const StreamSocket& rSocket): + SMTPClientSession(rSocket) { } diff --git a/NetSSL_OpenSSL/src/SecureServerSocket.cpp b/NetSSL_OpenSSL/src/SecureServerSocket.cpp index 6308ccc09..07f192a3f 100644 --- a/NetSSL_OpenSSL/src/SecureServerSocket.cpp +++ b/NetSSL_OpenSSL/src/SecureServerSocket.cpp @@ -48,18 +48,18 @@ SecureServerSocket::SecureServerSocket(const Socket& socket): } -SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog): +SecureServerSocket::SecureServerSocket(const SocketAddress& rAddress, int backlog): ServerSocket(new SecureServerSocketImpl(SSLManager::instance().defaultServerContext()), true) { - impl()->bind(address, true); + impl()->bind(rAddress, true); impl()->listen(backlog); } -SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog, Context::Ptr pContext): +SecureServerSocket::SecureServerSocket(const SocketAddress& rAddress, int backlog, Context::Ptr pContext): ServerSocket(new SecureServerSocketImpl(pContext), true) { - impl()->bind(address, true); + impl()->bind(rAddress, true); impl()->listen(backlog); } @@ -68,8 +68,8 @@ SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog): ServerSocket(new SecureServerSocketImpl(SSLManager::instance().defaultServerContext()), true) { IPAddress wildcardAddr; - SocketAddress address(wildcardAddr, port); - impl()->bind(address, true); + SocketAddress socketAddress(wildcardAddr, port); + impl()->bind(socketAddress, true); impl()->listen(backlog); } @@ -77,8 +77,8 @@ SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog, Context:: ServerSocket(new SecureServerSocketImpl(pContext), true) { IPAddress wildcardAddr; - SocketAddress address(wildcardAddr, port); - impl()->bind(address, true); + SocketAddress socketAddress(wildcardAddr, port); + impl()->bind(socketAddress, true); impl()->listen(backlog); } diff --git a/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp index dc8c5b898..ac4e323bd 100644 --- a/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp @@ -46,27 +46,27 @@ SocketImpl* SecureServerSocketImpl::acceptConnection(SocketAddress& clientAddr) } -void SecureServerSocketImpl::connect(const SocketAddress& address) +void SecureServerSocketImpl::connect(const SocketAddress& rAddress) { throw Poco::InvalidAccessException("Cannot connect() a SecureServerSocket"); } -void SecureServerSocketImpl::connect(const SocketAddress& address, const Poco::Timespan& timeout) +void SecureServerSocketImpl::connect(const SocketAddress& rAddress, const Poco::Timespan& timeout) { throw Poco::InvalidAccessException("Cannot connect() a SecureServerSocket"); } -void SecureServerSocketImpl::connectNB(const SocketAddress& address) +void SecureServerSocketImpl::connectNB(const SocketAddress& rAddress) { throw Poco::InvalidAccessException("Cannot connect() a SecureServerSocket"); } -void SecureServerSocketImpl::bind(const SocketAddress& address, bool reuseAddress) +void SecureServerSocketImpl::bind(const SocketAddress& rAddress, bool reuseAddress) { - _impl.bind(address, reuseAddress); + _impl.bind(rAddress, reuseAddress); reset(_impl.sockfd()); } @@ -97,13 +97,13 @@ int SecureServerSocketImpl::receiveBytes(void* buffer, int length, int flags) } -int SecureServerSocketImpl::sendTo(const void* buffer, int length, const SocketAddress& address, int flags) +int SecureServerSocketImpl::sendTo(const void* buffer, int length, const SocketAddress& rAddress, int flags) { throw Poco::InvalidAccessException("Cannot sendTo() on a SecureServerSocket"); } -int SecureServerSocketImpl::receiveFrom(void* buffer, int length, SocketAddress& address, int flags) +int SecureServerSocketImpl::receiveFrom(void* buffer, int length, SocketAddress& rAddress, int flags) { throw Poco::InvalidAccessException("Cannot receiveFrom() on a SecureServerSocket"); } diff --git a/NetSSL_OpenSSL/src/SecureStreamSocket.cpp b/NetSSL_OpenSSL/src/SecureStreamSocket.cpp index 635a8a331..4e6d5b26c 100644 --- a/NetSSL_OpenSSL/src/SecureStreamSocket.cpp +++ b/NetSSL_OpenSSL/src/SecureStreamSocket.cpp @@ -47,50 +47,50 @@ SecureStreamSocket::SecureStreamSocket(Context::Ptr pContext, Session::Ptr pSess } -SecureStreamSocket::SecureStreamSocket(const SocketAddress& address): +SecureStreamSocket::SecureStreamSocket(const SocketAddress& rAddress): StreamSocket(new SecureStreamSocketImpl(SSLManager::instance().defaultClientContext())) { - connect(address); + connect(rAddress); } -SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName): +SecureStreamSocket::SecureStreamSocket(const SocketAddress& rAddress, const std::string& hostName): StreamSocket(new SecureStreamSocketImpl(SSLManager::instance().defaultClientContext())) { static_cast(impl())->setPeerHostName(hostName); - connect(address); + connect(rAddress); } -SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext): +SecureStreamSocket::SecureStreamSocket(const SocketAddress& rAddress, Context::Ptr pContext): StreamSocket(new SecureStreamSocketImpl(pContext)) { - connect(address); + connect(rAddress); } -SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext, Session::Ptr pSession): +SecureStreamSocket::SecureStreamSocket(const SocketAddress& rAddress, Context::Ptr pContext, Session::Ptr pSession): StreamSocket(new SecureStreamSocketImpl(pContext)) { useSession(pSession); - connect(address); + connect(rAddress); } -SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext): +SecureStreamSocket::SecureStreamSocket(const SocketAddress& rAddress, const std::string& hostName, Context::Ptr pContext): StreamSocket(new SecureStreamSocketImpl(pContext)) { static_cast(impl())->setPeerHostName(hostName); - connect(address); + connect(rAddress); } -SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession): +SecureStreamSocket::SecureStreamSocket(const SocketAddress& rAddress, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession): StreamSocket(new SecureStreamSocketImpl(pContext)) { static_cast(impl())->setPeerHostName(hostName); useSession(pSession); - connect(address); + connect(rAddress); } diff --git a/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp index efb2fd2f4..2201e4b35 100644 --- a/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp @@ -64,23 +64,23 @@ void SecureStreamSocketImpl::acceptSSL() } -void SecureStreamSocketImpl::connect(const SocketAddress& address) +void SecureStreamSocketImpl::connect(const SocketAddress& rAddress) { - _impl.connect(address, !_lazyHandshake); + _impl.connect(rAddress, !_lazyHandshake); reset(_impl.sockfd()); } -void SecureStreamSocketImpl::connect(const SocketAddress& address, const Poco::Timespan& timeout) +void SecureStreamSocketImpl::connect(const SocketAddress& rAddress, const Poco::Timespan& timeout) { - _impl.connect(address, timeout, !_lazyHandshake); + _impl.connect(rAddress, timeout, !_lazyHandshake); reset(_impl.sockfd()); } -void SecureStreamSocketImpl::connectNB(const SocketAddress& address) +void SecureStreamSocketImpl::connectNB(const SocketAddress& rAddress) { - _impl.connectNB(address); + _impl.connectNB(rAddress); reset(_impl.sockfd()); } @@ -91,7 +91,7 @@ void SecureStreamSocketImpl::connectSSL() } -void SecureStreamSocketImpl::bind(const SocketAddress& address, bool reuseAddress) +void SecureStreamSocketImpl::bind(const SocketAddress& rAddress, bool reuseAddress) { throw Poco::InvalidAccessException("Cannot bind() a SecureStreamSocketImpl"); } @@ -129,13 +129,13 @@ int SecureStreamSocketImpl::receiveBytes(void* buffer, int length, int flags) } -int SecureStreamSocketImpl::sendTo(const void* buffer, int length, const SocketAddress& address, int flags) +int SecureStreamSocketImpl::sendTo(const void* buffer, int length, const SocketAddress& rAddress, int flags) { throw Poco::InvalidAccessException("Cannot sendTo() on a SecureStreamSocketImpl"); } -int SecureStreamSocketImpl::receiveFrom(void* buffer, int length, SocketAddress& address, int flags) +int SecureStreamSocketImpl::receiveFrom(void* buffer, int length, SocketAddress& rAddress, int flags) { throw Poco::InvalidAccessException("Cannot receiveFrom() on a SecureStreamSocketImpl"); } diff --git a/NetSSL_OpenSSL/src/X509Certificate.cpp b/NetSSL_OpenSSL/src/X509Certificate.cpp index a0463b2a6..5a79ca9bd 100644 --- a/NetSSL_OpenSSL/src/X509Certificate.cpp +++ b/NetSSL_OpenSSL/src/X509Certificate.cpp @@ -111,11 +111,11 @@ bool X509Certificate::verify(const Poco::Crypto::X509Certificate& certificate, c // compare by IP const HostEntry& heData = DNS::resolve(*it); const HostEntry::AddressList& addr = heData.addresses(); - HostEntry::AddressList::const_iterator it = addr.begin(); + HostEntry::AddressList::const_iterator itAddr = addr.begin(); HostEntry::AddressList::const_iterator itEnd = addr.end(); - for (; it != itEnd && !ok; ++it) + for (; itAddr != itEnd && !ok; ++itAddr) { - ok = (*it == ip); + ok = (*itAddr == ip); } } else diff --git a/NetSSL_OpenSSL/testsuite/CMakeLists.txt b/NetSSL_OpenSSL/testsuite/CMakeLists.txt index 9f37754be..ac9e270c5 100644 --- a/NetSSL_OpenSSL/testsuite/CMakeLists.txt +++ b/NetSSL_OpenSSL/testsuite/CMakeLists.txt @@ -18,7 +18,8 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation CppUnit) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} 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_CE_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj index 6e97ce8a6..827da2ba1 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ - {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 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_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 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/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 55cb0766c..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,13 +136,13 @@ true true true - + Level3 ProgramDatabase 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 @@ -167,13 +167,13 @@ true true true - + Level3 - + 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 @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase 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 @@ -227,13 +227,13 @@ true true true - + Level3 - + 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 @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase 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 @@ -287,13 +287,13 @@ true true true - + Level3 - + 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 @@ -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 20c95e0b3..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,13 +136,13 @@ true true true - + Level3 ProgramDatabase 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 @@ -167,13 +167,13 @@ true true true - + Level3 - + 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 @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase 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 @@ -227,13 +227,13 @@ true true true - + Level3 - + 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 @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase 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 @@ -287,13 +287,13 @@ true true true - + Level3 - + 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 @@ -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 f660ce367..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 @@ -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 @@ -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 e349275ba..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 @@ -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 @@ -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"/> \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 @@ /> + + + + 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..6ee874ece --- /dev/null +++ b/Redis/Redis_vs120.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 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Redis/Redis_vs120.vcxproj.filters b/Redis/Redis_vs120.vcxproj.filters new file mode 100644 index 000000000..0aa7847e8 --- /dev/null +++ b/Redis/Redis_vs120.vcxproj.filters @@ -0,0 +1,72 @@ + + + + + {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 + + + \ 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..d9fdc9668 --- /dev/null +++ b/Redis/Redis_x64_vs120.vcxproj @@ -0,0 +1,302 @@ + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Redis/Redis_x64_vs120.vcxproj.filters b/Redis/Redis_x64_vs120.vcxproj.filters new file mode 100644 index 000000000..243929f23 --- /dev/null +++ b/Redis/Redis_x64_vs120.vcxproj.filters @@ -0,0 +1,72 @@ + + + + + {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 + + + \ 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/Redis_x64_vs90.sln b/Redis/Redis_x64_vs90.sln index d91f9aaf0..e4c8d9000 100644 --- a/Redis/Redis_x64_vs90.sln +++ b/Redis/Redis_x64_vs90.sln @@ -1,10 +1,10 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_x64_vs90.vcproj", "{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_x64_vs90.vcproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" ProjectSection(ProjectDependencies) = postProject - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199} = {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199} + {12E39EE2-7049-312D-B390-7568D727CA25} = {12E39EE2-7049-312D-B390-7568D727CA25} EndProjectSection EndProject Global @@ -17,24 +17,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_shared|x64.Build.0 = debug_shared|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_shared|x64.ActiveCfg = release_shared|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_shared|x64.Build.0 = release_shared|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_shared|x64.Deploy.0 = release_shared|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_md|x64.Build.0 = release_static_md|x64 - {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {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 diff --git a/Redis/Redis_x64_vs90.vcproj b/Redis/Redis_x64_vs90.vcproj index 592421eef..4be593141 100644 --- a/Redis/Redis_x64_vs90.vcproj +++ b/Redis/Redis_x64_vs90.vcproj @@ -1,46 +1,35 @@ + 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/CMakeLists.txt b/Redis/testsuite/CMakeLists.txt index 16d9408a1..eb3784d36 100644 --- a/Redis/testsuite/CMakeLists.txt +++ b/Redis/testsuite/CMakeLists.txt @@ -20,4 +20,6 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoRedis PocoFoundation CppUnit ) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} PocoRedis PocoFoundation PocoCppUnit ) + diff --git a/Redis/testsuite/Makefile b/Redis/testsuite/Makefile index e3760770d..10c31fd09 100644 --- a/Redis/testsuite/Makefile +++ b/Redis/testsuite/Makefile @@ -12,6 +12,6 @@ objects = Driver RedisTest RedisTestSuite target = testrunner target_version = 1 -target_libs = PocoRedis PocoFoundation PocoNet CppUnit +target_libs = PocoRedis PocoFoundation PocoNet PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Redis/testsuite/TestSuite.progen b/Redis/testsuite/TestSuite.progen index d55b05017..178b5a446 100644 --- a/Redis/testsuite/TestSuite.progen +++ b/Redis/testsuite/TestSuite.progen @@ -5,5 +5,7 @@ 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 +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_vs100.vcxproj b/Redis/testsuite/TestSuite_vs100.vcxproj new file mode 100644 index 000000000..08961eac6 --- /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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.lib;%(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;ws2_32.lib;iphlpapi.lib;%(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;ws2_32.lib;iphlpapi.lib;%(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;ws2_32.lib;iphlpapi.lib;%(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..62f25fc94 --- /dev/null +++ b/Redis/testsuite/TestSuite_vs100.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {3c934d48-a7eb-44a0-a1ea-ecc0ed7de689} + + + {ba497fd6-c76f-4c82-b584-2e0f72e69ddb} + + + + + 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..d9e58b2b6 --- /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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;..\..\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;ws2_32.lib;iphlpapi.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;..\..\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;ws2_32.lib;iphlpapi.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;..\..\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;ws2_32.lib;iphlpapi.lib;%(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..dbc663585 --- /dev/null +++ b/Redis/testsuite/TestSuite_vs110.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {663776a1-2102-4515-95bd-13d9ed614276} + + + {bced4e5f-13db-496d-a2f2-3c5cb5de211c} + + + + + 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..4dee6b1f8 --- /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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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..2d9450e51 --- /dev/null +++ b/Redis/testsuite/TestSuite_vs120.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {97158bee-67ec-422b-a6b2-bea200ca607b} + + + {e20526bd-3c4a-4eda-a66f-ba861cdb2f67} + + + + + 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..42b988324 --- /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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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..d50a0fb95 --- /dev/null +++ b/Redis/testsuite/TestSuite_vs140.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {c56cc5bc-db89-42f0-adec-e9b1cb2ef404} + + + {4d43c6b3-5696-496c-9b21-0ccc1bf21f7b} + + + + + 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..5c0b8cf29 --- /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..42c5ed43c --- /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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.lib;%(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;ws2_32.lib;iphlpapi.lib;%(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;ws2_32.lib;iphlpapi.lib;%(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;ws2_32.lib;iphlpapi.lib;%(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..02646ef79 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {70af8c65-8c21-470b-8e52-5349ff7ad932} + + + {9e4b9972-d24c-465a-9c04-532c1a8984ed} + + + + + 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..fdd5fc482 --- /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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;..\..\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;ws2_32.lib;iphlpapi.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;..\..\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;ws2_32.lib;iphlpapi.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;..\..\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;ws2_32.lib;iphlpapi.lib;%(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..81db354bd --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {2eef7653-c645-4780-8e3d-d41074e092ed} + + + {6932d75a-7522-455e-bad2-e9356eb6ebe1} + + + + + 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..ee1c27208 --- /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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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..e133cb5e3 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {df09b19f-ebe8-4afe-9192-12c2cd2d1ce0} + + + {7fb8becc-981e-4a12-8713-297cfe8af5d1} + + + + + 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..d24dc6d54 --- /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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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;ws2_32.lib;iphlpapi.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..4c883d6c5 --- /dev/null +++ b/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {a539755c-0791-4159-a416-5a43b7b3b4f2} + + + {babaebed-7710-4b21-8b85-efd0763703e8} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_x64_vs90.vcproj b/Redis/testsuite/TestSuite_x64_vs90.vcproj index 8cc28cca7..12acc7db3 100644 --- a/Redis/testsuite/TestSuite_x64_vs90.vcproj +++ b/Redis/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Util/testsuite/CMakeLists.txt b/Util/testsuite/CMakeLists.txt index 1b6d16cbb..934e80fbf 100644 --- a/Util/testsuite/CMakeLists.txt +++ b/Util/testsuite/CMakeLists.txt @@ -24,4 +24,6 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoUtil PocoJSON PocoXML PocoFoundation CppUnit) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} 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_CE_vs90.vcproj b/Util/testsuite/TestSuite_CE_vs90.vcproj index e44090baf..8223909de 100644 --- a/Util/testsuite/TestSuite_CE_vs90.vcproj +++ b/Util/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 - {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 165f52350..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 @@ -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 @@ -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 436a3c6a2..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 @@ -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 @@ -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"/> 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/src/XMLWriter.cpp b/XML/src/XMLWriter.cpp index 5626d7462..5bb4f912c 100644 --- a/XML/src/XMLWriter.cpp +++ b/XML/src/XMLWriter.cpp @@ -712,14 +712,14 @@ void XMLWriter::declareNamespaces(const XMLString& namespaceURI, const XMLString bool defaultNameSpaceUsed = false; XMLString defaultNamespaceURI = _namespaces.getURI(std::string()); XMLString local; - XMLString prefix; + XMLString prefixString; XMLString elementNamespaceURI = namespaceURI; - Name::split(qname, prefix, local); + Name::split(qname, prefixString, local); if (elementNamespaceURI.empty()) - elementNamespaceURI = _namespaces.getURI(prefix); + elementNamespaceURI = _namespaces.getURI(prefixString); if (!elementNamespaceURI.empty()) { - usedNamespaces[prefix].insert(elementNamespaceURI); + usedNamespaces[prefixString].insert(elementNamespaceURI); if (!defaultNamespaceURI.empty() && elementNamespaceURI == defaultNamespaceURI) defaultNameSpaceUsed = true; } @@ -733,7 +733,7 @@ void XMLWriter::declareNamespaces(const XMLString& namespaceURI, const XMLString XMLString attributeLocal; Name::split(attributeQName, attributePrefix, attributeLocal); if (attributeNamespaceURI.empty()) - attributeNamespaceURI = _namespaces.getURI(prefix); + attributeNamespaceURI = _namespaces.getURI(prefixString); if (!attributeNamespaceURI.empty()) { usedNamespaces[attributePrefix].insert(attributeNamespaceURI); diff --git a/XML/testsuite/CMakeLists.txt b/XML/testsuite/CMakeLists.txt index 318192e60..9b3a9a734 100644 --- a/XML/testsuite/CMakeLists.txt +++ b/XML/testsuite/CMakeLists.txt @@ -18,4 +18,6 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoXML PocoFoundation CppUnit) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} 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_CE_vs90.vcproj b/XML/testsuite/TestSuite_CE_vs90.vcproj index 6d327e999..94a7b7a15 100644 --- a/XML/testsuite/TestSuite_CE_vs90.vcproj +++ b/XML/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 - {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 7f8d12d55..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 @@ -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 @@ -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 6710d869a..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 @@ -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 @@ -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"/> 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 0cb59b3d6..1a4c79078 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 67603ab39..7e26e3804 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 317694ce9..3b1a8c2de 100644 --- a/Zip/testsuite/CMakeLists.txt +++ b/Zip/testsuite/CMakeLists.txt @@ -18,7 +18,8 @@ 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} ${CMAKE_THREAD_LIBS_INIT} PocoZip PocoNet PocoFoundation CppUnit ) + +target_link_libraries( ${TESTUNIT} ${CMAKE_THREAD_LIBS_INIT} 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_CE_vs90.vcproj b/Zip/testsuite/TestSuite_CE_vs90.vcproj index 5fb753afc..b82cc972c 100644 --- a/Zip/testsuite/TestSuite_CE_vs90.vcproj +++ b/Zip/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 +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 005b74cbf..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 @@ -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 @@ -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 2fd869eac..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 @@ -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 @@ -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"/> #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 diff --git a/appveyor.yml b/appveyor.yml index 3b87d3124..e79fee5ff 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 @@ -98,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 # ------------------------------------------------------------------------------------------- @@ -207,37 +206,42 @@ 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 +# & C:\cygwin\bin\ls -lR $env:MYSQL32 +# & C:\cygwin\bin\ls -lR $env:MYSQL64 # ------------------------------------------------------------------------------------------- - ps: | if ($env:platform -eq "Win32") @@ -250,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") { @@ -262,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 @@ -285,6 +287,7 @@ before_build: $env:LIB = $env:POSTGRES64 + "\lib;" + $env:LIB $env:PATH = $env:POSTGRES64 + "\bin;" + $env:PATH } +# ------------------------------------------------------------------------------------------- after_build: - ps: | @@ -413,12 +416,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; 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 # 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 diff --git a/release/script/mkrelease b/release/script/mkrelease index 89c827040..6c71af7fd 100755 --- a/release/script/mkrelease +++ b/release/script/mkrelease @@ -19,7 +19,7 @@ if [ "$1" = "" ] ; then exit 1 fi -comps="Foundation XML JSON Util Net" +comps="CppUnit CppUnit/WinTestRunner Foundation XML JSON Util Net" internal=0 specfile="" version="" @@ -129,43 +129,6 @@ if [ $internal = 1 ] ; then cp ${POCO_BASE}/build/script/waitfortest ${target}/build/script fi - -# -# CppUnit -# -mkdir -p ${target}/CppUnit -mkdir -p ${target}/CppUnit/doc -mkdir -p ${target}/CppUnit/include/CppUnit -mkdir -p ${target}/CppUnit/src -mkdir -p ${target}/CppUnit/WinTestRunner -mkdir -p ${target}/CppUnit/WinTestRunner/include/WinTestRunner -mkdir -p ${target}/CppUnit/WinTestRunner/src -mkdir -p ${target}/CppUnit/WinTestRunner/res - -cp ${POCO_BASE}/CppUnit/doc/* ${target}/CppUnit/doc >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/include/CppUnit/* ${target}/CppUnit/include/CppUnit >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/src/* ${target}/CppUnit/src >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/*.sln ${target}/CppUnit >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/*.vcproj ${target}/CppUnit >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/*.vcxproj ${target}/CppUnit >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/*.vcxproj.filters ${target}/CppUnit >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/*.vcxproj.user ${target}/CppUnit >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/Makefile ${target}/CppUnit >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/*.vmsbuild ${target}/CppUnit >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/*.vxbuild ${target}/CppUnit >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/*.progen ${target}/CppUnit >/dev/null 2>&1 - -cp ${POCO_BASE}/CppUnit/WinTestRunner/include/WinTestRunner/* ${target}/CppUnit/WinTestRunner/include/WinTestRunner >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/WinTestRunner/src/* ${target}/CppUnit/WinTestRunner/src >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/WinTestRunner/res/WinTestRunner.rc ${target}/CppUnit/WinTestRunner/res >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/WinTestRunner/res/Resource.h ${target}/CppUnit/WinTestRunner/res >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcproj ${target}/CppUnit/WinTestRunner >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj ${target}/CppUnit/WinTestRunner >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj.filters ${target}/CppUnit/WinTestRunner >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj.user ${target}/CppUnit/WinTestRunner >/dev/null 2>&1 -cp ${POCO_BASE}/CppUnit/WinTestRunner/*.progen ${target}/CppUnit/WinTestRunner >/dev/null 2>&1 - - # # Copy components # @@ -178,8 +141,6 @@ done # # Create components file # -echo "CppUnit" >${target}/components -echo "CppUnit/WinTestRunner" >>${target}/components for comp in $comps ; do echo $comp >>${target}/components @@ -289,12 +250,6 @@ echo "COMPONENTS = $comps" >>${target}/Makefile cat >>${target}/Makefile <<'ENDOFSCRIPT' -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 @@ -322,13 +277,15 @@ samples="" cleans="" for comp in $comps ; do - libexecs="$libexecs ${comp}-libexec" - cleans="$cleans ${comp}-clean" - if [ -d "${POCO_BASE}/${comp}/testsuite" ] ; then - tests="$tests ${comp}-tests" - fi - if [ -d "${POCO_BASE}/${comp}/samples" ] ; then - samples="$samples ${comp}-samples" + if [ -f "${POCO_BASE}/${comp}/Makefile" ] ; then + libexecs="$libexecs ${comp}-libexec" + cleans="$cleans ${comp}-clean" + if [ -d "${POCO_BASE}/${comp}/testsuite" ] ; then + tests="$tests ${comp}-tests" + fi + if [ -d "${POCO_BASE}/${comp}/samples" ] ; then + samples="$samples ${comp}-samples" + fi fi done @@ -349,10 +306,11 @@ echo 'cleans: $(filter-out $(foreach f,$(OMIT),$f%),$(cleans))' >>${target}/Make for comp in $comps ; do - if [ "`grep -c POCO_LICENSING "${POCO_BASE}/${comp}/Makefile"`" != 0 ] ; then - dependencies=$licensingDep - else - dependencies="" + dependencies="" + if [ -f "${POCO_BASE}/${comp}/Makefile" ] ; then + if [ "`grep -c POCO_LICENSING "${POCO_BASE}/${comp}/Makefile"`" != 0 ] ; then + dependencies=$licensingDep + fi fi if [ -f "${POCO_BASE}/${comp}/dependencies" ] ; then for dep in `cat "${POCO_BASE}/${comp}/dependencies"` ; @@ -414,7 +372,7 @@ done cat >>${target}/Makefile <