j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into coverity_scan

Browse source
This commit is contained in:
Niels 2016-05-29 14:06:54 +02:00
commit 5666bd0e2d
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.travis.yml
View file

@ -40,7 +40,7 @@ matrix:
description: "Build submitted via Travis CI" description: "Build submitted via Travis CI"
notification_email: niels.lohmann@gmail.com notification_email: niels.lohmann@gmail.com
build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)" build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)"
build_command: "make doctest || true" build_command: "make coverity"
branch_pattern: coverity_scan branch_pattern: coverity_scan
env: COMPILER=g++-5 env: COMPILER=g++-5
@ -79,13 +79,13 @@ matrix:
packages: ['clang-3.8', 'valgrind'] packages: ['clang-3.8', 'valgrind']
env: COMPILER=clang++-3.8 env: COMPILER=clang++-3.8
- os: linux # - os: linux
compiler: clang # compiler: clang
addons: # addons:
apt: # apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise'] # sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise']
packages: ['clang-3.9', 'valgrind'] # packages: ['clang-3.9', 'valgrind']
env: COMPILER=clang++-3.9 # env: COMPILER=clang++-3.9
- os: osx - os: osx
osx_image: beta-xcode6.1 osx_image: beta-xcode6.1

8
Makefile
View file

@ -10,6 +10,7 @@ all: json_unit
# clean up # clean up
clean: clean:
rm -fr json_unit json_benchmarks fuzz fuzz-testing *.dSYM rm -fr json_unit json_benchmarks fuzz fuzz-testing *.dSYM
$(MAKE) clean -Cdoc
########################################################################## ##########################################################################
@ -30,7 +31,12 @@ json_unit: test/src/unit.cpp src/json.hpp test/src/catch.hpp
# compile example files and check output # compile example files and check output
doctest: doctest:
make check_output -C doc $(MAKE) check_output -C doc
# copmpile example files and do not check output (for coverity-scan)
coverity:
$(MAKE) compile_only -Cdoc CXXFLAGS="-std=c++11" CPPFLAGS="-I../src"
########################################################################## ##########################################################################

10
doc/Makefile
View file

@ -2,9 +2,6 @@ SRCDIR = ../src
all: doxygen all: doxygen
clean:
rm -fr me.nlohmann.json.docset html
########################################################################## ##########################################################################
# example files # example files
@ -40,10 +37,17 @@ create_output: $(EXAMPLES:.cpp=.output)
create_links: $(EXAMPLES:.cpp=.link) create_links: $(EXAMPLES:.cpp=.link)
# only compile files
compile_only: $(EXAMPLES:.cpp=)
# check output of all stand-alone example files # check output of all stand-alone example files
check_output: $(EXAMPLES:.cpp=.test) check_output: $(EXAMPLES:.cpp=.test)
clean:
rm -fr me.nlohmann.json.docset html $(EXAMPLES:.cpp=)
########################################################################## ##########################################################################
# Doxygen HTML documentation # Doxygen HTML documentation
########################################################################## ##########################################################################