From 024976cda2fa9ea82e1f55504934b79ca53180c3 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Thu, 20 Apr 2017 10:04:40 +0200 Subject: [PATCH] Renamed folder `include/` to `src/` (issue #461) --- ArduinoJson.h | 2 +- CHANGELOG.md | 1 + CMakeLists.txt | 1 + fuzzing/Makefile | 4 ++-- library.json | 1 - scripts/build-arduino-package.sh | 2 +- scripts/build-single-header.sh | 4 ++-- {include => src}/ArduinoJson.h | 0 {include => src}/ArduinoJson.hpp | 0 {include => src}/ArduinoJson/Configuration.hpp | 0 {include => src}/ArduinoJson/Data/Encoding.hpp | 0 {include => src}/ArduinoJson/Data/JsonBufferAllocated.hpp | 0 {include => src}/ArduinoJson/Data/JsonFloat.hpp | 0 {include => src}/ArduinoJson/Data/JsonInteger.hpp | 0 {include => src}/ArduinoJson/Data/JsonVariantAs.hpp | 0 {include => src}/ArduinoJson/Data/JsonVariantComparer.hpp | 0 {include => src}/ArduinoJson/Data/JsonVariantContent.hpp | 0 {include => src}/ArduinoJson/Data/JsonVariantDefault.hpp | 0 {include => src}/ArduinoJson/Data/JsonVariantType.hpp | 0 {include => src}/ArduinoJson/Data/List.hpp | 0 {include => src}/ArduinoJson/Data/ListConstIterator.hpp | 0 {include => src}/ArduinoJson/Data/ListIterator.hpp | 0 {include => src}/ArduinoJson/Data/ListNode.hpp | 0 {include => src}/ArduinoJson/Data/ReferenceType.hpp | 0 {include => src}/ArduinoJson/Data/ValueSetter.hpp | 0 {include => src}/ArduinoJson/Deserialization/Comments.hpp | 0 {include => src}/ArduinoJson/Deserialization/JsonParser.hpp | 0 .../ArduinoJson/Deserialization/JsonParserImpl.hpp | 0 {include => src}/ArduinoJson/Deserialization/StringWriter.hpp | 0 {include => src}/ArduinoJson/DynamicJsonBuffer.hpp | 0 {include => src}/ArduinoJson/JsonArray.hpp | 0 {include => src}/ArduinoJson/JsonArrayImpl.hpp | 0 {include => src}/ArduinoJson/JsonArraySubscript.hpp | 0 {include => src}/ArduinoJson/JsonBuffer.hpp | 0 {include => src}/ArduinoJson/JsonBufferBase.hpp | 0 {include => src}/ArduinoJson/JsonBufferImpl.hpp | 0 {include => src}/ArduinoJson/JsonObject.hpp | 0 {include => src}/ArduinoJson/JsonObjectImpl.hpp | 0 {include => src}/ArduinoJson/JsonObjectSubscript.hpp | 0 {include => src}/ArduinoJson/JsonPair.hpp | 0 {include => src}/ArduinoJson/JsonVariant.hpp | 0 {include => src}/ArduinoJson/JsonVariantBase.hpp | 0 {include => src}/ArduinoJson/JsonVariantComparisons.hpp | 0 {include => src}/ArduinoJson/JsonVariantImpl.hpp | 0 {include => src}/ArduinoJson/Polyfills/attributes.hpp | 0 {include => src}/ArduinoJson/Polyfills/ctype.hpp | 0 {include => src}/ArduinoJson/Polyfills/isFloat.hpp | 0 {include => src}/ArduinoJson/Polyfills/isInteger.hpp | 0 {include => src}/ArduinoJson/Polyfills/math.hpp | 0 {include => src}/ArduinoJson/Polyfills/normalize.hpp | 0 {include => src}/ArduinoJson/Polyfills/parseFloat.hpp | 0 {include => src}/ArduinoJson/Polyfills/parseInteger.hpp | 0 {include => src}/ArduinoJson/Print.hpp | 0 {include => src}/ArduinoJson/RawJson.hpp | 0 {include => src}/ArduinoJson/Serialization/DummyPrint.hpp | 0 .../ArduinoJson/Serialization/DynamicStringBuilder.hpp | 0 {include => src}/ArduinoJson/Serialization/IndentedPrint.hpp | 0 {include => src}/ArduinoJson/Serialization/JsonPrintable.hpp | 0 {include => src}/ArduinoJson/Serialization/JsonSerializer.hpp | 0 .../ArduinoJson/Serialization/JsonSerializerImpl.hpp | 0 {include => src}/ArduinoJson/Serialization/JsonWriter.hpp | 0 {include => src}/ArduinoJson/Serialization/Prettyfier.hpp | 0 .../ArduinoJson/Serialization/StaticStringBuilder.hpp | 0 .../ArduinoJson/Serialization/StreamPrintAdapter.hpp | 0 {include => src}/ArduinoJson/StaticJsonBuffer.hpp | 0 {include => src}/ArduinoJson/StringTraits/ArduinoStream.hpp | 0 {include => src}/ArduinoJson/StringTraits/CharPointer.hpp | 0 {include => src}/ArduinoJson/StringTraits/FlashString.hpp | 0 {include => src}/ArduinoJson/StringTraits/StdStream.hpp | 0 {include => src}/ArduinoJson/StringTraits/StdString.hpp | 0 {include => src}/ArduinoJson/StringTraits/StringTraits.hpp | 0 {include => src}/ArduinoJson/TypeTraits/EnableIf.hpp | 0 {include => src}/ArduinoJson/TypeTraits/FloatTraits.hpp | 0 {include => src}/ArduinoJson/TypeTraits/IsArray.hpp | 0 {include => src}/ArduinoJson/TypeTraits/IsBaseOf.hpp | 0 {include => src}/ArduinoJson/TypeTraits/IsChar.hpp | 0 {include => src}/ArduinoJson/TypeTraits/IsConst.hpp | 0 {include => src}/ArduinoJson/TypeTraits/IsFloatingPoint.hpp | 0 {include => src}/ArduinoJson/TypeTraits/IsIntegral.hpp | 0 {include => src}/ArduinoJson/TypeTraits/IsSame.hpp | 0 {include => src}/ArduinoJson/TypeTraits/IsSignedIntegral.hpp | 0 .../ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp | 0 {include => src}/ArduinoJson/TypeTraits/RemoveConst.hpp | 0 {include => src}/ArduinoJson/TypeTraits/RemoveReference.hpp | 0 test/CMakeLists.txt | 2 -- 85 files changed, 8 insertions(+), 9 deletions(-) rename {include => src}/ArduinoJson.h (100%) rename {include => src}/ArduinoJson.hpp (100%) rename {include => src}/ArduinoJson/Configuration.hpp (100%) rename {include => src}/ArduinoJson/Data/Encoding.hpp (100%) rename {include => src}/ArduinoJson/Data/JsonBufferAllocated.hpp (100%) rename {include => src}/ArduinoJson/Data/JsonFloat.hpp (100%) rename {include => src}/ArduinoJson/Data/JsonInteger.hpp (100%) rename {include => src}/ArduinoJson/Data/JsonVariantAs.hpp (100%) rename {include => src}/ArduinoJson/Data/JsonVariantComparer.hpp (100%) rename {include => src}/ArduinoJson/Data/JsonVariantContent.hpp (100%) rename {include => src}/ArduinoJson/Data/JsonVariantDefault.hpp (100%) rename {include => src}/ArduinoJson/Data/JsonVariantType.hpp (100%) rename {include => src}/ArduinoJson/Data/List.hpp (100%) rename {include => src}/ArduinoJson/Data/ListConstIterator.hpp (100%) rename {include => src}/ArduinoJson/Data/ListIterator.hpp (100%) rename {include => src}/ArduinoJson/Data/ListNode.hpp (100%) rename {include => src}/ArduinoJson/Data/ReferenceType.hpp (100%) rename {include => src}/ArduinoJson/Data/ValueSetter.hpp (100%) rename {include => src}/ArduinoJson/Deserialization/Comments.hpp (100%) rename {include => src}/ArduinoJson/Deserialization/JsonParser.hpp (100%) rename {include => src}/ArduinoJson/Deserialization/JsonParserImpl.hpp (100%) rename {include => src}/ArduinoJson/Deserialization/StringWriter.hpp (100%) rename {include => src}/ArduinoJson/DynamicJsonBuffer.hpp (100%) rename {include => src}/ArduinoJson/JsonArray.hpp (100%) rename {include => src}/ArduinoJson/JsonArrayImpl.hpp (100%) rename {include => src}/ArduinoJson/JsonArraySubscript.hpp (100%) rename {include => src}/ArduinoJson/JsonBuffer.hpp (100%) rename {include => src}/ArduinoJson/JsonBufferBase.hpp (100%) rename {include => src}/ArduinoJson/JsonBufferImpl.hpp (100%) rename {include => src}/ArduinoJson/JsonObject.hpp (100%) rename {include => src}/ArduinoJson/JsonObjectImpl.hpp (100%) rename {include => src}/ArduinoJson/JsonObjectSubscript.hpp (100%) rename {include => src}/ArduinoJson/JsonPair.hpp (100%) rename {include => src}/ArduinoJson/JsonVariant.hpp (100%) rename {include => src}/ArduinoJson/JsonVariantBase.hpp (100%) rename {include => src}/ArduinoJson/JsonVariantComparisons.hpp (100%) rename {include => src}/ArduinoJson/JsonVariantImpl.hpp (100%) rename {include => src}/ArduinoJson/Polyfills/attributes.hpp (100%) rename {include => src}/ArduinoJson/Polyfills/ctype.hpp (100%) rename {include => src}/ArduinoJson/Polyfills/isFloat.hpp (100%) rename {include => src}/ArduinoJson/Polyfills/isInteger.hpp (100%) rename {include => src}/ArduinoJson/Polyfills/math.hpp (100%) rename {include => src}/ArduinoJson/Polyfills/normalize.hpp (100%) rename {include => src}/ArduinoJson/Polyfills/parseFloat.hpp (100%) rename {include => src}/ArduinoJson/Polyfills/parseInteger.hpp (100%) rename {include => src}/ArduinoJson/Print.hpp (100%) rename {include => src}/ArduinoJson/RawJson.hpp (100%) rename {include => src}/ArduinoJson/Serialization/DummyPrint.hpp (100%) rename {include => src}/ArduinoJson/Serialization/DynamicStringBuilder.hpp (100%) rename {include => src}/ArduinoJson/Serialization/IndentedPrint.hpp (100%) rename {include => src}/ArduinoJson/Serialization/JsonPrintable.hpp (100%) rename {include => src}/ArduinoJson/Serialization/JsonSerializer.hpp (100%) rename {include => src}/ArduinoJson/Serialization/JsonSerializerImpl.hpp (100%) rename {include => src}/ArduinoJson/Serialization/JsonWriter.hpp (100%) rename {include => src}/ArduinoJson/Serialization/Prettyfier.hpp (100%) rename {include => src}/ArduinoJson/Serialization/StaticStringBuilder.hpp (100%) rename {include => src}/ArduinoJson/Serialization/StreamPrintAdapter.hpp (100%) rename {include => src}/ArduinoJson/StaticJsonBuffer.hpp (100%) rename {include => src}/ArduinoJson/StringTraits/ArduinoStream.hpp (100%) rename {include => src}/ArduinoJson/StringTraits/CharPointer.hpp (100%) rename {include => src}/ArduinoJson/StringTraits/FlashString.hpp (100%) rename {include => src}/ArduinoJson/StringTraits/StdStream.hpp (100%) rename {include => src}/ArduinoJson/StringTraits/StdString.hpp (100%) rename {include => src}/ArduinoJson/StringTraits/StringTraits.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/EnableIf.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/FloatTraits.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/IsArray.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/IsBaseOf.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/IsChar.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/IsConst.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/IsFloatingPoint.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/IsIntegral.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/IsSame.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/IsSignedIntegral.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/RemoveConst.hpp (100%) rename {include => src}/ArduinoJson/TypeTraits/RemoveReference.hpp (100%) diff --git a/ArduinoJson.h b/ArduinoJson.h index eaecef8c..896503a6 100644 --- a/ArduinoJson.h +++ b/ArduinoJson.h @@ -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" diff --git a/CHANGELOG.md b/CHANGELOG.md index f1c8a58c..5177de6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 ------ diff --git a/CMakeLists.txt b/CMakeLists.txt index 38db4a8e..61113a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/fuzzing/Makefile b/fuzzing/Makefile index 093db806..f3ed397f 100644 --- a/fuzzing/Makefile +++ b/fuzzing/Makefile @@ -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/* diff --git a/library.json b/library.json index 1e8adfe2..aeb4791c 100644 --- a/library.json +++ b/library.json @@ -13,7 +13,6 @@ }, "exclude": [ "scripts", - "src/ArduinoJson.h", "test", "third-party" ], diff --git a/scripts/build-arduino-package.sh b/scripts/build-arduino-package.sh index cccae2b5..6976bcd3 100755 --- a/scripts/build-arduino-package.sh +++ b/scripts/build-arduino-package.sh @@ -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 \ diff --git a/scripts/build-single-header.sh b/scripts/build-single-header.sh index c0cd2580..3ca9eea3 100644 --- a/scripts/build-single-header.sh +++ b/scripts/build-single-header.sh @@ -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 \ No newline at end of file +process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp \ No newline at end of file diff --git a/include/ArduinoJson.h b/src/ArduinoJson.h similarity index 100% rename from include/ArduinoJson.h rename to src/ArduinoJson.h diff --git a/include/ArduinoJson.hpp b/src/ArduinoJson.hpp similarity index 100% rename from include/ArduinoJson.hpp rename to src/ArduinoJson.hpp diff --git a/include/ArduinoJson/Configuration.hpp b/src/ArduinoJson/Configuration.hpp similarity index 100% rename from include/ArduinoJson/Configuration.hpp rename to src/ArduinoJson/Configuration.hpp diff --git a/include/ArduinoJson/Data/Encoding.hpp b/src/ArduinoJson/Data/Encoding.hpp similarity index 100% rename from include/ArduinoJson/Data/Encoding.hpp rename to src/ArduinoJson/Data/Encoding.hpp diff --git a/include/ArduinoJson/Data/JsonBufferAllocated.hpp b/src/ArduinoJson/Data/JsonBufferAllocated.hpp similarity index 100% rename from include/ArduinoJson/Data/JsonBufferAllocated.hpp rename to src/ArduinoJson/Data/JsonBufferAllocated.hpp diff --git a/include/ArduinoJson/Data/JsonFloat.hpp b/src/ArduinoJson/Data/JsonFloat.hpp similarity index 100% rename from include/ArduinoJson/Data/JsonFloat.hpp rename to src/ArduinoJson/Data/JsonFloat.hpp diff --git a/include/ArduinoJson/Data/JsonInteger.hpp b/src/ArduinoJson/Data/JsonInteger.hpp similarity index 100% rename from include/ArduinoJson/Data/JsonInteger.hpp rename to src/ArduinoJson/Data/JsonInteger.hpp diff --git a/include/ArduinoJson/Data/JsonVariantAs.hpp b/src/ArduinoJson/Data/JsonVariantAs.hpp similarity index 100% rename from include/ArduinoJson/Data/JsonVariantAs.hpp rename to src/ArduinoJson/Data/JsonVariantAs.hpp diff --git a/include/ArduinoJson/Data/JsonVariantComparer.hpp b/src/ArduinoJson/Data/JsonVariantComparer.hpp similarity index 100% rename from include/ArduinoJson/Data/JsonVariantComparer.hpp rename to src/ArduinoJson/Data/JsonVariantComparer.hpp diff --git a/include/ArduinoJson/Data/JsonVariantContent.hpp b/src/ArduinoJson/Data/JsonVariantContent.hpp similarity index 100% rename from include/ArduinoJson/Data/JsonVariantContent.hpp rename to src/ArduinoJson/Data/JsonVariantContent.hpp diff --git a/include/ArduinoJson/Data/JsonVariantDefault.hpp b/src/ArduinoJson/Data/JsonVariantDefault.hpp similarity index 100% rename from include/ArduinoJson/Data/JsonVariantDefault.hpp rename to src/ArduinoJson/Data/JsonVariantDefault.hpp diff --git a/include/ArduinoJson/Data/JsonVariantType.hpp b/src/ArduinoJson/Data/JsonVariantType.hpp similarity index 100% rename from include/ArduinoJson/Data/JsonVariantType.hpp rename to src/ArduinoJson/Data/JsonVariantType.hpp diff --git a/include/ArduinoJson/Data/List.hpp b/src/ArduinoJson/Data/List.hpp similarity index 100% rename from include/ArduinoJson/Data/List.hpp rename to src/ArduinoJson/Data/List.hpp diff --git a/include/ArduinoJson/Data/ListConstIterator.hpp b/src/ArduinoJson/Data/ListConstIterator.hpp similarity index 100% rename from include/ArduinoJson/Data/ListConstIterator.hpp rename to src/ArduinoJson/Data/ListConstIterator.hpp diff --git a/include/ArduinoJson/Data/ListIterator.hpp b/src/ArduinoJson/Data/ListIterator.hpp similarity index 100% rename from include/ArduinoJson/Data/ListIterator.hpp rename to src/ArduinoJson/Data/ListIterator.hpp diff --git a/include/ArduinoJson/Data/ListNode.hpp b/src/ArduinoJson/Data/ListNode.hpp similarity index 100% rename from include/ArduinoJson/Data/ListNode.hpp rename to src/ArduinoJson/Data/ListNode.hpp diff --git a/include/ArduinoJson/Data/ReferenceType.hpp b/src/ArduinoJson/Data/ReferenceType.hpp similarity index 100% rename from include/ArduinoJson/Data/ReferenceType.hpp rename to src/ArduinoJson/Data/ReferenceType.hpp diff --git a/include/ArduinoJson/Data/ValueSetter.hpp b/src/ArduinoJson/Data/ValueSetter.hpp similarity index 100% rename from include/ArduinoJson/Data/ValueSetter.hpp rename to src/ArduinoJson/Data/ValueSetter.hpp diff --git a/include/ArduinoJson/Deserialization/Comments.hpp b/src/ArduinoJson/Deserialization/Comments.hpp similarity index 100% rename from include/ArduinoJson/Deserialization/Comments.hpp rename to src/ArduinoJson/Deserialization/Comments.hpp diff --git a/include/ArduinoJson/Deserialization/JsonParser.hpp b/src/ArduinoJson/Deserialization/JsonParser.hpp similarity index 100% rename from include/ArduinoJson/Deserialization/JsonParser.hpp rename to src/ArduinoJson/Deserialization/JsonParser.hpp diff --git a/include/ArduinoJson/Deserialization/JsonParserImpl.hpp b/src/ArduinoJson/Deserialization/JsonParserImpl.hpp similarity index 100% rename from include/ArduinoJson/Deserialization/JsonParserImpl.hpp rename to src/ArduinoJson/Deserialization/JsonParserImpl.hpp diff --git a/include/ArduinoJson/Deserialization/StringWriter.hpp b/src/ArduinoJson/Deserialization/StringWriter.hpp similarity index 100% rename from include/ArduinoJson/Deserialization/StringWriter.hpp rename to src/ArduinoJson/Deserialization/StringWriter.hpp diff --git a/include/ArduinoJson/DynamicJsonBuffer.hpp b/src/ArduinoJson/DynamicJsonBuffer.hpp similarity index 100% rename from include/ArduinoJson/DynamicJsonBuffer.hpp rename to src/ArduinoJson/DynamicJsonBuffer.hpp diff --git a/include/ArduinoJson/JsonArray.hpp b/src/ArduinoJson/JsonArray.hpp similarity index 100% rename from include/ArduinoJson/JsonArray.hpp rename to src/ArduinoJson/JsonArray.hpp diff --git a/include/ArduinoJson/JsonArrayImpl.hpp b/src/ArduinoJson/JsonArrayImpl.hpp similarity index 100% rename from include/ArduinoJson/JsonArrayImpl.hpp rename to src/ArduinoJson/JsonArrayImpl.hpp diff --git a/include/ArduinoJson/JsonArraySubscript.hpp b/src/ArduinoJson/JsonArraySubscript.hpp similarity index 100% rename from include/ArduinoJson/JsonArraySubscript.hpp rename to src/ArduinoJson/JsonArraySubscript.hpp diff --git a/include/ArduinoJson/JsonBuffer.hpp b/src/ArduinoJson/JsonBuffer.hpp similarity index 100% rename from include/ArduinoJson/JsonBuffer.hpp rename to src/ArduinoJson/JsonBuffer.hpp diff --git a/include/ArduinoJson/JsonBufferBase.hpp b/src/ArduinoJson/JsonBufferBase.hpp similarity index 100% rename from include/ArduinoJson/JsonBufferBase.hpp rename to src/ArduinoJson/JsonBufferBase.hpp diff --git a/include/ArduinoJson/JsonBufferImpl.hpp b/src/ArduinoJson/JsonBufferImpl.hpp similarity index 100% rename from include/ArduinoJson/JsonBufferImpl.hpp rename to src/ArduinoJson/JsonBufferImpl.hpp diff --git a/include/ArduinoJson/JsonObject.hpp b/src/ArduinoJson/JsonObject.hpp similarity index 100% rename from include/ArduinoJson/JsonObject.hpp rename to src/ArduinoJson/JsonObject.hpp diff --git a/include/ArduinoJson/JsonObjectImpl.hpp b/src/ArduinoJson/JsonObjectImpl.hpp similarity index 100% rename from include/ArduinoJson/JsonObjectImpl.hpp rename to src/ArduinoJson/JsonObjectImpl.hpp diff --git a/include/ArduinoJson/JsonObjectSubscript.hpp b/src/ArduinoJson/JsonObjectSubscript.hpp similarity index 100% rename from include/ArduinoJson/JsonObjectSubscript.hpp rename to src/ArduinoJson/JsonObjectSubscript.hpp diff --git a/include/ArduinoJson/JsonPair.hpp b/src/ArduinoJson/JsonPair.hpp similarity index 100% rename from include/ArduinoJson/JsonPair.hpp rename to src/ArduinoJson/JsonPair.hpp diff --git a/include/ArduinoJson/JsonVariant.hpp b/src/ArduinoJson/JsonVariant.hpp similarity index 100% rename from include/ArduinoJson/JsonVariant.hpp rename to src/ArduinoJson/JsonVariant.hpp diff --git a/include/ArduinoJson/JsonVariantBase.hpp b/src/ArduinoJson/JsonVariantBase.hpp similarity index 100% rename from include/ArduinoJson/JsonVariantBase.hpp rename to src/ArduinoJson/JsonVariantBase.hpp diff --git a/include/ArduinoJson/JsonVariantComparisons.hpp b/src/ArduinoJson/JsonVariantComparisons.hpp similarity index 100% rename from include/ArduinoJson/JsonVariantComparisons.hpp rename to src/ArduinoJson/JsonVariantComparisons.hpp diff --git a/include/ArduinoJson/JsonVariantImpl.hpp b/src/ArduinoJson/JsonVariantImpl.hpp similarity index 100% rename from include/ArduinoJson/JsonVariantImpl.hpp rename to src/ArduinoJson/JsonVariantImpl.hpp diff --git a/include/ArduinoJson/Polyfills/attributes.hpp b/src/ArduinoJson/Polyfills/attributes.hpp similarity index 100% rename from include/ArduinoJson/Polyfills/attributes.hpp rename to src/ArduinoJson/Polyfills/attributes.hpp diff --git a/include/ArduinoJson/Polyfills/ctype.hpp b/src/ArduinoJson/Polyfills/ctype.hpp similarity index 100% rename from include/ArduinoJson/Polyfills/ctype.hpp rename to src/ArduinoJson/Polyfills/ctype.hpp diff --git a/include/ArduinoJson/Polyfills/isFloat.hpp b/src/ArduinoJson/Polyfills/isFloat.hpp similarity index 100% rename from include/ArduinoJson/Polyfills/isFloat.hpp rename to src/ArduinoJson/Polyfills/isFloat.hpp diff --git a/include/ArduinoJson/Polyfills/isInteger.hpp b/src/ArduinoJson/Polyfills/isInteger.hpp similarity index 100% rename from include/ArduinoJson/Polyfills/isInteger.hpp rename to src/ArduinoJson/Polyfills/isInteger.hpp diff --git a/include/ArduinoJson/Polyfills/math.hpp b/src/ArduinoJson/Polyfills/math.hpp similarity index 100% rename from include/ArduinoJson/Polyfills/math.hpp rename to src/ArduinoJson/Polyfills/math.hpp diff --git a/include/ArduinoJson/Polyfills/normalize.hpp b/src/ArduinoJson/Polyfills/normalize.hpp similarity index 100% rename from include/ArduinoJson/Polyfills/normalize.hpp rename to src/ArduinoJson/Polyfills/normalize.hpp diff --git a/include/ArduinoJson/Polyfills/parseFloat.hpp b/src/ArduinoJson/Polyfills/parseFloat.hpp similarity index 100% rename from include/ArduinoJson/Polyfills/parseFloat.hpp rename to src/ArduinoJson/Polyfills/parseFloat.hpp diff --git a/include/ArduinoJson/Polyfills/parseInteger.hpp b/src/ArduinoJson/Polyfills/parseInteger.hpp similarity index 100% rename from include/ArduinoJson/Polyfills/parseInteger.hpp rename to src/ArduinoJson/Polyfills/parseInteger.hpp diff --git a/include/ArduinoJson/Print.hpp b/src/ArduinoJson/Print.hpp similarity index 100% rename from include/ArduinoJson/Print.hpp rename to src/ArduinoJson/Print.hpp diff --git a/include/ArduinoJson/RawJson.hpp b/src/ArduinoJson/RawJson.hpp similarity index 100% rename from include/ArduinoJson/RawJson.hpp rename to src/ArduinoJson/RawJson.hpp diff --git a/include/ArduinoJson/Serialization/DummyPrint.hpp b/src/ArduinoJson/Serialization/DummyPrint.hpp similarity index 100% rename from include/ArduinoJson/Serialization/DummyPrint.hpp rename to src/ArduinoJson/Serialization/DummyPrint.hpp diff --git a/include/ArduinoJson/Serialization/DynamicStringBuilder.hpp b/src/ArduinoJson/Serialization/DynamicStringBuilder.hpp similarity index 100% rename from include/ArduinoJson/Serialization/DynamicStringBuilder.hpp rename to src/ArduinoJson/Serialization/DynamicStringBuilder.hpp diff --git a/include/ArduinoJson/Serialization/IndentedPrint.hpp b/src/ArduinoJson/Serialization/IndentedPrint.hpp similarity index 100% rename from include/ArduinoJson/Serialization/IndentedPrint.hpp rename to src/ArduinoJson/Serialization/IndentedPrint.hpp diff --git a/include/ArduinoJson/Serialization/JsonPrintable.hpp b/src/ArduinoJson/Serialization/JsonPrintable.hpp similarity index 100% rename from include/ArduinoJson/Serialization/JsonPrintable.hpp rename to src/ArduinoJson/Serialization/JsonPrintable.hpp diff --git a/include/ArduinoJson/Serialization/JsonSerializer.hpp b/src/ArduinoJson/Serialization/JsonSerializer.hpp similarity index 100% rename from include/ArduinoJson/Serialization/JsonSerializer.hpp rename to src/ArduinoJson/Serialization/JsonSerializer.hpp diff --git a/include/ArduinoJson/Serialization/JsonSerializerImpl.hpp b/src/ArduinoJson/Serialization/JsonSerializerImpl.hpp similarity index 100% rename from include/ArduinoJson/Serialization/JsonSerializerImpl.hpp rename to src/ArduinoJson/Serialization/JsonSerializerImpl.hpp diff --git a/include/ArduinoJson/Serialization/JsonWriter.hpp b/src/ArduinoJson/Serialization/JsonWriter.hpp similarity index 100% rename from include/ArduinoJson/Serialization/JsonWriter.hpp rename to src/ArduinoJson/Serialization/JsonWriter.hpp diff --git a/include/ArduinoJson/Serialization/Prettyfier.hpp b/src/ArduinoJson/Serialization/Prettyfier.hpp similarity index 100% rename from include/ArduinoJson/Serialization/Prettyfier.hpp rename to src/ArduinoJson/Serialization/Prettyfier.hpp diff --git a/include/ArduinoJson/Serialization/StaticStringBuilder.hpp b/src/ArduinoJson/Serialization/StaticStringBuilder.hpp similarity index 100% rename from include/ArduinoJson/Serialization/StaticStringBuilder.hpp rename to src/ArduinoJson/Serialization/StaticStringBuilder.hpp diff --git a/include/ArduinoJson/Serialization/StreamPrintAdapter.hpp b/src/ArduinoJson/Serialization/StreamPrintAdapter.hpp similarity index 100% rename from include/ArduinoJson/Serialization/StreamPrintAdapter.hpp rename to src/ArduinoJson/Serialization/StreamPrintAdapter.hpp diff --git a/include/ArduinoJson/StaticJsonBuffer.hpp b/src/ArduinoJson/StaticJsonBuffer.hpp similarity index 100% rename from include/ArduinoJson/StaticJsonBuffer.hpp rename to src/ArduinoJson/StaticJsonBuffer.hpp diff --git a/include/ArduinoJson/StringTraits/ArduinoStream.hpp b/src/ArduinoJson/StringTraits/ArduinoStream.hpp similarity index 100% rename from include/ArduinoJson/StringTraits/ArduinoStream.hpp rename to src/ArduinoJson/StringTraits/ArduinoStream.hpp diff --git a/include/ArduinoJson/StringTraits/CharPointer.hpp b/src/ArduinoJson/StringTraits/CharPointer.hpp similarity index 100% rename from include/ArduinoJson/StringTraits/CharPointer.hpp rename to src/ArduinoJson/StringTraits/CharPointer.hpp diff --git a/include/ArduinoJson/StringTraits/FlashString.hpp b/src/ArduinoJson/StringTraits/FlashString.hpp similarity index 100% rename from include/ArduinoJson/StringTraits/FlashString.hpp rename to src/ArduinoJson/StringTraits/FlashString.hpp diff --git a/include/ArduinoJson/StringTraits/StdStream.hpp b/src/ArduinoJson/StringTraits/StdStream.hpp similarity index 100% rename from include/ArduinoJson/StringTraits/StdStream.hpp rename to src/ArduinoJson/StringTraits/StdStream.hpp diff --git a/include/ArduinoJson/StringTraits/StdString.hpp b/src/ArduinoJson/StringTraits/StdString.hpp similarity index 100% rename from include/ArduinoJson/StringTraits/StdString.hpp rename to src/ArduinoJson/StringTraits/StdString.hpp diff --git a/include/ArduinoJson/StringTraits/StringTraits.hpp b/src/ArduinoJson/StringTraits/StringTraits.hpp similarity index 100% rename from include/ArduinoJson/StringTraits/StringTraits.hpp rename to src/ArduinoJson/StringTraits/StringTraits.hpp diff --git a/include/ArduinoJson/TypeTraits/EnableIf.hpp b/src/ArduinoJson/TypeTraits/EnableIf.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/EnableIf.hpp rename to src/ArduinoJson/TypeTraits/EnableIf.hpp diff --git a/include/ArduinoJson/TypeTraits/FloatTraits.hpp b/src/ArduinoJson/TypeTraits/FloatTraits.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/FloatTraits.hpp rename to src/ArduinoJson/TypeTraits/FloatTraits.hpp diff --git a/include/ArduinoJson/TypeTraits/IsArray.hpp b/src/ArduinoJson/TypeTraits/IsArray.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/IsArray.hpp rename to src/ArduinoJson/TypeTraits/IsArray.hpp diff --git a/include/ArduinoJson/TypeTraits/IsBaseOf.hpp b/src/ArduinoJson/TypeTraits/IsBaseOf.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/IsBaseOf.hpp rename to src/ArduinoJson/TypeTraits/IsBaseOf.hpp diff --git a/include/ArduinoJson/TypeTraits/IsChar.hpp b/src/ArduinoJson/TypeTraits/IsChar.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/IsChar.hpp rename to src/ArduinoJson/TypeTraits/IsChar.hpp diff --git a/include/ArduinoJson/TypeTraits/IsConst.hpp b/src/ArduinoJson/TypeTraits/IsConst.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/IsConst.hpp rename to src/ArduinoJson/TypeTraits/IsConst.hpp diff --git a/include/ArduinoJson/TypeTraits/IsFloatingPoint.hpp b/src/ArduinoJson/TypeTraits/IsFloatingPoint.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/IsFloatingPoint.hpp rename to src/ArduinoJson/TypeTraits/IsFloatingPoint.hpp diff --git a/include/ArduinoJson/TypeTraits/IsIntegral.hpp b/src/ArduinoJson/TypeTraits/IsIntegral.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/IsIntegral.hpp rename to src/ArduinoJson/TypeTraits/IsIntegral.hpp diff --git a/include/ArduinoJson/TypeTraits/IsSame.hpp b/src/ArduinoJson/TypeTraits/IsSame.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/IsSame.hpp rename to src/ArduinoJson/TypeTraits/IsSame.hpp diff --git a/include/ArduinoJson/TypeTraits/IsSignedIntegral.hpp b/src/ArduinoJson/TypeTraits/IsSignedIntegral.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/IsSignedIntegral.hpp rename to src/ArduinoJson/TypeTraits/IsSignedIntegral.hpp diff --git a/include/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp b/src/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp rename to src/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp diff --git a/include/ArduinoJson/TypeTraits/RemoveConst.hpp b/src/ArduinoJson/TypeTraits/RemoveConst.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/RemoveConst.hpp rename to src/ArduinoJson/TypeTraits/RemoveConst.hpp diff --git a/include/ArduinoJson/TypeTraits/RemoveReference.hpp b/src/ArduinoJson/TypeTraits/RemoveReference.hpp similarity index 100% rename from include/ArduinoJson/TypeTraits/RemoveReference.hpp rename to src/ArduinoJson/TypeTraits/RemoveReference.hpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 33e564df..e1abcef0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -60,8 +60,6 @@ if(MSVC) ) endif() -include_directories(${CMAKE_CURRENT_LIST_DIR}/../include) - add_subdirectory(DynamicJsonBuffer) add_subdirectory(IntegrationTests) add_subdirectory(JsonArray)