From b6e70a08692e7eaa5ba5dedce88dd461e45e3f8e Mon Sep 17 00:00:00 2001 From: zosrothko Date: Thu, 23 Mar 2017 17:04:53 +0100 Subject: [PATCH 01/15] Use g++-4.8 for mkdoc and mkrel --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4560cec9c..4cc4f23f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -154,8 +154,8 @@ matrix: - env: TEST_NAME="Linux documentation & release" compiler: gcc script: - - export CC="gcc" - - export CXX="g++" + - export CC="gcc-4.8" + - export CXX="g++-4.8" - . env.sh && mkdoc all && mkrel all # static code analysis with cppcheck (we can add --enable=all later) From ad5e674e1faf2ce15f68148ca736f759d7d2119a Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 29 Mar 2017 17:36:33 +0200 Subject: [PATCH 02/15] restore adding pcre_utf8_objects when build unbundled poco --- Foundation/Makefile | 1 + PageCompiler/File2Page/Makefile | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Foundation/Makefile b/Foundation/Makefile index 7a497e165..c2f44aa4f 100644 --- a/Foundation/Makefile +++ b/Foundation/Makefile @@ -46,6 +46,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables ifdef POCO_UNBUNDLED SYSLIBS += -lpcre -lz + objects += $(pcre_utf8_objects) else objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects) endif diff --git a/PageCompiler/File2Page/Makefile b/PageCompiler/File2Page/Makefile index 30fd3b597..a23b908a8 100644 --- a/PageCompiler/File2Page/Makefile +++ b/PageCompiler/File2Page/Makefile @@ -10,10 +10,6 @@ include $(POCO_BASE)/build/rules/global objects = File2Page -ifdef POCO_UNBUNDLED - SYSLIBS += -lz -lpcre -lexpat -endif - target = f2cpsp target_version = 1 target_libs = PocoUtil PocoXML PocoJSON PocoFoundation From 352e869080b090fa67d11a769c81cb55e2f81993 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Fri, 31 Mar 2017 13:18:30 +0200 Subject: [PATCH 03/15] make git not tracking bin/, bin64/, lib/, lib64 directory --- .gitignore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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/ From 8625227be73e85dfb36f3aeb4d8617520420e2d3 Mon Sep 17 00:00:00 2001 From: zosrothko Date: Sat, 15 Apr 2017 11:52:46 +0200 Subject: [PATCH 04/15] Use CC & CXX environment variables if they are defined --- build/config/Linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/config/Linux b/build/config/Linux index 40ef8f059..ee9609b3c 100644 --- a/build/config/Linux +++ b/build/config/Linux @@ -15,8 +15,8 @@ LINKMODE ?= SHARED # # Define Tools # -CC = ${CROSS_COMPILE}gcc -CXX = ${CROSS_COMPILE}g++ +CC ?= ${CROSS_COMPILE}gcc +CXX ?= ${CROSS_COMPILE}g++ LINK = $(CXX) LIB = ${CROSS_COMPILE}ar -cr RANLIB = ${CROSS_COMPILE}ranlib From dfc967d075c7195a3c6758c27b77e2426500591f Mon Sep 17 00:00:00 2001 From: zosrothko Date: Sat, 15 Apr 2017 11:55:38 +0200 Subject: [PATCH 05/15] Remove make silent mode --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cc4f23f2..f187161e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,21 +61,21 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -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=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -j2 && sudo make install && ./travis/OSX/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) bundled" compiler: gcc script: - export CC="gcc" - export CXX="g++" - - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh + - ./configure --everything && make -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 + - ./configure --everything && make -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" compiler: gcc @@ -83,7 +83,7 @@ matrix: - 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 + - ./configure --everything --unbundled && make -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" compiler: gcc @@ -91,17 +91,17 @@ matrix: - 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 + - ./configure --everything --unbundled && make -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 + - ./configure --everything --config=Linux-clang && make -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 + - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - env: TEST_NAME="Linux gcc 4.6 (CMake)" compiler: gcc @@ -110,7 +110,7 @@ matrix: - export CXX="g++" - 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_TESTS=ON .. && make -j2 && ctest -VV -E Data && cd .. - env: TEST_NAME="Linux gcc 4.8 (CMake)" compiler: gcc @@ -119,14 +119,14 @@ matrix: - 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 .. + - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -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 .. + - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -j2 && ctest -VV -E Data && cd .. - env: TEST_NAME="Linux arm-linux-gnueabi-g++ (CMake)" compiler: gcc @@ -136,7 +136,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_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -j2 && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" compiler: gcc @@ -146,7 +146,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_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -j2 && cd .. # QA jobs for code analytics and metrics From be01bea164a0ac99371b8edc6a9d8aafb71d32d1 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 15 Apr 2017 12:36:46 +0200 Subject: [PATCH 06/15] Use and to specify which compiler to use --- PocoDoc/cfg/mkdoc-poco.xml | 2 +- PocoDoc/cfg/mkdocumentation.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PocoDoc/cfg/mkdoc-poco.xml b/PocoDoc/cfg/mkdoc-poco.xml index 6ea368501..ba0d3a57e 100644 --- a/PocoDoc/cfg/mkdoc-poco.xml +++ b/PocoDoc/cfg/mkdoc-poco.xml @@ -44,7 +44,7 @@ ${PocoBuild}/*/doc/images - g++ + ${CXX} ${Includes}, -I/usr/local/mysql/include, diff --git a/PocoDoc/cfg/mkdocumentation.xml b/PocoDoc/cfg/mkdocumentation.xml index c2123c799..cc3ef3126 100644 --- a/PocoDoc/cfg/mkdocumentation.xml +++ b/PocoDoc/cfg/mkdocumentation.xml @@ -41,7 +41,7 @@ ${PocoBuild}/*/doc/images - g++ + ${CXX} ${Includes}, -I/usr/local/mysql/include, From 9a3da4cf826bb9af4a0c102846ae78d88f968ebc Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 15 Apr 2017 12:37:56 +0200 Subject: [PATCH 07/15] Take and environement variables when they are defined --- build/config/Linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/config/Linux b/build/config/Linux index 40ef8f059..ee9609b3c 100644 --- a/build/config/Linux +++ b/build/config/Linux @@ -15,8 +15,8 @@ LINKMODE ?= SHARED # # Define Tools # -CC = ${CROSS_COMPILE}gcc -CXX = ${CROSS_COMPILE}g++ +CC ?= ${CROSS_COMPILE}gcc +CXX ?= ${CROSS_COMPILE}g++ LINK = $(CXX) LIB = ${CROSS_COMPILE}ar -cr RANLIB = ${CROSS_COMPILE}ranlib From aa19729fc3803107668d653039c9410c90266e9c Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 15 Apr 2017 12:38:36 +0200 Subject: [PATCH 08/15] Add CC and CXX variables to PocoDoc.ini --- release/script/mkdocumentation | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release/script/mkdocumentation b/release/script/mkdocumentation index 5e143b556..d61578761 100755 --- a/release/script/mkdocumentation +++ b/release/script/mkdocumentation @@ -117,6 +117,11 @@ for inc in `find $build -name include -print` ; do includes="$includes,-I$inc" done +: ${CC:=gcc} +: ${CXX:=g++} + +echo "CC=$CC" >>$build/PocoDoc.ini +echo "CXX=$CXX" >>$build/PocoDoc.ini echo "PocoBuild=$build" >>$build/PocoDoc.ini echo "PocoBase=$POCO_BASE" >>$build/PocoDoc.ini echo "PocoDoc.output=$docPath" >>$build/PocoDoc.ini From 8343a0faef6974fb0becd83772c408487186f704 Mon Sep 17 00:00:00 2001 From: zosrothko Date: Sat, 15 Apr 2017 14:09:41 +0200 Subject: [PATCH 09/15] Restore make silent mode --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index f187161e2..4cc4f23f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,21 +61,21 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -j2 && sudo make install && ./travis/OSX/runtests.sh + - ./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" compiler: gcc script: - export CC="gcc" - export CXX="g++" - - ./configure --everything && make -j2 && ./travis/Linux/runtests.sh + - ./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 -j2 && ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" compiler: gcc @@ -83,7 +83,7 @@ matrix: - export CC="gcc" - export CXX="g++" - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - ./configure --everything --unbundled && make -j2 && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" compiler: gcc @@ -91,17 +91,17 @@ matrix: - 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 -j2 && ./travis/Linux/runtests.sh + - ./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 -j2 && ./travis/Linux/runtests.sh + - ./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 -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l + - ./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 @@ -110,7 +110,7 @@ matrix: - export CXX="g++" - source ./travis/ignored.sh - export POCO_BASE=`pwd` - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -j2 && ctest -VV -E Data && cd .. + - 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 @@ -119,14 +119,14 @@ matrix: - export CXX="g++-4.8" - source ./travis/ignored.sh - export POCO_BASE=`pwd` - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -j2 && ctest -VV -E Data && cd .. + - 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 -j2 && ctest -VV -E Data && cd .. + - 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 @@ -136,7 +136,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 -j2 && cd .. + - 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)" compiler: gcc @@ -146,7 +146,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 -j2 && cd .. + - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. # QA jobs for code analytics and metrics From e8b2ac9b2306951dc8dcecbb8426710242979151 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sun, 16 Apr 2017 10:18:04 +0200 Subject: [PATCH 10/15] Honor CC & CXX environment variables when set --- build/config/Linux | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/build/config/Linux b/build/config/Linux index ee9609b3c..9cc98ed74 100644 --- a/build/config/Linux +++ b/build/config/Linux @@ -15,14 +15,22 @@ LINKMODE ?= SHARED # # Define Tools # -CC ?= ${CROSS_COMPILE}gcc -CXX ?= ${CROSS_COMPILE}g++ +ifeq ($(origin CROSS_COMPILE), undefined) + CC ?=gcc + CXX ?=g++ + LIB = ar -cr + RANLIB = ranlib + STRIP = strip +else + CC = ${CROSS_COMPILE}gcc + CXX = ${CROSS_COMPILE}g++ + LIB = ${CROSS_COMPILE}ar -cr + RANLIB = ${CROSS_COMPILE}ranlib + STRIP = ${CROSS_COMPILE}strip +endif LINK = $(CXX) -LIB = ${CROSS_COMPILE}ar -cr -RANLIB = ${CROSS_COMPILE}ranlib SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln -STRIP = ${CROSS_COMPILE}strip DEP = $(POCO_BASE)/build/script/makedepend.gcc SHELL = sh RM = rm -rf From 106bef7c8b3ad4102b4c50a50c955b1bffe10ee3 Mon Sep 17 00:00:00 2001 From: zosrothko Date: Sun, 16 Apr 2017 13:57:57 +0200 Subject: [PATCH 11/15] Add display of the c++ compiler version --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4cc4f23f2..b8e0df371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,7 @@ matrix: script: - export CC="clang" - export CXX="clang++" + - $CXX --version - clang++ -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 @@ -68,6 +69,7 @@ matrix: 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" @@ -75,6 +77,7 @@ matrix: script: - export CC="gcc-4.8" - export CXX="g++-4.8" + - $CXX --version - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" @@ -82,6 +85,7 @@ matrix: script: - export CC="gcc" - export CXX="g++" + - $CXX --version - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh @@ -91,6 +95,7 @@ matrix: - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - export CC="gcc-4.8" - export CXX="g++-4.8" + - $CXX --version - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux clang 3.4 (make)" @@ -108,6 +113,7 @@ matrix: 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 .. @@ -117,6 +123,7 @@ matrix: script: - export CC="gcc-4.8" - export CXX="g++-4.8" + - $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 .. @@ -133,6 +140,7 @@ matrix: 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 @@ -143,6 +151,7 @@ matrix: 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 @@ -156,6 +165,7 @@ matrix: script: - export CC="gcc-4.8" - export CXX="g++-4.8" + - $CXX --version - . env.sh && mkdoc all && mkrel all # static code analysis with cppcheck (we can add --enable=all later) From a37622a52bdc41473401cec1222554c79afd0048 Mon Sep 17 00:00:00 2001 From: zosrothko Date: Sun, 16 Apr 2017 14:05:11 +0200 Subject: [PATCH 12/15] update with Linux & clang bundled & unbundled --- .travis.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8e0df371..52a425b4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,6 +64,25 @@ matrix: - clang++ -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 clang (make) unbundled" + compiler: clang + script: + - sudo apt-get install -qq -y clang + - export CC="clang" + - export CXX="clang++" + - $CXX --version + - 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="Linux clang (make) unbundled" + compiler: clang + script: + - sudo apt-get install -qq -y clang + - export CC="clang" + - export CXX="clang++" + - $CXX --version + - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh + - env: TEST_NAME="Linux gcc 4.6 (make) bundled" compiler: gcc script: @@ -98,11 +117,6 @@ matrix: - $CXX --version - ./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: From e052f3861a2a5c7554eb04a680ac7cc3eb8d2750 Mon Sep 17 00:00:00 2001 From: zosrothko Date: Sun, 16 Apr 2017 14:23:10 +0200 Subject: [PATCH 13/15] Refactor order of the tests. --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52a425b4d..dde9678b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ matrix: - clang++ -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 clang (make) unbundled" + - env: TEST_NAME="Linux clang (make) bundled" compiler: clang script: - sudo apt-get install -qq -y clang @@ -72,7 +72,7 @@ matrix: - export CXX="clang++" - $CXX --version - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux clang (make) unbundled" compiler: clang @@ -81,7 +81,7 @@ matrix: - export CC="clang" - export CXX="clang++" - $CXX --version - - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) bundled" compiler: gcc @@ -91,14 +91,6 @@ matrix: - $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" - - $CXX --version - - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" compiler: gcc script: @@ -108,6 +100,14 @@ matrix: - 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="Linux gcc 4.8 (make) bundled" + compiler: gcc + script: + - export CC="gcc-4.8" + - export CXX="g++-4.8" + - $CXX --version + - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh + - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" compiler: gcc script: From 260bbd525237e2dc1cd6ab7559d6159b3d9ad03e Mon Sep 17 00:00:00 2001 From: zosrothko Date: Mon, 17 Apr 2017 11:00:39 +0200 Subject: [PATCH 14/15] Comment out unbundled build since it fails on Ubuntu precise All unbundled build are failing on Ubuntu precise while there are ok on Ubuntu trusty & xenial. Waiting for Travis to change the worker's platform from Ubuntu precise to ubuntu trusty or newer. --- .travis.yml | 70 ++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index dde9678b9..34f4759b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ matrix: fast_finish: true include: - - env: TEST_NAME="OSX clang (make) bundled" + - env: TEST_NAME="clang (make) bundled" os: osx compiler: clang script: @@ -64,7 +64,7 @@ matrix: - clang++ -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 clang (make) bundled" + - env: TEST_NAME="clang (make) bundled" compiler: clang script: - sudo apt-get install -qq -y clang @@ -74,16 +74,16 @@ matrix: - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - - env: TEST_NAME="Linux clang (make) unbundled" - compiler: clang - script: - - sudo apt-get install -qq -y clang - - export CC="clang" - - export CXX="clang++" - - $CXX --version - - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh + #- env: TEST_NAME="clang (make) unbundled" + # compiler: clang + # script: + # - sudo apt-get install -qq -y clang + # - export CC="clang" + # - export CXX="clang++" + # - $CXX --version + # - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - - env: TEST_NAME="Linux gcc 4.6 (make) bundled" + - env: TEST_NAME="gcc 4.6 (make) bundled" compiler: gcc script: - export CC="gcc" @@ -91,16 +91,16 @@ matrix: - $CXX --version - ./configure --everything && 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++" - - $CXX --version - - 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="gcc 4.6 (make) unbundled" + # compiler: gcc + # script: + # - export CC="gcc" + # - export CXX="g++" + # - $CXX --version + # - 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="Linux gcc 4.8 (make) bundled" + - env: TEST_NAME="gcc 4.8 (make) bundled" compiler: gcc script: - export CC="gcc-4.8" @@ -108,21 +108,21 @@ matrix: - $CXX --version - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" - 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" - - $CXX --version - - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh + #- env: TEST_NAME="gcc 4.8 (make) unbundled" + # 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" + # - $CXX --version + # - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - - env: TEST_NAME="Linux arm-linux-gnueabi- (make)" + - env: TEST_NAME="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)" + - env: TEST_NAME="gcc 4.6 (CMake)" compiler: gcc script: - export CC="gcc" @@ -132,7 +132,7 @@ matrix: - 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)" + - env: TEST_NAME="gcc 4.8 (CMake)" compiler: gcc script: - export CC="gcc-4.8" @@ -142,14 +142,14 @@ matrix: - 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)" + - env: TEST_NAME="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="Linux arm-linux-gnueabi-g++ (CMake)" + - env: TEST_NAME="arm-linux-gnueabi-g++ (CMake)" compiler: gcc script: - export CC="arm-linux-gnueabi-gcc" @@ -160,7 +160,7 @@ matrix: - 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" @@ -174,7 +174,7 @@ 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-4.8" From ade93a30f801f33ea907daa52dee3a31502f7968 Mon Sep 17 00:00:00 2001 From: zosrothko Date: Mon, 17 Apr 2017 20:14:27 +0200 Subject: [PATCH 15/15] Test the new distribution feature of Travis --- .travis.yml | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34f4759b6..393358a86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,9 @@ services: - postgresql - mysql +dist: trusty +sudo: required + addons: postgresql: "9.3" @@ -74,14 +77,14 @@ matrix: - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - #- env: TEST_NAME="clang (make) unbundled" - # compiler: clang - # script: - # - sudo apt-get install -qq -y clang - # - export CC="clang" - # - export CXX="clang++" - # - $CXX --version - # - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh + - env: TEST_NAME="clang (make) unbundled" + compiler: clang + script: + - sudo apt-get install -qq -y clang + - export CC="clang" + - export CXX="clang++" + - $CXX --version + - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="gcc 4.6 (make) bundled" compiler: gcc @@ -91,14 +94,14 @@ matrix: - $CXX --version - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - #- env: TEST_NAME="gcc 4.6 (make) unbundled" - # compiler: gcc - # script: - # - export CC="gcc" - # - export CXX="g++" - # - $CXX --version - # - 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="gcc 4.6 (make) unbundled" + compiler: gcc + script: + - export CC="gcc" + - export CXX="g++" + - $CXX --version + - 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="gcc 4.8 (make) bundled" compiler: gcc @@ -108,14 +111,14 @@ matrix: - $CXX --version - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh - #- env: TEST_NAME="gcc 4.8 (make) unbundled" - # 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" - # - $CXX --version - # - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh + - env: TEST_NAME="gcc 4.8 (make) unbundled" + 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" + - $CXX --version + - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh - env: TEST_NAME="arm-linux-gnueabi- (make)" compiler: gcc