update build scripts

Author: Jason2866

build.sh

@@ -119,11 +119,11 @@ rm -rf build sdkconfig out
 
 # Add components version info
 mkdir -p "$AR_TOOLS/sdk" && rm -rf version.txt && rm -rf "$AR_TOOLS/sdk/versions.txt"
-component_version="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)
+component_version="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)
 echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
 for component in `ls "$AR_COMPS"`; do
     if [ -d "$AR_COMPS/$component/.git" ] || [ -d "$AR_COMPS/$component/.github" ]; then
-        component_version="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)
+        component_version="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD || git -C "$AR_COMPS/$component" tag --points-at HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)
         echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
     fi
 done

main/Kconfig.projbuild

@@ -13,3 +13,7 @@ config LIB_BUILDER_FLASHFREQ
     default "40m" if ESPTOOLPY_FLASHFREQ_40M
     default "26m" if ESPTOOLPY_FLASHFREQ_26M
     default "20m" if ESPTOOLPY_FLASHFREQ_20M
+
+config LIB_BUILDER_COMPILE
+    bool
+    default y

tools/archive-build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "")
-IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --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-solo1-$idf_version_string.tar.gz"
@@ -25,7 +25,6 @@ rm -rf arduino-esp32/platform.txt
 rm -rf arduino-esp32/package.json
 cp -f platform.txt arduino-esp32/
 cp -Rf tools/sdk arduino-esp32/tools/
-cp -f tools/esptool.py arduino-esp32/tools/
 cp -f tools/gen_esp32part.py arduino-esp32/tools/
 cp -f tools/platformio-build-*.py arduino-esp32/tools/
 cp ../package.json arduino-esp32/package.json

tools/config.sh

@@ -46,7 +46,6 @@ AR_COMPS="$AR_ROOT/components"
 AR_OUT="$AR_ROOT/out"
 AR_TOOLS="$AR_OUT/tools"
 AR_PLATFORM_TXT="$AR_OUT/platform.txt"
-AR_ESPTOOL_PY="$AR_TOOLS/esptool.py"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
 

tools/copy-bootloader.sh

@@ -7,18 +7,8 @@ BOOTCONF=$FLASH_MODE"_$FLASH_FREQ"
 
 source ./tools/config.sh
 
-echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.bin"
+echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.elf"
 
 mkdir -p "$AR_SDK/bin"
 
-# Workaround for getting the bootloaders to be flashable with esptool v4.x
-# It might still be needed for IDF5, but using the included esptool instead
-#cp "build/bootloader/bootloader.bin" "$AR_SDK/bin/bootloader_$BOOTCONF.bin"
-
-# We use esptool v.4.21 in Tasmota IDF fork so no need to clone here
-
-#if [ ! -e "tools/esptool" ]; then
-#	git clone https://github.com/espressif/esptool tools/esptool
-#fi
-./esp-idf/components/esptool_py/esptool/esptool.py --chip "$IDF_TARGET" elf2image --dont-append-digest "build/bootloader/bootloader.elf" -o "$AR_SDK/bin/bootloader_$BOOTCONF.bin"
 cp "build/bootloader/bootloader.elf" "$AR_SDK/bin/bootloader_$BOOTCONF.elf"

tools/copy-libs.sh

@@ -481,9 +481,6 @@ rm -rf platform_start.txt platform_mid.txt 1platform_mid.txt
 # sdkconfig
 cp -f "sdkconfig" "$AR_SDK/sdkconfig"
 
-# esptool.py
-cp "$IDF_COMPS/esptool_py/esptool/esptool.py" "$AR_ESPTOOL_PY"
-
 # gen_esp32part.py
 cp "$IDF_COMPS/partition_table/gen_esp32part.py" "$AR_GEN_PART_PY"
 

tools/copy-to-arduino.sh

@@ -16,10 +16,9 @@ fi
 
 echo "Installing new libraries to $ESP32_ARDUINO"
 
-rm -rf $ESP32_ARDUINO/tools/sdk $ESP32_ARDUINO/tools/esptool.py $ESP32_ARDUINO/tools/gen_esp32part.py $ESP32_ARDUINO/tools/platformio-build-*.py $ESP32_ARDUINO/platform.txt
+rm -rf $ESP32_ARDUINO/tools/sdk $ESP32_ARDUINO/tools/gen_esp32part.py $ESP32_ARDUINO/tools/platformio-build-*.py $ESP32_ARDUINO/platform.txt
 
 cp -f $AR_OUT/platform.txt $ESP32_ARDUINO/
 cp -Rf $AR_TOOLS/sdk $ESP32_ARDUINO/tools/
-cp -f $AR_TOOLS/esptool.py $ESP32_ARDUINO/tools/
 cp -f $AR_TOOLS/gen_esp32part.py $ESP32_ARDUINO/tools/
 cp -f $AR_TOOLS/platformio-build-*.py $ESP32_ARDUINO/tools/

tools/install-esp-idf.sh

@@ -46,4 +46,4 @@ cp "$IDF_PATH/components/esp32-camera/driver/private_include/cam_hal.h" "$IDF_PA
 
 source $IDF_PATH/export.sh
 export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
-export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD)
+export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)