forked from bblanchon/ArduinoJson
Moved ancillary files to extras/ (fixes #1011)
This commit is contained in:
Benoit Blanchon
6
.gitignore
vendored
6
.gitignore
vendored
@ -6,7 +6,7 @@
|
|||||||
/sftp-config.json
|
/sftp-config.json
|
||||||
.tags
|
.tags
|
||||||
.tags_sorted_by_file
|
.tags_sorted_by_file
|
||||||
/fuzzing/*_fuzzer
|
/extras/fuzzing/*_fuzzer
|
||||||
/fuzzing/*_fuzzer.options
|
/extras/fuzzing/*_fuzzer.options
|
||||||
/fuzzing/*_fuzzer_seed_corpus.zip
|
/extras/fuzzing/*_fuzzer_seed_corpus.zip
|
||||||
.vs/
|
.vs/
|
||||||
|
|||||||
@ -127,6 +127,6 @@ matrix:
|
|||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- "~/.platformio"
|
- "~/.platformio"
|
||||||
- "fuzzing/json_corpus"
|
- "extras/fuzzing/json_corpus"
|
||||||
- "fuzzing/msgpack_corpus"
|
- "extras/fuzzing/msgpack_corpus"
|
||||||
script: scripts/travis/$SCRIPT.sh
|
script: extras/ci/$SCRIPT.sh
|
||||||
|
|||||||
@ -6,6 +6,7 @@ HEAD
|
|||||||
|
|
||||||
* Use absolute instead of relative includes (issue #1072)
|
* Use absolute instead of relative includes (issue #1072)
|
||||||
* Changed `JsonVariant::as<bool>()` to return `true` for any non-null value (issue #1005)
|
* Changed `JsonVariant::as<bool>()` to return `true` for any non-null value (issue #1005)
|
||||||
|
* Moved ancillary files to `extras/` (issue #1011)
|
||||||
|
|
||||||
v6.11.5 (2019-08-23)
|
v6.11.5 (2019-08-23)
|
||||||
-------
|
-------
|
||||||
|
|||||||
@ -17,6 +17,5 @@ if(${COVERAGE})
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
|
include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
|
||||||
add_subdirectory(third-party/catch)
|
add_subdirectory(extras/tests)
|
||||||
add_subdirectory(test)
|
add_subdirectory(extras/fuzzing)
|
||||||
add_subdirectory(fuzzing)
|
|
||||||
|
|||||||
@ -5,4 +5,5 @@ make
|
|||||||
make test
|
make test
|
||||||
|
|
||||||
pip install --user cpp-coveralls 'requests[security]'
|
pip install --user cpp-coveralls 'requests[security]'
|
||||||
coveralls --exclude third-party --gcov-options '\-lp'; fi
|
pwd
|
||||||
|
coveralls --include 'src' --gcov-options '\-lp'
|
||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
ROOT_DIR=$(dirname $0)/../../
|
ROOT_DIR=$(dirname $0)/../../
|
||||||
INCLUDE_DIR=${ROOT_DIR}/src/
|
INCLUDE_DIR=${ROOT_DIR}/src/
|
||||||
FUZZING_DIR=${ROOT_DIR}/fuzzing/
|
FUZZING_DIR=${ROOT_DIR}/extras/fuzzing/
|
||||||
CXXFLAGS="-g -fprofile-instr-generate -fcoverage-mapping -fsanitize=address,undefined,fuzzer -fno-sanitize-recover=all"
|
CXXFLAGS="-g -fprofile-instr-generate -fcoverage-mapping -fsanitize=address,undefined,fuzzer -fno-sanitize-recover=all"
|
||||||
|
|
||||||
fuzz() {
|
fuzz() {
|
||||||
@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
pip install --user platformio
|
pip install --user platformio
|
||||||
|
|
||||||
rm -r test
|
|
||||||
|
|
||||||
case $BOARD in
|
case $BOARD in
|
||||||
uno)
|
uno)
|
||||||
platformio lib install 868 # SD library
|
platformio lib install 868 # SD library
|
||||||
@ -3,7 +3,7 @@
|
|||||||
TAG=$(git describe)
|
TAG=$(git describe)
|
||||||
OUTPUT="ArduinoJson-$TAG.zip"
|
OUTPUT="ArduinoJson-$TAG.zip"
|
||||||
|
|
||||||
cd $(dirname $0)/../..
|
cd $(dirname $0)/../../..
|
||||||
|
|
||||||
# remove existing file
|
# remove existing file
|
||||||
rm -f $OUTPUT
|
rm -f $OUTPUT
|
||||||
2
scripts/build-single-header.sh → extras/scripts/build-single-header.sh
Normal file → Executable file
2
scripts/build-single-header.sh → extras/scripts/build-single-header.sh
Normal file → Executable file
@ -7,7 +7,7 @@ RE_RELATIVE_INCLUDE='^#include[[:space:]]*"(.*)"'
|
|||||||
RE_ABSOLUTE_INCLUDE='^#include[[:space:]]*<(ArduinoJson/.*)>'
|
RE_ABSOLUTE_INCLUDE='^#include[[:space:]]*<(ArduinoJson/.*)>'
|
||||||
RE_SYSTEM_INCLUDE='^#include[[:space:]]*<(.*)>'
|
RE_SYSTEM_INCLUDE='^#include[[:space:]]*<(.*)>'
|
||||||
RE_EMPTY='^(#pragma[[:space:]]+once)?[[:space:]]*(//.*)?$'
|
RE_EMPTY='^(#pragma[[:space:]]+once)?[[:space:]]*(//.*)?$'
|
||||||
SRC_DIRECTORY="$(realpath "$(dirname $0)/../src")"
|
SRC_DIRECTORY="$(realpath "$(dirname $0)/../../src")"
|
||||||
|
|
||||||
|
|
||||||
declare -A INCLUDED
|
declare -A INCLUDED
|
||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
export PATH="$PATH:/Applications/CMake.app/Contents/bin/"
|
export PATH="$PATH:/Applications/CMake.app/Contents/bin/"
|
||||||
|
|
||||||
cd $(dirname $0)/..
|
cd $(dirname $0)/../..
|
||||||
ROOT=$(pwd)
|
ROOT=$(pwd)
|
||||||
|
|
||||||
mkdir "build"
|
mkdir "build"
|
||||||
2
scripts/publish-particle-library.sh → extras/scripts/publish-particle-library.sh
Normal file → Executable file
2
scripts/publish-particle-library.sh → extras/scripts/publish-particle-library.sh
Normal file → Executable file
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
SOURCE_DIR="$(dirname "$0")/.."
|
SOURCE_DIR="$(dirname "$0")/../.."
|
||||||
WORK_DIR=$(mktemp -d)
|
WORK_DIR=$(mktemp -d)
|
||||||
trap 'rm -rf "$WORK_DIR"' EXIT
|
trap 'rm -rf "$WORK_DIR"' EXIT
|
||||||
|
|
||||||
2
scripts/publish.sh → extras/scripts/publish.sh
Normal file → Executable file
2
scripts/publish.sh → extras/scripts/publish.sh
Normal file → Executable file
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
cd "$(dirname "$0")/.."
|
cd "$(dirname "$0")/../.."
|
||||||
|
|
||||||
VERSION="$1"
|
VERSION="$1"
|
||||||
DATE=$(date +%F)
|
DATE=$(date +%F)
|
||||||
0
scripts/wandbox/publish.sh → extras/scripts/wandbox/publish.sh
Normal file → Executable file
0
scripts/wandbox/publish.sh → extras/scripts/wandbox/publish.sh
Normal file → Executable file
@ -2,6 +2,8 @@
|
|||||||
# Copyright Benoit Blanchon 2014-2019
|
# Copyright Benoit Blanchon 2014-2019
|
||||||
# MIT License
|
# MIT License
|
||||||
|
|
||||||
|
add_subdirectory(catch)
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
|
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
|
||||||
add_compile_options(
|
add_compile_options(
|
||||||
-pedantic
|
-pedantic
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user