feat(repo): finish release/v3.0.0-rc3

Author: Lzw655

README.md

@@ -1,42 +1,18 @@
-# ESP32 Arduino Lib Builder [![ESP32 Arduino Libs CI](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml)
+# ESP32 Arduino Lib Builder
 
 This repository contains the scripts that produce the libraries included with esp32-arduino.
 
 Tested on Ubuntu (32 and 64 bit), Raspberry Pi and MacOS.
 
 ### Build on Ubuntu and Raspberry Pi
+
 ```bash
-sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache jq
-sudo pip install --upgrade pip
-git clone https://github.com/espressif/esp32-arduino-lib-builder
-cd esp32-arduino-lib-builder
+// Build all targets
 ./build.sh
-```
-
-### Using the User Interface
-
-You can more easily build the libraries using the user interface found in the `tools/config_editor/` folder.
-It is a Python script that allows you to select and edit the options for the libraries you want to build.
-The script has mouse support and can also be pre-configured using the same command line arguments as the `build.sh` script.
-For more information and troubleshooting, please refer to the [UI README](tools/config_editor/README.md).
-
-To use it, follow these steps:
-
-1. Make sure you have the required dependencies installed:
-  - Python 3.9 or later
-  - The [Textual](https://github.com/textualize/textual/) library
-  - All the dependencies listed in the previous section
 
-2. Execute the script `tools/config_editor/app.py` from any folder. It will automatically detect the path to the root of the repository.
-
-3. Configure the compilation and ESP-IDF options as desired.
-
-4. Click on the "Compile Static Libraries" button to start the compilation process.
-
-5. The script will show the compilation output in a new screen. Note that the compilation process can take many hours, depending on the number of libraries selected and the options chosen.
-
-6. If the compilation is successful and the option to copy the libraries to the Arduino Core folder is enabled, it will already be available for use in the Arduino IDE. Otherwise, you can find the compiled libraries in the `esp32-arduino-libs` folder alongside this repository.
-  - Note that the copy operation doesn't currently support the core downloaded from the Arduino IDE Boards Manager, only the manual installation from the [`arduino-esp32`](https://github.com/espressif/arduino-esp32) repository.
+// Build specific targets, e.g. ESP32-S3
+./build.sh -t esp32s3
+```
 
 ### Documentation
 

build.sh

@@ -68,11 +68,11 @@ while getopts ":A:I:i:c:t:b:D:sde" opt; do
             ;;
         b )
             b=$OPTARG
-            if [ "$b" != "build" ] && 
-               [ "$b" != "menuconfig" ] && 
-               [ "$b" != "reconfigure" ] && 
-               [ "$b" != "idf-libs" ] && 
-               [ "$b" != "copy-bootloader" ] && 
+            if [ "$b" != "build" ] &&
+               [ "$b" != "menuconfig" ] &&
+               [ "$b" != "reconfigure" ] &&
+               [ "$b" != "idf-libs" ] &&
+               [ "$b" != "copy-bootloader" ] &&
                [ "$b" != "mem-variant" ]; then
                 print_help
             fi
@@ -96,6 +96,8 @@ echo "TARGET(s): ${TARGET[@]}"
 
 mkdir -p dist
 
+source ./tools/config.sh
+
 if [ $SKIP_ENV -eq 0 ]; then
     echo "* Installing/Updating ESP-IDF and all components..."
     # update components from git
@@ -142,7 +144,7 @@ if [ "$BUILD_TYPE" != "all" ]; then
             # Skip building for targets that are not in the $TARGET array
             continue
         fi
-                
+
         configs="configs/defconfig.common;configs/defconfig.$target;configs/defconfig.debug_$BUILD_DEBUG"
         for defconf in `echo "$target_json" | jq -c '.features[]' | tr -d '"'`; do
             configs="$configs;configs/defconfig.$defconf"
@@ -187,7 +189,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
             continue
         fi
     fi
-    
+
     # Skip chips that should not be a part of the final libs
     # WARNING!!! this logic needs to be updated when cron builds are split into jobs
     if [ "$TARGET" = "all" ] && [ $target_skip -eq 1 ]; then
@@ -306,25 +308,21 @@ fi
 
 # Generate PlatformIO manifest file
 if [ "$BUILD_TYPE" = "all" ]; then
-    pushd $IDF_PATH
-    ibr=$(git describe --all --exact-match 2>/dev/null)
-    ic=$(git -C "$IDF_PATH" rev-parse --short HEAD)
-    popd
-    python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
-    if [ $? -ne 0 ]; then exit 1; fi
-fi
-
-# copy everything to arduino-esp32 installation
-if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then
-    ./tools/copy-to-arduino.sh
+    python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$IDF_BRANCH" -c "$IDF_COMMIT"
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 
-# push changes to esp32-arduino-libs and create pull request into arduino-esp32
-if [ $DEPLOY_OUT -eq 1 ]; then
-    ./tools/push-to-arduino.sh
-    if [ $? -ne 0 ]; then exit 1; fi
-fi
+# # copy everything to arduino-esp32 installation
+# if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then
+#     ./tools/copy-to-arduino.sh
+#     if [ $? -ne 0 ]; then exit 1; fi
+# fi
+
+# # push changes to esp32-arduino-libs and create pull request into arduino-esp32
+# if [ $DEPLOY_OUT -eq 1 ]; then
+#     ./tools/push-to-arduino.sh
+#     if [ $? -ne 0 ]; then exit 1; fi
+# fi
 
 # archive the build
 if [ $ARCHIVE_OUT -eq 1 ]; then

main/idf_component.yml

@@ -1,28 +1,109 @@
 dependencies:
   # Required IDF version
   idf: ">=5.1"
-  espressif/esp32-camera:
-    version: "master"
-    git: https://github.com/espressif/esp32-camera.git
-    require: public
-    rules:
-      - if: "target in [esp32, esp32s2, esp32s3]"
-  espressif/esp-tflite-micro:
-    version: ">=1.2.0"
+
+  chmorgan/esp-libhelix-mp3:
+    version: "1.0.3"
     require: public
+
+  espressif/cbor:
     rules:
-      - if: "target not in [esp32c2]"
+    - if: idf_version >=5.0
+    version: "0.6.0~1"
+
   espressif/esp-dl:
-    version: "master"
+    version: "79034eeb6a98e5dd896c1bf8e87403d562460078"
     git: https://github.com/espressif/esp-dl.git
     require: public
     rules:
       - if: "target in [esp32s3, esp32s2, esp32]"
+
+  esp-dsp:
+    version: "1.4.12"
+    rules:
+      - if: "target != esp32c2"
+
+  espressif/esp-nn:
+    version: "1.0.2"
+
   espressif/esp-sr:
-    version: ">=1.4.2"
+    version: "1.7.1"
     rules:
       - if: "target in [esp32s3]"
 
+  espressif/esp-tflite-micro:
+    version: "1.3.0"
+    require: public
+    rules:
+      - if: "target not in [esp32c2]"
+
+  espressif/esp-zboss-lib:
+    version: "1.3.1"
+    rules:
+      - if: "target != esp32c2"
+
+  espressif/esp-zigbee-lib:
+    version: "1.3.1"
+    rules:
+      - if: "target != esp32c2"
+
+  espressif/esp32-camera:
+    version: "dba8da9898928d9808d57a0b0cdcde9f130ed8fe"
+    git: https://github.com/espressif/esp32-camera.git
+    require: public
+    rules:
+      - if: "target in [esp32, esp32s2, esp32s3]"
+
+  espressif/esp_diag_data_store:
+    version: "1.0.1"
+
+  espressif/esp_diagnostics:
+    version: "1.1.0"
+
+  espressif/esp_insights:
+    version: "1.1.0"
+    rules:
+      - if: "target != esp32c2"
+
+  espressif/esp_modem:
+    version: "1.1.0"
+
+  espressif/esp_rainmaker:
+    version: "1.1.0"
+    rules:
+      - if: "target != esp32c2"
+
+  espressif/esp_schedule:
+    version: "1.1.1"
+
+  espressif/esp_secure_cert_mgr:
+    rules:
+    - if: idf_version >=4.3
+    version: "2.4.1"
+
+  espressif/jsmn:
+    version: "1.1.0"
+
+  espressif/json_generator:
+    version: "1.1.2"
+
+  espressif/json_parser:
+    version: "1.0.3"
+
+  mdns: "1.3.0"
+
+  espressif/qrcode:
+    version: "0.1.0~2"
+    rules:
+      - if: "target != esp32c2"
+
+  espressif/rmaker_common:
+    version: "1.4.5"
+    rules:
+      - if: "target != esp32c2"
+
+  joltwallet/littlefs: "1.14.4"
+
   # esp-sr: "^1.3.1"
   # esp32-camera: "^2.0.4"
   # esp-dl:

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 || git -C "$IDF_PATH" tag --points-at HEAD || echo "")
+source ./tools/config.sh
+
 idf_version_string=${IDF_BRANCH//\//_}"-$IDF_COMMIT"
 
 archive_path="dist/arduino-esp32-libs-$1-$idf_version_string.tar.gz"

tools/check-deploy-needed.sh

@@ -2,7 +2,7 @@
 
 source ./tools/config.sh
 
-IDF_COMMIT=`github_last_commit "$IDF_REPO" "$IDF_BRANCH"`
+# IDF_COMMIT=`github_last_commit "$IDF_REPO" "$IDF_BRANCH"`
 
 if [ -z $GITHUB_HEAD_REF ]; then
 	current_branch=`git branch --show-current`

tools/config.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+export IDF_COMMIT="442a798083"
+export IDF_BRANCH="release/v5.1"
+export AR_REPO_COMMIT="50ef6f43"
+export TINYUSB_REPO_COMMIT="82dfe9565"
 
 if [ -z $IDF_PATH ]; then
     export IDF_PATH="$PWD/esp-idf"
@@ -52,10 +56,10 @@ PIO_SDK="FRAMEWORK_SDK_DIR, \"$IDF_TARGET\""
 TOOLS_JSON_OUT="$AR_TOOLS/esp32-arduino-libs"
 IDF_LIBS_DIR="$AR_ROOT/../esp32-arduino-libs"
 
-if [ -d "$IDF_PATH" ]; then
-    export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
-    export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)
-fi
+# if [ -d "$IDF_PATH" ]; then
+#     export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
+#     export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)
+# fi
 
 function get_os(){
     OSBITS=`uname -m`