Skip to content

Commit

Permalink
Merge branch 'release/v1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Spiess-Knafl committed Aug 27, 2017
2 parents b84ffa1 + 3950f34 commit e960bf5
Show file tree
Hide file tree
Showing 153 changed files with 8,701 additions and 6,960 deletions.
29 changes: 29 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# osx noise
.DS_Store
profile

# xcode noise
build/*
*.mode1
*.mode1v3
*.mode2v3
*.perspective
*.perspectivev3
*.pbxuser
*.xcworkspace
xcuserdata

# svn & cvs
.svn
CVS
reports/*
doc/html
CMakeLists.txt.user*
src/examples/gen/*
*~

# IntelliJ
.idea

*.tar.gz
*.asc
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ src/examples/gen/*

# IntelliJ
.idea

*.tar.gz
*.asc
88 changes: 55 additions & 33 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,63 @@
language: cpp
dist: trusty

sudo: required
services:
- docker
before_install:
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -qq
- sudo apt-get install -qq libcurl4-openssl-dev libjsoncpp-dev libargtable2-dev libgnutls-dev libgcrypt11-dev valgrind wget gcc-5 g++-5
- wget http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.52.tar.gz
- tar -xvf libmicrohttpd-0.9.52.tar.gz
- cd libmicrohttpd-0.9.52
- ./configure && make
- sudo make install && sudo ldconfig
- cd .. && sudo rm -rf libmicrohttpd-0.9.52
- sudo pip install codecov
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -qq
- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi

install:
- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
- sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-5 90
- |
if [[ "$OS" == "native" && "$TRAVIS_OS_NAME" == "linux" ]]
then
sudo apt-get install -qq wget
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo add-apt-repository 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main' -y
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-get update -qq
sudo apt-get install -qq libcurl4-openssl-dev libhiredis-dev redis-server libjsoncpp-dev libargtable2-dev libgnutls-dev libgcrypt11-dev valgrind wget gcc-5 g++-5 clang-5.0
wget http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.52.tar.gz
tar -xvf libmicrohttpd-0.9.52.tar.gz
cd libmicrohttpd-0.9.52
./configure && make
sudo make install && sudo ldconfig
cd .. && sudo rm -rf libmicrohttpd-0.9.52
sudo pip install codecov
sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-5 90
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]
then
brew update
brew install jsoncpp argtable curl hiredis redis
brew install libmicrohttpd --with-ssl
fi
env:
- HTTP_SERVER=YES HTTP_CLIENT=YES COMPILE_STUBGEN=YES
matrix:
include:
- env: OS=fedora
os: linux
- env: OS=arch
os: linux
- env: OS=debian8
os: linux
- env: OS=debian9
os: linux
- env: OS=debian10
os: linux
- env: OS=ubuntu1604
os: linux
- env: OS=ubuntu1704
os: linux
- env: OS=native
os: linux
compiler: clang
- env: OS=native
os: linux
compiler: gcc
- env: OS=native
os: osx
compiler: clang

compiler:
- gcc
- gcc

script:
- mkdir -p build && cd build
- cmake -DCMAKE_BUILD_TYPE=Debug -DHTTP_CLIENT=${HTTP_CLIENT} -DHTTP_SERVER=${HTTP_SERVER} -DCOMPILE_STUBGEN=${COMPILE_STUBGEN} ..
- make
- make test
- sudo make install && sudo ldconfig
- g++ ../src/examples/simpleclient.cpp -ljsonrpccpp-client -ljsoncpp -ljsonrpccpp-common -lcurl -o sampleclient
- g++ ../src/examples/simpleserver.cpp -ljsonrpccpp-server -ljsoncpp -ljsonrpccpp-common -lmicrohttpd -o sampleserver
- sudo make uninstall
- cd ..
- ./dev/codecov.sh
after_success:
- bash <(curl -s https://codecov.io/bash)
- if [[ "$OS" == "native" ]]; then ./docker/build_test_install.sh; fi
- if [[ "$OS" == "native" && "$TRAVIS_OS_NAME" == "linux" && "$COMPILER" == "gcc" ]]; then ./dev/codecov.sh; fi
- if [[ "$OS" != "native" ]]; then cd docker; make ${OS}; fi
9 changes: 9 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,15 @@ Alexandre Poirot <[email protected]>
+ adapted build file to generate pkg-config file for this lib
+ added client and server connectors that use Tcp Sockets on Linux and Windows (uses native socket and thread API on each OS)

Trevor Vannoy <[email protected]>
+ python client stub generator

Jean-Daniel Michaud <jean.daniel,[email protected]>
+ added server/client file descriptor support

Jacques Software <[email protected]>
+ added support for redis connector

Bugfixes (chronological order)
==============================

Expand Down Expand Up @@ -66,3 +72,6 @@ Erik Lundin

Michał Górny <[email protected]>
+ bugfixes in the build system

Trevor Vannoy <[email protected]>
+ fixed tcp socket client compile issues
Loading

0 comments on commit e960bf5

Please sign in to comment.