Browse Source

Switched back to old library layout (issues #39, #43 and #45)

Benoit Blanchon 11 years ago
parent
commit
41651136bf
5 changed files with 40 additions and 23 deletions
  1. 23 0
      ArduinoJson.cpp
  2. 13 0
      ArduinoJson.h
  3. 0 8
      library.properties
  4. 4 2
      scripts/build-arduino-package.sh
  5. 0 13
      src/ArduinoJson.h

+ 23 - 0
ArduinoJson.cpp

@@ -0,0 +1,23 @@
+// Copyright Benoit Blanchon 2014-2015
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+#ifdef ARDUINO
+
+// This file is here to help the Arduino IDE find the other files.
+
+#include "src/Arduino/Print.cpp"
+#include "src/Internals/IndentedPrint.cpp"
+#include "src/Internals/JsonParser.cpp"
+#include "src/Internals/List.cpp"
+#include "src/Internals/Prettyfier.cpp"
+#include "src/Internals/QuotedString.cpp"
+#include "src/Internals/StringBuilder.cpp"
+#include "src/JsonArray.cpp"
+#include "src/JsonBuffer.cpp"
+#include "src/JsonObject.cpp"
+#include "src/JsonVariant.cpp"
+
+#endif

+ 13 - 0
ArduinoJson.h

@@ -0,0 +1,13 @@
+// Copyright Benoit Blanchon 2014-2015
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+#ifdef ARDUINO
+
+// This file is here to help the Arduino IDE find the other files.
+
+#include "include/ArduinoJson.h"
+
+#endif

+ 0 - 8
library.properties

@@ -1,8 +0,0 @@
-name=ArduinoJson
-version=4.0
-author=Benoit Blanchon <http://blog.benoitblanchon.fr/>
-maintainer=Benoit Blanchon <http://blog.benoitblanchon.fr/>
-sentence=An efficient and elegant JSON library for Arduino
-paragraph=Supports JSON parsing and formatting. Uses fixed memory allocation.
-url=https://github.com/bblanchon/ArduinoJson
-architectures=*

+ 4 - 2
scripts/build-arduino-package.sh

@@ -15,7 +15,9 @@ rm -f $OUTPUT
 	ArduinoJson/examples \
 	ArduinoJson/include \
 	ArduinoJson/keywords.txt \
-	ArduinoJson/library.properties \
 	ArduinoJson/LICENSE.md \
 	ArduinoJson/README.md \
-	ArduinoJson/src	
+	ArduinoJson/src	\
+	ArduinoJson/ArduinoJson.h \
+	ArduinoJson/ArduinoJson.cpp	\
+    -x!ArduinoJson/src/CMakeLists.txt

+ 0 - 13
src/ArduinoJson.h

@@ -1,13 +0,0 @@
-// Copyright Benoit Blanchon 2014
-// MIT License
-//
-// Arduino JSON library
-// https://github.com/bblanchon/ArduinoJson
-
-// About this file
-// ---------------
-// This file is here to please the Arduino IDE. It must be present in the src/
-// for the IDE to find it. Feel free to ignore this file if your working in
-// another environment
-
-#include "../include/ArduinoJson.h"