From a235f3ddae4302ab0967dea9cef64c27d2086f65 Mon Sep 17 00:00:00 2001 From: rbock Date: Thu, 21 Aug 2014 11:09:50 +0200 Subject: [PATCH 1/8] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f25797ba..0b8d6ebe 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,7 @@ sqlpp11 makes heavy use of C++11 and requires a recent compiler and STL. The fol * clang-3.2 on Ubuntu-12.4 * clang-3.4 on Ubuntu-12.4 * g++-4.8 on Ubuntu-12.4 + * g++-4.8 on cygwin 64bit * g++-4.9 on Debian Unstable __Database Connector:__ From e88a868d067dcfd76ec9a8af07aca890fa02dbdf Mon Sep 17 00:00:00 2001 From: rbock Date: Sun, 24 Aug 2014 09:34:01 +0200 Subject: [PATCH 2/8] Started to integrate with Travis CI --- .travis.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..24216e08 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,48 @@ +language: cpp + +os: + - linux + - osx + +compiler: + - clang + - gcc + +matrix: + # This excludes OSX builds from the build matrix for gcc + exclude: + - os: osx + compiler: gcc + +notifications: + email: + on_success: change + on_failure: always + +before_install: + - "if [ $CC = 'gcc' ]; then export CXX=g++; fi" + - "if [ $CC = 'clang' ]; then export CXX=clang++; fi" + - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew install cmake; fi" + # Install cpp-coveralls for reporting test coverage under only linux, see https://github.com/eddyxu/cpp-coveralls + #- "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo pip install cpp-coveralls; fi" + +install: + - "mkdir -p $TRAVIS_BUILD_DIR/build/scripts" + - "cd $TRAVIS_BUILD_DIR/build/scripts" + # Enable test coverage for travis-ci build + #- "cmake $TRAVIS_BUILD_DIR/src -DNTA_COV_ENABLED=ON" + - "cmake $TRAVIS_BUILD_DIR/src" + +script: + - "cd $TRAVIS_BUILD_DIR/build/scripts" + - "make -j3" + # test compile-time constraints + - "make test_sqlpp_constraints" + +after_success: + - "cd $TRAVIS_BUILD_DIR" + # Send test coverage report to http://coveralls.io under only linux + # - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then coveralls --exclude external --exclude doc --exclude src/test; fi" + + + From cadc7bdb3ab8513d96e4a72a426b830035222713 Mon Sep 17 00:00:00 2001 From: rbock Date: Sun, 24 Aug 2014 09:57:17 +0200 Subject: [PATCH 3/8] Updated credits a bit --- CREDITS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CREDITS b/CREDITS index 6ad7db8e..3675cef0 100644 --- a/CREDITS +++ b/CREDITS @@ -7,8 +7,12 @@ This library evolved through several stages and would probably not exist without * Peter Knoblach: Initial ideas * Ulrich Küttler: Feedback and extensions + * Metafeed GmbH: Production code using a forerunner version * PPRO Financial Ltd: Production code using sqlpp11 and a forerunner version + * The boost community: Invaluable suggestions and critiques + + * Meeting C++ Munich: Hosted the first talk about sqlpp11 If you miss your name of this list, please let me know. From 411022469f34c3f90bb90041993a417cb7fbb282 Mon Sep 17 00:00:00 2001 From: rbock Date: Sun, 24 Aug 2014 09:59:55 +0200 Subject: [PATCH 4/8] Bugfix in Travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 24216e08..2088c77a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: - "cd $TRAVIS_BUILD_DIR/build/scripts" # Enable test coverage for travis-ci build #- "cmake $TRAVIS_BUILD_DIR/src -DNTA_COV_ENABLED=ON" - - "cmake $TRAVIS_BUILD_DIR/src" + - "cmake $TRAVIS_BUILD_DIR" script: - "cd $TRAVIS_BUILD_DIR/build/scripts" From 3c3abfab41193a39ed831552a3787b68ab6b7729 Mon Sep 17 00:00:00 2001 From: Roland Bock Date: Sun, 24 Aug 2014 10:20:49 +0200 Subject: [PATCH 5/8] Exclude clang from Travis and use g++-4.8 clang is missing libc++ (might add that later) --- .travis.yml | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2088c77a..904ed15a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,35 +2,23 @@ language: cpp os: - linux - - osx compiler: - - clang + # - clang # disabled clang due to missing libc++ - gcc -matrix: - # This excludes OSX builds from the build matrix for gcc - exclude: - - os: osx - compiler: gcc - notifications: email: on_success: change on_failure: always before_install: - - "if [ $CC = 'gcc' ]; then export CXX=g++; fi" - - "if [ $CC = 'clang' ]; then export CXX=clang++; fi" - - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew install cmake; fi" - # Install cpp-coveralls for reporting test coverage under only linux, see https://github.com/eddyxu/cpp-coveralls - #- "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo pip install cpp-coveralls; fi" + - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi + - if [ "$CXX" == "g++" ]; then sudo apt-get install -qq g++-4.8; fi install: - "mkdir -p $TRAVIS_BUILD_DIR/build/scripts" - "cd $TRAVIS_BUILD_DIR/build/scripts" - # Enable test coverage for travis-ci build - #- "cmake $TRAVIS_BUILD_DIR/src -DNTA_COV_ENABLED=ON" - "cmake $TRAVIS_BUILD_DIR" script: @@ -39,10 +27,3 @@ script: # test compile-time constraints - "make test_sqlpp_constraints" -after_success: - - "cd $TRAVIS_BUILD_DIR" - # Send test coverage report to http://coveralls.io under only linux - # - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then coveralls --exclude external --exclude doc --exclude src/test; fi" - - - From facff35d0a1fcc2529019355b2c0df5692106ade Mon Sep 17 00:00:00 2001 From: Roland Bock Date: Sun, 24 Aug 2014 10:31:14 +0200 Subject: [PATCH 6/8] Next attempt to use g++-4.8 with Travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 904ed15a..0e1cef62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,7 @@ notifications: on_failure: always before_install: - - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - - if [ "$CXX" == "g++" ]; then sudo apt-get install -qq g++-4.8; fi + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi install: - "mkdir -p $TRAVIS_BUILD_DIR/build/scripts" From 2f979ff263c012eb2757779fb84c6424c416ed7d Mon Sep 17 00:00:00 2001 From: Roland Bock Date: Sun, 24 Aug 2014 10:40:14 +0200 Subject: [PATCH 7/8] Yet another try to get Travis CI going with g++-4.8 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0e1cef62..39ee5821 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,12 @@ notifications: on_failure: always before_install: + - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + - sudo apt-get update + - if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi + install: - "mkdir -p $TRAVIS_BUILD_DIR/build/scripts" - "cd $TRAVIS_BUILD_DIR/build/scripts" From 342a42758ad13b5b6613bc96d396856908b44127 Mon Sep 17 00:00:00 2001 From: Roland Bock Date: Sun, 24 Aug 2014 10:46:08 +0200 Subject: [PATCH 8/8] Fixed test_sqlpp_test_constraints to work with out of source build --- test_constraints/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_constraints/CMakeLists.txt b/test_constraints/CMakeLists.txt index 6b4693d5..aec592e4 100644 --- a/test_constraints/CMakeLists.txt +++ b/test_constraints/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${CMAKE_BINARY_DIR}/tests) +include_directories(${CMAKE_SOURCE_DIR}/tests) add_custom_target(test_sqlpp_constraints COMMAND true)