Renamed folder include/ to src/ (issue #461)

This commit is contained in:
Benoit Blanchon
2017-04-20 10:04:40 +02:00
parent df541a2a22
commit 024976cda2
85 changed files with 8 additions and 9 deletions

View File

@ -5,4 +5,4 @@
// https://bblanchon.github.io/ArduinoJson/
// If you like this project, please add a star!
#include "include/ArduinoJson.h"
#include "src/ArduinoJson.h"

View File

@ -7,6 +7,7 @@ HEAD
* Added `JsonArray::remove(iterator)` (issue #479)
* Added `JsonObject::remove(iterator)`
* Renamed `JsonArray::removeAt(size_t)` into `remove(size_t)`
* Renamed folder `include/` to `src/`
v5.8.4
------

View File

@ -14,5 +14,6 @@ if(${COVERAGE})
set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
endif()
include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
add_subdirectory(third-party/catch)
add_subdirectory(test)

View File

@ -1,13 +1,13 @@
# CAUTION: this file is invoked by https://github.com/google/oss-fuzz
CXXFLAGS += -I../include
CXXFLAGS += -I../src
all: \
$(OUT)/json_fuzzer \
$(OUT)/json_fuzzer_seed_corpus.zip \
$(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)
$(OUT)/json_fuzzer_seed_corpus.zip: seed_corpus/*

View File

@ -13,7 +13,6 @@
},
"exclude": [
"scripts",
"src/ArduinoJson.h",
"test",
"third-party"
],

View File

@ -12,7 +12,7 @@ rm -f $OUTPUT
7z a $OUTPUT \
ArduinoJson/CHANGELOG.md \
ArduinoJson/examples \
ArduinoJson/include \
ArduinoJson/src \
ArduinoJson/keywords.txt \
ArduinoJson/library.properties \
ArduinoJson/LICENSE.md \

View File

@ -39,6 +39,6 @@ process()
cd $(dirname $0)/../
INCLUDED=()
process include/ArduinoJson.h true > ../ArduinoJson-$TAG.h
process src/ArduinoJson.h true > ../ArduinoJson-$TAG.h
INCLUDED=()
process include/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp

View File

@ -60,8 +60,6 @@ if(MSVC)
)
endif()
include_directories(${CMAKE_CURRENT_LIST_DIR}/../include)
add_subdirectory(DynamicJsonBuffer)
add_subdirectory(IntegrationTests)
add_subdirectory(JsonArray)