8000 Moved ancillary files to `extras/` (fixes #1011) · joglosemarduino/ArduinoJson@b47ac27 · GitHub
[go: up one dir, main page]
Skip to content

Commit b47ac27

Browse files
bblanchonbblanchon
committed
Moved ancillary files to extras/ (fixes bblanchon#1011)
1 parent ed18e77 commit b47ac27

File tree

226 files changed

+19
-54
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+19
-54
lines changed

‎.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/sftp-config.json
77
.tags
88
.tags_sorted_by_file
9-
/fuzzing/*_fuzzer
10-
/fuzzing/*_fuzzer.options
11-
/fuzzing/*_fuzzer_seed_corpus.zip
9+
/extras/fuzzing/*_fuzzer
10+
/extras/fuzzing/*_fuzzer.options
11+
/extras/fuzzing/*_fuzzer_seed_corpus.zip
1212
.vs/

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,6 @@ matrix:
127127
cache:
128128
directories:
129129
- "~/.platformio"
130-
- "fuzzing/json_corpus"
131-
- "fuzzing/msgpack_corpus"
132-
script: scripts/travis/$SCRIPT.sh
130+
- "extras/fuzzing/json_corpus"
131+
- "extras/fuzzing/msgpack_corpus"
132+
script: extras/ci/$SCRIPT.sh

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions

‎CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ if(${COVERAGE})
1717
endif()
1818

1919
include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
20-
add_subdirectory(third-party/catch)
21-
add_subdirectory(test)
22-
add_subdirectory(fuzzing)
20+
add_subdirectory(extras/tests)
21+
add_subdirectory(extras/fuzzing)

‎scripts/travis/arduino.sh renamed to ‎extras/ci/arduino.sh

File renamed without changes.

‎scripts/travis/build.sh renamed to ‎extras/ci/build.sh

File renamed without changes.

‎scripts/travis/coverage.sh renamed to ‎extras/ci/coverage.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ make
55
make test
66

77
pip install --user cpp-coveralls 'requests[security]'
8-
coveralls --exclude third-party --gcov-options '\-lp'; fi
8+
pwd
9+
coveralls --include 'src' --gcov-options '\-lp'

‎scripts/travis/fuzz.sh renamed to ‎extras/ci/fuzz.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ROOT_DIR=$(dirname $0)/../../
44
INCLUDE_DIR=${ROOT_DIR}/src/
5-
FUZZING_DIR=${ROOT_DIR}/fuzzing/
5+
FUZZING_DIR=${ROOT_DIR}/extras/fuzzing/
66
CXXFLAGS="-g -fprofile-instr-generate -fcoverage-mapping -fsanitize=address,undefined,fuzzer -fno-sanitize-recover=all"
77

88
fuzz() {

‎scripts/travis/platformio.sh renamed to ‎extras/ci/platformio.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
pip install --user platformio
44

5-
rm -r test
6-
75
case $BOARD in
86
uno)
97
platformio lib install 868 # SD library

‎scripts/travis/test.sh renamed to ‎extras/ci/test.sh

File renamed without changes.

‎fuzzing/CMakeLists.txt renamed to ‎extras/fuzzing/CMakeLists.txt

File renamed without changes.

‎fuzzing/Makefile renamed to ‎extras/fuzzing/Makefile

File renamed without changes.

‎fuzzing/fuzzer_main.cpp renamed to ‎extras/fuzzing/fuzzer_main.cpp

File renamed without changes.

‎fuzzing/json_corpus/.gitignore renamed to ‎extras/fuzzing/json_corpus/.gitignore

File renamed without changes.

‎fuzzing/json_fuzzer.cpp renamed to ‎extras/fuzzing/json_fuzzer.cpp

File renamed without changes.

‎fuzzing/json_seed_corpus/Comments.json renamed to ‎extras/fuzzing/json_seed_corpus/Comments.json

File renamed without changes.

‎fuzzing/json_seed_corpus/EmptyArray.json renamed to ‎extras/fuzzing/json_seed_corpus/EmptyArray.json

File renamed without changes.

‎fuzzing/json_seed_corpus/EmptyObject.json renamed to ‎extras/fuzzing/json_seed_corpus/EmptyObject.json

File renamed without changes.

‎fuzzing/json_seed_corpus/ExcessiveNesting.json renamed to ‎extras/fuzzing/json_seed_corpus/ExcessiveNesting.json

File renamed without changes.

‎fuzzing/json_seed_corpus/IntegerOverflow.json renamed to ‎extras/fuzzing/json_seed_corpus/IntegerOverflow.json

File renamed without changes.

‎fuzzing/json_seed_corpus/Numbers.json renamed to ‎extras/fuzzing/json_seed_corpus/Numbers.json

File renamed without changes.

‎fuzzing/json_seed_corpus/OpenWeatherMap.json renamed to ‎extras/fuzzing/json_seed_corpus/OpenWeatherMap.json

File renamed without changes.

‎fuzzing/json_seed_corpus/Strings.json renamed to ‎extras/fuzzing/json_seed_corpus/Strings.json

File renamed without changes.

‎fuzzing/json_seed_corpus/WeatherUnderground.json renamed to ‎extras/fuzzing/json_seed_corpus/WeatherUnderground.json

File renamed without changes.

‎fuzzing/msgpack_corpus/.gitignore renamed to ‎extras/fuzzing/msgpack_corpus/.gitignore

File renamed without changes.

‎fuzzing/msgpack_fuzzer.cpp renamed to ‎extras/fuzzing/msgpack_fuzzer.cpp

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/array16 renamed to ‎extras/fuzzing/msgpack_seed_corpus/array16

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/array32 renamed to ‎extras/fuzzing/msgpack_seed_corpus/array32

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/false renamed to ‎extras/fuzzing/msgpack_seed_corpus/false

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/fixarray renamed to ‎extras/fuzzing/msgpack_seed_corpus/fixarray

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/fixint_negative renamed to ‎extras/fuzzing/msgpack_seed_corpus/fixint_negative

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/fixint_positive renamed to ‎extras/fuzzing/msgpack_seed_corpus/fixint_positive

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/fixmap renamed to ‎extras/fuzzing/msgpack_seed_corpus/fixmap

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/fixstr renamed to ‎extras/fuzzing/msgpack_seed_corpus/fixstr

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/float32 renamed to ‎extras/fuzzing/msgpack_seed_corpus/float32

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/float64 renamed to ‎extras/fuzzing/msgpack_seed_corpus/float64

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/int16 renamed to ‎extras/fuzzing/msgpack_seed_corpus/int16

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/int32 renamed to ‎extras/fuzzing/msgpack_seed_corpus/int32

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/int64 renamed to ‎extras/fuzzing/msgpack_seed_corpus/int64

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/int8 renamed to ‎extras/fuzzing/msgpack_seed_corpus/int8

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/map16 renamed to ‎extras/fuzzing/msgpack_seed_corpus/map16

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/map32 renamed to ‎extras/fuzzing/msgpack_seed_corpus/map32

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/nil renamed to ‎extras/fuzzing/msgpack_seed_corpus/nil

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/str16 renamed to ‎extras/fuzzing/msgpack_seed_corpus/str16

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/str32 renamed to ‎extras/fuzzing/msgpack_seed_corpus/str32

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/str8 renamed to ‎extras/fuzzing/msgpack_seed_corpus/str8

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/true renamed to ‎extras/fuzzing/msgpack_seed_corpus/true

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/uint16 renamed to ‎extras/fuzzing/msgpack_seed_corpus/uint16

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/uint32 renamed to ‎extras/fuzzing/msgpack_seed_corpus/uint32

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/uint64 renamed to ‎extras/fuzzing/msgpack_seed_corpus/uint64

File renamed without changes.

‎fuzzing/msgpack_seed_corpus/uint8 renamed to ‎extras/fuzzing/msgpack_seed_corpus/uint8

File renamed without changes.

‎scripts/build-arduino-package.sh renamed to ‎extras/scripts/build-arduino-package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
TAG=$(git describe)
44
OUTPUT="ArduinoJson-$TAG.zip"
55

6-
cd $(dirname $0)/../..
6+
cd $(dirname $0)/../../..
77

88
# remove existing file
99
rm -f $OUTPUT

‎scripts/build-single-header.sh renamed to ‎extras/scripts/build-single-header.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RE_RELATIVE_INCLUDE='^#include[[:space:]]*"(.*)"'
77
RE_ABSOLUTE_INCLUDE='^#include[[:space:]]*<(ArduinoJson/.*)>'
88
RE_SYSTEM_INCLUDE='^#include[[:space:]]*<(.*)>'
99
RE_EMPTY='^(#pragma[[:space:]]+once)?[[:space:]]*(//.*)?$'
10-
SRC_DIRECTORY="$(realpath "$(dirname $0)/../src")"
10+
SRC_DIRECTORY="$(realpath "$(dirname $0)/../../src")"
1111

1212

1313
declare -A INCLUDED

‎scripts/create-build-envs.sh renamed to ‎extras/scripts/create-build-envs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
export PATH="$PATH:/Applications/CMake.app/Contents/bin/"
44

5-
cd $(dirname $0)/..
5+
cd $(dirname $0)/../..
66
ROOT=$(pwd)
77

88
mkdir "build"

‎scripts/publish-particle-library.sh renamed to ‎extras/scripts/publish-particle-library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
SOURCE_DIR="$(dirname "$0")/.."
5+
SOURCE_DIR="$(dirname "$0")/../.."
66
WORK_DIR=$(mktemp -d)
77
trap 'rm -rf "$WORK_DIR"' EXIT
88

‎scripts/publish.sh renamed to ‎extras/scripts/publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
cd "$(dirname "$0")/.."
5+
cd "$(dirname "$0")/../.."
66

77
VERSION="$1"
88
DATE=$(date +%F)

‎scripts/wandbox/JsonGeneratorExample.cpp renamed to ‎extras/scripts/wandbox/JsonGeneratorExample.cpp

File renamed without changes.

‎scripts/wandbox/JsonParserExample.cpp renamed to ‎extras/scripts/wandbox/JsonParserExample.cpp

File renamed without changes.

‎scripts/wandbox/MsgPackParserExample.cpp renamed to ‎extras/scripts/wandbox/MsgPackParserExample.cpp

File renamed without changes.

‎scripts/wandbox/publish.sh renamed to ‎extras/scripts/wandbox/publish.sh

File renamed without changes.

‎test/CMakeLists.txt renamed to ‎extras/tests/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# Copyright Benoit Blanchon 2014-2019
33
# MIT License
44

5+
add_subdirectory(catch)
6+
57
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
68
add_compile_options(
79
-pedantic

‎test/ElementProxy/CMakeLists.txt renamed to ‎extras/tests/ElementProxy/CMakeLists.txt

File renamed without changes.

‎test/ElementProxy/add.cpp renamed to ‎extras/tests/ElementProxy/add.cpp

File renamed without changes.

‎test/ElementProxy/clear.cpp renamed to ‎extras/tests/ElementProxy/clear.cpp

File renamed without changes.

‎test/ElementProxy/compare.cpp renamed to ‎extras/tests/ElementProxy/compare.cpp

File renamed without changes.

‎test/ElementProxy/remove.cpp renamed to ‎extras/tests/ElementProxy/remove.cpp

File renamed without changes.

‎test/ElementProxy/set.cpp renamed to ‎extras/tests/ElementProxy/set.cpp

File renamed without changes.

‎test/ElementProxy/size.cpp renamed to ‎extras/tests/ElementProxy/size.cpp

File renamed without changes.

‎test/IntegrationTests/CMakeLists.txt renamed to ‎extras/tests/IntegrationTests/CMakeLists.txt

File renamed without changes.

‎test/IntegrationTests/gbathree.cpp renamed to ‎extras/tests/IntegrationTests/gbathree.cpp

File renamed without changes.

‎test/IntegrationTests/issue772.cpp renamed to ‎extras/tests/IntegrationTests/issue772.cpp

File renamed without changes.

‎test/IntegrationTests/round_trip.cpp renamed to ‎extras/tests/IntegrationTests/round_trip.cpp

File renamed without changes.

‎test/JsonArray/CMakeLists.txt renamed to ‎extras/tests/JsonArray/CMakeLists.txt

File renamed without changes.

‎test/JsonArray/add.cpp renamed to ‎extras/tests/JsonArray/add.cpp

File renamed without changes.

‎test/JsonArray/copyArray.cpp renamed to ‎extras/tests/JsonArray/copyArray.cpp

File renamed without changes.

‎test/JsonArray/createNested.cpp renamed to ‎extras/tests/JsonArray/createNested.cpp

File renamed without changes.

‎test/JsonArray/equals.cpp renamed to ‎extras/tests/JsonArray/equals.cpp

File renamed without changes.

‎test/JsonArray/get.cpp renamed to ‎extras/tests/JsonArray/get.cpp

File renamed without changes.

‎test/JsonArray/isNull.cpp renamed to ‎extras/tests/JsonArray/isNull.cpp

File renamed without changes.

‎test/JsonArray/iterator.cpp renamed to ‎extras/tests/JsonArray/iterator.cpp

File renamed without changes.

‎test/JsonArray/memoryUsage.cpp renamed to ‎extras/tests/JsonArray/memoryUsage.cpp

File renamed without changes.

‎test/JsonArray/nesting.cpp renamed to ‎extras/tests/JsonArray/nesting.cpp

File renamed without changes.

‎test/JsonArray/remove.cpp renamed to ‎extras/tests/JsonArray/remove.cpp

File renamed without changes.

‎test/JsonArray/size.cpp renamed to ‎extras/tests/JsonArray/size.cpp

File renamed without changes.

‎test/JsonArray/std_string.cpp renamed to ‎extras/tests/JsonArray/std_string.cpp

File renamed without changes.

‎test/JsonArray/subscript.cpp renamed to ‎extras/tests/JsonArray/subscript.cpp

File renamed without changes.

‎test/JsonArray/undefined.cpp renamed to ‎extras/tests/JsonArray/undefined.cpp

File renamed without changes.

‎test/JsonDeserializer/CMakeLists.txt renamed to ‎extras/tests/JsonDeserializer/CMakeLists.txt

File renamed without changes.

‎test/JsonDeserializer/DeserializationError.cpp renamed to ‎extras/tests/JsonDeserializer/DeserializationError.cpp

File renamed without changes.

‎test/JsonDeserializer/array.cpp renamed to ‎extras/tests/JsonDeserializer/array.cpp

File renamed without changes.

‎test/JsonDeserializer/array_static.cpp renamed to ‎extras/tests/JsonDeserializer/array_static.cpp

File renamed without changes.

‎test/JsonDeserializer/incomplete_input.cpp renamed to ‎extras/tests/JsonDeserializer/incomplete_input.cpp

File renamed without changes.

‎test/JsonDeserializer/input_types.cpp renamed to ‎extras/tests/JsonDeserializer/input_types.cpp