Skip to content

Commit

Permalink
Merge branch 'develop' into coverity_scan
Browse files Browse the repository at this point in the history
  • Loading branch information
nlohmann committed May 29, 2016
2 parents 03db7b0 + aa8aa3b commit 5666bd0
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ matrix:
description: "Build submitted via Travis CI"
notification_email: niels.lohmann@gmail.com
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
env: COMPILER=g++-5

Expand Down Expand Up @@ -79,13 +79,13 @@ matrix:
packages: ['clang-3.8', 'valgrind']
env: COMPILER=clang++-3.8

- os: linux
compiler: clang
addons:
apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise']
packages: ['clang-3.9', 'valgrind']
env: COMPILER=clang++-3.9
# - os: linux
# compiler: clang
# addons:
# apt:
# sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise']
# packages: ['clang-3.9', 'valgrind']
# env: COMPILER=clang++-3.9

- os: osx
osx_image: beta-xcode6.1
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ all: json_unit
# clean up
clean:
rm -fr json_unit json_benchmarks fuzz fuzz-testing *.dSYM
$(MAKE) clean -Cdoc


##########################################################################
Expand All @@ -30,7 +31,12 @@ json_unit: test/src/unit.cpp src/json.hpp test/src/catch.hpp

# compile example files and check output
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"


##########################################################################
Expand Down
10 changes: 7 additions & 3 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ SRCDIR = ../src

all: doxygen

clean:
rm -fr me.nlohmann.json.docset html


##########################################################################
# example files
Expand Down Expand Up @@ -40,10 +37,17 @@ create_output: $(EXAMPLES:.cpp=.output)

create_links: $(EXAMPLES:.cpp=.link)

# only compile files
compile_only: $(EXAMPLES:.cpp=)

# check output of all stand-alone example files
check_output: $(EXAMPLES:.cpp=.test)


clean:
rm -fr me.nlohmann.json.docset html $(EXAMPLES:.cpp=)


##########################################################################
# Doxygen HTML documentation
##########################################################################
Expand Down

0 comments on commit 5666bd0

Please sign in to comment.