Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Travis & AppVeyor: Unbind PDF module #1953

Merged
merged 6 commits into from
Oct 23, 2017
Merged

Travis & AppVeyor: Unbind PDF module #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3aae775
Unbind PDF
zosrothko Oct 21, 2017
f46240c
Upgrade to mysql-5.7.19
zosrothko Oct 22, 2017
e6d458c
Merge remote-tracking branch 'origin/develop' into unbind-pdf
zosrothko Oct 22, 2017
1b215f4
Put Cygwin ahead
zosrothko Oct 22, 2017
fc201a7
Merge remote-tracking branch 'kampbell/unbind-pdf' into unbind-pdf
zosrothko Oct 22, 2017
c233096
Add --omit=PDF
zosrothko Oct 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
22 changes: 12 additions & 10 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: build {branch}-{build}

cache:
- C:\mysql-5.7.18-win32
- C:\mysql-5.7.19-win32
- C:\ProgramData\chocolatey
- C:\OpenSSL-Win32
- C:\OpenSSL-Win64
Expand Down Expand Up @@ -56,8 +56,8 @@ configuration:
environment:
bundling: bundled
MYSQL32URL: http://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.19-win32.zip
MYSQL32ZIP: mysql-5.7.18-win32.zip
MYSQL32: C:\mysql-5.7.18-win32
MYSQL32ZIP: mysql-5.7.19-win32.zip
MYSQL32: C:\mysql-5.7.19-win32
MYSQL64: C:\Program Files\MySql\MySQL Server 5.7
POSTGRES32: C:\Program Files (x86)\PostgreSQL\9.6
POSTGRES64: C:\Program Files\PostgreSQL\9.6
Expand All @@ -68,11 +68,7 @@ environment:
OPENSSL64: C:\OpenSSL-Win64

matrix:
- builder: cmake
vsver: 140

- builder: cmake
vsver: 150
- builder: cygwin

- builder: msbuild
vsver: 140
Expand Down Expand Up @@ -102,7 +98,12 @@ environment:
# vsver: 150
# linkmode: static_mt

- builder: cygwin
- builder: cmake
vsver: 140

- builder: cmake
vsver: 150


matrix:
fast_finish: true
Expand Down Expand Up @@ -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."
}
Expand Down Expand Up @@ -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";
Expand Down
1 change: 0 additions & 1 deletion components
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Data/PostgreSQL
Zip
PageCompiler
PageCompiler/File2Page
PDF
CppParser
MongoDB
Redis
Expand Down
2 changes: 1 addition & 1 deletion openssl
Open in desktop
Submodule openssl updated 1 files
+8 −2 build.ps1