diff --git a/.gitattributes b/.gitattributes index 8c88af1d7..95c524dd0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -31,3 +31,8 @@ *.png binary *.jpg binary *.gif binary + +# Linguist overrides +.cpp linguist-language=C++ +.h linguist-language=C++ + diff --git a/.gitignore b/.gitignore index fdca5471a..894b4e899 100644 --- a/.gitignore +++ b/.gitignore @@ -98,10 +98,10 @@ release_static_md/ debug_static_md/ release_static_mt/ debug_static_mt/ -bin/* -bin64/* -lib/* -lib64/* +bin/ +bin64/ +lib/ +lib64/ pocomsg.h */testsuite/bin/* Util/testsuite/TestConfiguration/ diff --git a/.travis.yml b/.travis.yml index 847f6a9f6..ac159380a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,19 +8,15 @@ branches: - /.*pp.eyor.*/ before_install: - # we need a recent version of CMake - # - sudo add-apt-repository -y ppa:andykimpe/cmake3 - # linux prereqisite packages - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/cmake-3.2.3-Linux-x86_64/bin:$PATH; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev libsqlite3-dev; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y g++-arm-linux-gnueabi g++-arm-linux-gnueabihf clang-3.5; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y libpq-dev unixodbc-dev libmysqlclient-dev libsqlite3-dev; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y g++-arm-linux-gnueabi g++-arm-linux-gnueabihf; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y sloccount cppcheck; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y g++-4.8; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y gcc-5 g++-5; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5; fi services: - mongodb @@ -28,6 +24,9 @@ services: - postgresql - mysql +dist: trusty +sudo: enabled + addons: postgresql: "9.3" @@ -54,95 +53,113 @@ matrix: fast_finish: true include: - - env: TEST_NAME="OSX clang (make) bundled" + - env: TEST_NAME="clang (make) bundled" os: osx compiler: clang script: - export CC="clang" - export CXX="clang++" - - clang++ -x c++ /dev/null -dM -E + - $CXX --version + - $CXX -x c++ /dev/null -dM -E - ./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" + #- env: TEST_NAME="clang 3.5.0 (make) bundled" + # ======================================= compiler error on generating debug info for auto return + #compiler: clang + # script: + # - export CC="clang" + # - export CXX="clang++" + # - $CXX --version + # - ./configure --config=Linux-clang --everything && make -s -j2 && ./travis/Linux/runtests.sh + + #- env: TEST_NAME="clang 3.5.0 (make) unbundled" + # ======================================= compiler error on generating debug info for auto return + # error: debug information for auto is not yet supported + # error: debug information for auto is not yet supported + # ** Creating dependency info for src/Timespan.cpp + # make[1]: *** [/home/travis/build/Kampbell/poco/CppUnit/obj/Linux/x86_64/debug_shared/TestRunner.o] Error 1 # compiler: clang + # ======================================= + # script: + # - export CC="clang" + # - export CXX="clang++" + # - $CXX --version + # - ./configure --config=Linux-clang --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh + + - env: TEST_NAME="gcc 5.4.1 (make) bundled" compiler: gcc script: - - export CC="gcc" - - export CXX="g++" + - $CXX --version - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - - env: TEST_NAME="Linux gcc 4.8 (make) bundled" - compiler: gcc - script: - - export CC="gcc-4.8" - - export CXX="g++-4.8" - - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh + #- env: TEST_NAME="gcc 5.4.1 (make) unbundled" + # ======================================= unit tests failures due to unbundled pcre + # There was 1 error: + # 1: N7CppUnit10TestCallerI21RegularExpressionTestEE.testSubst2 + # "St9bad_alloc: std::bad_alloc" + # in "", line -1 + # + # There were 4 failures: + # 1: N7CppUnit10TestCallerI21RegularExpressionTestEE.testMatch4 + # "re.match("123 456", 0, matches) == 3" + # in "src/RegularExpressionTest.cpp", line 103 + # 2: N7CppUnit10TestCallerI21RegularExpressionTestEE.testMatch6 + # "expr.match("abcde", 0, 0)" + # in "src/RegularExpressionTest.cpp", line 136 + # 3: N7CppUnit10TestCallerI21RegularExpressionTestEE.testSplit2 + # "re.split("123 456", 0, strings) == 3" + # in "src/RegularExpressionTest.cpp", line 184 + # 4: N7CppUnit10TestCallerI21RegularExpressionTestEE.testGroup + # "re.match("abcd 1234", 0, matches) == 3" + # in "src/RegularExpressionTest.cpp", line 271 + # + # failed=Foundation + # ======================================= + # compiler: gcc + # script: + # - $CXX --version + # - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" - compiler: gcc - script: - - export CC="gcc" - - export CXX="g++" - - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh + #- env: TEST_NAME="arm-linux-gnueabi-g++ (make)" + # compiler: gcc + # script: + # - arm-linux-gnueabi-g++ --version + # - arm-linux-gnueabi-g++ -x c++ /dev/null -dM -E + # - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" + - env: TEST_NAME="gcc 5.4.1 (CMake)" compiler: gcc script: - - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - export CC="gcc-4.8" - - export CXX="g++-4.8" - - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - - - env: TEST_NAME="Linux clang 3.4 (make)" - compiler: clang - script: - - ./configure --everything --config=Linux-clang && make -s -j2 && ./travis/Linux/runtests.sh - - - env: TEST_NAME="Linux arm-linux-gnueabi- (make)" - compiler: gcc - script: - - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - - - env: TEST_NAME="Linux gcc 4.6 (CMake)" - compiler: gcc - script: - - export CC="gcc" - - export CXX="g++" + - $CXX --version - 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: - - export CC="gcc-4.8" - - export CXX="g++-4.8" - - 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 clang 3.4 (CMake)" - compiler: clang - script: - - 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="clang (CMake)" + # compiler: clang + # script: + # - 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 arm-linux-gnueabi-g++ (CMake)" - compiler: gcc - script: - - export CC="arm-linux-gnueabi-gcc" - - export CXX="arm-linux-gnueabi-g++" - - source ./travis/ignored.sh - - export POCO_BASE=`pwd` - - mkdir cmake-build - - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. + #- env: TEST_NAME="arm-linux-gnueabi-g++ (CMake)" + # ======================================= "arm-linux-gnueabi-g++: version 4.7.0: non compliant to c++11 + # compiler: gcc + # script: + # - export CC="arm-linux-gnueabi-gcc" + # - export CXX="arm-linux-gnueabi-g++" + # - $CXX --version + # - source ./travis/ignored.sh + # - export POCO_BASE=`pwd` + # - mkdir cmake-build + # - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. - - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" + - env: TEST_NAME="arm-linux-gnueabihf-g++ (CMake)" compiler: gcc script: - export CC="arm-linux-gnueabihf-gcc" - export CXX="arm-linux-gnueabihf-g++" + - $CXX --version - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build @@ -151,11 +168,10 @@ matrix: # QA jobs for code analytics and metrics # build documentation and release - - env: TEST_NAME="Linux documentation & release" + - env: TEST_NAME="documentation & release" compiler: gcc script: - - export CC="gcc" - - export CXX="g++" + - $CXX --version - . env.sh && mkdoc all && mkrel all # static code analysis with cppcheck (we can add --enable=all later) diff --git a/ApacheConnector/ApacheConnector_vs140.sln b/ApacheConnector/ApacheConnector_vs140.sln index f82b5ba79..d523dd5cb 100644 --- a/ApacheConnector/ApacheConnector_vs140.sln +++ b/ApacheConnector/ApacheConnector_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_vs140.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}" EndProject diff --git a/ApacheConnector/ApacheConnector_vs150.sln b/ApacheConnector/ApacheConnector_vs150.sln new file mode 100644 index 000000000..e80d6dc42 --- /dev/null +++ b/ApacheConnector/ApacheConnector_vs150.sln @@ -0,0 +1,21 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_vs150.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.Build.0 = release_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.Deploy.0 = release_shared|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ApacheConnector/ApacheConnector_vs150.vcxproj b/ApacheConnector/ApacheConnector_vs150.vcxproj new file mode 100644 index 000000000..363fe95fb --- /dev/null +++ b/ApacheConnector/ApacheConnector_vs150.vcxproj @@ -0,0 +1,137 @@ + + + + + debug_shared + Win32 + + + release_shared + Win32 + + + + ApacheConnector + {9866EE28-0612-4746-BD35-3B15B0AF7267} + ApacheConnector + Win32Proj + + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + mod_pocod + mod_poco + + + ..\bin\ + obj\ApacheConnector\$(Configuration)\ + true + + + ..\bin\ + obj\ApacheConnector\$(Configuration)\ + false + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + ..\bin\mod_pocod.dll + true + true + ..\bin\mod_pocod.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\mod_pocod.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + ..\bin\mod_poco.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\mod_poco.lib + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ApacheConnector/ApacheConnector_vs150.vcxproj.filters b/ApacheConnector/ApacheConnector_vs150.vcxproj.filters new file mode 100644 index 000000000..c0441f160 --- /dev/null +++ b/ApacheConnector/ApacheConnector_vs150.vcxproj.filters @@ -0,0 +1,57 @@ + + + + + {d72eb41f-654b-4f23-868f-204d35b8c556} + + + {099b5ea4-1450-4475-990a-aa81e0250a3a} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/ApacheConnector/ApacheConnector_x64_vs140.sln b/ApacheConnector/ApacheConnector_x64_vs140.sln index 53bb32793..7640f0e7d 100644 --- a/ApacheConnector/ApacheConnector_x64_vs140.sln +++ b/ApacheConnector/ApacheConnector_x64_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_x64_vs140.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}" EndProject diff --git a/ApacheConnector/ApacheConnector_x64_vs150.sln b/ApacheConnector/ApacheConnector_x64_vs150.sln new file mode 100644 index 000000000..62bc33980 --- /dev/null +++ b/ApacheConnector/ApacheConnector_x64_vs150.sln @@ -0,0 +1,21 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_x64_vs150.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.Build.0 = debug_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.ActiveCfg = release_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.Build.0 = release_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.Deploy.0 = release_shared|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ApacheConnector/ApacheConnector_x64_vs150.vcxproj b/ApacheConnector/ApacheConnector_x64_vs150.vcxproj new file mode 100644 index 000000000..a7f3ea991 --- /dev/null +++ b/ApacheConnector/ApacheConnector_x64_vs150.vcxproj @@ -0,0 +1,137 @@ + + + + + debug_shared + x64 + + + release_shared + x64 + + + + ApacheConnector + {9866EE28-0612-4746-BD35-3B15B0AF7267} + ApacheConnector + Win32Proj + + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + mod_poco64d + mod_poco64 + + + ..\bin64\ + obj64\ApacheConnector\$(Configuration)\ + true + + + ..\bin64\ + obj64\ApacheConnector\$(Configuration)\ + false + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + ..\bin64\mod_poco64d.dll + true + true + ..\bin64\mod_poco64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\mod_pocod.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + ..\bin64\mod_poco64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\mod_poco.lib + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ApacheConnector/ApacheConnector_x64_vs150.vcxproj.filters b/ApacheConnector/ApacheConnector_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..167e70c81 --- /dev/null +++ b/ApacheConnector/ApacheConnector_x64_vs150.vcxproj.filters @@ -0,0 +1,57 @@ + + + + + {5d80e875-82e1-4126-9e45-57eaea20520e} + + + {06d28b48-1434-44a3-89d0-7f9a0b3fdd4b} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/ApacheConnector/Makefile b/ApacheConnector/Makefile index eefcce048..74c7dd2e9 100644 --- a/ApacheConnector/Makefile +++ b/ApacheConnector/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.4/ApacheConnector/Makefile#2 $ -# # Makefile for ApacheConnector # diff --git a/ApacheConnector/include/ApacheApplication.h b/ApacheConnector/include/ApacheApplication.h index 3450bc1a5..f78b5c3c2 100644 --- a/ApacheConnector/include/ApacheApplication.h +++ b/ApacheConnector/include/ApacheApplication.h @@ -1,8 +1,6 @@ // // ApacheApplication.h // -// $Id: //poco/1.4/ApacheConnector/include/ApacheApplication.h#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/include/ApacheChannel.h b/ApacheConnector/include/ApacheChannel.h index cc66d3d00..aa33be6ce 100644 --- a/ApacheConnector/include/ApacheChannel.h +++ b/ApacheConnector/include/ApacheChannel.h @@ -1,8 +1,6 @@ // // ApacheChannel.h // -// $Id: //poco/1.4/ApacheConnector/include/ApacheChannel.h#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/include/ApacheConnector.h b/ApacheConnector/include/ApacheConnector.h index 76e0d01d4..49482c170 100644 --- a/ApacheConnector/include/ApacheConnector.h +++ b/ApacheConnector/include/ApacheConnector.h @@ -1,8 +1,6 @@ // // ApacheConnector.h // -// $Id: //poco/1.4/ApacheConnector/include/ApacheConnector.h#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/include/ApacheRequestHandlerFactory.h b/ApacheConnector/include/ApacheRequestHandlerFactory.h index f5fdc6e03..7e071aab5 100644 --- a/ApacheConnector/include/ApacheRequestHandlerFactory.h +++ b/ApacheConnector/include/ApacheRequestHandlerFactory.h @@ -1,8 +1,6 @@ // // ApacheRequestHandlerFactory.h // -// $Id: //poco/1.4/ApacheConnector/include/ApacheRequestHandlerFactory.h#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/include/ApacheServerRequest.h b/ApacheConnector/include/ApacheServerRequest.h index e28b953a5..dc6694f0e 100644 --- a/ApacheConnector/include/ApacheServerRequest.h +++ b/ApacheConnector/include/ApacheServerRequest.h @@ -1,8 +1,6 @@ // // ApacheServerRequest.h // -// $Id: //poco/1.4/ApacheConnector/include/ApacheServerRequest.h#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/include/ApacheServerResponse.h b/ApacheConnector/include/ApacheServerResponse.h index 7518f62ee..5b110dea1 100644 --- a/ApacheConnector/include/ApacheServerResponse.h +++ b/ApacheConnector/include/ApacheServerResponse.h @@ -1,8 +1,6 @@ // // ApacheServerResponse.h // -// $Id: //poco/1.4/ApacheConnector/include/ApacheServerResponse.h#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/include/ApacheStream.h b/ApacheConnector/include/ApacheStream.h index 634794cc7..f79cfc7e0 100644 --- a/ApacheConnector/include/ApacheStream.h +++ b/ApacheConnector/include/ApacheStream.h @@ -1,8 +1,6 @@ // // ApacheStream.h // -// $Id: //poco/1.4/ApacheConnector/include/ApacheStream.h#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/samples/FormServer/FormServer_vs150.vcxproj b/ApacheConnector/samples/FormServer/FormServer_vs150.vcxproj new file mode 100644 index 000000000..d3eb1cbdf --- /dev/null +++ b/ApacheConnector/samples/FormServer/FormServer_vs150.vcxproj @@ -0,0 +1,119 @@ + + + + + debug_shared + Win32 + + + release_shared + Win32 + + + + FormServer + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106} + FormServer + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + FormServerd + FormServer + + + bin\ + obj\FormServer\$(Configuration)\ + true + + + bin\ + obj\FormServer\$(Configuration)\ + false + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin\FormServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\FormServerd.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin\FormServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/ApacheConnector/samples/FormServer/FormServer_vs150.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_vs150.vcxproj.filters new file mode 100644 index 000000000..9460c748b --- /dev/null +++ b/ApacheConnector/samples/FormServer/FormServer_vs150.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {b6a0aaae-1643-4598-b8ca-8a2df82a3557} + + + + + Source Files + + + \ No newline at end of file diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs150.vcxproj b/ApacheConnector/samples/FormServer/FormServer_x64_vs150.vcxproj new file mode 100644 index 000000000..8c2fa2569 --- /dev/null +++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs150.vcxproj @@ -0,0 +1,119 @@ + + + + + debug_shared + x64 + + + release_shared + x64 + + + + FormServer + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106} + FormServer + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + FormServerd + FormServer + + + bin64\ + obj64\FormServer\$(Configuration)\ + true + + + bin64\ + obj64\FormServer\$(Configuration)\ + false + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin64\FormServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\FormServerd.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin64\FormServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs150.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..1f13f46e9 --- /dev/null +++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs150.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {186197e0-adfc-4f93-aec3-d6f2f58f245b} + + + + + Source Files + + + \ No newline at end of file diff --git a/ApacheConnector/samples/FormServer/Makefile b/ApacheConnector/samples/FormServer/Makefile index 3d7e50154..389b0c8bb 100644 --- a/ApacheConnector/samples/FormServer/Makefile +++ b/ApacheConnector/samples/FormServer/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.4/ApacheConnector/samples/FormServer/Makefile#1 $ -# # Makefile for Poco ApacheConnector sample # diff --git a/ApacheConnector/samples/FormServer/src/FormServer.cpp b/ApacheConnector/samples/FormServer/src/FormServer.cpp index e08ff07b3..278b71700 100644 --- a/ApacheConnector/samples/FormServer/src/FormServer.cpp +++ b/ApacheConnector/samples/FormServer/src/FormServer.cpp @@ -1,8 +1,6 @@ // // FormServer.cpp // -// $Id: //poco/1.4/ApacheConnector/samples/FormServer/src/FormServer.cpp#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/samples/Makefile b/ApacheConnector/samples/Makefile index c3fddce22..24d7ef95c 100644 --- a/ApacheConnector/samples/Makefile +++ b/ApacheConnector/samples/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.4/ApacheConnector/samples/Makefile#1 $ -# # Makefile for Poco ApacheConnector Samples # diff --git a/ApacheConnector/samples/TimeServer/Makefile b/ApacheConnector/samples/TimeServer/Makefile index 44f9da759..0d90794bb 100644 --- a/ApacheConnector/samples/TimeServer/Makefile +++ b/ApacheConnector/samples/TimeServer/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.4/ApacheConnector/samples/TimeServer/Makefile#1 $ -# # Makefile for Poco ApacheConnector sample # diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs150.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_vs150.vcxproj new file mode 100644 index 000000000..100e97a0d --- /dev/null +++ b/ApacheConnector/samples/TimeServer/TimeServer_vs150.vcxproj @@ -0,0 +1,119 @@ + + + + + debug_shared + Win32 + + + release_shared + Win32 + + + + TimeServer + {59EDFD20-9968-30F7-9532-44C08DA58C6E} + TimeServer + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + TimeServerd + TimeServer + + + bin\ + obj\TimeServer\$(Configuration)\ + true + + + bin\ + obj\TimeServer\$(Configuration)\ + false + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin\TimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TimeServerd.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin\TimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs150.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_vs150.vcxproj.filters new file mode 100644 index 000000000..ef1c1df3a --- /dev/null +++ b/ApacheConnector/samples/TimeServer/TimeServer_vs150.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {bca5e419-e2e7-4dee-a8b0-3079cc0c5142} + + + + + Source Files + + + \ No newline at end of file diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs150.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs150.vcxproj new file mode 100644 index 000000000..d6f627614 --- /dev/null +++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs150.vcxproj @@ -0,0 +1,119 @@ + + + + + debug_shared + x64 + + + release_shared + x64 + + + + TimeServer + {59EDFD20-9968-30F7-9532-44C08DA58C6E} + TimeServer + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + TimeServerd + TimeServer + + + bin64\ + obj64\TimeServer\$(Configuration)\ + true + + + bin64\ + obj64\TimeServer\$(Configuration)\ + false + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin64\TimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TimeServerd.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin64\TimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs150.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..589963168 --- /dev/null +++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs150.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {16d2dac4-6ab0-4920-ad66-dd3848c125cf} + + + + + Source Files + + + \ No newline at end of file diff --git a/ApacheConnector/samples/TimeServer/src/TimeServer.cpp b/ApacheConnector/samples/TimeServer/src/TimeServer.cpp index 6e40e900d..d12642df5 100644 --- a/ApacheConnector/samples/TimeServer/src/TimeServer.cpp +++ b/ApacheConnector/samples/TimeServer/src/TimeServer.cpp @@ -1,8 +1,6 @@ // // TimeServer.cpp // -// $Id: //poco/1.4/ApacheConnector/samples/TimeServer/src/TimeServer.cpp#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/samples/samples_vs140.sln b/ApacheConnector/samples/samples_vs140.sln index f4994bde5..b2dee3cda 100644 --- a/ApacheConnector/samples/samples_vs140.sln +++ b/ApacheConnector/samples/samples_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_vs140.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}" EndProject diff --git a/ApacheConnector/samples/samples_vs150.sln b/ApacheConnector/samples/samples_vs150.sln new file mode 100644 index 000000000..1360bee5c --- /dev/null +++ b/ApacheConnector/samples/samples_vs150.sln @@ -0,0 +1,29 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_vs150.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_vs150.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.Build.0 = release_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Build.0 = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Deploy.0 = release_shared|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ApacheConnector/samples/samples_x64_vs140.sln b/ApacheConnector/samples/samples_x64_vs140.sln index 7396fa021..1c13fedb2 100644 --- a/ApacheConnector/samples/samples_x64_vs140.sln +++ b/ApacheConnector/samples/samples_x64_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_x64_vs140.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}" EndProject diff --git a/ApacheConnector/samples/samples_x64_vs150.sln b/ApacheConnector/samples/samples_x64_vs150.sln new file mode 100644 index 000000000..a2af1a2a7 --- /dev/null +++ b/ApacheConnector/samples/samples_x64_vs150.sln @@ -0,0 +1,29 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_x64_vs150.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_x64_vs150.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.Build.0 = debug_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.ActiveCfg = release_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.Build.0 = release_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.Deploy.0 = release_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Build.0 = debug_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.ActiveCfg = release_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Build.0 = release_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Deploy.0 = release_shared|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ApacheConnector/src/ApacheApplication.cpp b/ApacheConnector/src/ApacheApplication.cpp index d187b3b94..c67810ceb 100644 --- a/ApacheConnector/src/ApacheApplication.cpp +++ b/ApacheConnector/src/ApacheApplication.cpp @@ -1,8 +1,6 @@ // // ApacheApplication.cpp // -// $Id: //poco/1.4/ApacheConnector/src/ApacheApplication.cpp#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/src/ApacheChannel.cpp b/ApacheConnector/src/ApacheChannel.cpp index 881ece3f5..d3579ff1d 100644 --- a/ApacheConnector/src/ApacheChannel.cpp +++ b/ApacheConnector/src/ApacheChannel.cpp @@ -1,8 +1,6 @@ // // ApacheApplication.cpp // -// $Id: //poco/1.4/ApacheConnector/src/ApacheChannel.cpp#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/src/ApacheConnector.cpp b/ApacheConnector/src/ApacheConnector.cpp index 725cffd23..b656f8e24 100644 --- a/ApacheConnector/src/ApacheConnector.cpp +++ b/ApacheConnector/src/ApacheConnector.cpp @@ -1,8 +1,6 @@ // // ApacheConnector.cpp // -// $Id: //poco/1.4/ApacheConnector/src/ApacheConnector.cpp#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/src/ApacheRequestHandlerFactory.cpp b/ApacheConnector/src/ApacheRequestHandlerFactory.cpp index f8ddb04ec..d1ac5d78d 100644 --- a/ApacheConnector/src/ApacheRequestHandlerFactory.cpp +++ b/ApacheConnector/src/ApacheRequestHandlerFactory.cpp @@ -1,8 +1,6 @@ // // ApacheRequestHandlerFactory.cpp // -// $Id: //poco/1.4/ApacheConnector/src/ApacheRequestHandlerFactory.cpp#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/src/ApacheServerRequest.cpp b/ApacheConnector/src/ApacheServerRequest.cpp index 14d16931b..ee22c903f 100644 --- a/ApacheConnector/src/ApacheServerRequest.cpp +++ b/ApacheConnector/src/ApacheServerRequest.cpp @@ -1,8 +1,6 @@ // // ApacheServerRequest.cpp // -// $Id: //poco/1.4/ApacheConnector/src/ApacheServerRequest.cpp#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/src/ApacheServerResponse.cpp b/ApacheConnector/src/ApacheServerResponse.cpp index 17ce2db6b..a8a270cd1 100644 --- a/ApacheConnector/src/ApacheServerResponse.cpp +++ b/ApacheConnector/src/ApacheServerResponse.cpp @@ -1,8 +1,6 @@ // // ApacheServerResponse.cpp // -// $Id: //poco/1.4/ApacheConnector/src/ApacheServerResponse.cpp#3 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/ApacheConnector/src/ApacheStream.cpp b/ApacheConnector/src/ApacheStream.cpp index 4e00e078f..aeaacc6a1 100644 --- a/ApacheConnector/src/ApacheStream.cpp +++ b/ApacheConnector/src/ApacheStream.cpp @@ -1,8 +1,6 @@ // // ApacheStream.h // -// $Id: //poco/1.4/ApacheConnector/src/ApacheStream.cpp#2 $ -// // Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/CHANGELOG b/CHANGELOG index 7e6b6c53f..bacd60f0a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,17 +1,286 @@ This is the changelog file for the POCO C++ Libraries. +Release 1.7.8p4 (2017-08-11) +============================ + +- fixed GH #1813: xmlparse.cpp doesn't compile in WinCE (poco 1.7.8p3) +- fixed GH #1834: Visual Studio 2008 cannot find stdint.h +- fixed GH #1842: Upgrade bundled expat to 2.2.3 +- fixed GH #1843: Use random salt for Poco::XML::NamePool + + +Release 1.7.8p3 (2017-06-22) +============================ + +- fixed GH #1760: Upgrade bundled expat to 2.2.1 which fixes some vulnerabilities: + http://seclists.org/oss-sec/2017/q2/499 + + +Release 1.7.8p2 (2017-04-18) +============================ + +- fixed GH #1655: CipherImpl memory leak with OpenSSL 1.1 + + +Release 1.7.8 (2017-02-21) +========================== + +- fixed GH #1212: Lost WebSocket Frames after Client Websocket Handshake is complete +- fixed GH #1260: URI encoding +- fixed GH #1501: Alpine 3.4 trouble with Foundation/src/Error.cpp +- fixed GH #1523: Long path names under Windows +- fixed GH #1536: Building with OS X 10.12 SDK and 10.7 deployment target without libc++ fails +- fixed GH #1537: Need to add multiple cflags parameters to configure +- fixed GH #1539: Allow overriding POCO_TARGET_OSARCH for iPhoneSimulator +- fixed GH #1546: Enable bitcode for iPhone build config +- fixed GH #1549: Latin2Encoding and 0xFF +- fixed GH #1551: Unable to use Poco on macOS 10.12 +- fixed GH #1552: IPv6 & operator throws an exception when scope = 0 +- fixed GH #1566: Poco/Zip issue with some CM_DEFLATE archives +- fixed GH #1567: Poco/ZIP issue with uncompressed archives +- fixed GH #1570: IPv6AddressImpl::toString() returns wrong output for IPv6 address "::" +- fixed GH #1571: ODBC Preparator memory leak +- fixed GH #1573: Poco::File::createDirectories() should not throw Poco::FileExistsException +- fixed GH #1580: Unable to unzip zip file created using non-seeking stream +- fixed GH #1581: Cannot find 'pcre.h' when using POCO_UNBUNDLED, a non-system PCRE, and CMake +- fixed GH #1588: Poco::Net::HTTPChunkedStreamBuf::readFromDevice(): restrict maximum + size of chunk length +- fixed GH #1589: Poco::Net::HTMLForm: restrict maximum field and value length +- fixed GH #1590: Poco::Net::DialogSocket: restrict maximum line length +- fixed GH #1591: Poco::Net::MultipartReader: restrict maximum boundary string length +- fixed GH #1597: adding empty file to zip leads to archive that can't be unzipped by windows +- fixed GH #1599: readFromDevice() in AutoDetectStream.cpp in Poco Zip cannot detect signature +- fixed GH #1534: Upgraded bundled zlib to 1.2.11 +- fixed GH #1558: Upgraded bundled SQLite to 3.16.2 +- fixed GH #1586: Upgraded bundled PCRE to 8.40 +- fixed GH #1538: Upgraded bundled double-conversion to 1.1.5 +- MongoDB: added support for authentication using "MONGODB-CR" and "SCRAM-SHA-1" + authentication schemes. +- MongoDB: additional documentation and fixes for style and consistency and minor + API improvements (e.g., Poco::MongoDB::Binary) + Note: some flag enumeration values have been renamed for better consistency + and readability; existing code using these will have to be updated. + + +Release 1.7.7 (2016-12-31) +========================== + +- fixed GH #865: FileChannel compress fails leaving empty .gz files +- fixed GH #990: Potential race condition in Poco::File on Windows +- fixed GH #1157: Fixing a bug in the NetSSL_Win module (Host name verification failed error) +- fixed GH #1351: Fix for android include pthread.h from /usr/include +- fixed GH #1436: ODBC Bug: Unicode text(NVARCHAT) read from DB is truncated to half +- fixed GH #1453: _clock_gettime Symbol not found on Mac 10.11 +- fixed GH #1460: POCO does not build with OpenSSL 1.1 +- fixed GH #1461: Poco::Data::SQLite::SQLiteStatementImpl::next() error +- fixed GH #1462: AbstractConfiguration::getUInt does not parse hex numbers +- fixed GH #1464: ODBCMetaColumn::init() always maps integer NUMERIC/DECIMAL to Int32 +- fixed GH #1465: Assertion violation in DateTime.cpp using ZipArchive +- fixed GH #1472: HTTP(S)StreamFactory should send a User-Agent header. +- fixed GH #1476: Fixed error with Poco::UTF8Encoding::isLegal() +- fixed GH #1484: ODBC: fix uninitialized variable +- fixed GH #1486: Support ODBC GUID data type as string +- fixed GH #1488: Poco::ObjectPool shrinks if returned object is not valid +- fixed GH #1515: Detection of closed websocket connection +- fixed GH #1521: bug in JSON ParseHandler.cpp (empty keys should be valid) +- fixed GH #1526: iOS app rejected, IPv6 not working +- fixed GH #1532: RecordSet and RowFilter: bad use of reference counter + + +Release 1.7.6 (2016-10-18) +========================== + +- fixed GH #1298: ZipFileInfo: Assertion violation when reading ods files +- fixed GH #1315: Redefine Poco assertions for static analysis +- fixed GH #1397: Fix issues reported by static source code analysis +- fixed GH #1403: Android compile with poco-1.7.5 no 'pthread_condattr_setclock' error +- fixed GH #1416: Assertion violation when unzipping +- fixed GH #1418: Poco::Delegate assignment operator fails to compile for some specializations +- fixed GH #1422: Can't build poco 1.7.4 or 1.7.5 on centos5 32 bit +- fixed GH #1429: exception thrown in MongoDB when using replicaset +- fixed GH #1431: Poco/FIFOBuffer.h copy issue +- fixed GH #1445: Use stable_sort to preserve order of IP addresses from DNS +- fixed GH #1456: better handle leap seconds in Poco::DateTime and Poco::LocalDateTime +- fixed GH #1458: Probably invalid epoll_create() usage inside Poco/Socket.cpp +- Poco::XML::NamePool: increased default size from 251 to 509. Default size can now + be changed by defining the POCO_XML_NAMEPOOL_DEFAULT_SIZE macro accordingly. +- Enchancements: Poco::XML::Document and Poco::XML::DOMParser have new constructors + taking a NamePool size. Poco::Util::XMLConfiguration::load() also has a new overload + for that purpose. +- Improved error handling in the Zip library (getting rid of some poco_assert macros + and did proper error handling instead). +- Added Poco::URISyntaxException (subclass of Poco::SyntaxException), which is now + thrown by Poco::URI. +- Improved error handling in Poco::URIStreamOpener::open(). +- Poco::Data::MySQL: Handle connection lost/server gone error when starting a transaction + and retry. +- XMLConfiguration default (and single-argument delimiter) constructor now loads an empty + XML document with "config" root element to make the configuration usable without an + additional call to load() or loadEmpty(). + + +Release 1.7.5 (2016-08-29) +========================== + +- fixed GH #1252: Unable to compile Poco::Data for Windows Compact Embedded 2013 +- fixed GH #1344: Poco::Event::wait(timeout) should use CLOCK_MONOTONIC on Linux +- fixed GH #1355: [JSON::Object] After copy-ctor, JSON::Object::_keys still points to + keys in map of copied object +- GH #1361: Shell expansion rules say that tilde must be replaced with $HOME before + calling getpwuid +- Poco::SingletonHolder: added reset() method +- prefer clock_getttime() over gettimeofday() if available +- Upgraded bundled SQLite to 3.14.1 + + +Release 1.7.4 (2016-07-20) +========================== + +- fixed GH #1300: Session constructor hangs +- fixed GH #1303: HTTPSClientSession::sendRequest() fails if server has wildcard cert +- fixed GH #1304: URI doesn't know "ws:/" or "wss://" schemes +- fixed GH #1307: Upgrade bundled expat to 2.2.0 +- fixed GH #1313: XML library compilation error +- fixed GH #1316: Empty SocketReactor never sleeps +- Upgraded bundled SQLite to 3.13.0 + + +Release 1.7.3 (2016-05-02) +========================== + +- fixed GH #993: Invalid zip format when opening a docx in word +- fixed GH #1235: Poco::Net::HTTPClientSession::sendRequest() should also handle HTTP_PATCH +- fixed GH #1236: Remove Poco::Data::Row::checkEmpty() as it prevents Row from being used + with all NULL rows +- fixed GH #1239: Poco::Zip::Compress with non-seekable stream fails for CM_STORE +- fixed GH #1242: Poco::Data::RowFormatter generate exception if the first column of first + row is null +- fixed GH #1253: ListMap does not maintain insertion order if key already exists +- Upgraded bundled SQLite to 3.12.2 + + +Release 1.7.2 (2016-03-21) +========================== + +- fixed GH #1197: Upgrade bundled expat to 2.1.1 + Expat 2.1.1 fixes a CVE: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-1283 +- fixed GH #1204: getdtablesize has been removed on Android 21 +- fixed GH #1203: Poco::Data::RecordSet should be reusable +- fixed GH #1198: Upgrade bundled SQLite to 3.12.1 + + +Release 1.7.1 (2016-03-14) +========================== + +- fixed GH #1187: Data/MySQL: Seeing frequent "MySQL server has gone away" errors +- fixed GH #1184: Attempting to connect via a proxy throws a DNS error "Host not found" +- fixed GH #1180: Possible deadlock when TaskManager::count() is called in onFinished +- NetSSL_OpenSSL: use TLS_*_method() instead of deprecated SSLv23_*_method() + if OpenSSL version is >= 1.1; initialize default/fallback client context to support + all TLS protocols, not just TLSv1 + + +Release 1.7.0 (2016-03-07) +========================== + +- POSSIBLE BREAKING CHANGE: removed automatic registration of Data connectors due to + issues with static initialization order. +- NetSSL_OpenSSL: added support for ECDH and DH ciphers; added support to disable + specific protocols (Poco::Net::Context::disableProtocols()); + new Poco::Net::Context constructor taking a Poco::Net::Context::Params structure that + allows specifying ECDH and DH parameters. +- Poco::Net::TCPServer: add additional try ... catch block around poll() to + gracefully deal with errors due to high system load (e.g., out of file descriptors). +- fixed GH #1171: Poco::Data::RecordSet: rowCount not reset after execute +- fixed GH #1167: CMake & POCO_UNBUNDLED: expat sources are compiled in libPocoXML +- fixed GH #1160: Poco::Net::NetException + "SSL Exception: error:1409F07F:SSL routines:ssl3_write_pending:bad write retry" +- fixed GH #1152: Wrong TaskProgressNotification description +- fixed GH #1141: Poco::StringTokenizer::TOK_TRIM changes behavior between 1.4 and 1.6 +- fixed GH #1137: Missing 'longint' type in SQLite +- fixed GH #1135: Different package on github and official web site +- fixed GH #1030: tvOS / WatchOS bitcode enabled for simulators +- fixed GH #1114: World-write permissions on files created by daemon +- fixed GH #1087: prevent line breaks in base64-encoded creds +- fixed GH #1026: Fixes for producing the poco-1.6.2 release on a Cygwin x86 platform +- fixed GH #1022: Abbreviation in setThreadName can happen even if thread name is not too long +- fixed GH #1002: ActiveDispatcher saves reference to event context after event was + performed until it gets new event +- fixed GH #973: overwrite existing files on windows when moving files +- fixed GH #969: Poco::File::renameTo() behaviour differs on windows and linux +- fixed GH #967: Missing data types in SQLite +- fixed GH #966: Possible crash when processing a corrupted Zip file +- fixed GH #958: Bug while reading X509Certificate subjectName +- fixed GH #937: Missing build_vs140.cmd +- fixed GH #933: Change in JSON::Object::set(key,value) behavior in 1.6.1 +- fixed GH #931: make strToInt() more strict in what it accepts +- fixed GH #921: `BasicUnbufferedStreamBuf` needs to be marked for import/export +- fixed GH #848: MailMessage::_encoding is not set when retrieving plain/text message +- fixed GH #767: Inconsistency in getPath & getPathAndQuery returns +- fixed GH #724: Poco 1.6.0 is not compiled with openssl 1.0.0 +- fixed GH #713: Improved support for producing Canonical XML in XMLWriter +- fixed GH #696: bug in parsing name of attachment poco c++ 1.6.0 +- fixed GH #335: Compress with nonseekable +- upgraded bundled SQLite to 3.11.0 +- added Poco::Crypto::X509Certificate::equals() to compare two certificates +- support for detecting Win8/Win10 in Poco::Environment +- Poco::Net::HTTPServerRequestImpl: fixed an issue with DELETE in persistent connections +- NetSSL: added Context::preferServerCiphers() +- NetSSL: added support for ECDH, new Context constructor +- NetSSL: add support for disabling certain protocols +- SMTPClientSession: added support for XOAUTH2 authentication +- Poco::Data::SessionPool: re-added customizeSession() method from 1.4.x releases +- improved SSLManager to automatically set-up a reasonable client Context if + none is configured +- add brew OpenSSL search paths to Darwin configs +- add HTTP/1.1 version to HTTPRequest for client WebSocket, as this is required for + most servers +- remove GCC_DIAG_OFF as this caused more issues than it solved +- respect POCO_NO_FORK_EXEC in ServerApplication (tvOS) +- tvOS and WatchOS support +- fix: need an implementation of available() for WebSocketImpl +- HTTPSessionInstantiator: respect global proxy config +- added constant for HTTP PATCH method to Poco::Net::HTTPRequest +- NumberParser::parseHex[64](): allow 0x/0X prefix + + +Release 1.6.1 (2015-08-03) +========================== + +- added project and solution files for Visual Studio 2015 +- upgraded bundled SQLite to 3.8.11.1 +- fixed GH #782: Poco::JSON::PrintHandler not working for nested arrays +- fixed GH #819: JSON Stringifier fails with preserve insert order +- fixed GH #878: UUID tryParse +- fixed GH #869: FIFOBuffer::read(T*, std::size_t) documentation inaccurate +- fixed GH #861: Var BadCastException +- fixed GH #779: BUG in 1.6.0 Zip code +- fixed GH #769: Poco::Var operator== throws exception +- fixed GH #766: Poco::JSON::PrintHandler not working for objects in array +- fixed GH #763: Unable to build static with NetSSL_OpenSSL for OS X +- fixed GH #750: BsonWriter::write missing size ? +- fixed GH #741: Timestamp anomaly in Poco::Logger on WindowsCE +- fixed GH #735: WEC2013 build fails due to missing Poco::Path methods. +- fixed GH #722: poco-1.6.0: Unicode Converter Test confuses string and char types +- fixed GH #719: StreamSocket::receiveBytes and FIFOBuffer issue in 1.6 +- fixed GH #706: POCO1.6 Sample EchoServer BUG +- fixed GH #646: Prevent possible data race in access to Timer::_periodicInerval +- DeflatingStream: do not flush underlying stream on sync() as these can cause + corrupted files in Zip archives + + Release 1.6.0 (2014-12-22) ========================== - fixed GH #625: MongoDB ensureIndex double insert? - fixed GH #622: Crypto: RSATest::testSign() should verify with public key only -- fixed GH #620: Data documentation sample code outdated +- fixed GH #620: Data documentation sample code outdated - fixed GH #618: OS X 10.10 defines PAGE_SIZE macro, conflicts with PAGE_SIZE in Thread_POSIX.cpp - fixed GH #616: Visual Studio warning C4244 - fixed GH #612: OpenSSLInitializer calls OPENSSL_config but not CONF_modules_free -- fixed GH #608: (Parallel)SocketAcceptor ctor/dtor call virtual functions +- fixed GH #608: (Parallel)SocketAcceptor ctor/dtor call virtual functions - fixed GH #607: Idle Reactor high CPU usage -- fixed GH #606: HTMLForm constructor read application/x-www-form-urlencoded UTF-8 request +- fixed GH #606: HTMLForm constructor read application/x-www-form-urlencoded UTF-8 request body first parameter with BOM in name - fixed GH #596: For OpenSSL 1.0.1, include openssl/crypto.h not openssl/fips.h - fixed GH #592: Incorrect format string in Poco::Dynamic::Struct @@ -24,18 +293,18 @@ Release 1.6.0 (2014-12-22) - fixed GH #483: multiple cases for sqlite_busy - fixed GH #482: Poco::JSON::Stringifier::stringify bad behaviour - fixed GH #478: HTTPCredentials not according to HTTP spec -- fixed GH #471: vs2010 release builds have optimization disabled ? +- fixed GH #471: vs2010 release builds have optimization disabled ? - fixed GH #468: HTTPClientSession/HTTPResponse not forwarding exceptions -- fixed GH #438: Poco::File::setLastModified() doesn't work -- fixed GH #402: StreamSocket::receiveBytes(FIFOBuffer&) and sendBytes(FIFOBuffer&) are +- fixed GH #438: Poco::File::setLastModified() doesn't work +- fixed GH #402: StreamSocket::receiveBytes(FIFOBuffer&) and sendBytes(FIFOBuffer&) are not thread safe -- fixed GH #345: Linker warning LNK4221 in Foundation for SignalHandler.obj, String.obj +- fixed GH #345: Linker warning LNK4221 in Foundation for SignalHandler.obj, String.obj and ByteOrder.obj - fixed GH #331: Poco::Zip does not support files with ".." in the name. - fixed GH #318: Logger local time doesn't automatically account for DST - fixed GH #294: Poco::Net::TCPServerParams::setMaxThreads(int count) will not accept count == 0. - fixed GH #215: develop WinCE build broken -- fixed GH #63: Net::NameValueCollection::size() returns int +- fixed GH #63: Net::NameValueCollection::size() returns int - Poco::Logger: formatting methods now support up to 10 arguments. - added Poco::Timestamp::raw() - Poco::DeflatingOutputStream and Poco::InflatingOutputStreams also flush underlying stream @@ -46,13 +315,13 @@ Release 1.6.0 (2014-12-22) - upgraded bundled sqlite to 3.8.7.2 - Poco::Thread: added support for starting functors/lambdas - Poco::Net::HTTPClientSession: added support for global proxy configuration -- added support for OAuth 1.0/2.0 via Poco::Net::OAuth10Credentials and +- added support for OAuth 1.0/2.0 via Poco::Net::OAuth10Credentials and Poco::Net::OAuth20Credentials classes. - Poco::Net::IPAddress: fixed IPv6 prefix handling issue on Windows - added Poco::Timestamp::TIMEVAL_MIN and Poco::Timestamp::TIMEVAL_MAX - added Poco::Clock::CLOCKVAL_MIN and Poco::Clock::CLOCKVAL_MAX - added poco_assert_msg() and poco_assert_msg_dbg() macros -- Poco::Net::Context: fixed a memory leak if the CA file was not found while creating the +- Poco::Net::Context: fixed a memory leak if the CA file was not found while creating the Context object (the underlying OpenSSL context would leak) - Poco::URI: added new constructor to create URI from Path - Various documentation and style fixes @@ -65,7 +334,7 @@ Release 1.5.4 (2014-10-14) - fixed GH #326: compile Net lib 1.5.2 without UTF8 support enabled - fixed GH #518: NetworkInterface.cpp compile error w/ POCO_NO_WSTRING (1.5.3) -- Fixed MSVC 2010 warnings on large alignment +- Fixed MSVC 2010 warnings on large alignment - make HTTPAuthenticationParams::parse() add value on end of string - fixed GH #482: Poco::JSON::Stringifier::stringify bad behaviour - fixed GH #508: Can't compile for arm64 architecture @@ -77,11 +346,11 @@ Release 1.5.4 (2014-10-14) - NetSSL: Fix typo in documentation - NetSSL_OpenSSL: support for TLS 1.1 and 1.2 - Zip: Added CM_AUTO, which automatically selects CM_STORE or CM_DEFLATE based - on file extension. Used to avoid double-compression of already compressed file + on file extension. Used to avoid double-compression of already compressed file formats such as images. - added %L modifier to PatternFormatter to switch to local time - removed unnecessary explicit in some multi-arg constructors -- Allow SecureStreamSocket::attach() to be used in server connections +- Allow SecureStreamSocket::attach() to be used in server connections - added Var::isBoolean() and fixed JSON stringifier - added poco_unexpected() macro invoking Bugcheck::unexpected() to deal with unexpected exceptions in destructors @@ -100,7 +369,7 @@ Release 1.5.4 (2014-10-14) - Poco::Buffer properly handles zero-sized buffers - GH #512: Poco:Data:ODBC:Binder.h causes a crash - Added Crypto_Win and NetSSL_Win libraries which are re-implementations of existing - Crypto and NetSSL_OpenSSL libraries based on WinCrypt/Schannel. The new libraries + Crypto and NetSSL_OpenSSL libraries based on WinCrypt/Schannel. The new libraries can be used as an almost drop-in replacement for the OpenSSL based libraries on Windows and Windows Embedded Compact platforms. Only available from GitHub for now. @@ -108,27 +377,27 @@ Release 1.5.4 (2014-10-14) Release 1.5.3 (2014-06-30) ========================== -- fixed GH# 316: Poco::DateTimeFormatter::append() gives wrong result for +- fixed GH# 316: Poco::DateTimeFormatter::append() gives wrong result for Poco::LocalDateTime - Poco::Data::MySQL: added SQLite thread cleanup handler -- Poco::Net::X509Certificate: improved and fixed domain name verification for +- Poco::Net::X509Certificate: improved and fixed domain name verification for wildcard domains - added Poco::Clock class, which uses a system-provided monotonic clock (if available) and is thus not affected by system realtime clock changes. Monotonic Clock is available on Windows, Linux, OS X and on POSIX platforms - supporting clock_gettime() and CLOCK_MONOTONIC. + supporting clock_gettime() and CLOCK_MONOTONIC. - Poco::Timer, Poco::Stopwatch, Poco::TimedNotificationQueue and Poco::Util::Timer have been changed to use Poco::Clock instead of Poco::Timestamp and are now unaffected by system realtime clock changes. - fixed GH# 350: Memory leak in Data/ODBC with BLOB - Correctly set MySQL time_type for Poco::Data::Date. -- fixed GH #352: Removed redundant #includes and fixed spelling mistakes. +- fixed GH #352: Removed redundant #includes and fixed spelling mistakes. - fixed setting of MYSQL_BIND is_unsigned value. - fixed GH #360: CMakeLists foundation: add Clock.cpp in the list of source files - Add extern "C" around on HPUX platform. - added runtests.sh - fixed CPPUNIT_IGNORE parsing -- fixed Glob from start path, for platforms not alowing transverse from root (Android) +- fixed Glob from start path, for platforms not allowing transverse from root (Android) - added NTPClient (Rangel Reale) - added PowerShell build script - added SmartOS build support @@ -150,7 +419,7 @@ Release 1.5.3 (2014-06-30) - Building Poco 1.5.2 for Synology RS812+ (Intel Atom) (honor POCO_NO_INOTIFY) - added WEC2013 support to buildwin.cmd and buildwin.ps1 - HTMLForm: in URL encoding, percent-encode more characters -- Fixed #include conflict with other libraries +- Fixed #include conflict with other libraries - Poco::Net::X509Certificate::verify() no longer uses DNS reverse lookups to validate host names - cert hostname validation is case insensitive and stricter for wildcard certificates - TCPServer: do not reduce the capacity of the default ThreadPool @@ -236,18 +505,18 @@ Release 1.5.2 (2013-09-16) - upgraded to expat 2.1.0 - Data/ODBC: added support for setting query timeout (via setProperty of "queryTimeout"). Timeout is int, given in seconds. -- fixed a potential endless loop in SecureStreamSocketImpl::sendBytes() +- fixed a potential endless loop in SecureStreamSocketImpl::sendBytes() and also removed unnecessary code. -- fixed GH #159: Crash in openssl CRYPTO_thread_id() after library libPocoCrypto.so +- fixed GH #159: Crash in openssl CRYPTO_thread_id() after library libPocoCrypto.so has been unloaded. -- fixed GH #155: MailOutputStream mangles consecutive newline sequences +- fixed GH #155: MailOutputStream mangles consecutive newline sequences - fixed GH #139: FileChannel::PROP_FLUSH is invalid (contains a tab character) - fixed GH #173: HTTPClientSession::proxyConnect forces DNS lookup of host names - fixed GH #194: MessageNotification constructor is inefficient. - fixed GH #189: Poco::NumberParser::tryParse() documentation bug - fixed GH #172: IPv6 Host field is stripped of Brackets in HTTPClientSession - fixed GH #188: Net: SocketAddress operator < unusable for std::map key -- fixed GH #128: DOMWriter incorrectly adds SYSTEM keyword to DTD if PUBLIC is +- fixed GH #128: DOMWriter incorrectly adds SYSTEM keyword to DTD if PUBLIC is already specified - fixed GH #65: Poco::format() misorders sign and padding specifiers - upgraded bundled SQLite to 3.7.17 @@ -260,21 +529,21 @@ Release 1.5.2 (2013-09-16) - fixed GH #209: Poco::NumberFormatter double length - fixed GH #204: Upgrade zlib to 1.2.8 - fixed GH #198: The "application.configDir" property is not always created. -- fixed GH #185: Poco::NumberFormatter::format(double value, int precision) +- fixed GH #185: Poco::NumberFormatter::format(double value, int precision) ignore precision == 0 - fixed GH #138: FreeBSD JSON tests fail - fixed GH #99: JSON::Query an JSON::Object -- limited allowed types for JSON::Query to Object, Array, Object::Ptr, +- limited allowed types for JSON::Query to Object, Array, Object::Ptr, Array::Ptr and empty - fixed GH #175: HTMLForm does not read URL parameters on POST or PUT - added GH #187: MySQL: allow access to the underlying connection handle - added GH #186: MySQL: support for MYSQL_SECURE_AUTH - fixed GH #174: MySQL: 4GB allocated when reading any largetext or largeblob field -- fixed a potential memory leak in Poco::Net::HTTPClientSession if it is misused - (e.g., sendRequest() is sent two times in a row without an intermediate call to - receiveResponse(), or by calling receiveResponse() two times in a row without +- fixed a potential memory leak in Poco::Net::HTTPClientSession if it is misused + (e.g., sendRequest() is sent two times in a row without an intermediate call to + receiveResponse(), or by calling receiveResponse() two times in a row without an intermediate call to sendRequest()) - GH #217 -- removed a few unnecessary protected accessor methods from Poco::Net::HTTPClientSession +- removed a few unnecessary protected accessor methods from Poco::Net::HTTPClientSession that would provide inappropriate access to internal state - merged GH #210: Don't call CloseHandle() twice on Windows; Ability to select the threadpool that will be used to start an Activity(Patrice Tarabbia) @@ -321,7 +590,7 @@ Release 1.5.1 (2013-01-11) - fixed GH32/SF596: Poco::JSON: Parsing long integer (int64) value fails. - added Net ifconfig sample (contributed by Philip Prindeville) - merged GH #34: add algorithm header (Roger Meier/Philip Prindeville) -- fixed GH #26: Cannot compile on gcc +- fixed GH #26: Cannot compile on gcc - merged SF #111: FTP Client logging (Marian Krivos) - fixed GH #30: Poco::Path::home() throws when called from Windows Service - fixed GH #22: MySQL connection string lowercased @@ -362,7 +631,7 @@ Release 1.5.0 (2012-10-14) - added IPAddress bitwise operators (&,|,^,~) - added IPAddress BinaryReader/Writer << and >> operators - modified IPAddress to force IPv6 to lowercase (RFC 5952) -- fixed SF#3538785: SMTPClientSession::sendMessage() should take recipient list +- fixed SF#3538785: SMTPClientSession::sendMessage() should take recipient list - added IPAddress::prefixLength() - UTF portability improvements - fixed SF#3556186: Linux shouldn't use in Net/SocketDefs.h @@ -371,7 +640,7 @@ Release 1.5.0 (2012-10-14) - added SF#3558085: Add formatter to MACAddress object - fixed SF#3552774: Don't hide default target in subordinate makefile - fixed SF#3534307: Building IPv6 for Linux by default -- fixed SF#3516844: poco missing symbols with external >=lipcre-8.13 +- fixed SF#3516844: poco missing symbols with external >=lipcre-8.13 - added SF#3544720: AbstractConfigurator to support 64bit values - fixed SF#3522081: WinRegistryConfiguration unable to read REG_QWORD values - fixed SF#3563626: For Win32 set Up/Running flags on NetworkInterface @@ -420,11 +689,11 @@ Release 1.4.7 (2014-10-06) - fixed GH #424: Poco::Timer deadlock - fixed GH #465: Fix result enum type XML_Error -> XML_Status - fixed GH #510: Incorrect RSAKey construction from istream -- fixed GH #332: POCO::ConsoleChannnel::initColors() assigns no color to +- fixed GH #332: POCO::ConsoleChannnel::initColors() assigns no color to PRIO_TRACE and wrong color to PRIO_FATAL - fixed GH #550: WebSocket fragmented message problem - Poco::Data::MySQL: added SQLite thread cleanup handler -- Poco::Net::X509Certificate: improved and fixed domain name verification for +- Poco::Net::X509Certificate: improved and fixed domain name verification for wildcard domains - fixed a crash in Foundation testsuite with Visual C++ 2012 - improved and fixed domain name verification for wildcard domains in @@ -433,7 +702,7 @@ Release 1.4.7 (2014-10-06) - added Poco::Clock class, which uses a system-provided monotonic clock (if available) and is thus not affected by system realtime clock changes. Monotonic Clock is available on Windows, Linux, OS X and on POSIX platforms - supporting clock_gettime() and CLOCK_MONOTONIC. + supporting clock_gettime() and CLOCK_MONOTONIC. - Poco::Timer, Poco::Stopwatch, Poco::TimedNotificationQueue and Poco::Util::Timer have been changed to use Poco::Clock instead of Poco::Timestamp and are now unaffected by system realtime clock changes. @@ -449,7 +718,7 @@ Release 1.4.7 (2014-10-06) - improved error handling in secure socket classes - Poco::ByteOrder now uses intrinsics if available - added new text encoding classes: Latin2Encoding, Windows1250Encoding, Windows1251Encoding -- Zip: Added CM_AUTO, which automatically selects CM_STORE or CM_DEFLATE based on file extension. +- Zip: Added CM_AUTO, which automatically selects CM_STORE or CM_DEFLATE based on file extension. Used to avoid double-compression of already compressed file formats such as images. @@ -481,30 +750,30 @@ Release 1.4.6p2 (2013-09-16) - upgraded to expat 2.1.0 - Data/ODBC: added support for setting query timeout (via setProperty of "queryTimeout"). Timeout is int, given in seconds. -- fixed a potential endless loop in SecureStreamSocketImpl::sendBytes() +- fixed a potential endless loop in SecureStreamSocketImpl::sendBytes() and also removed unnecessary code. -- fixed GH #159: Crash in openssl CRYPTO_thread_id() after library libPocoCrypto.so +- fixed GH #159: Crash in openssl CRYPTO_thread_id() after library libPocoCrypto.so has been unloaded. -- fixed GH #155: MailOutputStream mangles consecutive newline sequences +- fixed GH #155: MailOutputStream mangles consecutive newline sequences - fixed GH# 139: FileChannel::PROP_FLUSH is invalid (contains a tab character) - fixed GH# 173: HTTPClientSession::proxyConnect forces DNS lookup of host names - fixed GH# 194: MessageNotification constructor is inefficient. - fixed GH# 189: Poco::NumberParser::tryParse() documentation bug - fixed GH# 172: IPv6 Host field is stripped of Brackets in HTTPClientSession - fixed GH# 188: Net: SocketAddress operator < unusable for std::map key -- fixed GH# 128: DOMWriter incorrectly adds SYSTEM keyword to DTD if PUBLIC is +- fixed GH# 128: DOMWriter incorrectly adds SYSTEM keyword to DTD if PUBLIC is already specified - fixed GH# 65: Poco::format() misorders sign and padding specifiers - upgraded bundled SQLite to 3.7.17 - upgraded bundled zlib to 1.2.8 -- fixed a potential memory leak in Poco::Net::HTTPClientSession if it is misused - (e.g., sendRequest() is sent two times in a row without an intermediate call to - receiveResponse(), or by calling receiveResponse() two times in a row without +- fixed a potential memory leak in Poco::Net::HTTPClientSession if it is misused + (e.g., sendRequest() is sent two times in a row without an intermediate call to + receiveResponse(), or by calling receiveResponse() two times in a row without an intermediate call to sendRequest()) - GH #217 -- removed a few unnecessary protected accessor methods from Poco::Net::HTTPClientSession +- removed a few unnecessary protected accessor methods from Poco::Net::HTTPClientSession that would provide inappropriate access to internal state - fixed GH# 223 (Poco::Net::HTTPCookie does not support expiry times in the past) -- fixed GH# 233: ServerSocket::bind6(Poco::UInt16 port, bool reuseAddress, bool ipV6Only) +- fixed GH# 233: ServerSocket::bind6(Poco::UInt16 port, bool reuseAddress, bool ipV6Only) does not work - added ColorConsoleChannel and WindowsColorConsoleChannel classes supporting colorizing log messages @@ -514,7 +783,7 @@ Release 1.4.6p2 (2013-09-16) (links to specifications). - Added support for ARM64 architecture and iPhone 5s 64-bit builds (POCO_TARGET_OSARCH=arm64). - + Release 1.4.6p1 (2013-03-06) ============================ @@ -525,12 +794,12 @@ Release 1.4.6p1 (2013-03-06) - added DNS::reload() as a wrapper for res_init(). - On Linux, Poco::Environment::nodeId() first always tries to obtain the MAC address of eth0, before looking for other interfaces. -- Poco::Net::HTTPSession now always resets the buffer in connect() to clear +- Poco::Net::HTTPSession now always resets the buffer in connect() to clear any leftover data from a (failed) previous session - fixed copysign namespace issue in FPEnvironment_DUMMY.h - fixed a warning in Poco/Crypto/OpenSSLInitializer.h - added a build configuration for BeagleBoard/Angstrom -- fixed GH# 109: Bug in Poco::Net::SMTPClientSession::loginUsingPlain) +- fixed GH# 109: Bug in Poco::Net::SMTPClientSession::loginUsingPlain) - fixed compile errors with clang -std=c++11 - fixed GH# 116: Wrong timezone parsing in DateTimeParse (fix by Matej Knopp) - updated bundled SQLite to 3.7.15.2 @@ -544,7 +813,7 @@ Release 1.4.6 (2013-01-10) - fixed GH# 30: Poco::Path::home() throws - fixed SF Patch# 120 The ExpireLRUCache does not compile with a tuple as key on VS2010 - fixed SF# 603 count() is missing in HashMap -- Crypto and NetSSL_OpenSSL project files now use OpenSSL *MD.lib library files for +- Crypto and NetSSL_OpenSSL project files now use OpenSSL *MD.lib library files for static_md builds. Previously, the DLL import libs were used. - Poco::Environment::osDisplayName() now recognizes Windows 8/Server 2012 @@ -558,13 +827,13 @@ Release 1.4.5 (2012-11-19) - fixed SF# 3558012 Compilation fails when building with -ansi or -std=c++0x - fixed SF# 3563517 Get rid of loss-of-precision warnings on x64 MacOS - fixed SF# 3562244: Portability fix for AF_LINK -- fixed SF# 3562400: DatagramSocketImpl comment +- fixed SF# 3562400: DatagramSocketImpl comment - fixed SF# 594: Websocket fails with small masked payloads - fixed SF# 588: Missing POCO_ARCH and POCO_ARCH_LITTLE_ENDIAN define for WinCE on SH4 - fixed SF# 581: Out-of-bound array access in Unicode::properties() function. - fixed SF# 590: Segfault on FreeBSD when stack size not rounded - fixed SF# 586: Poco::DateTimeParser and ISO8601 issues when seconds fraction has more than 6 digits -- Poco::Net::HTTPSSessionInstantiator::registerInstantiator() now optionally accepts a +- Poco::Net::HTTPSSessionInstantiator::registerInstantiator() now optionally accepts a Poco::Net::Context object. - added Poco::XML::XMLWriter::depth() member function. - added Poco::XML::XMLWriter::uniquePrefix() and Poco::XML::XMLWriter::isNamespaceMapped(). @@ -573,7 +842,7 @@ Release 1.4.5 (2012-11-19) - fixed a bug in Poco::XML::XMLWriter::emptyElement(): need to pop namespace context - OS X builds now use Clang as default compiler - Updated SQLite to 3.7.14.1 -- POCO_SERVER_MAIN macro now has a try ... catch block for Poco::Exception and writes +- POCO_SERVER_MAIN macro now has a try ... catch block for Poco::Exception and writes the displayText to stderr. - Poco/Platform.h now defines POCO_LOCAL_STATIC_INIT_IS_THREADSAFE macro if the compiler generates thread-safe static local initialization code. @@ -585,21 +854,21 @@ Release 1.4.4 (2012-09-03) - ZipStream now builds correctly in unbundled build. - added proxy digest authentication support to Net library - integrated MySQL BLOB fixes from Franky Braem. -- use standard OpenSSL import libraries (libeay32.lib, ssleay32.lib) for Crypto and +- use standard OpenSSL import libraries (libeay32.lib, ssleay32.lib) for Crypto and NetSSL_OpenSSL Visual Studio project files. -- fixed a potential buffer corruption issue in Poco::Net::SecureStreamSocket if lazy +- fixed a potential buffer corruption issue in Poco::Net::SecureStreamSocket if lazy handshake is enabled and the first attempt to complete the handshake fails -- Poco::DateTimeParser::tryParse() without format specifier now correctly parses ISO8601 +- Poco::DateTimeParser::tryParse() without format specifier now correctly parses ISO8601 date/times with fractional seconds. -- Poco::Process::launch() now has additional overloads allowing to specify an initial +- Poco::Process::launch() now has additional overloads allowing to specify an initial directory and/or environment. -- Poco::Net::FTPClientSession: timeout was not applied to data connection, only to +- Poco::Net::FTPClientSession: timeout was not applied to data connection, only to control connection. -- Fixed potential IPv6 issue with socket constructors if IPv6 SocketAddress is given +- Fixed potential IPv6 issue with socket constructors if IPv6 SocketAddress is given (contributed by ??????? ????????? ). -- Added an additional (optional) parameter to Poco::Thread::setOSPriority() allowing to - specify a scheduling policy. Currently this is only used on POSIX platforms and allows - specifying SCHED_OTHER (default), SCHED_FIFO or SCHED_RR, as well as other +- Added an additional (optional) parameter to Poco::Thread::setOSPriority() allowing to + specify a scheduling policy. Currently this is only used on POSIX platforms and allows + specifying SCHED_OTHER (default), SCHED_FIFO or SCHED_RR, as well as other platform-specific policy values. - Added Poco::Crypto::DigestEngine class providing a Poco::DigestEngine interface to the digest algorithms provided by OpenSSL. @@ -607,7 +876,7 @@ Release 1.4.4 (2012-09-03) - In some cases, when an SSL exception was unexpectedly closed, a generic Poco::IOException was thrown. This was fixed to throw a SSLConnectionUnexpectedlyClosedException instead. - Added Poco::ObjectPool class template. -- Poco::Net::HTTPServer has a new stopAll() method allowing stopping/aborting of all +- Poco::Net::HTTPServer has a new stopAll() method allowing stopping/aborting of all currently active client connections. - The HTTP server framework now actively prevents sending a message body in the response to a HEAD request, or in case of a 204 No Content or 304 Not Modified @@ -618,8 +887,8 @@ Release 1.4.4 (2012-09-03) - Poco::Net::SecureSocketImpl::shutdown() now also shuts down the underlying socket. - fixed SF# 3552597: Crypto des-ecb error - fixed SF# 3550553: SecureSocketImpl::connect hangs -- fixed SF# 3543047: Poco::Timer bug for long startInterval/periodic interval -- fixed SF# 3539695: Thread attributes should be destroyed using the pthread_attr_destroy() +- fixed SF# 3543047: Poco::Timer bug for long startInterval/periodic interval +- fixed SF# 3539695: Thread attributes should be destroyed using the pthread_attr_destroy() - fixed SF# 3532311: Not able to set socket option on ServerSocket before bind Added Poco::Net::Socket::init(int af) which can be used to explicitely initialize the underlying socket before calling bind(), connect(), etc. @@ -669,10 +938,10 @@ Release 1.4.3 (2012-01-16) - fixed iPhone build config for Xcode 4.2 (compiler name changed to llvm-g++) - Poco::Util::XMLConfiguration: delimiter char (default '.') is now configurable. This allows for working with XML documents having element names with '.' in them. -- Poco::Util::OptionProcessor: Required option arguments can now be specified as - separate command line arguments, as in "--option value" in addition to the +- Poco::Util::OptionProcessor: Required option arguments can now be specified as + separate command line arguments, as in "--option value" in addition to the "--option=value" format. -- Poco::Util::HelpFormatter: improved option help formatting if indentation has +- Poco::Util::HelpFormatter: improved option help formatting if indentation has been set explicitely. - added Mail sample to NetSSL_OpenSSL, showing use of Poco::Net::SecureSMTPClientSession. - added additional read() overloads to Poco::Net::HTMLForm. @@ -684,7 +953,7 @@ Release 1.4.3 (2012-01-16) - Poco::Zip::ZipStreamBuf: fixed a crash if CM_STORE was used. - Added setContentLength64() and getContentLength64() to Poco::Net::HTTPMessage. - added Poco::Environment::osDisplayName(). -- fixed SF# 3463096: WinService leaves dangling handles (open() now does not reopen the +- fixed SF# 3463096: WinService leaves dangling handles (open() now does not reopen the service handle if it's already open) - fixed SF# 3426537: WinRegistryConfiguration can't read virtualized keys - added Poco::Buffer::resize() @@ -693,8 +962,8 @@ Release 1.4.3 (2012-01-16) - added version resource to POCO DLLs - fixed SF# 3440599: Dir Path in Quotes in PATH cause PathTest::testFind to fail. - fixed SF# 3406030: Glob::collect problem -- added Poco::Util::AbstractConfiguration::enableEvents() -- Poco::AtomicCounter now uses GCC builtins with GCC 4.1 or newer +- added Poco::Util::AbstractConfiguration::enableEvents() +- Poco::AtomicCounter now uses GCC builtins with GCC 4.1 or newer (contributed by Alexey Milovidov) - made Poco::Logger::formatDump() public as it may be useful for others as well (SF# 3453446) @@ -730,11 +999,11 @@ Release 1.4.3 (2012-01-16) - Fixed a WinCE-specific bug in Poco::Util::ServerApplication where uninitialize() would be called twice. - fixed SF# 3471957: WinRegistryKey::deleteKey() unable to delete alt views -- Added additional constructor to Poco::ScopedLock and Poco::ScopedLockWithUnlock - accepting a timeout as second argument. +- Added additional constructor to Poco::ScopedLock and Poco::ScopedLockWithUnlock + accepting a timeout as second argument. - Added Poco::Logger::parseLevel() - Poco::format(): an argument that does not match the format - specifier no longer results in a BadCastException. The string [ERRFMT] is + specifier no longer results in a BadCastException. The string [ERRFMT] is written to the result string instead. - PageCompiler: added createSession page attribute. @@ -742,12 +1011,12 @@ Release 1.4.3 (2012-01-16) Release 1.4.2p1 (2011-09-24) ============================ -- On Linux, the RTLD_DEEPBIND option is no longer passed to dlopen(). - This change was introduced in 1.4.2 to solve a specific problem one customer +- On Linux, the RTLD_DEEPBIND option is no longer passed to dlopen(). + This change was introduced in 1.4.2 to solve a specific problem one customer was having. Unfortunately, it leads to problems with RTTI. -- It's now possible to pass flags (SHLIB_GLOBAL, SHLIB_LOCAL) to - Poco::SharedLibrary::load() (and the constructor implicitly calling load()), - controlling the mode flags (RTLD_GLOBAL, RTLD_LOCAL) passed to dlopen(). +- It's now possible to pass flags (SHLIB_GLOBAL, SHLIB_LOCAL) to + Poco::SharedLibrary::load() (and the constructor implicitly calling load()), + controlling the mode flags (RTLD_GLOBAL, RTLD_LOCAL) passed to dlopen(). On platforms not using dlopen(), these flags are ignored. - fixed SF# 3400267: Path_WIN32.cpp bug @@ -758,15 +1027,15 @@ Release 1.4.2 (2011-08-28) - added Poco::DateTimeFormat::ISO8601_FRAC_FORMAT - added new Poco::DateTimeFormatter and Poco::DateTimeParser format specifier: %s for seconds with optional fractions of a second -- fixed a problem with ioctl() on BSD platforms (including OS X) where the - second argument to ioctl() is unsigned long instead of int, causing bad +- fixed a problem with ioctl() on BSD platforms (including OS X) where the + second argument to ioctl() is unsigned long instead of int, causing bad things on a OS X 64-bit kernel. -- fixed a potential endless loop when enumerating IPv6 network addresses +- fixed a potential endless loop when enumerating IPv6 network addresses (reported by Laurent Carcagno) - new compile-time config option on Windows to set thread names in debugger. Enable with -DPOCO_WIN32_DEBUGGER_THREAD_NAMES. Available only in debug builds. -- Cipher can now create Base64 and HexBinary encoded output without linefeeds +- Cipher can now create Base64 and HexBinary encoded output without linefeeds (suitable for use in cookies, etc.) - added Poco::Path::popFrontDirectory() - improved VxWorks support @@ -774,7 +1043,7 @@ Release 1.4.2 (2011-08-28) and related classes. - Added Poco::Net::ServerSocket::bind6() which allows control over the IPPROTO_IPV6/IPV6_V6ONLY socket option. -- Removed Poco::MD2Engine class due to licensing issues (the +- Removed Poco::MD2Engine class due to licensing issues (the license for the MD2 code from RSA only allows non-commercial use). Note that the MD4 and MD5 code from RSA does not have this issue. @@ -784,17 +1053,17 @@ Release 1.4.2 (2011-08-28) - Poco::Net::SocketAddress: when there is more than one address returned by a DNS lookup for a name, IPv4 addresses will be preferred to IPv6 ones. -- NetworkInterface::list() now also returns IPv4 interfaces on Windows when +- NetworkInterface::list() now also returns IPv4 interfaces on Windows when built with -DPOCO_HAVE_IPv6 -- XMLWriter: fixed a bug with attribute namespaces (no namespace prefix +- XMLWriter: fixed a bug with attribute namespaces (no namespace prefix written if attribute namespace is the same as element namespace) - fixed SF# 3378588: Mismatched new[]/delete (in RSAEncryptImpl and RSADecryptImpl) -- fixed SF# 3212954 (OpenSSLInitializer::uninitialize() crash) and +- fixed SF# 3212954 (OpenSSLInitializer::uninitialize() crash) and SF# 3196862 (Static OpenSSLInitializer instance causes Windows deadlocks) by removing the static Poco::Crypto::OpenSSLInitializer instance. Automatic OpenSSL - initialization is now done through Poco::Crypto::Cipher, Poco::Crypto::CipherKey, + initialization is now done through Poco::Crypto::Cipher, Poco::Crypto::CipherKey, Poco::Crypto::X509Certificate, Poco::Net::Context classes; however, it is still - recommended to call Poco::Crypto::initializeCrypto() and + recommended to call Poco::Crypto::initializeCrypto() and Poco::Crypto::uninitializeCrypto() early at application startup, and late at shutdown respectively (or Poco::Net::initializeSSL()/Poco::Net::uninitializeSSL() if the NetSSL library is used) to avoid multiple full OpenSSL init/uninit cycles @@ -815,9 +1084,9 @@ Release 1.4.2 (2011-08-28) - fixed SF# 3354451: Poco::Format::parsePrec never sets the precision to zero - fixed SF# 3387258: _MAX_PATH used but unknown in Path_WIN32 - fixed a problem in RSAKeyImpl where direct access to the RSA in a EVP_PKEY - would no longer work in recent OpenSSL versions. Using EVP_PKEY_get1_RSA() + would no longer work in recent OpenSSL versions. Using EVP_PKEY_get1_RSA() fixes the issue. -- added Poco::Crypto::EncryptingInputStream, Poco::Crypto::EncryptingOutputStream, +- added Poco::Crypto::EncryptingInputStream, Poco::Crypto::EncryptingOutputStream, Poco::Crypto::DecryptingInputStream and Poco::Crypto::DecryptingOutputStream. - fixed SF# 3148126: HTTPSClientSession destructor (!) throws an IOException - fixed SF# 3178098: Add constructor to Poco::TemporaryFile to specify directory @@ -830,15 +1099,15 @@ Release 1.4.2 (2011-08-28) - fixed SF# 3177372: FileChannel documentation inconsistency - added %E format specifier to Poco::PattermFormatter (epoch time in seconds since midnight, January 1 1970) -- On Windows, Poco::Util::ServerApplication now supports a /description command +- On Windows, Poco::Util::ServerApplication now supports a /description command line argument for specifying a service description (together with /registerService) -- added Poco::Util::WinService::setDescription() and +- added Poco::Util::WinService::setDescription() and Poco::Util::WinService::getDescription() - fixed SF# 3155477: Incorrect URI path handling - fixed SF# 3309736: Extended Exception macros to set default exception code new macro is named POCO_DECLARE_EXCEPTION_CODE - added getter functions for modulus and exponents to Poco::Crypto::RSAKey. -- added Poco::Net::SocketAddress::operator == () and +- added Poco::Net::SocketAddress::operator == () and Poco::Net::SocketAddress::operator != () - fixed SF# 3182746: IPAddress.cpp IPv6 bug on big-endian - fixed SF# 3196961: Unix daemon fails to loadConfiguration() if started from cwd @@ -851,7 +1120,7 @@ Release 1.4.2 (2011-08-28) events should be faster, as dispatching an event now needs less dynamic memory allocations. - fixed SF# 3178109: getNodeByPath() changes: - getNodeByPath() and getNodeByPathNS() have been moved to Poco::XML::Node. + getNodeByPath() and getNodeByPathNS() have been moved to Poco::XML::Node. Furthermore, when invoked on a Poco::XML::Document, the behavior has changed so that the document element is now included when traversing the path (previously, traversal would start at the document element, now it starts at the document). @@ -894,15 +1163,15 @@ Release 1.4.1 (2011-01-29) PocoMySQL -> PocoDataMySQL, PocoODBC -> PocoDataODBC) - added additional options to configure script - added additional documentation to Poco::Net::HTTPClientSession -- Poco::Net::HTTPClientSession::receiveResponse() closes the connection - if an exception is thrown while reading the response header. - This ensures that a new connection will be set up for the next request +- Poco::Net::HTTPClientSession::receiveResponse() closes the connection + if an exception is thrown while reading the response header. + This ensures that a new connection will be set up for the next request if persistent connections are used. - improved Poco::Net::MultipartDecoder performance by reading directly from streambuf -- improved performance of Poco::Base64Encoder, Poco::Base64Decoder, - Poco::HexBinaryEncoder and Poco::HexBinaryDecoder by working directly with the +- improved performance of Poco::Base64Encoder, Poco::Base64Decoder, + Poco::HexBinaryEncoder and Poco::HexBinaryDecoder by working directly with the given stream's streambuf. -- improved performance of MessageHeader::read() by reading directly from streambuf +- improved performance of MessageHeader::read() by reading directly from streambuf instead of istream. - it is now possible to specify additional MIME part header fields for a MIME part through the Poco::Net::PartSource class. @@ -919,11 +1188,11 @@ Release 1.4.1 (2011-01-29) to specify additional flags (in addition to KEY_READ and KEY_WRITE) for the samDesired argument of RegOpenKeyEx() or RegCreateKeyEx(). - improved Poco::BasicEvent::notify() performance by avoiding an unnecessary heap - allocation. + allocation. - added additional well-known port numbers to Poco::URI: rtsp, sip, sips, xmpp. - added Poco::Net::MediaType::matchesRange() -- improved invalid socket handling: a Poco::Net::InvalidSocketException is - now thrown instead of an assertion when an operation is attempted on a closed or +- improved invalid socket handling: a Poco::Net::InvalidSocketException is + now thrown instead of an assertion when an operation is attempted on a closed or otherwise uninitialized socket. @@ -954,24 +1223,24 @@ Release 1.4.0 (2010-12-14) - added system.nodeId to SystemConfiguration - added a note to Poco::Util::ServerApplication documentation regarding creation of threads -- added Poco::Net::IPAddress::broadcast() and Poco::Net::IPAddress::wildcard() to +- added Poco::Net::IPAddress::broadcast() and Poco::Net::IPAddress::wildcard() to create broadcast (255.255.255.255) and wildcard (0.0.0.0) addresses. - fixed SF# 2916154: Poco::Net::IPAddress::isLoopback() only works for 127.0.0.1. - added build configuration for iPhone Simulator - GNU Make based build system provides new variables: POCO_HOST_BINDIR, POCO_HOST_BINPATH, POCO_HOST_LIBDIR, POCO_HOST_LIBPATH and POCO_TARGET_* equivalents. - Application::initialize() and Application::uninitialize() will now be called from within run(). - This solves various issues with uninitialize() not being called, or being called inappropriately + This solves various issues with uninitialize() not being called, or being called inappropriately from the Application destructor. Please note that this change will break applications that use the Application class, but only call init() and not run(). - added /startup option to specify startup mode for Windows services (automatic or manual) - fixed SF# 2967354: SecureSocketImpl shutdown/close problem - fixed SF# 3006340: LinearHashTable grows even if key already exists -- fixed a particularly nasty Windows error handling issue that manifested itself on WinCE: - WSAGetLastError() would be called after a std::string was created. The string creation could result - in a heap operation which called a Windows API to allocate memory. This would reset the - GetLastError() error code. Since WSAGetLastError() is just an alias for GetLastError(), the actual +- fixed a particularly nasty Windows error handling issue that manifested itself on WinCE: + WSAGetLastError() would be called after a std::string was created. The string creation could result + in a heap operation which called a Windows API to allocate memory. This would reset the + GetLastError() error code. Since WSAGetLastError() is just an alias for GetLastError(), the actual error code from the socket operation would be lost. - upgraded SQLite to 3.7.3 - added --header-prefix option to PageCompiler @@ -991,12 +1260,12 @@ Release 1.4.0 (2010-12-14) - Added Poco::Nullable class template. - Added Poco::NullMutex, a no-op mutex to be used as template argument for template classes taking a mutex policy argument. -- Poco::XML::XMLWriter: fixed a namespace handling issue that occured with startPrefixMapping() and endPrefixMapping() -- Poco::Net::Context now allows for loading certificates and private keys from Poco::Crypto::X509Certificate objects +- Poco::XML::XMLWriter: fixed a namespace handling issue that occurred with startPrefixMapping() and endPrefixMapping() +- Poco::Net::Context now allows for loading certificates and private keys from Poco::Crypto::X509Certificate objects and Poco::Crypto::RSAKey objects. - Poco::Crypto::RSAKey no longer uses temporary files for stream operations. Memory buffers are used instead. - fixed SF# 2957865: added Poco::UUID::tryParse() -- All Zip classes now use Poco::File[Input|Output]Stream instead of std::[i|o]fstream. +- All Zip classes now use Poco::File[Input|Output]Stream instead of std::[i|o]fstream. UTF-8 filenames will now be handled correctly on Windows. - fixed SF# 2902029: zlib flush support (Z_SYNC_FLUSH) - added Poco::TextBufferIterator class @@ -1004,12 +1273,12 @@ Release 1.4.0 (2010-12-14) Socket::select() and Socket::poll() will use epoll under Linux if the Net library is compiled with -DPOCO_HAVE_FD_EPOLL. This is the default for the Linux build configuration (but not for the various build configurations targeting embedded Linux platforms). -- fixed SF# 2941664: Memory leak in DeflatingStream with zero-length streams (also fixed some other potential, +- fixed SF# 2941664: Memory leak in DeflatingStream with zero-length streams (also fixed some other potential, but unlikely, memory leaks) - fixed SF# 2946457: added RejectCertificateHandler - fixed SF# 2946621: Poco::Path bug with POCO_WIN32_UTF8 - fixed SF# 2929805: Environment::nodeId() does not work if no eth0 device exists -- Environment::nodeId() no longer throws if no hardware ethernet address can be determined. +- Environment::nodeId() no longer throws if no hardware ethernet address can be determined. It returns an all-zero address instead. - Added additional classification functions to Poco::Unicode class; made classification functions inline. - added Ascii class for ASCII character classification. @@ -1018,22 +1287,22 @@ Release 1.4.0 (2010-12-14) possible inconsistent results or assertions when the standard library functions are used with character codes outside the ASCII range. -- Poco::Net::MailMessage: fixed a bug in StringPartHandler that resulted in incorrect handling of non-ASCII data if +- Poco::Net::MailMessage: fixed a bug in StringPartHandler that resulted in incorrect handling of non-ASCII data if char is signed. - Improved Poco::Net::SMTPClientSession compatibility with various mail servers when using AUTH_LOGIN authentication. - Added CRAM-SHA1 support to Poco::Net::SMTPClientSession - Poco::Net::SMTPClientSession now also supports login with AUTH PLAIN. - Added Poco::Net::SecureSMTPClientSession class, supporting STARTTLS for secure SMTP connections. -- fixed an issue with SharedMemory on POSIX systems, where a shared memory region would be deleted +- fixed an issue with SharedMemory on POSIX systems, where a shared memory region would be deleted despite the server flag set to true (see http://pocoproject.org/forum/viewtopic.php?f=12&t=3494). - PageCompiler: added a new page context directive, to allow passing custom context objects to the request handler. - fixed StreamSocketImpl::sendBytes() for non-blocking sockets -- added Poco::Net::DialogSocket::receiveRawBytes(), which should be used instead of receiveBytes() due to internal +- added Poco::Net::DialogSocket::receiveRawBytes(), which should be used instead of receiveBytes() due to internal buffering by DialogSocket. - DOMParser: FEATURE_WHITESPACE has been renamed to FEATURE_FILTER_WHITESPACE (which now matches the underlying URI) and is now handled correctly (previously we did the exact reverse thing) -- added Poco::Util::AbstractConfiguration::remove() to remove a configuration property; added removeRaw() implementations +- added Poco::Util::AbstractConfiguration::remove() to remove a configuration property; added removeRaw() implementations to all implementations (contributions by Daniel Hobi and Alexey Shults). - fixed NetSSL_OpenSSL compilation error on Windows with OpenSSL 1.0 - Added optional FIPS mode support to NetSSL_OpenSSL (contributed by Lior Okman). @@ -1051,7 +1320,7 @@ Release 1.4.0 (2010-12-14) If true is passed, cancel() waits until the task queue has been purged. Otherwise, it returns immediately and works asynchronously, as before. - Poco::Net::HTTPServerResponse::redirect() now accepts an optional additional - argument to specify the HTTP status code for the redirection. + argument to specify the HTTP status code for the redirection. - fixed a warning (BinaryReader.cpp) and error (ThreadLocal.cpp) in Foundation when compiling with Visual Studio 2010 - fixed a wrong exception in Poco::Net::POP3ClientSession - Poco::Net::FTPClientSession and Poco::Net::SMTPClientSession now set the error code in exceptions they throw @@ -1070,11 +1339,11 @@ Release 1.4.0 (2010-12-14) - fixed SF# 3044303: Can't use own config file on Solaris & OSARCH_64BITS ignored - fixed SF# 2943896: AsyncChannel::log blocks - fixed a bug in Poco::Util::WinRegistryKey::getInt(): - The size variable passed to RegQueryValueExW() should be initialized to the size + The size variable passed to RegQueryValueExW() should be initialized to the size of the output buffer. - Added rudimentary support for compiling with Clang 2.0 (Xcode 4) on Mac OS X. - New build configurations for Mac OS X: Darwin32 and Darwin64 for explicit - 32-bit and 64-bit builds. Note that the default Darwin build configuration + 32-bit and 64-bit builds. Note that the default Darwin build configuration will build 64-bit on Snow Leopard and 32-bit on Leopard, but will always place build products in Darwin/i386. The new Darwin32 and Darwin64 configurations will use the correct directories. @@ -1086,10 +1355,10 @@ Release 1.4.0 (2010-12-14) when the plugin's shared library was unloaded, resulting in Bad Things happening. This can now no longer happen. As a downside, a pooled thread that fails to finish will block stopAll() and the destructor forever. -- NetSSL_OpenSSL: for a SecureStreamSocket, available() now returns the number of bytes that +- NetSSL_OpenSSL: for a SecureStreamSocket, available() now returns the number of bytes that are pending in the SSL buffer (SSL_pending()), not the actual socket buffer. - Added Poco::Net::HTTPClientSession::secure() to check for a secure connection. -- Poco::Net::HTTPRequest::setHost() now does not include the port number in the Host header +- Poco::Net::HTTPRequest::setHost() now does not include the port number in the Host header if it's either 80 or 443. - log messages can now optionally include source file path and line number - Poco::PatternFormatter can format source file path and line number (%U, %u) @@ -1122,7 +1391,7 @@ Release 1.4.0 (2010-12-14) Poco::UUID::null() and Poco::UUID::isNull(), respectively, to avoid issues with Objective-C++ projects on Mac OS X and iOS where nil is a system-provided macro. -- Crypto bugfixes: RSACipherImpl now pads every block of data, not just the +- Crypto bugfixes: RSACipherImpl now pads every block of data, not just the last (or last two). - Improved Crypto testsuite by adding new tests - Added new Visual Studio project configurations: debug_static_mt and release_static_mt @@ -1151,7 +1420,7 @@ Release 1.4.0 (2010-12-14) Applications using Crypto and/or NetSSL should call these methods appropriately at program startup and shutdown. Note: In release 1.3.6, similar functions have been added to the Net library. - + Release 1.3.6p2 (2010-01-15) ============================ @@ -1174,7 +1443,7 @@ Release 1.3.6p2 (2010-01-15) Release 1.3.6p1 (2009-12-21) ============================ -- added support for using external zlib, pcre, expat and sqlite3 instead of +- added support for using external zlib, pcre, expat and sqlite3 instead of bundled ones (-DPOCO_UNBUNDLED, configure --unbundled) - fixed SF# 2911407: Add sh4 support - fixed SF# 2912746: RSAKey::EXP_LARGE doesn't work @@ -1208,7 +1477,7 @@ Release 1.3.6 (2009-11-24) - fixed SF# 2828401: Deadlock in SocketReactor/NotificationCenter (also fixes patch# 1956490) NotificationCenter now uses a std::vector internally instead of a std::list, and the mutex is no longer held while notifications are sent to observers. -- fixed SF# 2835206: File_WIN32 not checking aganist INVALID_HANDLE_VALUE +- fixed SF# 2835206: File_WIN32 not checking against INVALID_HANDLE_VALUE - fixed SF# 2841812: Posix ThreadImpl::sleepImpl throws exceptions on EINTR - fixed SF# 2839579: simple DoS for SSL TCPServer, HTTPS server No SSL handshake is performed during accept() - the handshake is delayed until @@ -1217,13 +1486,13 @@ Release 1.3.6 (2009-11-24) nonblocking connections. - fixed SF# 2836049: Possible handle leak in FileStream If sync() fails, close() now simply set's the stream's bad bit. - In any case, close() closes the file handle/descriptor. + In any case, close() closes the file handle/descriptor. - fixed SF# 2814451: NetSSL: receiveBytes crashes if socket is closed - added a workaround for Vista service network initialization issue (an Windows service using the Net library running under Vista will crash in the call to WSAStartup() done in NetworkInitializer). Workaround is to call WSAStartup() in the application's main(). - Automatic call to WSAStartup() in the Net library can now be disabled + Automatic call to WSAStartup() in the Net library can now be disabled by compiling Net with -DPOCO_NET_NO_AUTOMATIC_WSASTARTUP. Also the new Poco::Net::initializeNetwork() and Poco::Net::uninitializeNetwork() functions can be used to call WSAStartup() and WSACleanup(), respectively, @@ -1236,7 +1505,7 @@ Release 1.3.6 (2009-11-24) - PageCompiler improvements: new tags, support for buffered output, etc. - better error reporting in Data MySQL connector (patch #2881270 by Jan "HanzZ" Kaluza) - fixed SF# 1892462: FTPClient:Choose explicitely between EPSV and PASV -- fixed SF# 2806365: Option for PageCompiler to write output to different dir +- fixed SF# 2806365: Option for PageCompiler to write output to different dir - fixed a documentation bug (wrong sample code) in Process::launch() documentation - added --header-output-dir option to PageCompiler - fixed SF# 2849144: Zip::Decompress notifications error @@ -1251,8 +1520,8 @@ Release 1.3.6 (2009-11-24) mail header fields when sending out mail containing non-ASCII characters. - fixed SF# 2890975: SMTPClientSession bug with 7BIT encoding -- fixed an issue with retrieving the value of socket options on Windows 7. - Before obtaining the value of a socket, we now initialize the variable receiving the +- fixed an issue with retrieving the value of socket options on Windows 7. + Before obtaining the value of a socket, we now initialize the variable receiving the socket option value to zero. - fixed SF# 2836141: Documentation errors - fixed SF# 2864232: Socket::select() does not detect closed sockets on windows @@ -1265,26 +1534,26 @@ Release 1.3.6 (2009-11-24) signal handler for SIGINT if the environment variable POCO_ENABLE_DEBUGGER is defined. - fixed SF# 2896070: Poco::Net::Context with non-ASCII paths -- added Unicode Surrogate support to Poco::UTF16Encoding. - See Poco::TextEncoding::queryConvert() and Poco::TextEncoding::sequenceLength() +- added Unicode Surrogate support to Poco::UTF16Encoding. + See Poco::TextEncoding::queryConvert() and Poco::TextEncoding::sequenceLength() for how this is implemented. Contributed by Philippe Cuvillier. - fixed SF# 2897650: [branch 1.3.6] Net.SocketAddress won't compile for CYGWIN - fixed SF# 2896161: Building on Windows fails when basedir has space in it - fixed SF# 2864380: Memory leak when using secure sockets - NetSSL_OpenSSL: the SSL/TLS session cache is now disabled by default and can be enabled per Context using Poco::Net::Context::enableSessionCache(). -- fixed SF# 2899039: Wrong DST handling in LocalDateTime +- fixed SF# 2899039: Wrong DST handling in LocalDateTime - added RWLock::ScopedReadLock and RWLock::ScopedWriteLock (contributed by Marc Chevrier) -- added Thread::TID type, as well as Thread::tid() and Thread::currentTid() to obtain the native +- added Thread::TID type, as well as Thread::tid() and Thread::currentTid() to obtain the native thread handle/ID - added Zip file comment support - On Windows, Poco::SharedLibrary::load() now uses LoadLibraryEx instead of LoadLibrary and uses the LOAD_WITH_ALTERED_SEARCH_PATH if an absolute path is specified. This will add the directory containing the library to the search path for DLLs that the loaded library depends upon. -- Mac OS X build settings now match those used by default Xcode projects, making linking the +- Mac OS X build settings now match those used by default Xcode projects, making linking the POCO libs to Xcode projects easier -- Replaced use of std::valarray in Poco::Net::ICMPEventArgs with std::vector due to issues with +- Replaced use of std::valarray in Poco::Net::ICMPEventArgs with std::vector due to issues with std::valarray together with STDCXX debug mode on OS X @@ -1293,8 +1562,8 @@ Release 1.3.5 (2009-05-11) - fixed SF# 2779410: Poco::Data::ODBC::HandleException impovement - fixed wrong exception text for Poco::UnhandledException -- Fixed a problem with SSL shutdown that causes clients (web browsers) - to hang when the server attempts to perform a clean SSL shutdown. We now call +- Fixed a problem with SSL shutdown that causes clients (web browsers) + to hang when the server attempts to perform a clean SSL shutdown. We now call SSL_shutdown() once, even if the shutdown is not complete after the first call. - added Poco::Crypto::X509Certificate::save() - fixed a bug in Poco::Zip::Decompress that results in wrong paths for extracted files @@ -1302,7 +1571,7 @@ Release 1.3.5 (2009-05-11) on Windows. - added Poco::Crypto::X509Certificate::issuedBy() to verify certificate chain. - fixed 0000089: Thread::sleep() on Linux is extremely inaccurate -- added methods to extract the contents of specific fields from the +- added methods to extract the contents of specific fields from the subject and issuer distinguished names of a certificate. @@ -1323,21 +1592,21 @@ Release 1.3.4 (2009-04-21) - fixed SF# 2583934: Zip: No Unix permissions set - the NetSSL_OpenSSL library has been heavily refactored - added NumberFormatter::append*() and DateTimeFormatter::append() functions -- use NumberFormatter::append() and DateTimeFormatter::append() instead of format() where +- use NumberFormatter::append() and DateTimeFormatter::append() instead of format() where it makes sense to gain some performance - added system.dateTime and system.pid to Poco::Util::SystemConfiguration - added %F format specifier (fractional seconds/microseconds) to DateTimeFormatter, DateTimeParser and PatternFormatter. - fixed SF# 2630476: Thread_POSIX::setStackSize() failure with g++ 4.3 - fixed SF# 2679279: Handling of -- option broken -- added compile options to reduce memory footprint of statically linked applications +- added compile options to reduce memory footprint of statically linked applications by excluding various classes from automatically being linked. See the POCO_NO_* macros in Poco/Config.h. - fixed SF# 2644940: on Windows the COMPUTER-NAME and the HOSTNAME can be different -- added DNS::hostName() function +- added DNS::hostName() function - added build configuration for iPhone (using Apple's SDK) - basic support for AIX 5.x/xlC 8 -- fixed a bug resulting in a badly formatted exception message with IOException +- fixed a bug resulting in a badly formatted exception message with IOException thrown due to a socket-related error - fixed SF# 2644718: NetworkInterface name conflict in MinGW - added a missing #include to CryptoTransform.h @@ -1359,20 +1628,20 @@ Release 1.3.4 (2009-04-21) - Data::SQLite: added support for automatic retries if the database is locked - XMLConfiguration is now writable - fixed an IPv6 implementation for Windows bug in HostEntry -- Timer class improvement: interval between callback is no longer influenced by the +- Timer class improvement: interval between callback is no longer influenced by the time needed to execute the callback. -- added PriorityNotificationQueue and TimedNotificationQueue classes to Foundation. - These are variants of the NotificationQueue class that support priority and +- added PriorityNotificationQueue and TimedNotificationQueue classes to Foundation. + These are variants of the NotificationQueue class that support priority and timestamp-tagged notifications. -- added Poco::Util::Timer class. This implements a timer that can schedule different +- added Poco::Util::Timer class. This implements a timer that can schedule different tasks at different times, using only one thread. -- the signatures of Poco::NotificationQueue and Poco::NotificationCenter member functions - have been changed to accept a Poco::Notification::Ptr instead of Poco::Notification* - to improve exception safety. This change should be transparent and fully backwards - compatible. The signature of the methods returning a Poco::Notification* have not been - changed for backwards compatibility. It is recommended, that any Notification* obtained - should be immediately assigned to a Notification::Ptr. -- SQLite::SessionImpl::isTransaction() now uses sqlite3_get_autocommit() to find out +- the signatures of Poco::NotificationQueue and Poco::NotificationCenter member functions + have been changed to accept a Poco::Notification::Ptr instead of Poco::Notification* + to improve exception safety. This change should be transparent and fully backwards + compatible. The signature of the methods returning a Poco::Notification* have not been + changed for backwards compatibility. It is recommended, that any Notification* obtained + should be immediately assigned to a Notification::Ptr. +- SQLite::SessionImpl::isTransaction() now uses sqlite3_get_autocommit() to find out about the transaction state. - refactored Crypto library to make it independent from NetSSL_OpenSSL. - added support for RSA-MD5 digital signatures to Crypto library. @@ -1381,8 +1650,8 @@ Release 1.3.4 (2009-04-21) - OpenSSL now depends on Crypto library (which makes more sense than vice versa, as it was before). Poco::Net::X509Certificate is now a subclass of Poco::Crypto::X509Certificate (adding the verify() - member function) and the Poco::Net::SSLInitializer class was - moved to Poco::Crypto::OpenSSLInitializer. + member function) and the Poco::Net::SSLInitializer class was + moved to Poco::Crypto::OpenSSLInitializer. - added build configs for static libraries to Zip - added batch mode to CppUnit::WinTestRunner. WinTestRunnerApp supports a batch mode, which runs the @@ -1397,12 +1666,12 @@ Release 1.3.4 (2009-04-21) - The IPv6 support for Windows now basically works (Net library compiled with POCO_HAVE_IPv6) - fixed a potential error when shutting down openssl in a statically linked application - added static build configs to Data library -- added Poco::AtomicCounter class, which uses OS-specific APIs for atomic (thread-safe) +- added Poco::AtomicCounter class, which uses OS-specific APIs for atomic (thread-safe) manipulation of counter values. -- Poco::RefCountedObject and Poco::SharedPtr now use Poco::AtomicCounter for +- Poco::RefCountedObject and Poco::SharedPtr now use Poco::AtomicCounter for reference counting - fixed SF# 2765569: LoadConfiguration failing from current directory - + Release 1.3.3p1 (2008-10-09) ============================ @@ -1426,13 +1695,13 @@ Release 1.3.3 (2008-10-07) - NetworkInterface now has displayName() member (useful only on Windows) - Poco::Util::WinRegistryKey now has a read-only mode - Poco::Util::WinRegistryKey::deleteKey() can now recursively delete registry keys -- Poco::File::created() now returns 0 if the creation date/time is not known, as - it's the case on most Unix platforms (including Linux). +- Poco::File::created() now returns 0 if the creation date/time is not known, as + it's the case on most Unix platforms (including Linux). On FreeBSD and Mac OS X, it returns the real creation time. - Time interval based log file rotation (Poco::FileChannel) now works - correctly. Since there's no reliable and portable way to find out the creation - date of a file (Windows has the tunneling "feature", most Unixes don't provide - the creation date), the creation/rotation date of the log file is written into + correctly. Since there's no reliable and portable way to find out the creation + date of a file (Windows has the tunneling "feature", most Unixes don't provide + the creation date), the creation/rotation date of the log file is written into the log file as the first line. - added Environment::nodeId() for obtaining the Ethernet address of the system (this is now also used by UUIDGenerator - the corresponding code from UUIDGenerator @@ -1514,11 +1783,11 @@ Foundation, XML, Net, Util: - URIStreamOpener improvement: redirect logic is now in URIStreamOpener. this enables support for redirects from http to https. - added support for temporary redirects and useproxy return code -- added getBlocking() to Socket +- added getBlocking() to Socket - added File::isHidden() - better WIN64 support (AMD64 and IA64 platforms are recognized) - added support for timed lock operations to [Fast]Mutex -- SharedLibrary: dlopen() is called with RTLD_GLOBAL instead of RTLD_LOCAL +- SharedLibrary: dlopen() is called with RTLD_GLOBAL instead of RTLD_LOCAL (see http://gcc.gnu.org/faq.html#dso) - Poco::Timer threads can now run with a specified priority - added testcase for SF# 1774351 @@ -1582,7 +1851,7 @@ Foundation, XML, Net, Util: - NetworkInterface (Windows): Loopback interface now has correct netmask; interfaces that do not have an IP address assigned are no longer reported. - Fixes for VC++ W4 warnings from EHL -- SharedMemory: first constructor has an additional "server" parameter +- SharedMemory: first constructor has an additional "server" parameter Setting to true does not unlink the shared memory region when the SharedMemory object is destroyed. (Alessandro Oliveira Ungaro) - fixed SF# 1768231: MemoryPool constructor @@ -1636,7 +1905,7 @@ Release 1.3.0 (2007-05-07) - added FileStream, FileInputStream, FileOutputStream to Foundation - added NodeAppender class to XML for faster DOM tree creation - HTTPServerRequest and HTTPServerResponse are now abstract base classes, - actual functionality has moved into HTTPServerRequestImpl and + actual functionality has moved into HTTPServerRequestImpl and HTTPServerResponseImpl. This allows us to plug other HTTP servers into POCO. - added DynamicAny class to Foundation @@ -1667,9 +1936,9 @@ Release 1.3.0 (2007-05-07) - fixed SF# 1710053: LogStream proposal - fixed a bug involving empty root directories in Windows DirectoryIterator implementation (see http://www.appinf.com/poco/wiki/tiki-view_forum_thread.php?comments_parentId=343&forumId=6) -- robustness improvements to ActiveMethod - removed the opportunity for memory leaks in +- robustness improvements to ActiveMethod - removed the opportunity for memory leaks in case something goes while invoking the method -- made C library usage more C++-like - use C++ headers (e.g. ) instead of +- made C library usage more C++-like - use C++ headers (e.g. ) instead of C ones (). Also, use C library functions in std namespace. - added Unicode and UTF8String for improved Unicode support. The Unicode class can be used to obtain the Unicode properties of a character. @@ -1686,16 +1955,16 @@ Release 1.3.0 (2007-05-07) (see Poco/Foundation.h and Poco/Config.h). - The Visual Studio project files for the POCO libraries now include configurations for building static libraries. - + Release 1.2.9 (2007-02-26) ========================== - fixed a formatting problem in Util::HelpFormatter - HTTPClientSession::sendRequest() now attempts to send the complete request in one network packet. -- improved network performance of ChunkedOutputStream: chunk size and chunk data +- improved network performance of ChunkedOutputStream: chunk size and chunk data are sent in one network packet if possible -- fixed SF# 1655035: Wrong expires field calculation in HTTPCookie +- fixed SF# 1655035: Wrong expires field calculation in HTTPCookie (thanks to Sergey N. Yatskevich for this and other fixes) - fixed SF# 1655049: Fix discrepancy of a code to the description - fixed SF# 1655170: Poco::Timezone::standardName() problem on WIN32 @@ -1712,14 +1981,14 @@ Release 1.2.9 (2007-02-26) - HTTPServer now sends a Bad Request response if it fails to parse the HTTP request header. - HTTPServer now sends an Internal Server Error response if the request handler throws an exception prior to sending a response.- enabled TCP_NODELAY per default on TCPServer/HTTPServer -- fixed a bug in HTTP persistent connection handling +- fixed a bug in HTTP persistent connection handling (server does not send Connection: close when it reaches connection maximum) - HTMLForm - POST submission of URL encoded form no longer uses chunked transfer encoding (thus improving interoperability with certain web servers) - integrated Environment.cpp from Main (missing get(var, default)) -- added missing AutoPtr include to Util/Application +- added missing AutoPtr include to Util/Application (and using Poco::AutoPtr is no longer necessary for POCO_APP_MAIN macro) -- fixed SF# 1635420: Per Regents of the University of Calfornia letter, +- fixed SF# 1635420: Per Regents of the University of Calfornia letter, remove advertising from BSD licensed parts - fixed SF# 1633133: MultipartWriter writes superluous CR-LF at beginning @@ -1759,7 +2028,7 @@ Release 1.2.7 (2006-12-07) - fixed SF #1592776: LayeredConfiguration: getRaw should enumerate in reverse order - SF Patch # 1599848 ] VS 2005 Util build fails - Logger::dump() now uses std::size_t instead of int for buffer size -- LayeredConfiguration now supports a priority value for each configuration. +- LayeredConfiguration now supports a priority value for each configuration. Also, it's possible to specify for each configuration added whether it should be writeable. - ServerApplication: cd to root directory only if running as a daemon @@ -1770,7 +2039,7 @@ Release 1.2.7 (2006-12-07) configure supports --no-wstring and --no-fpenvironment flags build system supports POCO_FLAGS environment variable for compiler flags - RemoteGen: fixed error handling for write protected files (SystemException) - fixing integral constant overflow messages with large cache expiration, m_ support for type serializers, + fixing integral constant overflow messages with large cache expiration, m_ support for type serializers, case-insensitive comparison added @@ -1798,14 +2067,14 @@ Release 1.2.5 (2006-10-23) - improved options handling: better handling of (non) ambiguities. If both an option named "help" and one named "helper" is specified, this no longer causes ambiguity errors. - added check for duplicate option definition -- ThreadPool bugfix: fixed a crash that occurs on Linux multiprocessor machines - (caused by an thread unsafe string assignment corrupting the heap...) +- ThreadPool bugfix: fixed a crash that occurs on Linux multiprocessor machines + (caused by an thread unsafe string assignment corrupting the heap...) (SF# 1575315) - improved ThreadPool performance - XML now compiles with -DXML_UNICODE_WCHAR_T (SF# 1575174) - fixed SF# 1572757: HTML forms can have more than one key/value pair with the same name -- got rid of the dynamic casts in Events, Events/Cache: simpler/faster Delegate < operator, - prevents some rare dynamic casts error from occuring when using StrategyCollection with Caches +- got rid of the dynamic casts in Events, Events/Cache: simpler/faster Delegate < operator, + prevents some rare dynamic casts error from occurring when using StrategyCollection with Caches - improvements to Logger and LoggingConfigurator: * added Logger::unsafeGet() * added Logger::setProperty(loggerName, propertyName, value) @@ -1869,7 +2138,7 @@ Release 1.2.1 (2006-08-29) Release 1.2.0 (2006-08-29) ========================== -- DateTime fixes: Julian Day is no longer stored internally. +- DateTime fixes: Julian Day is no longer stored internally. Times (hours, minutes, seconds, ...) are now always taken from an utcValue (if available) and not from the Julian day. The Julian day is only used for calculating year, month and day (except when the Julian day is the only thing we have) This helps us get rid of rounding errors that the Julian Day arithmetic introduced.- on Windows, UUIDGenerator no longer uses Netbios, but GetAdaptersInfo instead @@ -2010,7 +2279,7 @@ Release 1.1b1 (2006-03-03) - added Buffer template class to Foundation - added the UnicodeConverter utility class. This is mainly used for Windows Unicode support and probably of little use for anything else. - added Path::resolve() -- added Windows Unicode support. This calls the Unicode variant of the Windows API functions. +- added Windows Unicode support. This calls the Unicode variant of the Windows API functions. For this to work, all strings must be UTF-8 encoded and POCO_WIN32_UTF8 must be defined in all compilation units. - added StreamCopier::copyToString() - added URIStreamOpener::unregisterStreamFactory() and new variants of URIStreamOpener::open() that also work with filesystem paths. @@ -2066,7 +2335,7 @@ Release 1.0b1 (2006-01-09) Release 1.0a1 (2006-01-03) [internal] ===================================== -- mediaType is used consistently to refer to a MIME media type (some occurences of contentType and mimeType have been replaced) +- mediaType is used consistently to refer to a MIME media type (some occurrences of contentType and mimeType have been replaced) - moved MediaType::quote() to MessageHeader and made it public - added MultipartWriter::stream() - Renamed AttachmentSource to PartSource and AttachmentHandler to PartHandler @@ -2079,8 +2348,8 @@ Release 1.0a1 (2006-01-03) [internal] - added StreamSocket::connectNB() (non-blocking connect) - added Observer::accepts() - added SocketReactor, SocketConnector and SocketAcceptor classes to support event-based socket programming -- NamespacePrefixesStrategy now uses expat's XML_SetReturnNSTriplet(). - The previously used separate namespace handling code has been removed. +- NamespacePrefixesStrategy now uses expat's XML_SetReturnNSTriplet(). + The previously used separate namespace handling code has been removed. This improves performance if NamespacePrefixesStrategy is used (both the n amespaces and namespace-prefixes SAX2 features are used) - upgraded expat to 2.0 pre-release (2005-12-27) snapshot @@ -2105,7 +2374,7 @@ Release 0.96.1 (2005-12-28) - added DateTimeFormatter::format() for Timespan - added ErrorHandler class and better exception handling for threads - added poco_debugger() and poco_debugger_msg() macros -- added project and solution files for Visual Studio 2005 (due to some bugs/leaks in Microsofts standard library - see +- added project and solution files for Visual Studio 2005 (due to some bugs/leaks in Microsofts standard library - see http://lab.msdn.microsoft.com/productfeedback/viewfeedback.aspx?feedbackid=e08bd793-3fef-40ff-adda-ed313e0eafcc we do not recommend using this for production purposes) - fixed two problems with out-of-range string iterator in Path (the testsuite triggered an assertion in VC++ 8.0) @@ -2180,7 +2449,7 @@ Relesae 0.95.1 (2005-10-15) [internal] - Socket classes use Timespan::useconds() to fill struct timeval - added DatagramSocket, MulticastSocket and NetworkInterface classes - added socket classes and related basic stuff -- added additonal constructor/assign to Timespan- added BasicBufferedBidirectionalStreamBuf +- added additional constructor/assign to Timespan- added BasicBufferedBidirectionalStreamBuf - fixed a potential MT issue in Base64Decoder - code beautifying in [Un]BufferedStreamBuf - more improvements to ClassLoader @@ -2197,7 +2466,7 @@ Release 0.94.1 (2005-09-30) [internal] - added SimpleFileChannel - RotateAtTimeStrategy: ::getNextRollover() rewritten (buggy) -- DateTime +- DateTime microseconds assert corrected asserts in computeGregorian() (except for year - see comment in computeGregorian()) milliseconds calculation modified in computeGregorian() @@ -2206,7 +2475,7 @@ Release 0.94.1 (2005-09-30) [internal] - LocalDateTime: added timestamp() method - FileChannel: added "times" property (used to determine whether to use UTC or local time with RotateAtTimeStrategy) - ::setProperty() modified (whenever "times" property is set, methods setRotation and setArchive are + ::setProperty() modified (whenever "times" property is set, methods setRotation and setArchive are reinvoked to reflect the change) - FileChannel: added support for archived file compression and archived file purging - FileChannel tests modified @@ -2228,7 +2497,7 @@ Release 0.94.1 (2005-09-30) [internal] - added Path::tryParse() - SAXParser::parse()/EntityResolverImpl now works for both URIs and local filesystem paths (fixes #1254812) - + Release 0.93.1 (2005-08-01) =========================== @@ -2329,7 +2598,3 @@ The release does not contain all features planned for the later 1.0 release (the NET library is missing, for example), but is already quite usable. Please refer to the README file for more information and instructions for building the libraries. - - --- -$Id: //poco/1.4/dist/CHANGELOG#59 $ diff --git a/CMakeLists.txt b/CMakeLists.txt index a95ec5db6..a163a4b36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,15 +7,19 @@ # ENABLE_TESTS # ENABLE_SAMPLES -cmake_minimum_required(VERSION 3.0.0) +cmake_minimum_required(VERSION 3.1.0) project(Poco) +option(POCO_VERBOSE_MESSAGES "Enable informational messages during configure" ON) + file(STRINGS "${PROJECT_SOURCE_DIR}/libversion" SHARED_LIBRARY_VERSION) # Read the version information from the VERSION file file (STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PACKAGE_VERSION ) -message(STATUS "Poco package version: ${PACKAGE_VERSION}") +if(POCO_VERBOSE_MESSAGES) + message(STATUS "Poco package version: ${PACKAGE_VERSION}") +endif() string(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION}) string(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION}) string(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION}) @@ -36,12 +40,36 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) # Append our module directory to CMake set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -# COMMENT REPLACED BY BIICODE - ################################################################################# # Setup C/C++ compiler options ################################################################################# +option(DISABLE_CPP11 "Disable C++11 if available" OFF) +option(DISABLE_CPP14 "Disable C++14 if available" OFF) + +if (DISABLE_CPP11 OR DISABLE_CPP14) + add_definitions(-DPOCO_DISABLE_CPP11) + + if (DISABLE_CPP14) + add_definitions(-DPOCO_DISABLE_CPP14) + endif() +else() + # C++11/14 compiler flags + include(CXX11) + check_for_cxx11_compiler(CXX11_COMPILER) + + # If a C++11 compiler is available, then set the appropriate flags + if(CXX11_COMPILER) + enable_cxx11() + check_for_cxx14_compiler(CXX14_COMPILER) + + # If a C++14 compiler is available, then set the appropriate flags + if(CXX14_COMPILER) + enable_cxx14() + endif() + endif() +endif() + if(NOT MSVC_IDE) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING @@ -64,9 +92,19 @@ option(ENABLE_MONGODB "Enable MongoDB" ON) option(ENABLE_PDF "Enable PDF" OFF) option(ENABLE_UTIL "Enable Util" ON) option(ENABLE_NET "Enable Net" ON) -option(ENABLE_NETSSL "Enable NetSSL" ON) -option(ENABLE_NETSSL_WIN "Enable NetSSL Windows" OFF) -option(ENABLE_CRYPTO "Enable Crypto" ON) +find_package(OpenSSL QUIET) +if(OPENSSL_FOUND) + option(ENABLE_NETSSL "Enable NetSSL" ON) + option(ENABLE_CRYPTO "Enable Crypto" ON) +else() + option(ENABLE_NETSSL "Enable NetSSL" OFF) + option(ENABLE_CRYPTO "Enable Crypto" OFF) +endif() +if(WIN32) + option(ENABLE_NETSSL_WIN "Enable NetSSL Windows" ON) +else() + set(ENABLE_NETSSL_WIN OFF) +endif() option(ENABLE_DATA "Enable Data" ON) option(ENABLE_DATA_SQLITE "Enable Data SQlite" ON) option(ENABLE_DATA_MYSQL "Enable Data MySQL" ON) @@ -107,31 +145,41 @@ endif() if(POCO_STATIC) set( LIB_MODE_DEFINITIONS -DPOCO_STATIC -DPOCO_NO_AUTOMATIC_LIBS) set( LIB_MODE STATIC ) - message(STATUS "Building static libraries") + if(POCO_VERBOSE_MESSAGES) + message(STATUS "Building static libraries") + endif() else(POCO_STATIC) set( LIB_MODE SHARED ) set( LIB_MODE_DEFINITIONS -DPOCO_NO_AUTOMATIC_LIBS) - message(STATUS "Building dynamic libraries") + if(POCO_VERBOSE_MESSAGES) + message(STATUS "Building dynamic libraries") + endif() endif(POCO_STATIC) if (ENABLE_TESTS) include(CTest) enable_testing() - message(STATUS "Building with tests") -else () + if(POCO_VERBOSE_MESSAGES) + message(STATUS "Building with tests") + endif() +elseif (POCO_VERBOSE_MESSAGES) message(STATUS "Building without tests") endif () if (ENABLE_SAMPLES) - message(STATUS "Building with samples") -else () + if(POCO_VERBOSE_MESSAGES) + message(STATUS "Building with samples") + endif() +elseif (POCO_VERBOSE_MESSAGES) message(STATUS "Building without samples") endif () if (POCO_UNBUNDLED) add_definitions( -DPOCO_UNBUNDLED) - message(STATUS "Build with using external sqlite, libz, pcre, expat ...") -else () + if(POCO_VERBOSE_MESSAGES) + message(STATUS "Build with using external sqlite, libz, pcre, expat ...") + endif() +elseif (POCO_VERBOSE_MESSAGES) message(STATUS "Build with using internal copy of sqlite, libz, pcre, expat, ...") endif () @@ -143,7 +191,7 @@ set(Poco_COMPONENTS "") # Pthreads/threads support find_package(Threads REQUIRED) -if (ENABLE_TESTS) +if (ENABLE_TESTS OR ENABLE_CPPUNIT) add_subdirectory(CppUnit) list(APPEND Poco_COMPONENTS "CppUnit") endif () @@ -182,18 +230,27 @@ if(WIN32 AND ENABLE_NETSSL_WIN) list(APPEND Poco_COMPONENTS "NetSSL_Win") endif(WIN32 AND ENABLE_NETSSL_WIN) -find_package(OpenSSL) -if(OPENSSL_FOUND) - include_directories("${OPENSSL_INCLUDE_DIR}") - if(ENABLE_NETSSL) - add_subdirectory(NetSSL_OpenSSL) - list(APPEND Poco_COMPONENTS "NetSSL_OpenSSL") - endif() - if(ENABLE_CRYPTO) - add_subdirectory(Crypto) - list(APPEND Poco_COMPONENTS "Crypto") - endif() -endif(OPENSSL_FOUND) +if(ENABLE_NETSSL OR ENABLE_CRYPTO) + find_package(OpenSSL REQUIRED) + if(OPENSSL_FOUND) + if(MSVC) + option(OPENSSL_IS_STATIC + "Set to OFF|ON (default is OFF) if OpenSSL has beenbuild as static libraries" OFF) + if(OPENSSL_IS_STATIC) + list(APPEND OPENSSL_LIBRARIES ws2_32 Crypt32) + endif() + endif() + include_directories("${OPENSSL_INCLUDE_DIR}") + if(ENABLE_NETSSL) + add_subdirectory(NetSSL_OpenSSL) + list(APPEND Poco_COMPONENTS "NetSSL_OpenSSL") + endif() + if(ENABLE_CRYPTO) + add_subdirectory(Crypto) + list(APPEND Poco_COMPONENTS "Crypto") + endif() + endif(OPENSSL_FOUND) +endif(ENABLE_NETSSL OR ENABLE_CRYPTO) if(ENABLE_DATA) add_subdirectory(Data) @@ -289,29 +346,29 @@ install( # in tree build settings #configure_file(PocoBuildTreeSettings.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PocoBuildTreeSettings.cmake @ONLY) +if(POCO_VERBOSE_MESSAGES) + message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") + message(STATUS "Installation target path: ${CMAKE_INSTALL_PREFIX}") -message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") -message(STATUS "Installation target path: ${CMAKE_INSTALL_PREFIX}") + message(STATUS "") + message(STATUS "Generated with config types: ${CMAKE_CONFIGURATION_TYPES}") + message(STATUS "Setting Poco build type - ${CMAKE_BUILD_TYPE}") + message(STATUS "") -message(STATUS "") -message(STATUS "Generated with config types: ${CMAKE_CONFIGURATION_TYPES}") -message(STATUS "Setting Poco build type - ${CMAKE_BUILD_TYPE}") -message(STATUS "") - -message(STATUS "C_FLAGS: =${CMAKE_C_FLAGS}") -message(STATUS "CMAKE_C_FLAGS_DEBUG:=${CMAKE_C_FLAGS_DEBUG}") -message(STATUS "CMAKE_C_FLAGS_RELEASE:=${CMAKE_C_FLAGS_RELEASE}") -message(STATUS "CMAKE_C_FLAGS_MINSIZEREL:=${CMAKE_C_FLAGS_MINSIZEREL}") -message(STATUS "CMAKE_C_FLAGS_RELWITHDEBINFO:=${CMAKE_C_FLAGS_RELWITHDEBINFO}") -message(STATUS "") -message(STATUS "") -message(STATUS "CXX_FLAGS:=${CMAKE_CXX_FLAGS}") -message(STATUS "CMAKE_CXX_FLAGS_DEBUG:=${CMAKE_CXX_FLAGS_DEBUG}") -message(STATUS "CMAKE_CXX_FLAGS_RELEASE:=${CMAKE_CXX_FLAGS_RELEASE}") -message(STATUS "CMAKE_CXX_FLAGS_MINSIZEREL:=${CMAKE_CXX_FLAGS_MINSIZEREL}") -message(STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO:=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") - -foreach(component ${Poco_COMPONENTS}) -message(STATUS "Building: ${component}") -endforeach() + message(STATUS "C_FLAGS: =${CMAKE_C_FLAGS}") + message(STATUS "CMAKE_C_FLAGS_DEBUG:=${CMAKE_C_FLAGS_DEBUG}") + message(STATUS "CMAKE_C_FLAGS_RELEASE:=${CMAKE_C_FLAGS_RELEASE}") + message(STATUS "CMAKE_C_FLAGS_MINSIZEREL:=${CMAKE_C_FLAGS_MINSIZEREL}") + message(STATUS "CMAKE_C_FLAGS_RELWITHDEBINFO:=${CMAKE_C_FLAGS_RELWITHDEBINFO}") + message(STATUS "") + message(STATUS "") + message(STATUS "CXX_FLAGS:=${CMAKE_CXX_FLAGS}") + message(STATUS "CMAKE_CXX_FLAGS_DEBUG:=${CMAKE_CXX_FLAGS_DEBUG}") + message(STATUS "CMAKE_CXX_FLAGS_RELEASE:=${CMAKE_CXX_FLAGS_RELEASE}") + message(STATUS "CMAKE_CXX_FLAGS_MINSIZEREL:=${CMAKE_CXX_FLAGS_MINSIZEREL}") + message(STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO:=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") + foreach(component ${Poco_COMPONENTS}) + message(STATUS "Building: ${component}") + endforeach() +endif() diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d771181e7..239272ffd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,10 +1,12 @@ # Contributing --- -## Bug Reports and Feature requests +## Bug Reports and Feature Requests --- If you think you've found a bug or would like to see a feature in one of the [upcoming releases](https://github.com/pocoproject/poco/milestones), file an [issue](https://github.com/pocoproject/poco/issues). Please make sure that your explanations are clear and coherent; do the homework of understanding the problem and searching for existing solutions before posting. +Possible security issues or vulnerabilities can also be reported via email directly to the core team security AT pocoproject.org. The core team will respond to security issues within 24 hours. + If you're in a hurry, the fastest way to have bugs fixed or features added are code contributions. Good code contributions, to be precise; if you want to contribute, read on ... --- diff --git a/CppParser/CppParser_vs140.sln b/CppParser/CppParser_vs140.sln index a3c9e6a1b..4488e06dc 100644 --- a/CppParser/CppParser_vs140.sln +++ b/CppParser/CppParser_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_vs140.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" EndProject diff --git a/CppParser/CppParser_vs150.sln b/CppParser/CppParser_vs150.sln new file mode 100644 index 000000000..39e0818b1 --- /dev/null +++ b/CppParser/CppParser_vs150.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_vs150.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs150.vcxproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}" + ProjectSection(ProjectDependencies) = postProject + {C77B9D92-EC91-11DA-A4CE-005056C00008} = {C77B9D92-EC91-11DA-A4CE-005056C00008} + 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 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CppParser/CppParser_vs150.vcxproj b/CppParser/CppParser_vs150.vcxproj new file mode 100644 index 000000000..4b5699a09 --- /dev/null +++ b/CppParser/CppParser_vs150.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 + + + + CppParser + {C77B9D92-EC91-11DA-A4CE-005056C00008} + CppParser + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoCppParserd + PocoCppParsermdd + PocoCppParsermtd + PocoCppParser + PocoCppParsermd + PocoCppParsermt + + + ..\bin\ + obj\CppParser\$(Configuration)\ + true + + + ..\bin\ + obj\CppParser\$(Configuration)\ + false + + + ..\lib\ + obj\CppParser\$(Configuration)\ + + + ..\lib\ + obj\CppParser\$(Configuration)\ + + + ..\lib\ + obj\CppParser\$(Configuration)\ + + + ..\lib\ + obj\CppParser\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin\PocoCppParserd.dll + true + true + ..\bin\PocoCppParserd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppParserd.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin\PocoCppParser.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppParser.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoCppParsermtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoCppParsermtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib\PocoCppParsermt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoCppParsermdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoCppParsermdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoCppParsermd.pdb + Level3 + + Default + + + ..\lib\PocoCppParsermd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CppParser/CppParser_vs150.vcxproj.filters b/CppParser/CppParser_vs150.vcxproj.filters new file mode 100644 index 000000000..67d8b7dce --- /dev/null +++ b/CppParser/CppParser_vs150.vcxproj.filters @@ -0,0 +1,141 @@ + + + + + {08d897bd-4d06-4936-b5ed-492793679f19} + + + {989fe9fa-f6bf-41f9-9464-b74b66795c2a} + + + {90206526-4f13-4828-b50d-e689b35ec5bb} + + + {6b2a3f2f-5f8f-4e40-a07d-0dd7be13b9e4} + + + {4e80f0a2-2008-49d7-9c10-c13627c8632d} + + + {b78f121d-387e-4e27-b0be-2a7bff82b1fd} + + + {c684cec0-28f0-4eac-ae4b-79aee0db5b39} + + + {4963871a-d4ba-4037-8d96-46b39107c965} + + + {469446e1-2db3-47d8-b987-8d517bcbecdf} + + + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Attributes\Header Files + + + Attributes\Header Files + + + + + CppParser\Source Files + + + CppParser\Source Files + + + CppParser\Source Files + + + CppParser\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Attributes\Source Files + + + Attributes\Source Files + + + \ No newline at end of file diff --git a/CppParser/CppParser_x64_vs140.sln b/CppParser/CppParser_x64_vs140.sln index 65f3a6d8f..d124ad89d 100644 --- a/CppParser/CppParser_x64_vs140.sln +++ b/CppParser/CppParser_x64_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_x64_vs140.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" EndProject diff --git a/CppParser/CppParser_x64_vs150.sln b/CppParser/CppParser_x64_vs150.sln new file mode 100644 index 000000000..79d37cec4 --- /dev/null +++ b/CppParser/CppParser_x64_vs150.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_x64_vs150.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs150.vcxproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}" + ProjectSection(ProjectDependencies) = postProject + {C77B9D92-EC91-11DA-A4CE-005056C00008} = {C77B9D92-EC91-11DA-A4CE-005056C00008} + 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 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Build.0 = release_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Build.0 = release_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CppParser/CppParser_x64_vs150.vcxproj b/CppParser/CppParser_x64_vs150.vcxproj new file mode 100644 index 000000000..7fc1d6e59 --- /dev/null +++ b/CppParser/CppParser_x64_vs150.vcxproj @@ -0,0 +1,318 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + CppParser + {C77B9D92-EC91-11DA-A4CE-005056C00008} + CppParser + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoCppParser64d + PocoCppParsermdd + PocoCppParsermtd + PocoCppParser64 + PocoCppParsermd + PocoCppParsermt + + + ..\bin64\ + obj64\CppParser\$(Configuration)\ + true + + + ..\bin64\ + obj64\CppParser\$(Configuration)\ + false + + + ..\lib64\ + obj64\CppParser\$(Configuration)\ + + + ..\lib64\ + obj64\CppParser\$(Configuration)\ + + + ..\lib64\ + obj64\CppParser\$(Configuration)\ + + + ..\lib64\ + obj64\CppParser\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin64\PocoCppParser64d.dll + true + true + ..\bin64\PocoCppParser64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppParserd.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin64\PocoCppParser64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppParser.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoCppParsermtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoCppParsermtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoCppParsermt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoCppParsermdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoCppParsermdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoCppParsermd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CppParser/CppParser_x64_vs150.vcxproj.filters b/CppParser/CppParser_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..6197cd8d9 --- /dev/null +++ b/CppParser/CppParser_x64_vs150.vcxproj.filters @@ -0,0 +1,141 @@ + + + + + {b8468d40-83c3-4647-9281-c8682408c065} + + + {0b3034cd-7bf3-4ac7-93f4-3b7b4657a3d4} + + + {af3e2eb7-1a19-4aac-8bf2-e61fd5827767} + + + {4bf47783-d51e-46b4-a220-3ce496235b12} + + + {7fcb15f3-315c-4c04-8c92-f65a00794143} + + + {817b50e7-1cdc-47b6-92a2-2218a3e60301} + + + {b12156d7-fba5-4b8f-81ad-7bd0f97154f5} + + + {c9cba87b-085b-42ff-a792-5533685d5609} + + + {0d524c9d-e332-43b4-a27a-d8b34d6b5c92} + + + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Attributes\Header Files + + + Attributes\Header Files + + + + + CppParser\Source Files + + + CppParser\Source Files + + + CppParser\Source Files + + + CppParser\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Attributes\Source Files + + + Attributes\Source Files + + + \ No newline at end of file diff --git a/CppParser/Makefile b/CppParser/Makefile index 66489d93b..1e1c29d67 100644 --- a/CppParser/Makefile +++ b/CppParser/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.4/CppParser/Makefile#2 $ -# # Makefile for Poco CppParser # diff --git a/CppParser/include/Poco/CppParser/Attributes.h b/CppParser/include/Poco/CppParser/Attributes.h index 83d77f235..2f90db269 100644 --- a/CppParser/include/Poco/CppParser/Attributes.h +++ b/CppParser/include/Poco/CppParser/Attributes.h @@ -1,8 +1,6 @@ // // Attributes.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Attributes.h#2 $ -// // Library: CppParser // Package: Attributes // Module: Attributes diff --git a/CppParser/include/Poco/CppParser/AttributesParser.h b/CppParser/include/Poco/CppParser/AttributesParser.h index 3ae5f9d52..8dcd62537 100644 --- a/CppParser/include/Poco/CppParser/AttributesParser.h +++ b/CppParser/include/Poco/CppParser/AttributesParser.h @@ -1,8 +1,6 @@ // // AttributesParser.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/AttributesParser.h#2 $ -// // Library: CppParser // Package: Attributes // Module: AttributesParser diff --git a/CppParser/include/Poco/CppParser/BuiltIn.h b/CppParser/include/Poco/CppParser/BuiltIn.h index c360f6a84..666cd7057 100644 --- a/CppParser/include/Poco/CppParser/BuiltIn.h +++ b/CppParser/include/Poco/CppParser/BuiltIn.h @@ -1,8 +1,6 @@ // // BuiltIn.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/BuiltIn.h#1 $ -// // Library: CppParser // Package: SymbolTable // Module: BuiltIn diff --git a/CppParser/include/Poco/CppParser/CppParser.h b/CppParser/include/Poco/CppParser/CppParser.h index 4e60b8daa..ea7125e90 100644 --- a/CppParser/include/Poco/CppParser/CppParser.h +++ b/CppParser/include/Poco/CppParser/CppParser.h @@ -1,8 +1,6 @@ // // CppParser.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/CppParser.h#2 $ -// // Library: CppParser // Package: CppParser // Module: CppParser @@ -30,7 +28,7 @@ // from a DLL simpler. All files within this DLL are compiled with the CppParser_EXPORTS // 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 -// CppParser_API functions as being imported from a DLL, wheras this DLL sees symbols +// CppParser_API functions as being imported from a DLL, whereas this DLL sees symbols // defined with this macro as being exported. // #if (defined(_WIN32) || defined(__CYGWIN__)) && defined(POCO_DLL) diff --git a/CppParser/include/Poco/CppParser/CppToken.h b/CppParser/include/Poco/CppParser/CppToken.h index 659cd6303..e53fb9903 100644 --- a/CppParser/include/Poco/CppParser/CppToken.h +++ b/CppParser/include/Poco/CppParser/CppToken.h @@ -1,8 +1,6 @@ // // CppToken.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/CppToken.h#2 $ -// // Library: CppParser // Package: CppParser // Module: CppToken diff --git a/CppParser/include/Poco/CppParser/Decl.h b/CppParser/include/Poco/CppParser/Decl.h index f24ed93dc..c67e3069f 100644 --- a/CppParser/include/Poco/CppParser/Decl.h +++ b/CppParser/include/Poco/CppParser/Decl.h @@ -1,8 +1,6 @@ // // Decl.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Decl.h#1 $ -// // Library: CppParser // Package: SymbolTable // Module: Decl diff --git a/CppParser/include/Poco/CppParser/Enum.h b/CppParser/include/Poco/CppParser/Enum.h index a78a42b6a..d4305c5c1 100644 --- a/CppParser/include/Poco/CppParser/Enum.h +++ b/CppParser/include/Poco/CppParser/Enum.h @@ -1,8 +1,6 @@ // // Enum.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Enum.h#1 $ -// // Library: CppParser // Package: SymbolTable // Module: Enum diff --git a/CppParser/include/Poco/CppParser/EnumValue.h b/CppParser/include/Poco/CppParser/EnumValue.h index d5c4af798..f0e082fe8 100644 --- a/CppParser/include/Poco/CppParser/EnumValue.h +++ b/CppParser/include/Poco/CppParser/EnumValue.h @@ -1,8 +1,6 @@ // // EnumValue.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/EnumValue.h#1 $ -// // Library: CppParser // Package: SymbolTable // Module: EnumValue diff --git a/CppParser/include/Poco/CppParser/Function.h b/CppParser/include/Poco/CppParser/Function.h index 08e6cd55d..8e051baa1 100644 --- a/CppParser/include/Poco/CppParser/Function.h +++ b/CppParser/include/Poco/CppParser/Function.h @@ -1,8 +1,6 @@ // // Function.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Function.h#2 $ -// // Library: CppParser // Package: SymbolTable // Module: Function diff --git a/CppParser/include/Poco/CppParser/NameSpace.h b/CppParser/include/Poco/CppParser/NameSpace.h index f5556c49d..bab153706 100644 --- a/CppParser/include/Poco/CppParser/NameSpace.h +++ b/CppParser/include/Poco/CppParser/NameSpace.h @@ -1,8 +1,6 @@ // // NameSpace.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/NameSpace.h#1 $ -// // Library: CppParser // Package: SymbolTable // Module: NameSpace diff --git a/CppParser/include/Poco/CppParser/Parameter.h b/CppParser/include/Poco/CppParser/Parameter.h index 04713ffe1..61de6c0e2 100644 --- a/CppParser/include/Poco/CppParser/Parameter.h +++ b/CppParser/include/Poco/CppParser/Parameter.h @@ -1,8 +1,6 @@ // // Parameter.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Parameter.h#1 $ -// // Library: CppParser // Package: SymbolTable // Module: Parameter diff --git a/CppParser/include/Poco/CppParser/Parser.h b/CppParser/include/Poco/CppParser/Parser.h index 8ba4b406f..6c7e4a4d1 100644 --- a/CppParser/include/Poco/CppParser/Parser.h +++ b/CppParser/include/Poco/CppParser/Parser.h @@ -1,8 +1,6 @@ // // Parser.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Parser.h#1 $ -// // Library: CppParser // Package: CppParser // Module: Parser diff --git a/CppParser/include/Poco/CppParser/Struct.h b/CppParser/include/Poco/CppParser/Struct.h index 28c86765e..12c25cbf4 100644 --- a/CppParser/include/Poco/CppParser/Struct.h +++ b/CppParser/include/Poco/CppParser/Struct.h @@ -1,8 +1,6 @@ // // Struct.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Struct.h#2 $ -// // Library: CppParser // Package: SymbolTable // Module: Struct diff --git a/CppParser/include/Poco/CppParser/Symbol.h b/CppParser/include/Poco/CppParser/Symbol.h index 1e0c17be2..e731d45ec 100644 --- a/CppParser/include/Poco/CppParser/Symbol.h +++ b/CppParser/include/Poco/CppParser/Symbol.h @@ -1,8 +1,6 @@ // // Symbol.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Symbol.h#2 $ -// // Library: CppParser // Package: SymbolTable // Module: Symbol diff --git a/CppParser/include/Poco/CppParser/Tokenizer.h b/CppParser/include/Poco/CppParser/Tokenizer.h index 4fa23f613..8a59d1d8c 100644 --- a/CppParser/include/Poco/CppParser/Tokenizer.h +++ b/CppParser/include/Poco/CppParser/Tokenizer.h @@ -1,8 +1,6 @@ // // Tokenizer.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Tokenizer.h#1 $ -// // Library: CppParser // Package: CppParser // Module: Tokenizer diff --git a/CppParser/include/Poco/CppParser/TypeDef.h b/CppParser/include/Poco/CppParser/TypeDef.h index 564ad3ae5..d629464e1 100644 --- a/CppParser/include/Poco/CppParser/TypeDef.h +++ b/CppParser/include/Poco/CppParser/TypeDef.h @@ -1,8 +1,6 @@ // // TypeDef.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/TypeDef.h#1 $ -// // Library: CppParser // Package: SymbolTable // Module: TypeDef diff --git a/CppParser/include/Poco/CppParser/Utility.h b/CppParser/include/Poco/CppParser/Utility.h index 7c2ba7479..3ded488e0 100644 --- a/CppParser/include/Poco/CppParser/Utility.h +++ b/CppParser/include/Poco/CppParser/Utility.h @@ -1,8 +1,6 @@ // // Utility.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Utility.h#1 $ -// // Library: CppParser // Package: CppParser // Module: Utility diff --git a/CppParser/include/Poco/CppParser/Variable.h b/CppParser/include/Poco/CppParser/Variable.h index 448207698..d167eda59 100644 --- a/CppParser/include/Poco/CppParser/Variable.h +++ b/CppParser/include/Poco/CppParser/Variable.h @@ -1,8 +1,6 @@ // // Variable.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Variable.h#1 $ -// // Library: CppParser // Package: SymbolTable // Module: Variable diff --git a/CppParser/src/Attributes.cpp b/CppParser/src/Attributes.cpp index f8ca91c0a..21d14e808 100644 --- a/CppParser/src/Attributes.cpp +++ b/CppParser/src/Attributes.cpp @@ -1,8 +1,6 @@ // // Attributes.cpp // -// $Id: //poco/1.4/CppParser/src/Attributes.cpp#2 $ -// // Library: CppParser // Package: Attributes // Module: Attributes diff --git a/CppParser/src/AttributesParser.cpp b/CppParser/src/AttributesParser.cpp index 0f14dc2ea..441c988b8 100644 --- a/CppParser/src/AttributesParser.cpp +++ b/CppParser/src/AttributesParser.cpp @@ -1,8 +1,6 @@ // // AttributesParser.cpp // -// $Id: //poco/1.4/CppParser/src/AttributesParser.cpp#1 $ -// // Library: CppParser // Package: Attributes // Module: AttributesParser diff --git a/CppParser/src/BuiltIn.cpp b/CppParser/src/BuiltIn.cpp index 753d1bcd1..c0f472cff 100644 --- a/CppParser/src/BuiltIn.cpp +++ b/CppParser/src/BuiltIn.cpp @@ -1,8 +1,6 @@ // // BuiltIn.cpp // -// $Id: //poco/1.4/CppParser/src/BuiltIn.cpp#1 $ -// // Library: CppParser // Package: SymbolTable // Module: BuiltIn diff --git a/CppParser/src/CppToken.cpp b/CppParser/src/CppToken.cpp index a31027a61..81f9cca0b 100644 --- a/CppParser/src/CppToken.cpp +++ b/CppParser/src/CppToken.cpp @@ -1,8 +1,6 @@ // // CppToken.cpp // -// $Id: //poco/1.4/CppParser/src/CppToken.cpp#3 $ -// // Library: CppParser // Package: CppParser // Module: CppToken diff --git a/CppParser/src/Decl.cpp b/CppParser/src/Decl.cpp index aab14be52..0821b2e5a 100644 --- a/CppParser/src/Decl.cpp +++ b/CppParser/src/Decl.cpp @@ -1,8 +1,6 @@ // // Decl.cpp // -// $Id: //poco/1.4/CppParser/src/Decl.cpp#1 $ -// // Library: CppParser // Package: SymbolTable // Module: Decl diff --git a/CppParser/src/Enum.cpp b/CppParser/src/Enum.cpp index ff5af9e51..ec156a15d 100644 --- a/CppParser/src/Enum.cpp +++ b/CppParser/src/Enum.cpp @@ -1,8 +1,6 @@ // // Enum.cpp // -// $Id: //poco/1.4/CppParser/src/Enum.cpp#1 $ -// // Library: CppParser // Package: SymbolTable // Module: Enum diff --git a/CppParser/src/EnumValue.cpp b/CppParser/src/EnumValue.cpp index a193806ec..987ff8038 100644 --- a/CppParser/src/EnumValue.cpp +++ b/CppParser/src/EnumValue.cpp @@ -1,8 +1,6 @@ // // EnumValue.cpp // -// $Id: //poco/1.4/CppParser/src/EnumValue.cpp#1 $ -// // Library: CppParser // Package: SymbolTable // Module: EnumValue diff --git a/CppParser/src/Function.cpp b/CppParser/src/Function.cpp index 583010037..021b39a74 100644 --- a/CppParser/src/Function.cpp +++ b/CppParser/src/Function.cpp @@ -1,8 +1,6 @@ // // Function.cpp // -// $Id: //poco/1.4/CppParser/src/Function.cpp#2 $ -// // Library: CppParser // Package: SymbolTable // Module: Function diff --git a/CppParser/src/NameSpace.cpp b/CppParser/src/NameSpace.cpp index 30bb2ad95..5f69c147c 100644 --- a/CppParser/src/NameSpace.cpp +++ b/CppParser/src/NameSpace.cpp @@ -1,8 +1,6 @@ // // Namespace.cpp // -// $Id: //poco/1.4/CppParser/src/NameSpace.cpp#1 $ -// // Library: CppParser // Package: SymbolTable // Module: Namespace diff --git a/CppParser/src/Parameter.cpp b/CppParser/src/Parameter.cpp index 40a8a765c..b7b3fdabe 100644 --- a/CppParser/src/Parameter.cpp +++ b/CppParser/src/Parameter.cpp @@ -1,8 +1,6 @@ // // Parameter.cpp // -// $Id: //poco/1.4/CppParser/src/Parameter.cpp#2 $ -// // Library: CppParser // Package: SymbolTable // Module: Parameter diff --git a/CppParser/src/Parser.cpp b/CppParser/src/Parser.cpp index 8c9b51647..c17ba1b17 100644 --- a/CppParser/src/Parser.cpp +++ b/CppParser/src/Parser.cpp @@ -1,8 +1,6 @@ // // Parser.cpp // -// $Id: //poco/1.4/CppParser/src/Parser.cpp#2 $ -// // Library: CppParser // Package: CppParser // Module: Parser @@ -215,7 +213,12 @@ const Token* Parser::parseNameSpace(const Token* pNext) std::string name = pNext->tokenString(); pNext = next(); expectOperator(pNext, OperatorToken::OP_OPENBRACE, "{"); - NameSpace* pNS = dynamic_cast(currentNameSpace()->lookup(name)); + + std::string fullName = currentNameSpace()->fullName(); + if (!fullName.empty()) fullName += "::"; + fullName += name; + + NameSpace* pNS = dynamic_cast(currentNameSpace()->lookup(fullName)); bool undefined = (pNS == 0); if (undefined) pNS = new NameSpace(name, currentNameSpace()); pushNameSpace(pNS, -1, undefined); diff --git a/CppParser/src/Struct.cpp b/CppParser/src/Struct.cpp index df1397d69..02db88321 100644 --- a/CppParser/src/Struct.cpp +++ b/CppParser/src/Struct.cpp @@ -1,8 +1,6 @@ // // Struct.cpp // -// $Id: //poco/1.4/CppParser/src/Struct.cpp#1 $ -// // Library: CppParser // Package: SymbolTable // Module: Struct diff --git a/CppParser/src/Symbol.cpp b/CppParser/src/Symbol.cpp index 3553986ea..c497f7292 100644 --- a/CppParser/src/Symbol.cpp +++ b/CppParser/src/Symbol.cpp @@ -1,8 +1,6 @@ // // Symbol.cpp // -// $Id: //poco/1.4/CppParser/src/Symbol.cpp#2 $ -// // Library: CppParser // Package: SymbolTable // Module: Symbol diff --git a/CppParser/src/Tokenizer.cpp b/CppParser/src/Tokenizer.cpp index 5b549eea3..d557e2a86 100644 --- a/CppParser/src/Tokenizer.cpp +++ b/CppParser/src/Tokenizer.cpp @@ -1,8 +1,6 @@ // // Tokenizer.cpp // -// $Id: //poco/1.4/CppParser/src/Tokenizer.cpp#1 $ -// // Library: CppParser // Package: CppParser // Module: Tokenizer diff --git a/CppParser/src/TypeDef.cpp b/CppParser/src/TypeDef.cpp index e799dd054..4a867399b 100644 --- a/CppParser/src/TypeDef.cpp +++ b/CppParser/src/TypeDef.cpp @@ -1,8 +1,6 @@ // // TypeDef.cpp // -// $Id: //poco/1.4/CppParser/src/TypeDef.cpp#1 $ -// // Library: CppParser // Package: SymbolTable // Module: TypeDef diff --git a/CppParser/src/Utility.cpp b/CppParser/src/Utility.cpp index b311ff93b..2eb93a266 100644 --- a/CppParser/src/Utility.cpp +++ b/CppParser/src/Utility.cpp @@ -1,8 +1,6 @@ // // Utility.cpp // -// $Id: //poco/1.4/CppParser/src/Utility.cpp#3 $ -// // Library: CppParser // Package: CppParser // Module: Utility diff --git a/CppParser/src/Variable.cpp b/CppParser/src/Variable.cpp index 099217d17..01459f0e5 100644 --- a/CppParser/src/Variable.cpp +++ b/CppParser/src/Variable.cpp @@ -1,8 +1,6 @@ // // Variable.cpp // -// $Id: //poco/1.4/CppParser/src/Variable.cpp#1 $ -// // Library: CppParser // Package: SymbolTable // Module: Variable diff --git a/CppParser/testsuite/Makefile b/CppParser/testsuite/Makefile index bcc78aa92..28666b0d2 100644 --- a/CppParser/testsuite/Makefile +++ b/CppParser/testsuite/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.3/CppParser/testsuite/Makefile#1 $ -# # Makefile for Poco CppParser testsuite # diff --git a/CppParser/testsuite/TestSuite_vs150.vcxproj b/CppParser/testsuite/TestSuite_vs150.vcxproj new file mode 100644 index 000000000..5bfe47faf --- /dev/null +++ b/CppParser/testsuite/TestSuite_vs150.vcxproj @@ -0,0 +1,321 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {C79112BD-EC91-11DA-A4CE-005056C00008} + TestSuite + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_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;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + %(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;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + %(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + + + + + + + diff --git a/CppParser/testsuite/TestSuite_vs150.vcxproj.filters b/CppParser/testsuite/TestSuite_vs150.vcxproj.filters new file mode 100644 index 000000000..e9d025287 --- /dev/null +++ b/CppParser/testsuite/TestSuite_vs150.vcxproj.filters @@ -0,0 +1,69 @@ + + + + + {9929018b-179f-492b-a733-d1f5abcd2479} + + + {bcb7bc69-8cae-4c48-aa53-8b0b55e4054b} + + + {96dcbe12-e448-458f-98d6-be87835b5144} + + + {52e09a54-6bcd-4252-bf53-fe504b7b9c17} + + + {bf078f4d-1d68-4746-9f97-0f6da0c94826} + + + {0865a633-5e42-4c06-a398-154c0f72c217} + + + {56db63c4-6348-44a0-aebf-6ef195eb0726} + + + {5d8c4a53-d13d-4d3c-991e-c483459ebf86} + + + {8346840d-0b7f-4233-b07a-7df2ea11510a} + + + {09e0b80d-499c-4b8b-9458-297054f3ff6e} + + + {723c87e0-edcb-471c-a2a7-7d12e16d02f1} + + + + + CppParser\Header Files + + + _Suite\Header Files + + + Attributes\Header Files + + + Attributes\Header Files + + + + + CppParser\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + Attributes\Source Files + + + Attributes\Source Files + + + \ No newline at end of file diff --git a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj new file mode 100644 index 000000000..7c237dcc9 --- /dev/null +++ b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj @@ -0,0 +1,321 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {C79112BD-EC91-11DA-A4CE-005056C00008} + TestSuite + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_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;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + %(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;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + %(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + + + + + + + diff --git a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..5db16c673 --- /dev/null +++ b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -0,0 +1,69 @@ + + + + + {42e28acd-4e76-49ae-8c76-4ff803c1a486} + + + {38f0aef4-d917-4e61-b857-6a18fb9bcd78} + + + {0275c375-4b06-4d23-8406-c1b5db6fc7cc} + + + {0aaa2b1d-6ae9-4b9e-a95e-409842a30f5b} + + + {be778440-a77a-4d37-a8c8-97493c21a69d} + + + {b58acc29-1117-449b-bacd-6764b7997942} + + + {194c0639-9fe3-492e-be75-fe0a3ecbd08f} + + + {fc59f695-cd52-4557-a726-1c78b8190c63} + + + {7a6ad52c-d6ac-44f2-922f-5a8b8b3a8e98} + + + {3db5fd60-b922-4deb-959e-932963e32a74} + + + {26d20b38-8fbc-431d-927a-06b15eb07d4d} + + + + + CppParser\Header Files + + + _Suite\Header Files + + + Attributes\Header Files + + + Attributes\Header Files + + + + + CppParser\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + Attributes\Source Files + + + Attributes\Source Files + + + \ No newline at end of file diff --git a/CppParser/testsuite/src/AttributesParserTest.cpp b/CppParser/testsuite/src/AttributesParserTest.cpp index aa9b25234..7bc232e9f 100644 --- a/CppParser/testsuite/src/AttributesParserTest.cpp +++ b/CppParser/testsuite/src/AttributesParserTest.cpp @@ -1,8 +1,6 @@ // // AttributesParserTest.cpp // -// $Id: //poco/1.3/CppParser/testsuite/src/AttributesParserTest.cpp#1 $ -// // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/CppParser/testsuite/src/AttributesParserTest.h b/CppParser/testsuite/src/AttributesParserTest.h index df5a03afb..228c897b0 100644 --- a/CppParser/testsuite/src/AttributesParserTest.h +++ b/CppParser/testsuite/src/AttributesParserTest.h @@ -1,8 +1,6 @@ // // AttributesParserTest.h // -// $Id: //poco/1.3/CppParser/testsuite/src/AttributesParserTest.h#1 $ -// // Definition of the AttributesParserTest class. // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. diff --git a/CppParser/testsuite/src/AttributesTestSuite.cpp b/CppParser/testsuite/src/AttributesTestSuite.cpp index 2e6f49568..469e9ba49 100644 --- a/CppParser/testsuite/src/AttributesTestSuite.cpp +++ b/CppParser/testsuite/src/AttributesTestSuite.cpp @@ -1,8 +1,6 @@ // // AttributesTestSuite.cpp // -// $Id: //poco/1.3/CppParser/testsuite/src/AttributesTestSuite.cpp#1 $ -// // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/CppParser/testsuite/src/AttributesTestSuite.h b/CppParser/testsuite/src/AttributesTestSuite.h index 3dff3f0ec..412469923 100644 --- a/CppParser/testsuite/src/AttributesTestSuite.h +++ b/CppParser/testsuite/src/AttributesTestSuite.h @@ -1,8 +1,6 @@ // // AttributesTestSuite.h // -// $Id: //poco/1.3/CppParser/testsuite/src/AttributesTestSuite.h#1 $ -// // Definition of the AttributesTestSuite class. // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. diff --git a/CppParser/testsuite/src/CppParserTest.cpp b/CppParser/testsuite/src/CppParserTest.cpp index d1af53176..9fdbeb01d 100644 --- a/CppParser/testsuite/src/CppParserTest.cpp +++ b/CppParser/testsuite/src/CppParserTest.cpp @@ -1,8 +1,6 @@ // // CppParserTest.cpp // -// $Id: //poco/1.3/CppParser/testsuite/src/CppParserTest.cpp#2 $ -// // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/CppParser/testsuite/src/CppParserTest.h b/CppParser/testsuite/src/CppParserTest.h index 5d6aabf15..35265e8d1 100644 --- a/CppParser/testsuite/src/CppParserTest.h +++ b/CppParser/testsuite/src/CppParserTest.h @@ -1,8 +1,6 @@ // // CppParserTest.h // -// $Id: //poco/1.3/CppParser/testsuite/src/CppParserTest.h#2 $ -// // Definition of the CppParserTest class. // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. diff --git a/CppParser/testsuite/src/CppParserTestSuite.cpp b/CppParser/testsuite/src/CppParserTestSuite.cpp index e71d2b0d4..de48edcb2 100644 --- a/CppParser/testsuite/src/CppParserTestSuite.cpp +++ b/CppParser/testsuite/src/CppParserTestSuite.cpp @@ -1,8 +1,6 @@ // // CppParserTestSuite.cpp // -// $Id: //poco/1.3/CppParser/testsuite/src/CppParserTestSuite.cpp#1 $ -// // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/CppParser/testsuite/src/CppParserTestSuite.h b/CppParser/testsuite/src/CppParserTestSuite.h index 7d1284c07..88d9bd9f0 100644 --- a/CppParser/testsuite/src/CppParserTestSuite.h +++ b/CppParser/testsuite/src/CppParserTestSuite.h @@ -1,8 +1,6 @@ // // CppParserTestSuite.h // -// $Id: //poco/1.3/CppParser/testsuite/src/CppParserTestSuite.h#1 $ -// // Definition of the CppParserTestSuite class. // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. diff --git a/CppParser/testsuite/src/Driver.cpp b/CppParser/testsuite/src/Driver.cpp index d20639504..8ed38bed5 100644 --- a/CppParser/testsuite/src/Driver.cpp +++ b/CppParser/testsuite/src/Driver.cpp @@ -1,8 +1,6 @@ // // Driver.cpp // -// $Id: //poco/1.3/CppParser/testsuite/src/Driver.cpp#1 $ -// // Console-based test driver for Poco CppParser. // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. diff --git a/CppParser/testsuite/src/WinDriver.cpp b/CppParser/testsuite/src/WinDriver.cpp index 2c82cd75c..eb268dc27 100644 --- a/CppParser/testsuite/src/WinDriver.cpp +++ b/CppParser/testsuite/src/WinDriver.cpp @@ -1,8 +1,6 @@ // // WinDriver.cpp // -// $Id: //poco/1.3/CppParser/testsuite/src/WinDriver.cpp#1 $ -// // Windows test driver for Poco CppParser. // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. diff --git a/CppUnit/CppUnit.vxbuild b/CppUnit/CppUnit.vxbuild deleted file mode 100644 index ffe867662..000000000 --- a/CppUnit/CppUnit.vxbuild +++ /dev/null @@ -1,16 +0,0 @@ -# -# CppUnit.vxbuild -# -# $Id: //poco/1.4/CppUnit/CppUnit.vxbuild#2 $ -# -TARGET=cppUnit -SOURCES=" - CppUnitException.cpp - TestCase.cpp - TestDecorator.cpp - TestFailure.cpp - TestResult.cpp - TestRunner.cpp - TestSuite.cpp - TextTestResult.cpp -" diff --git a/CppUnit/CppUnit_vs140.sln b/CppUnit/CppUnit_vs140.sln index 2b747a676..8be65794f 100644 --- a/CppUnit/CppUnit_vs140.sln +++ b/CppUnit/CppUnit_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs140.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject diff --git a/CppUnit/CppUnit_vs150.sln b/CppUnit/CppUnit_vs150.sln new file mode 100644 index 000000000..af77591ad --- /dev/null +++ b/CppUnit/CppUnit_vs150.sln @@ -0,0 +1,37 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs150.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" +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 + {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_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_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 + EndGlobalSection +EndGlobal diff --git a/CppUnit/CppUnit_vs150.vcxproj b/CppUnit/CppUnit_vs150.vcxproj new file mode 100644 index 000000000..58737badd --- /dev/null +++ b/CppUnit/CppUnit_vs150.vcxproj @@ -0,0 +1,307 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + CppUnit + {138BB448-808A-4FE5-A66D-78D1F8770F59} + CppUnit + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_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)\ + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin\PocoCppUnitd.dll + true + true + ..\bin\PocoCppUnitd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppUnitd.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin\PocoCppUnit.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppUnit.lib + MachineX86 + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoCppUnitmtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoCppUnitmtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs150.vcxproj.filters b/CppUnit/CppUnit_vs150.vcxproj.filters new file mode 100644 index 000000000..21d0807bd --- /dev/null +++ b/CppUnit/CppUnit_vs150.vcxproj.filters @@ -0,0 +1,86 @@ + + + + + {a8d27618-a198-4717-8c54-06f871c9bcae} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {e1764315-6342-498e-b2ad-51da33cc65ed} + *.h + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source 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 + + + \ No newline at end of file diff --git a/CppUnit/CppUnit_x64_vs140.sln b/CppUnit/CppUnit_x64_vs140.sln index 9db045a80..0f5939572 100644 --- a/CppUnit/CppUnit_x64_vs140.sln +++ b/CppUnit/CppUnit_x64_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs140.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject diff --git a/CppUnit/CppUnit_x64_vs150.sln b/CppUnit/CppUnit_x64_vs150.sln new file mode 100644 index 000000000..19a3766f4 --- /dev/null +++ b/CppUnit/CppUnit_x64_vs150.sln @@ -0,0 +1,37 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs150.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" +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 + {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_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_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 + EndGlobalSection +EndGlobal diff --git a/CppUnit/CppUnit_x64_vs150.vcxproj b/CppUnit/CppUnit_x64_vs150.vcxproj new file mode 100644 index 000000000..cda95d198 --- /dev/null +++ b/CppUnit/CppUnit_x64_vs150.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 + + + + CppUnit + {138BB448-808A-4FE5-A66D-78D1F8770F59} + CppUnit + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_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)\ + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin64\PocoCppUnit64d.dll + true + true + ..\bin64\PocoCppUnit64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppUnitd.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppUnit_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin64\PocoCppUnit64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppUnit.lib + MachineX64 + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoCppUnitmtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoCppUnitmtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_x64_vs150.vcxproj.filters b/CppUnit/CppUnit_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..70980c693 --- /dev/null +++ b/CppUnit/CppUnit_x64_vs150.vcxproj.filters @@ -0,0 +1,86 @@ + + + + + {b5ba0264-5e62-4d68-9a03-b01f9c9820dc} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {f57dad78-1006-43ce-a732-bf1967e7d756} + *.h + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source 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 + + + \ No newline at end of file diff --git a/CppUnit/Makefile b/CppUnit/Makefile index ba8c05295..53dafcb61 100644 --- a/CppUnit/Makefile +++ b/CppUnit/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.4/PocoCppUnit/Makefile#1 $ -# # Makefile for Poco CppUnit # diff --git a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h b/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h index 55b646c81..b005dd439 100644 --- a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h +++ b/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h @@ -1,8 +1,6 @@ // // WinTestRunner.h // -// $Id: //poco/1.4/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h#1 $ -// // Application shell for CppUnit's TestRunner dialog. // diff --git a/CppUnit/WinTestRunner/src/ActiveTest.cpp b/CppUnit/WinTestRunner/src/ActiveTest.cpp index 2fc5110fa..cd84bb329 100644 --- a/CppUnit/WinTestRunner/src/ActiveTest.cpp +++ b/CppUnit/WinTestRunner/src/ActiveTest.cpp @@ -1,8 +1,6 @@ // // ActiveTest.cpp // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/ActiveTest.cpp#1 $ -// #include diff --git a/CppUnit/WinTestRunner/src/ActiveTest.h b/CppUnit/WinTestRunner/src/ActiveTest.h index 4b8724e9c..0bff66f34 100644 --- a/CppUnit/WinTestRunner/src/ActiveTest.h +++ b/CppUnit/WinTestRunner/src/ActiveTest.h @@ -1,8 +1,6 @@ // // ActiveTest.h // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/ActiveTest.h#1 $ -// #ifndef ActiveTest_INCLUDED diff --git a/CppUnit/WinTestRunner/src/DLLMain.cpp b/CppUnit/WinTestRunner/src/DLLMain.cpp index 8fd293115..cb75d7809 100644 --- a/CppUnit/WinTestRunner/src/DLLMain.cpp +++ b/CppUnit/WinTestRunner/src/DLLMain.cpp @@ -1,8 +1,6 @@ // // DLLMain.cpp // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/DLLMain.cpp#1 $ -// #include diff --git a/CppUnit/WinTestRunner/src/GUITestResult.cpp b/CppUnit/WinTestRunner/src/GUITestResult.cpp index 9486d02b5..4531dabe1 100644 --- a/CppUnit/WinTestRunner/src/GUITestResult.cpp +++ b/CppUnit/WinTestRunner/src/GUITestResult.cpp @@ -1,8 +1,6 @@ // // GUITestResult.cpp // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/GUITestResult.cpp#1 $ -// #include "TestRunnerDlg.h" diff --git a/CppUnit/WinTestRunner/src/GUITestResult.h b/CppUnit/WinTestRunner/src/GUITestResult.h index a017e48f7..dc7496b42 100644 --- a/CppUnit/WinTestRunner/src/GUITestResult.h +++ b/CppUnit/WinTestRunner/src/GUITestResult.h @@ -1,8 +1,6 @@ // // GUITestResult.h // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/GUITestResult.h#1 $ -// #ifndef GuiTestResult_INCLUDED diff --git a/CppUnit/WinTestRunner/src/ProgressBar.cpp b/CppUnit/WinTestRunner/src/ProgressBar.cpp index 08935e548..3a2bca891 100644 --- a/CppUnit/WinTestRunner/src/ProgressBar.cpp +++ b/CppUnit/WinTestRunner/src/ProgressBar.cpp @@ -1,8 +1,6 @@ // // ProgressBar.cpp // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/ProgressBar.cpp#1 $ -// #include "ProgressBar.h" diff --git a/CppUnit/WinTestRunner/src/ProgressBar.h b/CppUnit/WinTestRunner/src/ProgressBar.h index 03384b5fe..9edb49ea9 100644 --- a/CppUnit/WinTestRunner/src/ProgressBar.h +++ b/CppUnit/WinTestRunner/src/ProgressBar.h @@ -1,8 +1,6 @@ // // ProgressBar.h // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/ProgressBar.h#1 $ -// #ifndef ProgressBar_INCLUDED diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp b/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp index 03b66b56f..1b82cb6e4 100644 --- a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp +++ b/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp @@ -1,8 +1,6 @@ // // TestRunnerDlg.cpp // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp#1 $ -// #include diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.h b/CppUnit/WinTestRunner/src/TestRunnerDlg.h index f31bc3adc..bce8052f1 100644 --- a/CppUnit/WinTestRunner/src/TestRunnerDlg.h +++ b/CppUnit/WinTestRunner/src/TestRunnerDlg.h @@ -1,8 +1,6 @@ // // TestRunnerDlg.h // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/TestRunnerDlg.h#1 $ -// #ifndef TestRunnerDlg_INCLUDED diff --git a/CppUnit/WinTestRunner/src/WinTestRunner.cpp b/CppUnit/WinTestRunner/src/WinTestRunner.cpp index cc9edb584..4f0c31557 100644 --- a/CppUnit/WinTestRunner/src/WinTestRunner.cpp +++ b/CppUnit/WinTestRunner/src/WinTestRunner.cpp @@ -1,8 +1,6 @@ // // WinTestRunner.cpp // -// $Id: //poco/1.4/CppUnit/WinTestRunner/src/WinTestRunner.cpp#1 $ -// #include "WinTestRunner/WinTestRunner.h" diff --git a/CppUnit/include/Poco/CppUnit/CppUnit.h b/CppUnit/include/Poco/CppUnit/CppUnit.h index 5cb67d461..7c4d8abfa 100644 --- a/CppUnit/include/Poco/CppUnit/CppUnit.h +++ b/CppUnit/include/Poco/CppUnit/CppUnit.h @@ -1,8 +1,6 @@ // // CppUnit.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/CppUnit.h#1 $ -// #ifndef Poco_CppUnit__CppUnitINCLUDED @@ -24,7 +22,7 @@ // 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 +// CppUnit_API functions as being imported from a DLL, whereas this DLL sees symbols // defined with this macro as being exported. // #if defined(_WIN32) && defined(POCO_DLL) diff --git a/CppUnit/include/Poco/CppUnit/CppUnitException.h b/CppUnit/include/Poco/CppUnit/CppUnitException.h index 670290c58..b6bcdce09 100644 --- a/CppUnit/include/Poco/CppUnit/CppUnitException.h +++ b/CppUnit/include/Poco/CppUnit/CppUnitException.h @@ -1,8 +1,6 @@ // // CppUnitException.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/CppUnitException.h#1 $ -// #ifndef Poco_CppUnit_CppUnitException_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/Guards.h b/CppUnit/include/Poco/CppUnit/Guards.h index e8b6fb152..5b5b6d113 100644 --- a/CppUnit/include/Poco/CppUnit/Guards.h +++ b/CppUnit/include/Poco/CppUnit/Guards.h @@ -1,8 +1,6 @@ // // Guards.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/Guards.h#1 $ -// #ifndef Poco_CppUnit_Guards_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/Orthodox.h b/CppUnit/include/Poco/CppUnit/Orthodox.h index 201c61475..de1bf5bc5 100644 --- a/CppUnit/include/Poco/CppUnit/Orthodox.h +++ b/CppUnit/include/Poco/CppUnit/Orthodox.h @@ -1,8 +1,6 @@ // // Orthodox.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/Orthodox.h#1 $ -// #ifndef Poco_CppUnit_Orthodox_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/RepeatedTest.h b/CppUnit/include/Poco/CppUnit/RepeatedTest.h index a23021837..716d00f41 100644 --- a/CppUnit/include/Poco/CppUnit/RepeatedTest.h +++ b/CppUnit/include/Poco/CppUnit/RepeatedTest.h @@ -1,8 +1,6 @@ // // RepeatedTest.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/RepeatedTest.h#1 $ -// #ifndef Poco_CppUnit_RepeatedTest_INCLUDED @@ -45,7 +43,7 @@ private: // Counts the number of test cases that will be run by this test. -inline RepeatedTest::countTestCases () +inline int RepeatedTest::countTestCases () { return TestDecorator::countTestCases() * _timesRepeat; } diff --git a/CppUnit/include/Poco/CppUnit/Test.h b/CppUnit/include/Poco/CppUnit/Test.h index 0d4128500..5f2ca559c 100644 --- a/CppUnit/include/Poco/CppUnit/Test.h +++ b/CppUnit/include/Poco/CppUnit/Test.h @@ -1,8 +1,6 @@ // // Test.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/Test.h#1 $ -// #ifndef Poco_CppUnit_Test_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/TestCaller.h b/CppUnit/include/Poco/CppUnit/TestCaller.h index d859bb7ce..7eaf2e753 100644 --- a/CppUnit/include/Poco/CppUnit/TestCaller.h +++ b/CppUnit/include/Poco/CppUnit/TestCaller.h @@ -1,8 +1,6 @@ // // TestCaller.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/TestCaller.h#1 $ -// #ifndef Poco_CppUnit_TestCaller_INCLUDED @@ -89,7 +87,11 @@ protected: private: TestMethod _test; +#if __cplusplus < 201103L std::auto_ptr _fixture; +#else + std::unique_ptr _fixture; +#endif }; diff --git a/CppUnit/include/Poco/CppUnit/TestCase.h b/CppUnit/include/Poco/CppUnit/TestCase.h index cbe648a57..a88602e06 100644 --- a/CppUnit/include/Poco/CppUnit/TestCase.h +++ b/CppUnit/include/Poco/CppUnit/TestCase.h @@ -1,8 +1,6 @@ // // TestCase.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/TestCase.h#1 $ -// #ifndef Poco_CppUnit_TestCase_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/TestDecorator.h b/CppUnit/include/Poco/CppUnit/TestDecorator.h index dc781ac31..00061a503 100644 --- a/CppUnit/include/Poco/CppUnit/TestDecorator.h +++ b/CppUnit/include/Poco/CppUnit/TestDecorator.h @@ -1,8 +1,6 @@ // // TestDecorator.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/TestDecorator.h#1 $ -// #ifndef Poco_CppUnit_TestDecorator_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/TestFailure.h b/CppUnit/include/Poco/CppUnit/TestFailure.h index 830dec1c8..e4073310d 100644 --- a/CppUnit/include/Poco/CppUnit/TestFailure.h +++ b/CppUnit/include/Poco/CppUnit/TestFailure.h @@ -1,8 +1,6 @@ // // TestFailure.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/TestFailure.h#1 $ -// #ifndef Poco_CppUnit_TestFailure_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/TestResult.h b/CppUnit/include/Poco/CppUnit/TestResult.h index 3470a8b53..941863f53 100644 --- a/CppUnit/include/Poco/CppUnit/TestResult.h +++ b/CppUnit/include/Poco/CppUnit/TestResult.h @@ -1,8 +1,6 @@ // // TestResult.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/TestResult.h#1 $ -// #ifndef Poco_CppUnit_TestResult_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/TestRunner.h b/CppUnit/include/Poco/CppUnit/TestRunner.h index 8b859f5f8..6d2589720 100644 --- a/CppUnit/include/Poco/CppUnit/TestRunner.h +++ b/CppUnit/include/Poco/CppUnit/TestRunner.h @@ -1,8 +1,6 @@ // // TestRunner.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/TestRunner.h#2 $ -// #ifndef Poco_CppUnit_TestRunner_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/TestSetup.h b/CppUnit/include/Poco/CppUnit/TestSetup.h index 57be08f19..c01b3a96d 100644 --- a/CppUnit/include/Poco/CppUnit/TestSetup.h +++ b/CppUnit/include/Poco/CppUnit/TestSetup.h @@ -1,8 +1,6 @@ // // TestSetup.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/TestSetup.h#1 $ -// #ifndef Poco_CppUnit_TestSetup_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/TestSuite.h b/CppUnit/include/Poco/CppUnit/TestSuite.h index 7aba91da0..388843af5 100644 --- a/CppUnit/include/Poco/CppUnit/TestSuite.h +++ b/CppUnit/include/Poco/CppUnit/TestSuite.h @@ -1,8 +1,6 @@ // // TestSuite.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/TestSuite.h#1 $ -// #ifndef Poco_CppUnit_TestSuite_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/TextTestResult.h b/CppUnit/include/Poco/CppUnit/TextTestResult.h index 901e740a9..0c54a22b4 100644 --- a/CppUnit/include/Poco/CppUnit/TextTestResult.h +++ b/CppUnit/include/Poco/CppUnit/TextTestResult.h @@ -1,8 +1,6 @@ // // TextTestResult.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/TextTestResult.h#1 $ -// #ifndef Poco_CppUnit_TextTestResult_INCLUDED diff --git a/CppUnit/include/Poco/CppUnit/estring.h b/CppUnit/include/Poco/CppUnit/estring.h index 0637f10ff..686c6df7e 100644 --- a/CppUnit/include/Poco/CppUnit/estring.h +++ b/CppUnit/include/Poco/CppUnit/estring.h @@ -1,8 +1,6 @@ // // estring.h // -// $Id: //poco/1.4/CppUnit/include/CppUnit/estring.h#1 $ -// #ifndef Poco_CppUnit_estring_INCLUDED diff --git a/CppUnit/src/CppUnitException.cpp b/CppUnit/src/CppUnitException.cpp index b13981f09..34e73891a 100644 --- a/CppUnit/src/CppUnitException.cpp +++ b/CppUnit/src/CppUnitException.cpp @@ -1,8 +1,6 @@ // // CppUnitException.cpp // -// $Id: //poco/1.4/CppUnit/src/CppUnitException.cpp#1 $ -// #include "Poco/CppUnit/CppUnitException.h" diff --git a/CppUnit/src/TestCase.cpp b/CppUnit/src/TestCase.cpp index 7931dd8fd..bcde742d5 100644 --- a/CppUnit/src/TestCase.cpp +++ b/CppUnit/src/TestCase.cpp @@ -1,8 +1,6 @@ // // TestCase.cpp // -// $Id: //poco/1.4/CppUnit/src/TestCase.cpp#1 $ -// #include diff --git a/CppUnit/src/TestDecorator.cpp b/CppUnit/src/TestDecorator.cpp index 7963829bf..aeb5aab00 100644 --- a/CppUnit/src/TestDecorator.cpp +++ b/CppUnit/src/TestDecorator.cpp @@ -1,8 +1,6 @@ // // TestDecorator.cpp // -// $Id: //poco/1.4/CppUnit/src/TestDecorator.cpp#1 $ -// #include "Poco/CppUnit/TestDecorator.h" diff --git a/CppUnit/src/TestFailure.cpp b/CppUnit/src/TestFailure.cpp index f52c0ad6f..a1a164f4a 100644 --- a/CppUnit/src/TestFailure.cpp +++ b/CppUnit/src/TestFailure.cpp @@ -1,8 +1,6 @@ // // TestFailure.cpp // -// $Id: //poco/1.4/CppUnit/src/TestFailure.cpp#1 $ -// #include "Poco/CppUnit/TestFailure.h" diff --git a/CppUnit/src/TestResult.cpp b/CppUnit/src/TestResult.cpp index b124146e9..7f06481bf 100644 --- a/CppUnit/src/TestResult.cpp +++ b/CppUnit/src/TestResult.cpp @@ -1,8 +1,6 @@ // // TestResult.cpp // -// $Id: //poco/1.4/CppUnit/src/TestResult.cpp#1 $ -// #include "Poco/CppUnit/TestResult.h" diff --git a/CppUnit/src/TestRunner.cpp b/CppUnit/src/TestRunner.cpp index e1e814028..a28dee2a1 100644 --- a/CppUnit/src/TestRunner.cpp +++ b/CppUnit/src/TestRunner.cpp @@ -1,8 +1,6 @@ // // TestRunner.cpp // -// $Id: //poco/1.4/CppUnit/src/TestRunner.cpp#1 $ -// #include "Poco/CppUnit/TestRunner.h" diff --git a/CppUnit/src/TestSuite.cpp b/CppUnit/src/TestSuite.cpp index b0daa5167..9f3cdb989 100644 --- a/CppUnit/src/TestSuite.cpp +++ b/CppUnit/src/TestSuite.cpp @@ -1,8 +1,6 @@ // // TestSuite.cpp // -// $Id: //poco/1.4/CppUnit/src/TestSuite.cpp#1 $ -// #include "Poco/CppUnit/TestSuite.h" diff --git a/CppUnit/src/TextTestResult.cpp b/CppUnit/src/TextTestResult.cpp index b7eb8f09a..2f5adb5bb 100644 --- a/CppUnit/src/TextTestResult.cpp +++ b/CppUnit/src/TextTestResult.cpp @@ -1,8 +1,6 @@ // // TextTestResult.cpp // -// $Id: //poco/1.4/CppUnit/src/TextTestResult.cpp#1 $ -// #include "Poco/CppUnit/TextTestResult.h" diff --git a/Crypto/Crypto_vs140.sln b/Crypto/Crypto_vs140.sln index 7a63af1c8..ac3b067fd 100644 --- a/Crypto/Crypto_vs140.sln +++ b/Crypto/Crypto_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_vs140.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}" EndProject diff --git a/Crypto/Crypto_vs150.sln b/Crypto/Crypto_vs150.sln new file mode 100644 index 000000000..2eed9db3b --- /dev/null +++ b/Crypto/Crypto_vs150.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_vs150.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs150.vcxproj", "{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}" + ProjectSection(ProjectDependencies) = postProject + {EEEE7259-32E9-4D56-B023-C733940AB2A0} = {EEEE7259-32E9-4D56-B023-C733940AB2A0} + 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 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|Win32.Build.0 = release_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|Win32.Build.0 = release_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Crypto/Crypto_vs150.vcxproj b/Crypto/Crypto_vs150.vcxproj new file mode 100644 index 000000000..1db098cab --- /dev/null +++ b/Crypto/Crypto_vs150.vcxproj @@ -0,0 +1,349 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Crypto + {EEEE7259-32E9-4D56-B023-C733940AB2A0} + Crypto + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoCryptod + PocoCryptomdd + PocoCryptomtd + PocoCrypto + PocoCryptomd + PocoCryptomt + + + ..\bin\ + obj\Crypto\$(Configuration)\ + true + + + ..\bin\ + obj\Crypto\$(Configuration)\ + false + + + ..\lib\ + obj\Crypto\$(Configuration)\ + + + ..\lib\ + obj\Crypto\$(Configuration)\ + + + ..\lib\ + obj\Crypto\$(Configuration)\ + + + ..\lib\ + obj\Crypto\$(Configuration)\ + + + + xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\* +xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\* + + + Disabled + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoCryptod.dll + true + true + ..\bin\PocoCryptod.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCryptod.lib + MachineX86 + + + + + xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\* +xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\* + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoCrypto.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCrypto.lib + MachineX86 + + + + + xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\* +xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\* + + + Disabled + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoCryptomtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoCryptomtd.lib + + + + + xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\* + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib\PocoCryptomt.lib + + + + + xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\* +xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\* + + + Disabled + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoCryptomdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoCryptomdd.lib + + + + + xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\* +xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\* + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoCryptomd.pdb + Level3 + + Default + + + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib\PocoCryptomd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + diff --git a/Crypto/Crypto_vs150.vcxproj.filters b/Crypto/Crypto_vs150.vcxproj.filters new file mode 100644 index 000000000..b3ac1daa3 --- /dev/null +++ b/Crypto/Crypto_vs150.vcxproj.filters @@ -0,0 +1,144 @@ + + + + + {f86d0db3-1f38-4e8f-a0c1-3304c5bbefaf} + + + {1ad5d24f-864e-4dac-a5d5-a71d94dcab5d} + + + {88d72806-7325-4695-9531-ce91bcb64f96} + + + {fe53b6f8-1764-457d-b89f-5b916bc1b9d4} + + + {ef846b7e-d402-452d-95d3-15f5284615b6} + + + {021fe3fa-a990-4f63-890e-ddfd40dbea11} + + + {6f4fd8fc-20d8-4f01-af59-47ea3922af43} + + + {c007b078-c379-4265-a7a5-1c2004dad3c8} + + + {3767a057-c3b6-462e-a456-a835794575a6} + + + {9a7cc673-46d7-4d9a-9115-64e2fe9a5d4c} + + + {e7665092-43c7-4169-8c06-9945e694579c} + + + {f952168e-5d40-4fa2-99d6-0f96f14bab52} + + + {3fbb240c-fcc3-4794-a777-f743040f2cdf} + + + {dda9ed9c-c8e1-4cc3-a8ed-5b74e3dd2c1f} + + + {c798bb15-362f-4de8-b0d7-5c6b94803785} + + + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + Certificate\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + Digest\Header Files + + + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + Certificate\Source Files + + + CryptoCore\Source Files + + + Digest\Source Files + + + + + + \ No newline at end of file diff --git a/Crypto/Crypto_x64_vs140.sln b/Crypto/Crypto_x64_vs140.sln index ae29a0f27..182237d21 100644 --- a/Crypto/Crypto_x64_vs140.sln +++ b/Crypto/Crypto_x64_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_x64_vs140.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}" EndProject diff --git a/Crypto/Crypto_x64_vs150.sln b/Crypto/Crypto_x64_vs150.sln new file mode 100644 index 000000000..ea2082495 --- /dev/null +++ b/Crypto/Crypto_x64_vs150.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_x64_vs150.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs150.vcxproj", "{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}" + ProjectSection(ProjectDependencies) = postProject + {EEEE7259-32E9-4D56-B023-C733940AB2A0} = {EEEE7259-32E9-4D56-B023-C733940AB2A0} + 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 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|x64.Build.0 = debug_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|x64.ActiveCfg = release_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|x64.Build.0 = release_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|x64.Deploy.0 = release_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.Build.0 = release_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.Build.0 = debug_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.ActiveCfg = release_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.Build.0 = release_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.Deploy.0 = release_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.Build.0 = release_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Crypto/Crypto_x64_vs150.vcxproj b/Crypto/Crypto_x64_vs150.vcxproj new file mode 100644 index 000000000..0918b8844 --- /dev/null +++ b/Crypto/Crypto_x64_vs150.vcxproj @@ -0,0 +1,347 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Crypto + {EEEE7259-32E9-4D56-B023-C733940AB2A0} + Crypto + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoCrypto64d + PocoCryptomdd + PocoCryptomtd + PocoCrypto64 + PocoCryptomd + PocoCryptomt + + + ..\bin64\ + obj64\Crypto\$(Configuration)\ + true + + + ..\bin64\ + obj64\Crypto\$(Configuration)\ + false + + + ..\lib64\ + obj64\Crypto\$(Configuration)\ + + + ..\lib64\ + obj64\Crypto\$(Configuration)\ + + + ..\lib64\ + obj64\Crypto\$(Configuration)\ + + + ..\lib64\ + obj64\Crypto\$(Configuration)\ + + + + xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\* +xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\* + + + Disabled + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoCrypto64d.dll + true + true + ..\bin64\PocoCrypto64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCryptod.lib + MachineX64 + + + + + xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\* +xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\* + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoCrypto64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCrypto.lib + MachineX64 + + + + + xcopy /y ..\openssl\win64\lib\debug\*64MTd.lib ..\lib64\* +xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\* + + + Disabled + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoCryptomtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoCryptomtd.lib + + + + + xcopy /y ..\openssl\win64\lib\release\*64MT.lib ..\lib64\* + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoCryptomt.lib + + + + + xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\* +xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\* + + + Disabled + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoCryptomdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib64\PocoCryptomdd.lib + + + + + xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\* +xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\* + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\lib64\PocoCryptomd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + diff --git a/Crypto/Crypto_x64_vs150.vcxproj.filters b/Crypto/Crypto_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..a4a66ab1b --- /dev/null +++ b/Crypto/Crypto_x64_vs150.vcxproj.filters @@ -0,0 +1,144 @@ + + + + + {57d84653-d70a-453d-b9f9-a7524c9b2176} + + + {e10f250c-4ec1-42fd-a22f-c61a977644d2} + + + {6b410b3b-01b3-4574-be9e-85257793743f} + + + {6631a709-94c8-45cd-bb21-2b4efcf3d011} + + + {c417c5ae-bead-4294-b296-6724d88ec4fd} + + + {0e08ac83-fc41-464f-8e36-207e4560bd83} + + + {db41a864-a479-4adc-83ed-00bdf4f6f47e} + + + {33862f69-a4ba-47ee-a0ad-7131728d1b9a} + + + {2de2f717-e725-4676-b412-1f7f29c538a9} + + + {33f87543-341e-42eb-916a-22fb65d130eb} + + + {b4c0e690-ccb1-476a-8950-35629f195fc3} + + + {53bdb598-c173-445d-8f2c-9c163f7dc79d} + + + {514a3721-28cc-48ed-b0cb-a88c76b72578} + + + {eda27b78-1e6e-48e2-be66-c8a3b741332c} + + + {595005f4-d364-4004-b8c0-35bd531f4752} + + + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + Certificate\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + Digest\Header Files + + + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + Certificate\Source Files + + + CryptoCore\Source Files + + + Digest\Source Files + + + + + + \ No newline at end of file diff --git a/Crypto/Makefile b/Crypto/Makefile index 745ff68c2..26ed5ea8d 100644 --- a/Crypto/Makefile +++ b/Crypto/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.4/Crypto/Makefile#2 $ -# # Makefile for Poco Crypto # diff --git a/Crypto/include/Poco/Crypto/Cipher.h b/Crypto/include/Poco/Crypto/Cipher.h index aba9bd7c4..fbe0c30ae 100644 --- a/Crypto/include/Poco/Crypto/Cipher.h +++ b/Crypto/include/Poco/Crypto/Cipher.h @@ -1,8 +1,6 @@ // // Cipher.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/Cipher.h#3 $ -// // Library: Crypto // Package: Cipher // Module: Cipher diff --git a/Crypto/include/Poco/Crypto/CipherFactory.h b/Crypto/include/Poco/Crypto/CipherFactory.h index 7cfd73e6f..36aa964a1 100644 --- a/Crypto/include/Poco/Crypto/CipherFactory.h +++ b/Crypto/include/Poco/Crypto/CipherFactory.h @@ -1,8 +1,6 @@ // // CipherFactory.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/CipherFactory.h#1 $ -// // Library: Crypto // Package: Cipher // Module: CipherFactory diff --git a/Crypto/include/Poco/Crypto/CipherImpl.h b/Crypto/include/Poco/Crypto/CipherImpl.h index c4abfdd56..d6e8e0e79 100644 --- a/Crypto/include/Poco/Crypto/CipherImpl.h +++ b/Crypto/include/Poco/Crypto/CipherImpl.h @@ -1,8 +1,6 @@ // // CipherImpl.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/CipherImpl.h#2 $ -// // Library: Crypto // Package: Cipher // Module: CipherImpl diff --git a/Crypto/include/Poco/Crypto/CipherKey.h b/Crypto/include/Poco/Crypto/CipherKey.h index 367afc28e..607831ab8 100644 --- a/Crypto/include/Poco/Crypto/CipherKey.h +++ b/Crypto/include/Poco/Crypto/CipherKey.h @@ -1,8 +1,6 @@ // // CipherKey.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/CipherKey.h#1 $ -// // Library: Crypto // Package: Cipher // Module: CipherKey diff --git a/Crypto/include/Poco/Crypto/CipherKeyImpl.h b/Crypto/include/Poco/Crypto/CipherKeyImpl.h index 6b2a6a8b2..907b043c1 100644 --- a/Crypto/include/Poco/Crypto/CipherKeyImpl.h +++ b/Crypto/include/Poco/Crypto/CipherKeyImpl.h @@ -1,8 +1,6 @@ // // CipherKeyImpl.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/CipherKeyImpl.h#3 $ -// // Library: Crypto // Package: Cipher // Module: CipherKeyImpl diff --git a/Crypto/include/Poco/Crypto/Crypto.h b/Crypto/include/Poco/Crypto/Crypto.h index bcf0aa068..0bde118a7 100644 --- a/Crypto/include/Poco/Crypto/Crypto.h +++ b/Crypto/include/Poco/Crypto/Crypto.h @@ -1,8 +1,6 @@ // // Crypto.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/Crypto.h#3 $ -// // Library: Crypto // Package: CryptoCore // Module: Crypto @@ -57,7 +55,7 @@ enum RSAPaddingMode // from a DLL simpler. All files within this DLL are compiled with the Crypto_EXPORTS // 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 -// Crypto_API functions as being imported from a DLL, wheras this DLL sees symbols +// Crypto_API functions as being imported from a DLL, whereas this DLL sees symbols // defined with this macro as being exported. // #if defined(_WIN32) diff --git a/Crypto/include/Poco/Crypto/CryptoStream.h b/Crypto/include/Poco/Crypto/CryptoStream.h index 469b05cf6..25a99a4ae 100644 --- a/Crypto/include/Poco/Crypto/CryptoStream.h +++ b/Crypto/include/Poco/Crypto/CryptoStream.h @@ -1,8 +1,6 @@ // // CryptoStream.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/CryptoStream.h#2 $ -// // Library: Crypto // Package: Cipher // Module: CryptoStream diff --git a/Crypto/include/Poco/Crypto/CryptoTransform.h b/Crypto/include/Poco/Crypto/CryptoTransform.h index 1bae01ff5..d1612a78d 100644 --- a/Crypto/include/Poco/Crypto/CryptoTransform.h +++ b/Crypto/include/Poco/Crypto/CryptoTransform.h @@ -1,8 +1,6 @@ // // CryptoTransform.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/CryptoTransform.h#2 $ -// // Library: Crypto // Package: Cipher // Module: CryptoTransform diff --git a/Crypto/include/Poco/Crypto/DigestEngine.h b/Crypto/include/Poco/Crypto/DigestEngine.h index 5de75392a..8244a6ea8 100644 --- a/Crypto/include/Poco/Crypto/DigestEngine.h +++ b/Crypto/include/Poco/Crypto/DigestEngine.h @@ -1,8 +1,6 @@ // // DigestEngine.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/DigestEngine.h#1 $ -// // Library: Crypto // Package: Digest // Module: DigestEngine @@ -61,7 +59,7 @@ protected: private: std::string _name; - EVP_MD_CTX* _ctx; + EVP_MD_CTX* _pContext; Poco::DigestEngine::Digest _digest; OpenSSLInitializer _openSSLInitializer; }; diff --git a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h index b616f08fa..d92c3a9ef 100644 --- a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h +++ b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h @@ -1,8 +1,6 @@ // // OpenSSLInitializer.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/OpenSSLInitializer.h#1 $ -// // Library: Crypto // Package: CryptoCore // Module: OpenSSLInitializer @@ -84,8 +82,9 @@ protected: static void dynlockDestroy(struct CRYPTO_dynlock_value* lock, const char* file, int line); private: + static Poco::FastMutex _mutex; static Poco::FastMutex* _mutexes; - static Poco::AtomicCounter _rc; + static int _rc; static bool _disableSSLInitialization; }; diff --git a/Crypto/include/Poco/Crypto/RSACipherImpl.h b/Crypto/include/Poco/Crypto/RSACipherImpl.h index bc24fd051..2ebc38e3b 100644 --- a/Crypto/include/Poco/Crypto/RSACipherImpl.h +++ b/Crypto/include/Poco/Crypto/RSACipherImpl.h @@ -1,8 +1,6 @@ // // RSACipherImpl.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/RSACipherImpl.h#2 $ -// // Library: Crypto // Package: RSA // Module: RSACipherImpl diff --git a/Crypto/include/Poco/Crypto/RSADigestEngine.h b/Crypto/include/Poco/Crypto/RSADigestEngine.h index 3b63661e2..7c4d38605 100644 --- a/Crypto/include/Poco/Crypto/RSADigestEngine.h +++ b/Crypto/include/Poco/Crypto/RSADigestEngine.h @@ -1,8 +1,6 @@ // // RSADigestEngine.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/RSADigestEngine.h#1 $ -// // Library: Crypto // Package: RSA // Module: RSADigestEngine diff --git a/Crypto/include/Poco/Crypto/RSAKey.h b/Crypto/include/Poco/Crypto/RSAKey.h index a6a6bc206..cd858d52b 100644 --- a/Crypto/include/Poco/Crypto/RSAKey.h +++ b/Crypto/include/Poco/Crypto/RSAKey.h @@ -1,8 +1,6 @@ // // RSAKey.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/RSAKey.h#2 $ -// // Library: Crypto // Package: RSA // Module: RSAKey diff --git a/Crypto/include/Poco/Crypto/RSAKeyImpl.h b/Crypto/include/Poco/Crypto/RSAKeyImpl.h index f439a3d18..18f7106a9 100644 --- a/Crypto/include/Poco/Crypto/RSAKeyImpl.h +++ b/Crypto/include/Poco/Crypto/RSAKeyImpl.h @@ -1,8 +1,6 @@ // // RSAKeyImpl.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/RSAKeyImpl.h#3 $ -// // Library: Crypto // Package: RSA // Module: RSAKeyImpl diff --git a/Crypto/include/Poco/Crypto/X509Certificate.h b/Crypto/include/Poco/Crypto/X509Certificate.h index f4e09cdbf..8ac5fce4d 100644 --- a/Crypto/include/Poco/Crypto/X509Certificate.h +++ b/Crypto/include/Poco/Crypto/X509Certificate.h @@ -1,8 +1,6 @@ // // X509Certificate.h // -// $Id: //poco/1.4/Crypto/include/Poco/Crypto/X509Certificate.h#2 $ -// // Library: Crypto // Package: Certificate // Module: X509Certificate @@ -46,7 +44,9 @@ public: NID_LOCALITY_NAME = 15, NID_STATE_OR_PROVINCE = 16, NID_ORGANIZATION_NAME = 17, - NID_ORGANIZATION_UNIT_NAME = 18 + NID_ORGANIZATION_UNIT_NAME = 18, + NID_PKCS9_EMAIL_ADDRESS = 48, + NID_SERIAL_NUMBER = 105 }; explicit X509Certificate(std::istream& istr); diff --git a/Crypto/samples/Makefile b/Crypto/samples/Makefile index b860b589c..64fd4b6d4 100644 --- a/Crypto/samples/Makefile +++ b/Crypto/samples/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/Main/Util/samples/Makefile#3 $ -# # Makefile for Poco Util Samples # diff --git a/Crypto/samples/genrsakey/Makefile b/Crypto/samples/genrsakey/Makefile index f66663e85..450781577 100644 --- a/Crypto/samples/genrsakey/Makefile +++ b/Crypto/samples/genrsakey/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/Main/template/sample.make#4 $ -# # Makefile for Poco genrsakey # diff --git a/Crypto/samples/genrsakey/genrsakey_vs150.vcxproj b/Crypto/samples/genrsakey/genrsakey_vs150.vcxproj new file mode 100644 index 000000000..edd4df277 --- /dev/null +++ b/Crypto/samples/genrsakey/genrsakey_vs150.vcxproj @@ -0,0 +1,311 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + genrsakey + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947} + genrsakey + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + genrsakeyd + genrsakeyd + genrsakeyd + genrsakey + genrsakey + genrsakey + + + bin\ + obj\genrsakey\$(Configuration)\ + true + + + bin\ + obj\genrsakey\$(Configuration)\ + false + + + bin\static_mt\ + obj\genrsakey\$(Configuration)\ + true + + + bin\static_mt\ + obj\genrsakey\$(Configuration)\ + false + + + bin\static_md\ + obj\genrsakey\$(Configuration)\ + true + + + bin\static_md\ + obj\genrsakey\$(Configuration)\ + false + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\genrsakeyd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\genrsakeyd.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\genrsakey.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\genrsakeyd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\genrsakeyd.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\genrsakey.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\genrsakeyd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\genrsakeyd.pdb + Console + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\genrsakey.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Crypto/samples/genrsakey/genrsakey_vs150.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_vs150.vcxproj.filters new file mode 100644 index 000000000..d69b9e4e1 --- /dev/null +++ b/Crypto/samples/genrsakey/genrsakey_vs150.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + {64e9478d-3de0-412a-8e91-a9571c0309f9} + + + {f507c203-afa7-461f-9acf-1bba23795f68} + + + + + Source Files + + + \ No newline at end of file diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs150.vcxproj b/Crypto/samples/genrsakey/genrsakey_x64_vs150.vcxproj new file mode 100644 index 000000000..1997492e3 --- /dev/null +++ b/Crypto/samples/genrsakey/genrsakey_x64_vs150.vcxproj @@ -0,0 +1,311 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + genrsakey + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947} + genrsakey + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + genrsakeyd + genrsakeyd + genrsakeyd + genrsakey + genrsakey + genrsakey + + + bin64\ + obj64\genrsakey\$(Configuration)\ + true + + + bin64\ + obj64\genrsakey\$(Configuration)\ + false + + + bin64\static_mt\ + obj64\genrsakey\$(Configuration)\ + true + + + bin64\static_mt\ + obj64\genrsakey\$(Configuration)\ + false + + + bin64\static_md\ + obj64\genrsakey\$(Configuration)\ + true + + + bin64\static_md\ + obj64\genrsakey\$(Configuration)\ + false + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\genrsakeyd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\genrsakeyd.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\genrsakey.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\genrsakeyd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\genrsakeyd.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\genrsakey.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\genrsakeyd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\genrsakeyd.pdb + Console + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;..\..\..\openssl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\genrsakey.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs150.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..379512bff --- /dev/null +++ b/Crypto/samples/genrsakey/genrsakey_x64_vs150.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + {22f69679-ccb9-4333-bfb7-b85b22c1d824} + + + {bdab7d69-afba-4a8a-ac58-fd15c8e7baf7} + + + + + Source Files + + + \ No newline at end of file diff --git a/Crypto/samples/genrsakey/src/genrsakey.cpp b/Crypto/samples/genrsakey/src/genrsakey.cpp index 40ffc0a16..75ce37544 100644 --- a/Crypto/samples/genrsakey/src/genrsakey.cpp +++ b/Crypto/samples/genrsakey/src/genrsakey.cpp @@ -1,8 +1,6 @@ // // genrsakey.cpp // -// $Id: //poco/1.4/Crypto/samples/genrsakey/src/genrsakey.cpp#1 $ -// // This sample demonstrates the XYZ class. // // Copyright (c) 2007, Applied Informatics Software Engineering GmbH. diff --git a/Crypto/samples/samples_vs140.sln b/Crypto/samples/samples_vs140.sln index 83e219e9e..c4a6abd53 100644 --- a/Crypto/samples/samples_vs140.sln +++ b/Crypto/samples/samples_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_vs140.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}" EndProject diff --git a/Crypto/samples/samples_vs150.sln b/Crypto/samples/samples_vs150.sln new file mode 100644 index 000000000..801017a1e --- /dev/null +++ b/Crypto/samples/samples_vs150.sln @@ -0,0 +1,37 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_vs150.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}" +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 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.Build.0 = release_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Crypto/samples/samples_x64_vs140.sln b/Crypto/samples/samples_x64_vs140.sln index 87a2de2f5..cb08c7ff1 100644 --- a/Crypto/samples/samples_x64_vs140.sln +++ b/Crypto/samples/samples_x64_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_x64_vs140.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}" EndProject diff --git a/Crypto/samples/samples_x64_vs150.sln b/Crypto/samples/samples_x64_vs150.sln new file mode 100644 index 000000000..1512f81d2 --- /dev/null +++ b/Crypto/samples/samples_x64_vs150.sln @@ -0,0 +1,37 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_x64_vs150.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}" +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 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.Build.0 = debug_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.ActiveCfg = release_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.Build.0 = release_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.Deploy.0 = release_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.Build.0 = release_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Crypto/src/Cipher.cpp b/Crypto/src/Cipher.cpp index 55ebff756..8b4d57964 100644 --- a/Crypto/src/Cipher.cpp +++ b/Crypto/src/Cipher.cpp @@ -1,8 +1,6 @@ // // Cipher.cpp // -// $Id: //poco/1.4/Crypto/src/Cipher.cpp#2 $ -// // Library: Crypto // Package: Cipher // Module: Cipher diff --git a/Crypto/src/CipherFactory.cpp b/Crypto/src/CipherFactory.cpp index e8f5f6fb0..28ba37486 100644 --- a/Crypto/src/CipherFactory.cpp +++ b/Crypto/src/CipherFactory.cpp @@ -1,8 +1,6 @@ // // CipherFactory.cpp // -// $Id: //poco/1.4/Crypto/src/CipherFactory.cpp#2 $ -// // Library: Crypto // Package: Cipher // Module: CipherFactory diff --git a/Crypto/src/CipherImpl.cpp b/Crypto/src/CipherImpl.cpp index b115ede8f..c554c49dd 100644 --- a/Crypto/src/CipherImpl.cpp +++ b/Crypto/src/CipherImpl.cpp @@ -1,8 +1,6 @@ // // CipherImpl.cpp // -// $Id: //poco/1.4/Crypto/src/CipherImpl.cpp#3 $ -// // Library: Crypto // Package: Cipher // Module: CipherImpl @@ -77,7 +75,11 @@ namespace private: const EVP_CIPHER* _pCipher; - EVP_CIPHER_CTX _ctx; +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + EVP_CIPHER_CTX* _pContext; +#else + EVP_CIPHER_CTX _context; +#endif ByteVec _key; ByteVec _iv; }; @@ -92,30 +94,53 @@ namespace _key(key), _iv(iv) { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + _pContext = EVP_CIPHER_CTX_new(); EVP_CipherInit( - &_ctx, + _pContext, _pCipher, &_key[0], _iv.empty() ? 0 : &_iv[0], (dir == DIR_ENCRYPT) ? 1 : 0); +#else + EVP_CipherInit( + &_context, + _pCipher, + &_key[0], + _iv.empty() ? 0 : &_iv[0], + (dir == DIR_ENCRYPT) ? 1 : 0); +#endif } CryptoTransformImpl::~CryptoTransformImpl() { - EVP_CIPHER_CTX_cleanup(&_ctx); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + EVP_CIPHER_CTX_cleanup(_pContext); + EVP_CIPHER_CTX_free(_pContext); +#else + EVP_CIPHER_CTX_cleanup(&_context); +#endif } std::size_t CryptoTransformImpl::blockSize() const { - return EVP_CIPHER_CTX_block_size(&_ctx); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + return EVP_CIPHER_CTX_block_size(_pContext); +#else + return EVP_CIPHER_CTX_block_size(&_context); +#endif } int CryptoTransformImpl::setPadding(int padding) { - return EVP_CIPHER_CTX_set_padding(&_ctx, padding); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + return EVP_CIPHER_CTX_block_size(_pContext); +#else + return EVP_CIPHER_CTX_set_padding(&_context, padding); +#endif } @@ -128,13 +153,21 @@ namespace poco_assert (outputLength >= (inputLength + blockSize() - 1)); int outLen = static_cast(outputLength); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int rc = EVP_CipherUpdate( - &_ctx, + _pContext, output, &outLen, input, static_cast(inputLength)); - +#else + int rc = EVP_CipherUpdate( + &_context, + output, + &outLen, + input, + static_cast(inputLength)); +#endif if (rc == 0) throwError(); @@ -153,7 +186,11 @@ namespace // Use the '_ex' version that does not perform implicit cleanup since we // will call EVP_CIPHER_CTX_cleanup() from the dtor as there is no // guarantee that finalize() will be called if an error occurred. - int rc = EVP_CipherFinal_ex(&_ctx, output, &len); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + int rc = EVP_CipherFinal_ex(_pContext, output, &len); +#else + int rc = EVP_CipherFinal_ex(&_context, output, &len); +#endif if (rc == 0) throwError(); diff --git a/Crypto/src/CipherKey.cpp b/Crypto/src/CipherKey.cpp index 82a099776..302318216 100644 --- a/Crypto/src/CipherKey.cpp +++ b/Crypto/src/CipherKey.cpp @@ -1,8 +1,6 @@ // // CipherKey.cpp // -// $Id: //poco/1.4/Crypto/src/CipherKey.cpp#1 $ -// // Library: Crypto // Package: Cipher // Module: CipherKey diff --git a/Crypto/src/CipherKeyImpl.cpp b/Crypto/src/CipherKeyImpl.cpp index 7f496aa07..810b86e02 100644 --- a/Crypto/src/CipherKeyImpl.cpp +++ b/Crypto/src/CipherKeyImpl.cpp @@ -1,8 +1,6 @@ // // CipherKeyImpl.cpp // -// $Id: //poco/1.4/Crypto/src/CipherKeyImpl.cpp#1 $ -// // Library: Crypto // Package: Cipher // Module: CipherKeyImpl diff --git a/Crypto/src/CryptoStream.cpp b/Crypto/src/CryptoStream.cpp index 97e73ce81..6b29b7f07 100644 --- a/Crypto/src/CryptoStream.cpp +++ b/Crypto/src/CryptoStream.cpp @@ -1,8 +1,6 @@ // // CryptoStream.cpp // -// $Id: //poco/1.4/Crypto/src/CryptoStream.cpp#2 $ -// // Library: Crypto // Package: Cipher // Module: CryptoStream diff --git a/Crypto/src/CryptoTransform.cpp b/Crypto/src/CryptoTransform.cpp index 20157ab7d..e4e58fd6e 100644 --- a/Crypto/src/CryptoTransform.cpp +++ b/Crypto/src/CryptoTransform.cpp @@ -1,8 +1,6 @@ // // CryptoTransform.cpp // -// $Id: //poco/1.4/Crypto/src/CryptoTransform.cpp#2 $ -// // Library: Crypto // Package: Cipher // Module: CryptoTransform diff --git a/Crypto/src/DigestEngine.cpp b/Crypto/src/DigestEngine.cpp index 6e574ab42..bac2d44e0 100644 --- a/Crypto/src/DigestEngine.cpp +++ b/Crypto/src/DigestEngine.cpp @@ -1,8 +1,6 @@ // // DigestEngine.cpp // -// $Id: //poco/1.4/Crypto/src/DigestEngine.cpp#1 $ -// // Library: Crypto // Package: Digest // Module: DigestEngine @@ -23,46 +21,51 @@ namespace Crypto { DigestEngine::DigestEngine(const std::string& name): - _name(name) + _name(name), + _pContext(EVP_MD_CTX_create()) { const EVP_MD* md = EVP_get_digestbyname(_name.c_str()); if (!md) throw Poco::NotFoundException(_name); - _ctx = EVP_MD_CTX_create(); - EVP_DigestInit_ex(_ctx, md, NULL); + EVP_DigestInit_ex(_pContext, md, NULL); } DigestEngine::~DigestEngine() { - EVP_MD_CTX_destroy(_ctx); + EVP_MD_CTX_destroy(_pContext); } int DigestEngine::nid() const { - return EVP_MD_nid(_ctx->digest); + return EVP_MD_nid(EVP_MD_CTX_md(_pContext)); } std::size_t DigestEngine::digestLength() const { - return EVP_MD_CTX_size(_ctx); + return EVP_MD_CTX_size(_pContext); } void DigestEngine::reset() { - EVP_MD_CTX_cleanup(_ctx); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + EVP_MD_CTX_free(_pContext); + _pContext = EVP_MD_CTX_create(); +#else + EVP_MD_CTX_cleanup(_pContext); +#endif const EVP_MD* md = EVP_get_digestbyname(_name.c_str()); if (!md) throw Poco::NotFoundException(_name); - EVP_DigestInit_ex(_ctx, md, NULL); + EVP_DigestInit_ex(_pContext, md, NULL); } const Poco::DigestEngine::Digest& DigestEngine::digest() { _digest.clear(); - unsigned len = EVP_MD_CTX_size(_ctx); + unsigned len = EVP_MD_CTX_size(_pContext); _digest.resize(len); - EVP_DigestFinal_ex(_ctx, &_digest[0], &len); + EVP_DigestFinal_ex(_pContext, &_digest[0], &len); reset(); return _digest; } @@ -70,7 +73,7 @@ const Poco::DigestEngine::Digest& DigestEngine::digest() void DigestEngine::updateImpl(const void* data, std::size_t length) { - EVP_DigestUpdate(_ctx, data, length); + EVP_DigestUpdate(_pContext, data, length); } diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp index 380834172..b397a274d 100644 --- a/Crypto/src/OpenSSLInitializer.cpp +++ b/Crypto/src/OpenSSLInitializer.cpp @@ -1,8 +1,6 @@ // // OpenSSLInitializer.cpp // -// $Id: //poco/1.4/Crypto/src/OpenSSLInitializer.cpp#3 $ -// // Library: Crypto // Package: CryptoCore // Module: OpenSSLInitializer @@ -33,9 +31,9 @@ using Poco::Thread; namespace Poco { namespace Crypto { - +Poco::FastMutex OpenSSLInitializer::_mutex; Poco::FastMutex* OpenSSLInitializer::_mutexes(0); -Poco::AtomicCounter OpenSSLInitializer::_rc; +int OpenSSLInitializer::_rc(0); bool OpenSSLInitializer::_disableSSLInitialization = false; OpenSSLInitializer::OpenSSLInitializer() @@ -59,6 +57,7 @@ OpenSSLInitializer::~OpenSSLInitializer() void OpenSSLInitializer::initialize() { + FastMutex::ScopedLock lock(_mutex); if (++_rc == 1) { #if OPENSSL_VERSION_NUMBER >= 0x0907000L @@ -104,6 +103,7 @@ void OpenSSLInitializer::initialize() void OpenSSLInitializer::uninitialize() { + FastMutex::ScopedLock lock(_mutex); if (--_rc == 0) { if(_mutexes != NULL) { diff --git a/Crypto/src/RSACipherImpl.cpp b/Crypto/src/RSACipherImpl.cpp index 91c5b815d..9ba36b5b4 100644 --- a/Crypto/src/RSACipherImpl.cpp +++ b/Crypto/src/RSACipherImpl.cpp @@ -1,8 +1,6 @@ // // RSACipherImpl.cpp // -// $Id: //poco/1.4/Crypto/src/RSACipherImpl.cpp#3 $ -// // Library: Crypto // Package: RSA // Module: RSACipherImpl diff --git a/Crypto/src/RSADigestEngine.cpp b/Crypto/src/RSADigestEngine.cpp index f0ae5c980..948aa25ac 100644 --- a/Crypto/src/RSADigestEngine.cpp +++ b/Crypto/src/RSADigestEngine.cpp @@ -1,8 +1,6 @@ // // RSADigestEngine.cpp // -// $Id: //poco/1.4/Crypto/src/RSADigestEngine.cpp#1 $ -// // Library: Crypto // Package: RSA // Module: RSADigestEngine diff --git a/Crypto/src/RSAKey.cpp b/Crypto/src/RSAKey.cpp index 3dfcd138e..f3c9026df 100644 --- a/Crypto/src/RSAKey.cpp +++ b/Crypto/src/RSAKey.cpp @@ -1,8 +1,6 @@ // // RSAKey.cpp // -// $Id: //poco/1.4/Crypto/src/RSAKey.cpp#2 $ -// // Library: Crypto // Package: RSA // Module: RSAKey diff --git a/Crypto/src/RSAKeyImpl.cpp b/Crypto/src/RSAKeyImpl.cpp index 8333453ce..cc86b3038 100644 --- a/Crypto/src/RSAKeyImpl.cpp +++ b/Crypto/src/RSAKeyImpl.cpp @@ -1,8 +1,6 @@ // // RSAKeyImpl.cpp // -// $Id: //poco/1.4/Crypto/src/RSAKeyImpl.cpp#3 $ -// // Library: Crypto // Package: RSA // Module: RSAKeyImpl @@ -207,19 +205,43 @@ int RSAKeyImpl::size() const RSAKeyImpl::ByteVec RSAKeyImpl::modulus() const { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + const BIGNUM* n = 0; + const BIGNUM* e = 0; + const BIGNUM* d = 0; + RSA_get0_key(_pRSA, &n, &e, &d); + return convertToByteVec(n); +#else return convertToByteVec(_pRSA->n); +#endif } RSAKeyImpl::ByteVec RSAKeyImpl::encryptionExponent() const { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + const BIGNUM* n = 0; + const BIGNUM* e = 0; + const BIGNUM* d = 0; + RSA_get0_key(_pRSA, &n, &e, &d); + return convertToByteVec(e); +#else return convertToByteVec(_pRSA->e); +#endif } RSAKeyImpl::ByteVec RSAKeyImpl::decryptionExponent() const { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + const BIGNUM* n = 0; + const BIGNUM* e = 0; + const BIGNUM* d = 0; + RSA_get0_key(_pRSA, &n, &e, &d); + return convertToByteVec(d); +#else return convertToByteVec(_pRSA->d); +#endif } diff --git a/Crypto/src/X509Certificate.cpp b/Crypto/src/X509Certificate.cpp index 0137c6bfc..4faca5783 100644 --- a/Crypto/src/X509Certificate.cpp +++ b/Crypto/src/X509Certificate.cpp @@ -1,8 +1,6 @@ // // X509Certificate.cpp // -// $Id: //poco/1.4/Crypto/src/X509Certificate.cpp#1 $ -// // Library: Crypto // Package: Certificate // Module: X509Certificate @@ -63,7 +61,11 @@ X509Certificate::X509Certificate(X509* pCert, bool shared): if (shared) { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + X509_up_ref(_pCert); +#else _pCert->references++; +#endif } init(); diff --git a/Crypto/testsuite/Makefile b/Crypto/testsuite/Makefile index 7921f1eda..9bf7be01e 100644 --- a/Crypto/testsuite/Makefile +++ b/Crypto/testsuite/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.4/Crypto/testsuite/Makefile#1 $ -# # Makefile for Poco Crypto testsuite # diff --git a/Crypto/testsuite/TestSuite_vs150.vcxproj b/Crypto/testsuite/TestSuite_vs150.vcxproj new file mode 100644 index 000000000..de42a0eff --- /dev/null +++ b/Crypto/testsuite/TestSuite_vs150.vcxproj @@ -0,0 +1,321 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15} + TestSuite + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_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;..\..\openssl\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;..\..\openssl\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;..\..\openssl\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;Crypt32.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;..\..\openssl\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;Crypt32.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\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;Crypt32.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;..\..\openssl\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;Crypt32.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + + + + + + + diff --git a/Crypto/testsuite/TestSuite_vs150.vcxproj.filters b/Crypto/testsuite/TestSuite_vs150.vcxproj.filters new file mode 100644 index 000000000..83d92417e --- /dev/null +++ b/Crypto/testsuite/TestSuite_vs150.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + {72d07a3a-5a55-40ba-beef-e01e3adc4809} + + + {718dc6ed-3044-4fee-9f82-4feba66bd1af} + + + {3ea4c9b3-89c1-4ec5-a8d4-95089a9db1ec} + + + {525a739d-41aa-4b51-a396-5904f7b8f2fe} + + + {cfa723eb-1beb-4ac7-bd5a-07dc29aed1cb} + + + {8a3c2b9a-ed96-42d7-b170-10aca8bacbb5} + + + {a9b0539e-4174-479e-af67-e66acd9cf307} + + + {71338c2e-326a-4d20-8247-2a7a676cc5df} + + + + + Crypto\Header Files + + + Crypto\Header Files + + + Crypto\Header Files + + + _Suite\Header Files + + + + + Crypto\Header Files + + + Crypto\Source Files + + + Crypto\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + \ No newline at end of file diff --git a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj new file mode 100644 index 000000000..edaad9f90 --- /dev/null +++ b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj @@ -0,0 +1,321 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15} + TestSuite + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_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;..\..\openssl\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;..\..\openssl\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;..\..\openssl\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;Crypt32.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;..\..\openssl\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;Crypt32.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\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;Crypt32.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;..\..\openssl\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;Crypt32.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + + + + + + + diff --git a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..6d55b4f44 --- /dev/null +++ b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + {0d243529-62fc-49fa-bf49-6b20be35d758} + + + {d59dd2ed-e29b-4069-bd09-288dfdc189dd} + + + {290b4b3f-ad50-44e5-947d-d5de0caefcb7} + + + {fb6480ec-c0c2-4f06-9539-766b4ac38a00} + + + {4b600911-d0cc-41bc-8881-37620c43dfb7} + + + {40f47d6d-82b2-4506-a9b6-139ea9d6ba22} + + + {953fdd66-dc5a-496e-8d14-794ce8038864} + + + {be96f14c-522b-4ac6-b0d5-b2dd3942b698} + + + + + Crypto\Header Files + + + Crypto\Header Files + + + Crypto\Header Files + + + _Suite\Header Files + + + + + Crypto\Header Files + + + Crypto\Source Files + + + Crypto\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + \ No newline at end of file diff --git a/Crypto/testsuite/src/CryptoTest.cpp b/Crypto/testsuite/src/CryptoTest.cpp index ae3c58525..040e2454c 100644 --- a/Crypto/testsuite/src/CryptoTest.cpp +++ b/Crypto/testsuite/src/CryptoTest.cpp @@ -1,8 +1,6 @@ // // CryptoTest.cpp // -// $Id: //poco/1.4/Crypto/testsuite/src/CryptoTest.cpp#2 $ -// // Copyright (c) 2008, Applied Informatics Software Engineering GmbH. // and Contributors. // @@ -292,6 +290,8 @@ void CryptoTest::testCertificate() std::string stateOrProvince(cert.subjectName(X509Certificate::NID_STATE_OR_PROVINCE)); std::string organizationName(cert.subjectName(X509Certificate::NID_ORGANIZATION_NAME)); std::string organizationUnitName(cert.subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME)); + std::string emailAddress(cert.subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS)); + std::string serialNumber(cert.subjectName(X509Certificate::NID_SERIAL_NUMBER)); assert (subjectName == "/CN=appinf.com/O=Applied Informatics Software Engineering GmbH/OU=Development/ST=Carinthia/C=AT/L=St. Jakob im Rosental/emailAddress=guenter.obiltschnig@appinf.com"); assert (issuerName == subjectName); @@ -301,6 +301,8 @@ void CryptoTest::testCertificate() assert (stateOrProvince == "Carinthia"); assert (organizationName == "Applied Informatics Software Engineering GmbH"); assert (organizationUnitName == "Development"); + assert (emailAddress == "guenter.obiltschnig@appinf.com"); + assert (serialNumber == ""); // fails with recent OpenSSL versions: // assert (cert.issuedBy(cert)); diff --git a/Crypto/testsuite/src/CryptoTest.h b/Crypto/testsuite/src/CryptoTest.h index 14300a749..2f67d1038 100644 --- a/Crypto/testsuite/src/CryptoTest.h +++ b/Crypto/testsuite/src/CryptoTest.h @@ -1,8 +1,6 @@ // // CryptoTest.h // -// $Id: //poco/1.4/Crypto/testsuite/src/CryptoTest.h#2 $ -// // Definition of the CryptoTest class. // // Copyright (c) 2008, Applied Informatics Software Engineering GmbH. diff --git a/Crypto/testsuite/src/CryptoTestSuite.cpp b/Crypto/testsuite/src/CryptoTestSuite.cpp index 2cd239623..2474d3c27 100644 --- a/Crypto/testsuite/src/CryptoTestSuite.cpp +++ b/Crypto/testsuite/src/CryptoTestSuite.cpp @@ -1,8 +1,6 @@ // // CryptoTestSuite.cpp // -// $Id: //poco/1.4/Crypto/testsuite/src/CryptoTestSuite.cpp#1 $ -// // Copyright (c) 2008, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/Crypto/testsuite/src/CryptoTestSuite.h b/Crypto/testsuite/src/CryptoTestSuite.h index 1c6b0a130..e51294d15 100644 --- a/Crypto/testsuite/src/CryptoTestSuite.h +++ b/Crypto/testsuite/src/CryptoTestSuite.h @@ -1,8 +1,6 @@ // // CryptoTestSuite.h // -// $Id: //poco/1.4/Crypto/testsuite/src/CryptoTestSuite.h#1 $ -// // Definition of the CryptoTestSuite class. // // Copyright (c) 2008, Applied Informatics Software Engineering GmbH. diff --git a/Crypto/testsuite/src/DigestEngineTest.cpp b/Crypto/testsuite/src/DigestEngineTest.cpp index 3d5160f46..b1e8c60ac 100644 --- a/Crypto/testsuite/src/DigestEngineTest.cpp +++ b/Crypto/testsuite/src/DigestEngineTest.cpp @@ -1,8 +1,6 @@ // // DigestEngineTest.cpp // -// $Id: //poco/1.4/Crypto/testsuite/src/DigestEngineTest.cpp#1 $ -// // Copyright (c) 2012, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/Crypto/testsuite/src/DigestEngineTest.h b/Crypto/testsuite/src/DigestEngineTest.h index 7a395b990..52818385e 100644 --- a/Crypto/testsuite/src/DigestEngineTest.h +++ b/Crypto/testsuite/src/DigestEngineTest.h @@ -1,8 +1,6 @@ // // DigestEngineTest.h // -// $Id: //poco/1.4/Crypto/testsuite/src/DigestEngineTest.h#1 $ -// // Definition of the DigestEngineTest class. // // Copyright (c) 2012, Applied Informatics Software Engineering GmbH. diff --git a/Crypto/testsuite/src/Driver.cpp b/Crypto/testsuite/src/Driver.cpp index afcb3708f..a47f6eff6 100644 --- a/Crypto/testsuite/src/Driver.cpp +++ b/Crypto/testsuite/src/Driver.cpp @@ -1,8 +1,6 @@ // // Driver.cpp // -// $Id: //poco/1.4/Crypto/testsuite/src/Driver.cpp#1 $ -// // Console-based test driver for Poco Crypto. // // Copyright (c) 2007, Applied Informatics Software Engineering GmbH. diff --git a/Crypto/testsuite/src/RSATest.cpp b/Crypto/testsuite/src/RSATest.cpp index f67d71ae5..3cb25f15d 100644 --- a/Crypto/testsuite/src/RSATest.cpp +++ b/Crypto/testsuite/src/RSATest.cpp @@ -1,8 +1,6 @@ // // RSATest.cpp // -// $Id: //poco/1.4/Crypto/testsuite/src/RSATest.cpp#1 $ -// // Copyright (c) 2008, Applied Informatics Software Engineering GmbH. // and Contributors. // diff --git a/Crypto/testsuite/src/RSATest.h b/Crypto/testsuite/src/RSATest.h index 609a6c2de..b28a6f330 100644 --- a/Crypto/testsuite/src/RSATest.h +++ b/Crypto/testsuite/src/RSATest.h @@ -1,8 +1,6 @@ // // RSATest.h // -// $Id: //poco/1.4/Crypto/testsuite/src/RSATest.h#1 $ -// // Definition of the RSATest class. // // Copyright (c) 2008, Applied Informatics Software Engineering GmbH. diff --git a/Crypto/testsuite/src/WinCEDriver.cpp b/Crypto/testsuite/src/WinCEDriver.cpp index 6cabc793c..77a788b15 100644 --- a/Crypto/testsuite/src/WinCEDriver.cpp +++ b/Crypto/testsuite/src/WinCEDriver.cpp @@ -1,8 +1,6 @@ // // WinCEDriver.cpp // -// $Id: //poco/1.4/Crypto/testsuite/src/WinCEDriver.cpp#1 $ -// // Console-based test driver for Windows CE. // // Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH. diff --git a/Crypto/testsuite/src/WinDriver.cpp b/Crypto/testsuite/src/WinDriver.cpp index 7bbef8179..d7f26bba6 100644 --- a/Crypto/testsuite/src/WinDriver.cpp +++ b/Crypto/testsuite/src/WinDriver.cpp @@ -1,8 +1,6 @@ // // WinDriver.cpp // -// $Id: //poco/1.4/Crypto/testsuite/src/WinDriver.cpp#1 $ -// // Windows test driver for Poco Crypto. // // Copyright (c) 2008, Applied Informatics Software Engineering GmbH. diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt index 2c06eca4f..77b38a1e1 100644 --- a/Data/CMakeLists.txt +++ b/Data/CMakeLists.txt @@ -48,9 +48,11 @@ if(ENABLE_DATA_MYSQL) find_package(MySQL) if(MYSQL_FOUND) include_directories("${MYSQL_INCLUDE_DIR}") - message(STATUS "MySQL Support Enabled") + if(POCO_VERBOSE_MESSAGES) + message(STATUS "MySQL Support Enabled") + endif() add_subdirectory( MySQL ) - else() + elseif(POCO_VERBOSE_MESSAGES) message(STATUS "MySQL Support Disabled - no MySQL library") endif(MYSQL_FOUND) endif(ENABLE_DATA_MYSQL) @@ -58,10 +60,12 @@ endif(ENABLE_DATA_MYSQL) if(ENABLE_DATA_POSTGRESQL) find_package(PostgreSQL) if(POSTGRESQL_FOUND) - include_directories("${POSTGRESQL_INCLUDE_DIR}") - message(STATUS "PostgreSQL Support Enabled") + include_directories("${PostgreSQL_INCLUDE_DIR}") + if(POCO_VERBOSE_MESSAGES) + message(STATUS "PostgreSQL Support Enabled") + endif() add_subdirectory( PostgreSQL ) - else() + elseif(POCO_VERBOSE_MESSAGES) message(STATUS "PostgreSQL Support Disabled - no PostgreSQL library") endif(POSTGRESQL_FOUND) endif(ENABLE_DATA_POSTGRESQL) @@ -70,14 +74,18 @@ if(ENABLE_DATA_ODBC) find_package(ODBC) if(WIN32 AND NOT WINCE) set(ODBC_LIBRARIES "odbc32" "odbccp32") - message(STATUS "Windows native ODBC Support Enabled") + if(POCO_VERBOSE_MESSAGES) + message(STATUS "Windows native ODBC Support Enabled") + endif() add_subdirectory( ODBC ) else(WIN32 AND NOT WINCE) if(ODBC_FOUND) include_directories("${ODBC_INCLUDE_DIRECTORIES}") - message(STATUS "ODBC Support Enabled") + if(POCO_VERBOSE_MESSAGES) + message(STATUS "ODBC Support Enabled") + endif() add_subdirectory( ODBC ) - else() + elseif(POCO_VERBOSE_MESSAGES) message(STATUS "ODBC Support Disabled - no ODBC runtime") endif() endif(WIN32 AND NOT WINCE) diff --git a/Data/Data_vs140.sln b/Data/Data_vs140.sln index ee4139288..5fa42eced 100644 --- a/Data/Data_vs140.sln +++ b/Data/Data_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_vs140.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" EndProject diff --git a/Data/Data_vs150.sln b/Data/Data_vs150.sln new file mode 100644 index 000000000..165ee7e49 --- /dev/null +++ b/Data/Data_vs150.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_vs150.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs150.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" + ProjectSection(ProjectDependencies) = postProject + {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} + 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 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Build.0 = release_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/Data_vs150.vcxproj b/Data/Data_vs150.vcxproj new file mode 100644 index 000000000..d071a94cd --- /dev/null +++ b/Data/Data_vs150.vcxproj @@ -0,0 +1,370 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Data + {240E83C3-368D-11DB-9FBC-00123FC423B5} + Data + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25420.1 + PocoDatad + PocoDatamdd + PocoDatamtd + PocoData + PocoDatamd + PocoDatamt + + + ..\bin\ + obj\Data\$(Configuration)\ + true + + + ..\bin\ + obj\Data\$(Configuration)\ + false + + + ..\lib\ + obj\Data\$(Configuration)\ + + + ..\lib\ + obj\Data\$(Configuration)\ + + + ..\lib\ + obj\Data\$(Configuration)\ + + + ..\lib\ + obj\Data\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + ..\bin\PocoDatad.dll + true + true + ..\bin\PocoDatad.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoDatad.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\bin\PocoData.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoData.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoDatamtd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoDatamtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\lib\PocoDatamt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoDatamdd.pdb + Level3 + ProgramDatabase + Default + + + ..\lib\PocoDatamdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoDatamd.pdb + Level3 + + Default + + + ..\lib\PocoDatamd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/Data_vs150.vcxproj.filters b/Data/Data_vs150.vcxproj.filters new file mode 100644 index 000000000..6955f3014 --- /dev/null +++ b/Data/Data_vs150.vcxproj.filters @@ -0,0 +1,294 @@ + + + + + {f9d1e08b-dbe5-4e6f-aa50-2d1d55759e57} + + + {4f916936-1861-4e69-988d-aabafd646070} + + + {3fa3dc58-a602-44bb-9ef6-e325bc5ddb19} + + + {0ce6a211-601d-4ab5-ae69-35556a1cc335} + + + {71c8985a-a573-40ea-9faa-050f2c9b4076} + + + {2e2bdcea-c03e-4113-9545-66227073ba9b} + + + {7163d8d2-820f-409c-b62a-73a7cad2c1a3} + + + {56dff3f3-ff8c-4434-b86f-ee6fe5ea1335} + + + {a131b91f-6d66-44ed-9fa2-abf33275d265} + + + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + \ No newline at end of file diff --git a/Data/Data_x64_vs140.sln b/Data/Data_x64_vs140.sln index 76c05ff45..a18363efa 100644 --- a/Data/Data_x64_vs140.sln +++ b/Data/Data_x64_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_x64_vs140.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" EndProject diff --git a/Data/Data_x64_vs150.sln b/Data/Data_x64_vs150.sln new file mode 100644 index 000000000..d51044d7f --- /dev/null +++ b/Data/Data_x64_vs150.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_x64_vs150.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs150.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" + ProjectSection(ProjectDependencies) = postProject + {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} + 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 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/Data_x64_vs150.vcxproj b/Data/Data_x64_vs150.vcxproj new file mode 100644 index 000000000..63daab29b --- /dev/null +++ b/Data/Data_x64_vs150.vcxproj @@ -0,0 +1,375 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Data + {240E83C3-368D-11DB-9FBC-00123FC423B5} + Data + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25420.1 + PocoData64d + PocoDatamdd + PocoDatamtd + PocoData64 + PocoDatamd + PocoDatamt + + + ..\bin64\ + obj64\Data\$(Configuration)\ + true + + + ..\bin64\ + obj64\Data\$(Configuration)\ + false + + + ..\lib64\ + obj64\Data\$(Configuration)\ + + + ..\lib64\ + obj64\Data\$(Configuration)\ + + + ..\lib64\ + obj64\Data\$(Configuration)\ + + + ..\lib64\ + obj64\Data\$(Configuration)\ + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + /bigobj %(AdditionalOptions) + + + ..\bin64\PocoData64d.dll + true + true + ..\bin64\PocoData64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoDatad.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + /bigobj %(AdditionalOptions) + + + ..\bin64\PocoData64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoData.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoDatamtd.pdb + Level3 + ProgramDatabase + Default + /bigobj %(AdditionalOptions) + + + ..\lib64\PocoDatamtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + /bigobj %(AdditionalOptions) + + + ..\lib64\PocoDatamt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoDatamdd.pdb + Level3 + ProgramDatabase + Default + /bigobj %(AdditionalOptions) + + + ..\lib64\PocoDatamdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + /bigobj %(AdditionalOptions) + + + ..\lib64\PocoDatamd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/Data_x64_vs150.vcxproj.filters b/Data/Data_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..c288b332e --- /dev/null +++ b/Data/Data_x64_vs150.vcxproj.filters @@ -0,0 +1,294 @@ + + + + + {28f51acf-99fe-4049-b2e6-dc1ba8aa2cd4} + + + {26710ac5-bf0d-4c12-98ff-ad3f749445e9} + + + {b0f5810b-abe5-4455-9800-69a886d2a75b} + + + {ec8969d0-e356-4554-9d98-857c0817276b} + + + {e6f737b6-75ae-4133-a6f4-47baad8e0ff1} + + + {650c5609-65a3-4276-9aac-a66f52dfb051} + + + {581ed0aa-4507-4247-bf44-1eabc8c4b989} + + + {639652eb-b8ae-4e9a-bbdf-012608808d79} + + + {b3c5fa32-47a1-4bbe-b639-2746ea8ef8b9} + + + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + \ No newline at end of file diff --git a/Data/Makefile b/Data/Makefile index f61d2111a..4199095cb 100644 --- a/Data/Makefile +++ b/Data/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/Main/Data/Makefile#11 $ -# # Makefile for Poco Data # diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile index 09f7ff5ea..11fe208ae 100644 --- a/Data/MySQL/Makefile +++ b/Data/MySQL/Makefile @@ -1,8 +1,6 @@ # # Makefile # -# $Id: //poco/1.4/Data/MySQL/Makefile#1 $ -# # Makefile for Poco MySQL # diff --git a/Data/MySQL/MySQL_vs140.sln b/Data/MySQL/MySQL_vs140.sln index 5e4929722..3dc3078a4 100644 --- a/Data/MySQL/MySQL_vs140.sln +++ b/Data/MySQL/MySQL_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_vs140.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" EndProject diff --git a/Data/MySQL/MySQL_vs150.sln b/Data/MySQL/MySQL_vs150.sln new file mode 100644 index 000000000..ceeb08594 --- /dev/null +++ b/Data/MySQL/MySQL_vs150.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_vs150.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs150.vcxproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}" + ProjectSection(ProjectDependencies) = postProject + {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} + 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 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Build.0 = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.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 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.Build.0 = release_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/MySQL/MySQL_vs150.vcxproj b/Data/MySQL/MySQL_vs150.vcxproj new file mode 100644 index 000000000..e1d80c438 --- /dev/null +++ b/Data/MySQL/MySQL_vs150.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 + + + + MySQL + {73E19FDE-1570-488C-B3DB-72A60FADD408} + MySQL + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoDataMySQLd + PocoDataMySQLmdd + PocoDataMySQLmtd + PocoDataMySQL + PocoDataMySQLmd + PocoDataMySQLmt + + + ..\..\bin\ + obj\MySQL\$(Configuration)\ + true + + + ..\..\bin\ + obj\MySQL\$(Configuration)\ + false + + + ..\..\lib\ + obj\MySQL\$(Configuration)\ + + + ..\..\lib\ + obj\MySQL\$(Configuration)\ + + + ..\..\lib\ + obj\MySQL\$(Configuration)\ + + + ..\..\lib\ + obj\MySQL\$(Configuration)\ + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libmysql.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataMySQLd.dll + true + true + ..\..\bin\PocoDataMySQLd.pdb + ..\..\lib;%(AdditionalLibraryDirectories) + Console + ..\..\lib\PocoDataMySQLd.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libmysql.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataMySQL.dll + true + false + ..\..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib\PocoDataMySQL.lib + MachineX86 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib\PocoDataMySQLmtd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib\PocoDataMySQLmtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\..\lib\PocoDataMySQLmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib\PocoDataMySQLmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib\PocoDataMySQLmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\..\lib\PocoDataMySQLmd.pdb + Level3 + + Default + + + libmysql.lib;%(AdditionalDependencies) + ..\..\lib\PocoDataMySQLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/MySQL_vs150.vcxproj.filters b/Data/MySQL/MySQL_vs150.vcxproj.filters new file mode 100644 index 000000000..b69fa92ac --- /dev/null +++ b/Data/MySQL/MySQL_vs150.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/MySQL/MySQL_x64_vs140.sln b/Data/MySQL/MySQL_x64_vs140.sln index fb3a8f5c8..a4d88a249 100644 --- a/Data/MySQL/MySQL_x64_vs140.sln +++ b/Data/MySQL/MySQL_x64_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_x64_vs140.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" EndProject diff --git a/Data/MySQL/MySQL_x64_vs150.sln b/Data/MySQL/MySQL_x64_vs150.sln new file mode 100644 index 000000000..cf708a136 --- /dev/null +++ b/Data/MySQL/MySQL_x64_vs150.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2017 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_x64_vs150.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs150.vcxproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}" + ProjectSection(ProjectDependencies) = postProject + {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + 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_shared|x64.Deploy.0 = debug_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.ActiveCfg = release_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Build.0 = release_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Deploy.0 = release_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.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 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Build.0 = debug_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.ActiveCfg = release_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Build.0 = release_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Deploy.0 = release_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Build.0 = release_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/MySQL/MySQL_x64_vs150.vcxproj b/Data/MySQL/MySQL_x64_vs150.vcxproj new file mode 100644 index 000000000..0aa268bef --- /dev/null +++ b/Data/MySQL/MySQL_x64_vs150.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 + + + + MySQL + {73E19FDE-1570-488C-B3DB-72A60FADD408} + MySQL + Win32Proj + + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + StaticLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 + PocoDataMySQL64d + PocoDataMySQLmdd + PocoDataMySQLmtd + PocoDataMySQL64 + PocoDataMySQLmd + PocoDataMySQLmt + + + ..\..\bin64\ + obj64\MySQL\$(Configuration)\ + true + + + ..\..\bin64\ + obj64\MySQL\$(Configuration)\ + false + + + ..\..\lib64\ + obj64\MySQL\$(Configuration)\ + + + ..\..\lib64\ + obj64\MySQL\$(Configuration)\ + + + ..\..\lib64\ + obj64\MySQL\$(Configuration)\ + + + ..\..\lib64\ + obj64\MySQL\$(Configuration)\ + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + + + libmysql.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataMySQL64d.dll + true + true + ..\..\bin64\PocoDataMySQL64d.pdb + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + ..\..\lib64\PocoDataMySQLd.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + libmysql.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataMySQL64.dll + true + false + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib64\PocoDataMySQL.lib + MachineX64 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib64\PocoDataMySQLmtd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib64\PocoDataMySQLmtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + + + ..\..\lib64\PocoDataMySQLmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib64\PocoDataMySQLmdd.pdb + Level3 + ProgramDatabase + Default + + + ..\..\lib64\PocoDataMySQLmdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + + + ..\..\lib64\PocoDataMySQLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/MySQL_x64_vs150.vcxproj.filters b/Data/MySQL/MySQL_x64_vs150.vcxproj.filters new file mode 100644 index 000000000..b69fa92ac --- /dev/null +++ b/Data/MySQL/MySQL_x64_vs150.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/MySQL/include/Poco/Data/MySQL/Binder.h b/Data/MySQL/include/Poco/Data/MySQL/Binder.h index 5c1c15752..5bb1dd25b 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Binder.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Binder.h @@ -1,9 +1,7 @@ // // Binder.h // -// $Id: //poco/1.4/Data/MySQL/include/Poco/Data/MySQL/Binder.h#1 $ -// -// Library: Data +// Library: Data/MySQL // Package: MySQL // Module: Binder // diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h index ffb6a82d5..4cf1879ff 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h @@ -1,9 +1,7 @@ // // Connector.h // -// $Id: //poco/1.4/Data/MySQL/include/Poco/Data/MySQL/Connector.h#1 $ -// -// Library: Data +// Library: Data/MySQL // Package: MySQL // Module: Connector // @@ -22,6 +20,7 @@ #include "Poco/Data/MySQL/MySQL.h" #include "Poco/Data/Connector.h" +#include "Poco/Mutex.h" // Note: to avoid static (de)initialization problems, @@ -60,6 +59,8 @@ public: static void unregisterConnector(); /// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory + + static Poco::FastMutex _mutex; }; diff --git a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h index 24fa60e80..4815f67c8 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h @@ -1,9 +1,7 @@ // // Extractor.h // -// $Id: //poco/1.4/Data/MySQL/include/Poco/Data/MySQL/Extractor.h#1 $ -// -// Library: Data +// Library: Data/MySQL // Package: MySQL // Module: Extractor // @@ -25,6 +23,8 @@ #include "Poco/Data/MySQL/ResultMetadata.h" #include "Poco/Data/AbstractExtractor.h" #include "Poco/Data/LOB.h" +#include "Poco/Data/Date.h" +#include "Poco/Data/Time.h" namespace Poco { @@ -322,6 +322,18 @@ public: private: bool realExtractFixed(std::size_t pos, enum_field_types type, void* buffer, bool isUnsigned = false); + bool realExtractFixedBlob(std::size_t pos, enum_field_types type, void* buffer, size_t len); + + template + T extractAny(std::size_t pos, bool& success) + { + T value; + success = extract(pos, value); + return value; + } + + template + bool extractToDynamic(std::size_t pos, T& val); // Prevent VC8 warning "operator= could not be generated" Extractor& operator=(const Extractor&); @@ -332,6 +344,97 @@ private: ResultMetadata& _metadata; }; +template +bool Extractor::extractToDynamic(std::size_t pos, T &val) +{ + MetaColumn::ColumnDataType columnType = _metadata.metaColumn(static_cast(pos)).type(); + + T resultValue; + bool success = false; + + switch (columnType) + { + case MetaColumn::FDT_BOOL: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_INT8: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_UINT8: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_INT16: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_UINT16: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_INT32: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_UINT32: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_INT64: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_UINT64: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_FLOAT: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_DOUBLE: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_STRING: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_WSTRING: + return false; + + case MetaColumn::FDT_BLOB: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_CLOB: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_DATE: + resultValue = extractAny(pos, success); + break; + + case MetaColumn::FDT_TIME: + resultValue = extractAny