new ci scripts

.appveyor.yml

@@ -7,34 +7,17 @@ platform:
   - x64
 
 configuration:
-  - Debug
   - Release
 
 for:
 
--
-  matrix:
-    only:
-      - platform: x86
-        configuration: Debug
-  build_script:
-    - scripts\build_debug_x86.bat
-
--
-  matrix:
-    only:
-      - platform: x64
-        configuration: Debug
-  build_script:
-    - scripts\build_debug_x64.bat
-
 -
   matrix:
     only:
       - platform: x86
         configuration: Release
   build_script:
-    - scripts\build_release_x86.bat
+    - .ci\build_windows_x86.bat
 
 -
   matrix:
@@ -42,4 +25,4 @@ for:
       - platform: x64
         configuration: Release
   build_script:
-    - scripts\build_release_x64.bat
+    - .ci\build_windows_x64.bat

.ci/build_coverage.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+DIR="$( cd "$( dirname "${BASH_SOURCE}" )" && pwd )"
+
+ROOT_DIR="${DIR}/.."
+BUILD_DIR="${ROOT_DIR}/build/coverage"
+
+mkdir -p "${BUILD_DIR}"
+(cd "${BUILD_DIR}" && cmake "${ROOT_DIR}" -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COVERAGE=ON)
+(cd "${BUILD_DIR}" && cmake --build .)
+
+(cd "${BUILD_DIR}" && lcov -d . -z)
+(cd "${BUILD_DIR}" && ctest --verbose)
+
+(cd "${BUILD_DIR}" && lcov -d . -c -o "coverage.info")
+(cd "${BUILD_DIR}" && lcov -r "coverage.info" "*/usr/*" "*/untests/*" -o "coverage.info")
+(cd "${BUILD_DIR}" && lcov -l "coverage.info")
+
+bash <(curl -s https://codecov.io/bash) -f "${BUILD_DIR}/coverage.info" || echo "Codecov did not collect coverage reports"

.ci/build_darwin.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+DIR="$( cd "$( dirname "${BASH_SOURCE}" )" && pwd )"
+
+ROOT_DIR="${DIR}/.."
+BUILD_DIR="${ROOT_DIR}/build/darwin_release"
+
+mkdir -p "${BUILD_DIR}"
+(cd "${BUILD_DIR}" && cmake "${ROOT_DIR}" -DCMAKE_BUILD_TYPE=Release)
+(cd "${BUILD_DIR}" && cmake --build .)
+(cd "${BUILD_DIR}" && ctest --verbose)

.ci/build_linux.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+DIR="$( cd "$( dirname "${BASH_SOURCE}" )" && pwd )"
+
+ROOT_DIR="${DIR}/.."
+BUILD_DIR="${ROOT_DIR}/build/linux_release"
+
+mkdir -p "${BUILD_DIR}"
+(cd "${BUILD_DIR}" && cmake "${ROOT_DIR}" -DCMAKE_BUILD_TYPE=Release)
+(cd "${BUILD_DIR}" && cmake --build .)
+(cd "${BUILD_DIR}" && ctest --verbose)

.ci/build_windows_x64.bat

@@ -0,0 +1,19 @@
+@echo off
+set DIR=%~dp0
+
+set ROOT_DIR=%DIR%..\
+set BUILD_DIR=%ROOT_DIR%build\windows_release_x64\
+
+if not exist %BUILD_DIR% mkdir %BUILD_DIR% || goto :error
+
+pushd %BUILD_DIR% || goto :error
+cmake %ROOT_DIR% -A x64 || goto :error
+cmake --build . --config Release || goto :error
+ctest --verbose || goto :error
+popd || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%

.ci/build_windows_x86.bat

@@ -0,0 +1,19 @@
+@echo off
+set DIR=%~dp0
+
+set ROOT_DIR=%DIR%..\
+set BUILD_DIR=%ROOT_DIR%build\windows_release_x86\
+
+if not exist %BUILD_DIR% mkdir %BUILD_DIR% || goto :error
+
+pushd %BUILD_DIR% || goto :error
+cmake %ROOT_DIR% -A Win32 || goto :error
+cmake --build . --config Release || goto :error
+ctest --verbose || goto :error
+popd || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%

.travis.yml

@@ -8,116 +8,60 @@ jobs:
   include:
 
     #
-    # linux (g++-7)
+    # linux (g++)
     #
 
     - os: linux
-      dist: xenial
+      dist: bionic
       stage: linux
-      name: debug, g++-7
+      name: g++-7
       addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7"] } }
       env: CC=gcc-7 CXX=g++-7
-      script: ./scripts/build_debug.sh
+      script: .ci/build_linux.sh
 
     - os: linux
-      dist: xenial
+      dist: bionic
       stage: linux
-      name: release, g++-7
+      name: g++-8
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7"] } }
-      env: CC=gcc-7 CXX=g++-7
-      script: ./scripts/build_release.sh
-
-    #
-    # linux (g++-8)
-    #
-
-    - os: linux
-      dist: xenial
-      stage: linux
-      name: debug, g++-8
       addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-8"] } }
       env: CC=gcc-8 CXX=g++-8
-      script: ./scripts/build_debug.sh
+      script: .ci/build_linux.sh
-
-    - os: linux
-      dist: xenial
-      stage: linux
-      name: release, g++-8
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-8"] } }
-      env: CC=gcc-8 CXX=g++-8
-      script: ./scripts/build_release.sh
 
     #
-    # linux (clang++-5.0)
+    # linux (clang++)
     #
 
     - os: linux
-      dist: xenial
+      dist: bionic
       stage: linux
-      name: debug, clang++-5.0
+      name: clang++-5.0
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7", "clang-5.0"] } }
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["clang-5.0"] } }
       env: CC=clang-5.0 CXX=clang++-5.0
-      script: ./scripts/build_debug.sh
+      script: .ci/build_linux.sh
 
     - os: linux
-      dist: xenial
+      dist: bionic
       stage: linux
-      name: release, clang++-5.0
+      name: clang++-6.0
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7", "clang-5.0"] } }
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["clang-6.0"] } }
-      env: CC=clang-5.0 CXX=clang++-5.0
-      script: ./scripts/build_release.sh
-
-    #
-    # linux (clang++-6.0)
-    #
-
-    - os: linux
-      dist: xenial
-      stage: linux
-      name: debug, clang++-6.0
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7", "clang-6.0"] } }
       env: CC=clang-6.0 CXX=clang++-6.0
-      script: ./scripts/build_debug.sh
+      script: .ci/build_linux.sh
-
-    - os: linux
-      dist: xenial
-      stage: linux
-      name: release, clang++-6.0
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7", "clang-6.0"] } }
-      env: CC=clang-6.0 CXX=clang++-6.0
-      script: ./scripts/build_release.sh
 
     #
-    # macosx (xcode10)
+    # darwin
     #
 
     - os: osx
       osx_image: xcode10
-      stage: macosx
+      stage: darwin
-      name: debug, xcode10
+      name: xcode10
-      script: ./scripts/build_debug.sh
+      script: .ci/build_darwin.sh
-
-    - os: osx
-      osx_image: xcode10
-      stage: macosx
-      name: release, xcode10
-      script: ./scripts/build_release.sh
-
-    #
-    # macosx (xcode11)
-    #
 
     - os: osx
       osx_image: xcode11
-      stage: macosx
+      stage: darwin
-      name: debug, xcode11
+      name: xcode11
-      script: ./scripts/build_debug.sh
+      script: .ci/build_darwin.sh
-
-    - os: osx
-      osx_image: xcode11
-      stage: macosx
-      name: release, xcode11
-      script: ./scripts/build_release.sh
 
     #
     # coverage
@@ -126,6 +70,6 @@ jobs:
     - os: osx
       osx_image: xcode10
       stage: coverage
-      name: coverage, xcode10
+      name: coverage
       addons: { homebrew: { packages: ["lcov"], update: true } }
-      script: ./scripts/upload_coverage.sh
+      script: .ci/build_coverage.sh

scripts/build_all.bat

@@ -1,12 +0,0 @@
-@echo off
-set SCRIPT_DIR=%~dp0%
-call %SCRIPT_DIR%\build_debug_x86.bat || goto :error
-call %SCRIPT_DIR%\build_debug_x64.bat || goto :error
-call %SCRIPT_DIR%\build_release_x86.bat || goto :error
-call %SCRIPT_DIR%\build_release_x64.bat || goto :error
-
-goto :EOF
-
-:error
-echo Failed with error #%errorlevel%.
-exit /b %errorlevel%

scripts/build_all.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-SCRIPT_DIR=`dirname "$BASH_SOURCE"`
-$SCRIPT_DIR/build_debug.sh
-$SCRIPT_DIR/build_release.sh

scripts/build_clear.bat

@@ -1,9 +0,0 @@
-@echo off
-set BUILD_DIR=%~dp0%\..\build
-rmdir /s /q %BUILD_DIR% || goto :error
-
-goto :EOF
-
-:error
-echo Failed with error #%errorlevel%.
-exit /b %errorlevel%

scripts/build_clear.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-set -e
-BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-rm -rf $BUILD_DIR

scripts/build_debug.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-mkdir -p $BUILD_DIR/Debug
-pushd $BUILD_DIR/Debug
-cmake -DCMAKE_BUILD_TYPE=Debug ../..
-cmake --build .
-ctest --verbose
-popd

scripts/build_debug_x64.bat

@@ -1,14 +0,0 @@
-@echo off
-set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\Debug\x64 || goto :error
-pushd %BUILD_DIR%\Debug\x64 || goto :error
-cmake ..\..\.. -A x64 || goto :error
-cmake --build . --config Debug || goto :error
-ctest --verbose || goto :error
-popd || goto :error
-
-goto :EOF
-
-:error
-echo Failed with error #%errorlevel%.
-exit /b %errorlevel%

scripts/build_debug_x86.bat

@@ -1,14 +0,0 @@
-@echo off
-set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\Debug\x86 || goto :error
-pushd %BUILD_DIR%\Debug\x86 || goto :error
-cmake ..\..\.. -A Win32 || goto :error
-cmake --build . --config Debug || goto :error
-ctest --verbose || goto :error
-popd || goto :error
-
-goto :EOF
-
-:error
-echo Failed with error #%errorlevel%.
-exit /b %errorlevel%

scripts/build_release.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-mkdir -p $BUILD_DIR/Release
-pushd $BUILD_DIR/Release
-cmake -DCMAKE_BUILD_TYPE=Release ../..
-cmake --build .
-ctest --verbose
-popd

scripts/build_release_x64.bat

@@ -1,14 +0,0 @@
-@echo off
-set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\Release\x64 || goto :error
-pushd %BUILD_DIR%\Release\x64 || goto :error
-cmake ..\..\.. -A x64 || goto :error
-cmake --build . --config Release || goto :error
-ctest --verbose || goto :error
-popd || goto :error
-
-goto :EOF
-
-:error
-echo Failed with error #%errorlevel%.
-exit /b %errorlevel%

scripts/build_release_x86.bat

@@ -1,14 +0,0 @@
-@echo off
-set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\Release\x86 || goto :error
-pushd %BUILD_DIR%\Release\x86 || goto :error
-cmake ..\..\.. -A Win32 || goto :error
-cmake --build . --config Release || goto :error
-ctest --verbose || goto :error
-popd || goto :error
-
-goto :EOF
-
-:error
-echo Failed with error #%errorlevel%.
-exit /b %errorlevel%

scripts/upload_coverage.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e
-
-BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-mkdir -p $BUILD_DIR/coverage
-cd $BUILD_DIR/coverage
-cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COVERAGE=ON ../..
-cmake --build .
-
-lcov -d . -z
-ctest --verbose
-
-lcov -d . -c -o "coverage.info"
-lcov -r "coverage.info" "*/usr/*" "*/untests/*" -o "coverage.info"
-lcov -l "coverage.info"
-
-bash <(curl -s https://codecov.io/bash) -f "coverage.info" || echo "Codecov did not collect coverage reports"