Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
aa8aa3ba
Commit
aa8aa3ba
authored
May 29, 2016
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
overworked coverity stuffy
parent
6bdb883b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
12 deletions
+22
-12
.travis.yml
.travis.yml
+8
-8
Makefile
Makefile
+7
-1
Makefile
doc/Makefile
+7
-3
No files found.
.travis.yml
View file @
aa8aa3ba
...
@@ -40,7 +40,7 @@ matrix:
...
@@ -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:
...
@@ -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
...
...
Makefile
View file @
aa8aa3ba
...
@@ -10,6 +10,7 @@ all: json_unit
...
@@ -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
...
@@ -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"
##########################################################################
##########################################################################
...
...
doc/Makefile
View file @
aa8aa3ba
...
@@ -2,9 +2,6 @@ SRCDIR = ../src
...
@@ -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)
...
@@ -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
##########################################################################
##########################################################################
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment