From a771f12d91bb29cb27131ac1d49868135cb050c2 Mon Sep 17 00:00:00 2001
From: david gauchard <gauchard@laas.fr>
Date: Sun, 16 Feb 2020 21:20:39 +0100
Subject: [PATCH 1/3] allow versions 0.0.* to be special

---
 package/build_boards_manager_package.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh
index ff63547b97..3fcb279361 100755
--- a/package/build_boards_manager_package.sh
+++ b/package/build_boards_manager_package.sh
@@ -5,9 +5,10 @@
 
 ver=`git describe --tag`
 visiblever=$ver
-if [ "$ver" = 0.0.1 ]; then
+# match 0.0.*
+if [ "${ver%.*}" = 0.0 ]; then
 
-    git tag -d 0.0.1
+    git tag -d ${ver}
     ver=`git describe --tag HEAD`
     plain_ver=$ver
 

From a6965e9947905a56481a0fb11a2d2fb73272189b Mon Sep 17 00:00:00 2001
From: david gauchard <gauchard@laas.fr>
Date: Sun, 16 Feb 2020 21:51:48 +0100
Subject: [PATCH 2/3] allow merging more json release file

---
 package/build_boards_manager_package.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh
index 3fcb279361..7ceb3ebb32 100755
--- a/package/build_boards_manager_package.sh
+++ b/package/build_boards_manager_package.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-#
 
 #set -x
 
@@ -168,8 +167,19 @@ curl -L -o $old_json "https://github.com/esp8266/Arduino/releases/download/${bas
 new_json=package_esp8266com_index.json
 
 set +e
-# Merge the old and new, then drop any obsolete package versions
-python3 ../../merge_packages.py $new_json $old_json | python3 ../../drop_versions.py - tools 1.20.0-26-gb404fb9 >tmp && mv tmp $new_json && rm $old_json
+# Merge the old and new
+python3 ../../merge_packages.py $new_json $old_json > tmp
+
+# additional json to merge (for experimental releases)
+for json in ${MOREJSONPACKAGES}; do
+    if [ ! -z "$json" -a -r "$json" ]; then
+        python3 ../../merge_packages.py tmp $json > tmp2
+        mv tmp2 tmp
+    fi
+done
+
+# drop any obsolete package versions
+python3 ../../drop_versions.py - tools 1.20.0-26-gb404fb9 < tmp > tmp2 && mv tmp2 $new_json && rm $old_json tmp
 
 # Verify the JSON file can be read, fail if it's not OK
 set -e

From eda053500afced05a4307cdb9d5952fec214bf13 Mon Sep 17 00:00:00 2001
From: david gauchard <gauchard@laas.fr>
Date: Sun, 16 Feb 2020 22:31:23 +0100
Subject: [PATCH 3/3] verbosity

---
 package/build_boards_manager_package.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh
index 7ceb3ebb32..372fa2c63f 100755
--- a/package/build_boards_manager_package.sh
+++ b/package/build_boards_manager_package.sh
@@ -171,8 +171,10 @@ set +e
 python3 ../../merge_packages.py $new_json $old_json > tmp
 
 # additional json to merge (for experimental releases)
+echo "Additional json package files: ${MOREJSONPACKAGES}"
 for json in ${MOREJSONPACKAGES}; do
     if [ ! -z "$json" -a -r "$json" ]; then
+        echo "- merging $json"
         python3 ../../merge_packages.py tmp $json > tmp2
         mv tmp2 tmp
     fi