From 59cd1f14331ff50ca14bc82953ad3f054decd8dc Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Wed, 22 Jun 2016 21:51:37 +0200
Subject: [PATCH] Fix packaging script

---
 scripts/build-arduino-package.sh     |  3 +-
 scripts/build-old-arduino-package.sh | 52 ----------------------------
 2 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100755 scripts/build-old-arduino-package.sh

diff --git a/scripts/build-arduino-package.sh b/scripts/build-arduino-package.sh
index a5d1d1b58..cccae2b53 100755
--- a/scripts/build-arduino-package.sh
+++ b/scripts/build-arduino-package.sh
@@ -17,5 +17,4 @@ rm -f $OUTPUT
 	ArduinoJson/library.properties \
 	ArduinoJson/LICENSE.md \
 	ArduinoJson/README.md \
-	ArduinoJson/src	\
-	-x!ArduinoJson/src/CMakeLists.txt
+	ArduinoJson/ArduinoJson.h
diff --git a/scripts/build-old-arduino-package.sh b/scripts/build-old-arduino-package.sh
deleted file mode 100755
index e6e4f6f0b..000000000
--- a/scripts/build-old-arduino-package.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-TAG=$(git describe)
-OUTPUT="ArduinoJson-$TAG-old-layout.zip"
-
-cd $(dirname $0)/..
-
-cat > ArduinoJson.h <<END
-// WARNING:
-// --------
-// This file is a workaround for old version of the Arduino IDE.
-// If you are using Arduino IDE 1.0.6 or above, then you installed the wrong 
-// package of ArduinoJson.
-// In that case, just delete the current installation and install the package.
-
-END
-cp ArduinoJson.h ArduinoJson.cpp
-
-cat "include/ArduinoJson.h" | sed 's!include "!include "include/!g' >> ArduinoJson.h
-
-find src -name "*.cpp" |
-while read FILE; do
-	echo >> ArduinoJson.cpp
-	echo "// $FILE" >> ArduinoJson.cpp
-	echo "//" >> ArduinoJson.cpp
-	cat "$FILE" | sed 's!\.\./!!g' >> ArduinoJson.cpp
-done
-
-unix2dos ArduinoJson.cpp
-unix2dos ArduinoJson.h
-
-pushd ..
-
-# remove existing file
-rm -f $OUTPUT
-
-# create zipman dos2
-7z a $OUTPUT \
-	ArduinoJson/CHANGELOG.md \
-	ArduinoJson/examples \
-	ArduinoJson/include/ArduinoJson \
-	ArduinoJson/keywords.txt \
-	ArduinoJson/LICENSE.md \
-	ArduinoJson/README.md \
-	ArduinoJson/ArduinoJson.h \
-	ArduinoJson/ArduinoJson.cpp \
-	-x!ArduinoJson/src/CMakeLists.txt
-
-popd
-
-rm ArduinoJson.h
-rm ArduinoJson.cpp