overworked coverity stuffy
This commit is contained in:
parent
6bdb883b5c
commit
aa8aa3ba9f
16
.travis.yml
16
.travis.yml
@ -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
|
||||
|
||||
@ -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
|
||||
|
8
Makefile
8
Makefile
@ -10,6 +10,7 @@ all: json_unit
|
||||
# clean up
|
||||
clean:
|
||||
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
|
||||
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
10
doc/Makefile
@ -2,9 +2,6 @@ SRCDIR = ../src
|
||||
|
||||
all: doxygen
|
||||
|
||||
clean:
|
||||
rm -fr me.nlohmann.json.docset html
|
||||
|
||||
|
||||
##########################################################################
|
||||
# example files
|
||||
@ -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
|
||||
##########################################################################
|
||||
|
Loading…
Reference in New Issue
Block a user