forked from bblanchon/ArduinoJson
Renamed folder include/ to src/ (issue #461)
This commit is contained in:
1 parent
df541a2a22
commit
024976cda2
85 files changed
+8
-9
No files matched your search
+1
-1
@@ -5,4 +5,4 @@
|
|||||||
// https://bblanchon.github.io/ArduinoJson/
|
// https://bblanchon.github.io/ArduinoJson/
|
||||||
// If you like this project, please add a star!
|
// If you like this project, please add a star!
|
||||||
|
|
||||||
#include "include/ArduinoJson.h"
|
#include "src/ArduinoJson.h"
|
||||||
@@ -7,6 +7,7 @@ HEAD
|
|||||||
* Added `JsonArray::remove(iterator)` (issue #479)
|
* Added `JsonArray::remove(iterator)` (issue #479)
|
||||||
* Added `JsonObject::remove(iterator)`
|
* Added `JsonObject::remove(iterator)`
|
||||||
* Renamed `JsonArray::removeAt(size_t)` into `remove(size_t)`
|
* Renamed `JsonArray::removeAt(size_t)` into `remove(size_t)`
|
||||||
|
* Renamed folder `include/` to `src/`
|
||||||
|
|
||||||
v5.8.4
|
v5.8.4
|
||||||
------
|
------
|
||||||
|
|||||||
@@ -14,5 +14,6 @@ if(${COVERAGE})
|
|||||||
set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
|
set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
|
||||||
add_subdirectory(third-party/catch)
|
add_subdirectory(third-party/catch)
|
||||||
add_subdirectory(test)
|
add_subdirectory(test)
|
||||||
+2
-2
@@ -1,13 +1,13 @@
|
|||||||
# CAUTION: this file is invoked by https://github.com/google/oss-fuzz
|
# CAUTION: this file is invoked by https://github.com/google/oss-fuzz
|
||||||
|
|
||||||
CXXFLAGS += -I../include
|
CXXFLAGS += -I../src
|
||||||
|
|
||||||
all: \
|
all: \
|
||||||
$(OUT)/json_fuzzer \
|
$(OUT)/json_fuzzer \
|
||||||
$(OUT)/json_fuzzer_seed_corpus.zip \
|
$(OUT)/json_fuzzer_seed_corpus.zip \
|
||||||
$(OUT)/json_fuzzer.options
|
$(OUT)/json_fuzzer.options
|
||||||
|
|
||||||
$(OUT)/json_fuzzer: fuzzer.cpp $(shell find ../include -type f)
|
$(OUT)/json_fuzzer: fuzzer.cpp $(shell find ../src -type f)
|
||||||
$(CXX) $(CXXFLAGS) $< -o$@ $(LIB_FUZZING_ENGINE)
|
$(CXX) $(CXXFLAGS) $< -o$@ $(LIB_FUZZING_ENGINE)
|
||||||
|
|
||||||
$(OUT)/json_fuzzer_seed_corpus.zip: seed_corpus/*
|
$(OUT)/json_fuzzer_seed_corpus.zip: seed_corpus/*
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
},
|
},
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"scripts",
|
"scripts",
|
||||||
"src/ArduinoJson.h",
|
|
||||||
"test",
|
"test",
|
||||||
"third-party"
|
"third-party"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ rm -f $OUTPUT
|
|||||||
7z a $OUTPUT \
|
7z a $OUTPUT \
|
||||||
ArduinoJson/CHANGELOG.md \
|
ArduinoJson/CHANGELOG.md \
|
||||||
ArduinoJson/examples \
|
ArduinoJson/examples \
|
||||||
ArduinoJson/include \
|
ArduinoJson/src \
|
||||||
ArduinoJson/keywords.txt \
|
ArduinoJson/keywords.txt \
|
||||||
ArduinoJson/library.properties \
|
ArduinoJson/library.properties \
|
||||||
ArduinoJson/LICENSE.md \
|
ArduinoJson/LICENSE.md \
|
||||||
|
|||||||
@@ -39,6 +39,6 @@ process()
|
|||||||
|
|
||||||
cd $(dirname $0)/../
|
cd $(dirname $0)/../
|
||||||
INCLUDED=()
|
INCLUDED=()
|
||||||
process include/ArduinoJson.h true > ../ArduinoJson-$TAG.h
|
process src/ArduinoJson.h true > ../ArduinoJson-$TAG.h
|
||||||
INCLUDED=()
|
INCLUDED=()
|
||||||
process include/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
|
process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -60,8 +60,6 @@ if(MSVC)
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_LIST_DIR}/../include)
|
|
||||||
|
|
||||||
add_subdirectory(DynamicJsonBuffer)
|
add_subdirectory(DynamicJsonBuffer)
|
||||||
add_subdirectory(IntegrationTests)
|
add_subdirectory(IntegrationTests)
|
||||||
add_subdirectory(JsonArray)
|
add_subdirectory(JsonArray)
|
||||||
|
|||||||
Reference in new issue
Block a user