From f743b67558beff69d04c5f126363c7532650e94c Mon Sep 17 00:00:00 2001 From: zosrothko Date: Mon, 23 Oct 2017 17:38:03 +0200 Subject: [PATCH] Travis & AppVeyor: Unbind PDF module (#1953) * Unbind PDF * Upgrade to mysql-5.7.19 * Put Cygwin ahead * Add --omit=PDF --- .travis.yml | 38 +++++++++++++++++++------------------- appveyor.yml | 16 +++++++++------- components | 1 - openssl | 2 +- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4878fb7a0..d00a8b3954 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,16 +69,16 @@ matrix: - export CC="gcc-4.9" - export CXX="g++-4.9" - $CXX --version - - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - + - ./configure --everything --omit=PDF && make -s -j2 && ./travis/Linux/runtests.sh + - env: TEST_NAME="gcc 5.4 (make) bundled" compiler: gcc script: - export CC="gcc-5" - export CXX="g++-5" - $CXX --version - - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - + - ./configure --everything --omit=PDF && make -s -j2 && ./travis/Linux/runtests.sh + #- env: TEST_NAME="gcc 5.4 (make) unbundled" # ======================================= unit tests fail ures due to unbundled pcre # There was 1 error: @@ -108,8 +108,8 @@ matrix: # - export CC="gcc-5" # - export CXX="g++-5" # - $CXX --version - # - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - + # - ./configure --everything --omit=PDF --unbundled && make -s -j2 && ./travis/Linux/runtests.sh + - env: TEST_NAME="gcc 4.9 (CMake)" compiler: gcc script: @@ -119,8 +119,8 @@ matrix: - $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 .. - + - mkdir cmake-build && cd cmake-build && cmake -DENABLE_PDF=OFF -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. + - env: TEST_NAME="clang (make) bundled" os: osx @@ -130,7 +130,7 @@ matrix: - export CXX="clang++" - $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 + - ./configure --everything --omit=PDF,Data/ODBC,Data/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install && ./travis/OSX/runtests.sh - env: TEST_NAME="clang 4.0 (make) bundled" compiler: clang @@ -140,8 +140,8 @@ matrix: - export CC="clang-4.0" - export CXX="clang++-4.0" - $CXX --version - - ./configure --config=Linux-clang --everything && make -s -j2 && ./travis/Linux/runtests.sh - + - ./configure --config=Linux-clang --everything --omit=PDF && make -s -j2 && ./travis/Linux/runtests.sh + - env: TEST_NAME="clang 5.0 (make) bundled" compiler: clang script: @@ -150,7 +150,7 @@ matrix: - export CC="clang-5.0" - export CXX="clang++-5.0" - $CXX --version - - ./configure --config=Linux-clang --everything && make -s -j2 && ./travis/Linux/runtests.sh + - ./configure --config=Linux-clang --everything --omit=PDF && 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 @@ -163,22 +163,22 @@ matrix: # - export CC="clang" # - export CXX="clang++" # - $CXX --version - # - ./configure --config=Linux-clang --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - + # - ./configure --config=Linux-clang --everything --omit=PDF --unbundled && make -s -j2 && ./travis/Linux/runtests.sh + #- env: TEST_NAME="arm-linux-gnueabi-g++ (make)" # compiler: gcc # script: # - sudo apt-get install -qq -y g++-arm-linux-gnueabi g++-arm-linux-gnueabihf # - 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 + # - ./configure --omit=PDF,Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l #- 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 .. + # - mkdir cmake-build && cd cmake-build && cmake -DENABLE_PDF=OFF -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. #- env: TEST_NAME="arm-linux-gnueabi-g++ (CMake)" # ======================================= "arm-linux-gnueabi-g++: version 4.7.0: non compliant to c++11 @@ -190,8 +190,8 @@ matrix: # - $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 .. + # - mkdir cmake-build + # - cd cmake-build && cmake -DENABLE_PDF=OFF -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. - env: TEST_NAME="arm-linux-gnueabihf-g++ (CMake)" compiler: gcc @@ -203,7 +203,7 @@ matrix: - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build - - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. + - cd cmake-build && cmake -DENABLE_PDF=OFF -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. # QA jobs for code analytics and metrics diff --git a/appveyor.yml b/appveyor.yml index 1801edb333..6ad8c932a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,11 +68,7 @@ environment: OPENSSL64: C:\OpenSSL-Win64 matrix: - - builder: cmake - vsver: 140 - - - builder: cmake - vsver: 150 + - builder: cygwin - builder: msbuild vsver: 140 @@ -102,7 +98,12 @@ environment: # vsver: 150 # linkmode: static_mt - - builder: cygwin + - builder: cmake + vsver: 140 + + - builder: cmake + vsver: 150 + matrix: fast_finish: true @@ -401,7 +402,7 @@ build_script: if ($env:builder -eq "cygwin") { $LastExitCode=0; - $cmd='bash.exe configure --everything';iex "& $cmd" + $cmd='bash.exe configure --everything --omit=PDF';iex "& $cmd" if ($LastExitCode -ne 0) { throw "$cmd failed with exit code $LastExitCode." } @@ -448,6 +449,7 @@ build_script: { $defs+=" -DDISABLE_INTERNAL_OPENSSL=ON"; } + $defs+=" -DENABLE_PDF=OFF"; $defs+=" -DENABLE_NETSSL=ON"; $defs+=" -DENABLE_NETSSL_WIN=ON"; $defs+=" -DENABLE_DATA_MYSQL=OFF"; diff --git a/components b/components index f119611aba..d764ad9e3d 100644 --- a/components +++ b/components @@ -16,7 +16,6 @@ Data/PostgreSQL Zip PageCompiler PageCompiler/File2Page -PDF CppParser MongoDB Redis diff --git a/openssl b/openssl index 26b1673caa..af3dfc6ca7 160000 --- a/openssl +++ b/openssl @@ -1 +1 @@ -Subproject commit 26b1673caad94a702b6d694f48f917a283b30777 +Subproject commit af3dfc6ca786061640f55618b022aa4a62dffb2e