ci: switch to trusty image

Author: sztomi

.gitignore

@@ -1,13 +1,16 @@
-build
-.idea
+.DS_Store
+build/
+.idea/
+.vscode/
+
+doc/site/
+doc/doxygen/
+
 *.pyc
 compile_commands.json
 CMakeLists.txt.user
 cppcheck*
 report
 utils/release
-.vscode
-doc/site
-doc/doxygen
 doc/all.xml
 reference.md

.travis.yml

@@ -1,35 +1,26 @@
 language: c++
+os: linux 
+dist: trusty
+sudo: required
 
-os:
-  - linux
+matrix:
+  include:
+    - compiler: gcc
+      env: RPCLIB_CXX_STANDARD=11 BUILD_TYPE=Release COVERAGE="ON"
+    - compiler: gcc
+      env: RPCLIB_CXX_STANDARD=14 BUILD_TYPE=Release COVERAGE="OFF"
+    - compiler: clang
+      env: RPCLIB_CXX_STANDARD=11 BUILD_TYPE=Release COVERAGE="OFF"
+    - compiler: clang
+      env: RPCLIB_CXX_STANDARD=14 BUILD_TYPE=Release COVERAGE="OFF"
 
-env:
-  matrix:
-      - RPCLIB_CXX_STANDARD=14 BUILD_TYPE=Release
-      - RPCLIB_CXX_STANDARD=11 BUILD_TYPE=Release
-
-compiler:
-  - gcc
-  - clang
-
-addons:
-  apt:
-    sources:
-      - llvm-toolchain-precise-3.8
-      - ubuntu-toolchain-r-test
-      - george-edison55-precise-backports
-    packages:
-      - libsfml-dev
-      - g++-5
-      - gcc-5
-      - clang-3.8
-      - cmake
-      - cmake-data
+before_install:
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo apt-get update -qq
 
 install:
-  - if [ "$CXX" == "g++" ];     then export CXX="g++-5" CC="gcc-5"; fi
-  - if [ "$CXX" == "clang++" ]; then export CXX="clang++-3.8" CC="clang-3.8"; fi
-  - pip install --user cpp-coveralls
+  - sudo apt-get install -qq g++-5
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90
   - pip install --user conan
   - pip install --user requests==2.5.3
   - conan remote add conan-community https://api.bintray.com/conan/conan-community/conan
@@ -38,10 +29,11 @@ script:
   - mkdir build ; cd build
   - conan install .. -r conan-community
   - . ./activate.sh
-  - cmake -DRPCLIB_ENABLE_COVERAGE=ON -DRPCLIB_BUILD_TESTS=ON -DRPCLIB_CXX_STANDARD=$RPCLIB_CXX_STANDARD -DCMAKE_INSTALL_PREFIX=../install ..
+  - cmake -DRPCLIB_ENABLE_COVERAGE=$COVERAGE -DRPCLIB_BUILD_TESTS=ON -DRPCLIB_CXX_STANDARD=$RPCLIB_CXX_STANDARD -DCMAKE_INSTALL_PREFIX=../install ..
   - cmake --build . --config $BUILD_TYPE
   - cmake --build . --target install
 
 after_success:
-  - ./output/bin/rpc_test
-  - coveralls --exclude dependencies --exclude test --exclude include/rpc/msgpack --exclude include/rcp/msgpack.hpp --gcov /usr/bin/gcov-5
+  - ./tests/rpc_test
+  - lcov --capture --directory . --output-file coverage.info
+  - bash <(curl -s https://codecov.io/bash)

CMakeLists.txt

@@ -5,6 +5,7 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 include(policies)
 include(msvc_support)
+include(coverage)
 
 #
 # Options
@@ -28,9 +29,6 @@ option(RPCLIB_MSVC_STATIC_RUNTIME
   "MSVC only: build with /MT instead of /MD" 
   OFF)
 
-# Perform steps and checks required for MSVC support
-rpclib_msvc_support()
-
 #
 # Other configuration values
 #
@@ -53,6 +51,8 @@ if(NOT ${RPCLIB_CXX_STANDARD} EQUAL 14 AND
   message(fatal_error "Unsupported C++ standard: ${RPCLIB_CXX_STANDARD}")
 endif()
 
+set(CMAKE_CXX_STANDARD ${RPCLIB_CXX_STANDARD})
+
 #
 # Compile & install the library
 #
@@ -105,17 +105,13 @@ add_library(${PROJECT_NAME}
   ${DEP_HEADERS}
   ${RPCLIB_HEADERS})
 
+# Perform steps and checks required for MSVC support
+rpclib_msvc_support()
+
 set(RPCLIB_BUILD_FLAGS "") # reset flags
 
-if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-  target_compile_options(${PROJECT_NAME} PUBLIC 
-    -std=c++${RPCLIB_CXX_STANDARD})
-  if(RPCLIB_ENABLE_COVERAGE)
-    target_compile_options(${PROJECT_NAME} PRIVATE --coverage -O0 -g)
-    # yes, this is ugly as "--coverage" is not a library, but a flag.
-    # however, this does not work with the LINK_FLAGS target property
-    list(APPEND RPCLIB_DEP_LIBRARIES "--coverage")
-  endif()
+if(RPCLIB_ENABLE_COVERAGE)
+  enable_coverage(${PROJECT_NAME})
 endif()
 
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
@@ -131,16 +127,17 @@ if (RPCLIB_EXTRA_BUILD_FLAGS)
   list(APPEND RPCLIB_BUILD_FLAGS ${RPCLIB_EXTRA_BUILD_FLAGS})
 endif()
 
-target_compile_definitions(${PROJECT_NAME} PRIVATE
-  "${RPCLIB_COMPILE_DEFINITIONS}"
-  "${RPCLIB_ARCH_DEF}"
-  "${RPCLIB_OS_DEF}"
-  "ASIO_STANDALONE"
-  "RPCLIB_ASIO=clmdep_asio"
-  "RPCLIB_FMT=clmdep_fmt")
-
-target_compile_definitions(${PROJECT_NAME} PUBLIC 
-  "RPCLIB_MSGPACK=clmdep_msgpack")
+target_compile_definitions(${PROJECT_NAME} 
+  PRIVATE
+    "${RPCLIB_COMPILE_DEFINITIONS}"
+    "${RPCLIB_ARCH_DEF}"
+    "ASIO_STANDALONE"
+    "RPCLIB_ASIO=clmdep_asio"
+    "RPCLIB_FMT=clmdep_fmt"
+  PUBLIC
+    "${RPCLIB_OS_DEF}"
+    "RPCLIB_MSGPACK=clmdep_msgpack"
+  )
 
 if(RPCLIB_ENABLE_LOGGING)
   target_compile_definitions(${PROJECT_NAME} PRIVATE "RPCLIB_ENABLE_LOGGING")

README.md

@@ -1,5 +1,5 @@
 
-# rpclib ![MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build Status](https://travis-ci.org/rpclib/rpclib.svg?branch=master)](https://travis-ci.org/rpclib/rpclib) [![Build status](https://ci.appveyor.com/api/projects/status/9lft2tlamcox8epq?svg=true)](https://ci.appveyor.com/project/sztomi/callme) [![Coverage Status](https://coveralls.io/repos/github/rpclib/rpclib/badge.svg)](https://coveralls.io/github/rpclib/rpclib?branch=dev) ![Coverity](https://scan.coverity.com/projects/7259/badge.svg?flat=1) [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?maxAge=2592000)](https://gitter.im/rpclib/Lobby)
+# rpclib ![MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build Status](https://travis-ci.org/rpclib/rpclib.svg?branch=master)](https://travis-ci.org/rpclib/rpclib) [![Build status](https://ci.appveyor.com/api/projects/status/9lft2tlamcox8epq?svg=true)](https://ci.appveyor.com/project/sztomi/callme) [![Coverage Status](https://img.shields.io/codecov/c/github/rpclib/rpclib/dev.svg)](https://img.shields.io/codecov/c/github/rpclib/rpclib/dev.svg) ![Coverity](https://scan.coverity.com/projects/7259/badge.svg?flat=1) [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?maxAge=2592000)](https://gitter.im/rpclib/Lobby)
 
 `rpclib` is a RPC library for C++, providing both a client and server implementation. It is built using modern C++14, and as such, requires a recent compiler. Main highlights:
 

appveyor.yml

@@ -14,6 +14,7 @@ configuration:
 environment:
   matrix:
     - CMAKE_PLATFORM: "Visual Studio 14 2015"
+    - CMAKE_PLATFORM: "Visual Studio 15 2017"
 
 install: true
 
@@ -23,8 +24,6 @@ build_script:
   - git submodule update --init --recursive
   - md build
   - cd build
-  - cmake -DRPCLIB_ENABLE_COVERAGE=ON -DRPCLIB_BUILD_TESTS=ON -G "%CMAKE_PLATFORM%" ..
-  - set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  - set MSBuildOptions=/v:m /p:Configuration=%Configuration% /logger:%MSBuildLogger%
-  - msbuild %MSBuildOptions% rpc.sln
-  - .\output\bin\Release\rpc_test.exe
+  - cmake -DRPCLIB_BUILD_TESTS=ON -G "%CMAKE_PLATFORM%" ..
+  - cmake --build . --config %CONFIGURATION%
+  - .\tests\Release\rpc_test.exe

cmake/coverage.cmake

@@ -0,0 +1,16 @@
+function(enable_coverage TARGET)
+  if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+
+    if(APPLE)
+      set(COVERAGE_LIB "")
+    else()
+      set(COVERAGE_LIB -lgcov)
+    endif()
+
+    set_target_properties(${TARGET}
+      PROPERTIES
+      COMPILE_FLAGS --coverage
+      LINK_FLAGS    "${COVERAGE_LIB} --coverage"
+      )
+  endif()
+endfunction()

codecov.yml

@@ -0,0 +1,7 @@
+
+ignore:
+  - "include/rpc/msgpack"
+  - "dependencies"
+
+coverage:
+  precision: 2

tests/CMakeLists.txt

@@ -1,3 +1,5 @@
+include(coverage)
+
 set(TEST_PROJECT_NAME ${CMAKE_PROJECT_NAME}_test)
 set(TEST_SOURCES
   ${RPCLIB_DEPENDENCIES}/src/gmock-gtest-all.cc
@@ -33,3 +35,6 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     -Wno-exit-time-destructors -Wno-switch-enum -Wno-format-nonliteral -Wno-unused-parameter -Wno-disabled-macro-expansion)
 endif()
 
+if(RPCLIB_ENABLE_COVERAGE)
+  enable_coverage(${TEST_PROJECT_NAME})
+endif()