From e7a0a1bddeca10bc2cc706a9d46bf9483ccbb9ec Mon Sep 17 00:00:00 2001
From: Szybet <53944559+Szybet@users.noreply.github.com>
Date: Sun, 23 Jun 2024 00:58:35 +0200
Subject: [PATCH 1/8] Update archive-build.sh

---
 tools/archive-build.sh | 66 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index f973a42ef..8cc59ef33 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -1,12 +1,64 @@
 #!/bin/bash
 
-IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "")
-IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD || echo "")
 idf_version_string=${IDF_BRANCH//\//_}"-$IDF_COMMIT"
 
-archive_path="dist/arduino-esp32-libs-$1-$idf_version_string.tar.gz"
+archive_path="dist/arduino-esp32-libs-$TARGET-$idf_version_string.tar.gz"
+build_archive_path="dist/arduino-esp32-build-$TARGET-$idf_version_string.tar.gz"
+pio_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.tar.gz"
+pio_zip_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.zip"
 
-mkdir -p dist && rm -rf "$archive_path"
-if [ -d "out" ]; then
-	cd out && tar zcf "../$archive_path" * && cd ..
-fi
+mkdir -p dist && rm -rf "$archive_path" "$build_archive_path"
+
+cd out
+echo "Creating PlatformIO Tasmota framework-arduinoespressif32"
+mkdir -p arduino-esp32/cores/esp32
+mkdir -p arduino-esp32/tools/partitions
+cp -rf ../components/arduino/tools arduino-esp32
+cp -rf ../components/arduino/cores arduino-esp32
+cp -rf ../components/arduino/libraries arduino-esp32
+cp -rf ../components/arduino/variants arduino-esp32
+cp -f ../components/arduino/CMa* arduino-esp32
+cp -f ../components/arduino/idf* arduino-esp32
+cp -f ../components/arduino/Kco* arduino-esp32
+cp -f ../components/arduino/pac* arduino-esp32
+rm -rf arduino-esp32/docs
+rm -rf arduino-esp32/tests
+rm -rf arduino-esp32/idf_component_examples
+rm -rf arduino-esp32/libraries/RainMaker
+rm -rf arduino-esp32/libraries/Insights
+rm -rf arduino-esp32/libraries/ESP_I2S
+rm -rf arduino-esp32/libraries/SPIFFS
+rm -rf arduino-esp32/libraries/BLE
+rm -rf arduino-esp32/libraries/SimpleBLE
+rm -rf arduino-esp32/libraries/BluetoothSerial
+rm -rf arduino-esp32/libraries/WiFiProv
+rm -rf arduino-esp32/libraries/WiFiClientSecure
+rm -rf arduino-esp32/libraries/NetworkClientSecure
+rm -rf arduino-esp32/libraries/ESP_SR
+rm -rf arduino-esp32/libraries/ESP_NOW
+rm -rf arduino-esp32/libraries/TFLiteMicro
+rm -rf arduino-esp32/libraries/ESP32
+rm -rf arduino-esp32/package
+rm -rf arduino-esp32/tools/esp32-arduino-libs
+rm -rf arduino-esp32/tools/*.exe
+rm -rf arduino-esp32/tools/esptool.py
+rm -rf arduino-esp32/tools/get.py
+rm -rf arduino-esp32/tools/ide-debug
+rm -rf arduino-esp32/tools/gen_insights_package.py
+rm -rf arduino-esp32/platform.txt
+rm -rf arduino-esp32/programmers.txt
+rm -rf arduino-esp32/boards.txt
+rm -rf arduino-esp32/package.json
+rm -rf arduino-esp32/*.md
+cp -Rf tools/esp32-arduino-libs arduino-esp32/tools/
+cp ../package.json arduino-esp32/package.json
+cp ../core_version.h arduino-esp32/cores/esp32/core_version.h
+mv arduino-esp32/ framework-arduinoespressif32/
+cd framework-arduinoespressif32/libraries
+rm -rf **/examples
+cd ../tools/esp32-arduino-libs
+rm -rf **/flags
+cd ../../../
+# If the framework is needed as tar.gz uncomment next line
+# tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/
+7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/

From 00eb37c8c8c2b0c52a979bf555e20b30f1727867 Mon Sep 17 00:00:00 2001
From: Szybet <53944559+Szybet@users.noreply.github.com>
Date: Sun, 23 Jun 2024 01:24:53 +0200
Subject: [PATCH 2/8] a

---
 tools/archive-build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 8cc59ef33..c9c94efd8 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -7,7 +7,8 @@ build_archive_path="dist/arduino-esp32-build-$TARGET-$idf_version_string.tar.gz"
 pio_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.tar.gz"
 pio_zip_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.zip"
 
-mkdir -p dist && rm -rf "$archive_path" "$build_archive_path"
+rm -rf dist
+mkdir -p dist
 
 cd out
 echo "Creating PlatformIO Tasmota framework-arduinoespressif32"

From 322978aedb1f8768aacbcbc79a5fcf5158c8c7a8 Mon Sep 17 00:00:00 2001
From: Szybet <53944559+Szybet@users.noreply.github.com>
Date: Sun, 23 Jun 2024 01:51:56 +0200
Subject: [PATCH 3/8] pio package

---
 tools/archive-build.sh | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index c9c94efd8..3128e3174 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -11,34 +11,34 @@ rm -rf dist
 mkdir -p dist
 
 cd out
-echo "Creating PlatformIO Tasmota framework-arduinoespressif32"
+echo "Creating PlatformIO framework-arduinoespressif32"
 mkdir -p arduino-esp32/cores/esp32
 mkdir -p arduino-esp32/tools/partitions
 cp -rf ../components/arduino/tools arduino-esp32
 cp -rf ../components/arduino/cores arduino-esp32
 cp -rf ../components/arduino/libraries arduino-esp32
 cp -rf ../components/arduino/variants arduino-esp32
-cp -f ../components/arduino/CMa* arduino-esp32
-cp -f ../components/arduino/idf* arduino-esp32
-cp -f ../components/arduino/Kco* arduino-esp32
-cp -f ../components/arduino/pac* arduino-esp32
+cp -rf ../components/arduino/CMa* arduino-esp32
+cp -rf ../components/arduino/idf* arduino-esp32
+cp -rf ../components/arduino/Kco* arduino-esp32
+cp -rf ../components/arduino/pac* arduino-esp32
 rm -rf arduino-esp32/docs
 rm -rf arduino-esp32/tests
 rm -rf arduino-esp32/idf_component_examples
-rm -rf arduino-esp32/libraries/RainMaker
-rm -rf arduino-esp32/libraries/Insights
-rm -rf arduino-esp32/libraries/ESP_I2S
-rm -rf arduino-esp32/libraries/SPIFFS
-rm -rf arduino-esp32/libraries/BLE
-rm -rf arduino-esp32/libraries/SimpleBLE
-rm -rf arduino-esp32/libraries/BluetoothSerial
-rm -rf arduino-esp32/libraries/WiFiProv
-rm -rf arduino-esp32/libraries/WiFiClientSecure
-rm -rf arduino-esp32/libraries/NetworkClientSecure
-rm -rf arduino-esp32/libraries/ESP_SR
-rm -rf arduino-esp32/libraries/ESP_NOW
-rm -rf arduino-esp32/libraries/TFLiteMicro
-rm -rf arduino-esp32/libraries/ESP32
+# rm -rf arduino-esp32/libraries/RainMaker
+# rm -rf arduino-esp32/libraries/Insights
+# rm -rf arduino-esp32/libraries/ESP_I2S
+# rm -rf arduino-esp32/libraries/SPIFFS
+# rm -rf arduino-esp32/libraries/BLE
+# rm -rf arduino-esp32/libraries/SimpleBLE
+# rm -rf arduino-esp32/libraries/BluetoothSerial
+# rm -rf arduino-esp32/libraries/WiFiProv
+# rm -rf arduino-esp32/libraries/WiFiClientSecure
+# rm -rf arduino-esp32/libraries/NetworkClientSecure
+# rm -rf arduino-esp32/libraries/ESP_SR
+# rm -rf arduino-esp32/libraries/ESP_NOW
+# rm -rf arduino-esp32/libraries/TFLiteMicro
+# rm -rf arduino-esp32/libraries/ESP32
 rm -rf arduino-esp32/package
 rm -rf arduino-esp32/tools/esp32-arduino-libs
 rm -rf arduino-esp32/tools/*.exe
@@ -51,7 +51,7 @@ rm -rf arduino-esp32/programmers.txt
 rm -rf arduino-esp32/boards.txt
 rm -rf arduino-esp32/package.json
 rm -rf arduino-esp32/*.md
-cp -Rf tools/esp32-arduino-libs arduino-esp32/tools/
+cp -rf tools/esp32-arduino-libs arduino-esp32/tools/
 cp ../package.json arduino-esp32/package.json
 cp ../core_version.h arduino-esp32/cores/esp32/core_version.h
 mv arduino-esp32/ framework-arduinoespressif32/

From 5e489ad2025324a2f526d382dd64ba29c4837410 Mon Sep 17 00:00:00 2001
From: Szybet <53944559+Szybet@users.noreply.github.com>
Date: Sun, 23 Jun 2024 02:00:07 +0200
Subject: [PATCH 4/8] now working pio

---
 tools/archive-build.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 3128e3174..0e984918e 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -52,8 +52,16 @@ rm -rf arduino-esp32/boards.txt
 rm -rf arduino-esp32/package.json
 rm -rf arduino-esp32/*.md
 cp -rf tools/esp32-arduino-libs arduino-esp32/tools/
-cp ../package.json arduino-esp32/package.json
-cp ../core_version.h arduino-esp32/cores/esp32/core_version.h
+cp /app/esp32-arduino-lib-builder/out/tools/esp32-arduino-libs/package.json arduino-esp32/package.json
+
+#cp ../core_version.h arduino-esp32/cores/esp32/core_version.h
+rm -rf arduino-esp32/cores/esp32/core_version.h
+touch arduino-esp32/cores/esp32/core_version.h
+echo "#define ARDUINO_ESP32_GIT_VER 0xa92d49f" >> arduino-esp32/cores/esp32/core_version.h
+echo "#define ARDUINO_ESP32_GIT_DESC 3.0.2" >> arduino-esp32/cores/esp32/core_version.h
+echo "#define ARDUINO_ESP32_RELEASE_3_0_2" >> arduino-esp32/cores/esp32/core_version.h
+echo "#define ARDUINO_ESP32_RELEASE "3_0_2"" >> arduino-esp32/cores/esp32/core_version.h
+
 mv arduino-esp32/ framework-arduinoespressif32/
 cd framework-arduinoespressif32/libraries
 rm -rf **/examples

From 943fbdb6d6ad82534f558c2400dd00e93f3579d4 Mon Sep 17 00:00:00 2001
From: Szybet <53944559+Szybet@users.noreply.github.com>
Date: Sun, 23 Jun 2024 02:00:49 +0200
Subject: [PATCH 5/8] pio env

---
 tools/archive-build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 0e984918e..396d617d7 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -62,6 +62,7 @@ echo "#define ARDUINO_ESP32_GIT_DESC 3.0.2" >> arduino-esp32/cores/esp32/core_ve
 echo "#define ARDUINO_ESP32_RELEASE_3_0_2" >> arduino-esp32/cores/esp32/core_version.h
 echo "#define ARDUINO_ESP32_RELEASE "3_0_2"" >> arduino-esp32/cores/esp32/core_version.h
 
+rm -rf framework-arduinoespressif32/
 mv arduino-esp32/ framework-arduinoespressif32/
 cd framework-arduinoespressif32/libraries
 rm -rf **/examples

From 81f795fc6a30ccaa6c51693d85db9bbeb2d55c16 Mon Sep 17 00:00:00 2001
From: Szybet <53944559+Szybet@users.noreply.github.com>
Date: Sun, 23 Jun 2024 02:02:52 +0200
Subject: [PATCH 6/8] NOW WORKING MAYBE

---
 tools/archive-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 396d617d7..8de8143a5 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -60,7 +60,7 @@ touch arduino-esp32/cores/esp32/core_version.h
 echo "#define ARDUINO_ESP32_GIT_VER 0xa92d49f" >> arduino-esp32/cores/esp32/core_version.h
 echo "#define ARDUINO_ESP32_GIT_DESC 3.0.2" >> arduino-esp32/cores/esp32/core_version.h
 echo "#define ARDUINO_ESP32_RELEASE_3_0_2" >> arduino-esp32/cores/esp32/core_version.h
-echo "#define ARDUINO_ESP32_RELEASE "3_0_2"" >> arduino-esp32/cores/esp32/core_version.h
+echo "#define ARDUINO_ESP32_RELEASE \"3_0_2\"" >> arduino-esp32/cores/esp32/core_version.h
 
 rm -rf framework-arduinoespressif32/
 mv arduino-esp32/ framework-arduinoespressif32/

From 46f10ba447b81189d3b223cf640a8f64bf372094 Mon Sep 17 00:00:00 2001
From: Szybet <53944559+Szybet@users.noreply.github.com>
Date: Sun, 23 Jun 2024 02:03:28 +0200
Subject: [PATCH 7/8] maybe now working

---
 tools/archive-build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 8de8143a5..2bb963367 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -71,4 +71,5 @@ rm -rf **/flags
 cd ../../../
 # If the framework is needed as tar.gz uncomment next line
 # tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/
+rm -rf ../$pio_zip_archive_path
 7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/

From 8b4ffb888939a32c4d09824644821d8ace0b21fc Mon Sep 17 00:00:00 2001
From: Szybet <53944559+Szybet@users.noreply.github.com>
Date: Mon, 1 Jul 2024 23:11:00 +0200
Subject: [PATCH 8/8] ignore weirs git pull errors, it works anyway

---
 tools/install-arduino.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/install-arduino.sh b/tools/install-arduino.sh
index 51e1162a4..235a9273c 100755
--- a/tools/install-arduino.sh
+++ b/tools/install-arduino.sh
@@ -41,9 +41,9 @@ fi
 
 if [ "$AR_BRANCH" ]; then
 	echo "AR_BRANCH='$AR_BRANCH'"
-	git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \
-	git -C "$AR_COMPS/arduino" fetch && \
-	git -C "$AR_COMPS/arduino" pull --ff-only
+	git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH"
+	git -C "$AR_COMPS/arduino" fetch
+	git -C "$AR_COMPS/arduino" pull --ff-only || true
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
@@ -55,8 +55,8 @@ if [ ! -d "$IDF_LIBS_DIR" ]; then
 	git clone "$AR_LIBS_REPO_URL" "$IDF_LIBS_DIR"
 else
 	echo "Updating esp32-arduino-libs..."
-	git -C "$IDF_LIBS_DIR" fetch && \
-	git -C "$IDF_LIBS_DIR" pull --ff-only
+	git -C "$IDF_LIBS_DIR" fetch
+	git -C "$IDF_LIBS_DIR" pull --ff-only || true
 fi
 if [ $? -ne 0 ]; then exit 1; fi