Update build.sh

Jason2866 · web-flow · commit ad061a622439 · 2024-04-05T19:22:31.000+02:00
diff --git a/build.sh b/build.sh
@@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then
     exit 1
 fi
 
-TARGET="all"
+export TARGET="all"
 BUILD_TYPE="all"
 SKIP_ENV=0
 COPY_OUT=0
@@ -20,15 +20,15 @@ if [ -z $DEPLOY_OUT ]; then
 fi
 
 function print_help() {
-    echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|reconfigure|idf_libs|copy_bootloader|mem_variant>] [config ...]"
+    echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|reconfigure|idf-libs|copy-bootloader|mem-variant>] [config ...]"
     echo "       -s     Skip installing/updating of ESP-IDF and all components"
     echo "       -A     Set which branch of arduino-esp32 to be used for compilation"
     echo "       -I     Set which branch of ESP-IDF to be used for compilation"
     echo "       -i     Set which commit of ESP-IDF to be used for compilation"
     echo "       -e     Archive the build to dist"
     echo "       -d     Deploy the build to github arduino-esp32"
     echo "       -c     Set the arduino-esp32 folder to copy the result to. ex. '$HOME/Arduino/hardware/espressif/esp32'"
-    echo "       -t     Set the build target(chip). ex. 'esp32s3'"
+    echo "       -t     Set the build target(chip) ex. 'esp32s3' or select multiple targets(chips) by separating them with comma ex. 'esp32,esp32s3,esp32c3'"
     echo "       -b     Set the build type. ex. 'build' to build the project and prepare for uploading to a board"
     echo "       ...    Specify additional configs to be applied. ex. 'qio 80m' to compile for QIO Flash@80MHz. Requires -b"
     exit 1
@@ -59,16 +59,16 @@ while getopts ":A:I:i:c:t:b:sde" opt; do
             export IDF_COMMIT="$OPTARG"
             ;;
         t )
-            TARGET=$OPTARG
+            IFS=',' read -ra TARGET <<< "$OPTARG"
             ;;
         b )
             b=$OPTARG
-            if [ "$b" != "build" ] &&
-               [ "$b" != "menuconfig" ] &&
-               [ "$b" != "reconfigure" ] &&
-               [ "$b" != "idf_libs" ] &&
-               [ "$b" != "copy_bootloader" ] &&
-               [ "$b" != "mem_variant" ]; then
+            if [ "$b" != "build" ] && 
+               [ "$b" != "menuconfig" ] && 
+               [ "$b" != "reconfigure" ] && 
+               [ "$b" != "idf-libs" ] && 
+               [ "$b" != "copy-bootloader" ] && 
+               [ "$b" != "mem-variant" ]; then
                 print_help
             fi
             BUILD_TYPE="$b"
@@ -86,6 +86,9 @@ done
 shift $((OPTIND -1))
 CONFIGS=$@
 
+# Output the TARGET array
+echo "TARGET(s): ${TARGET[@]}"
+
 mkdir -p dist
 rm -rf dependencies.lock
 
@@ -113,27 +116,42 @@ if [ "$BUILD_TYPE" != "all" ]; then
         echo "ERROR: You need to specify target for non-default builds"
         print_help
     fi
-    configs="configs/defconfig.common;configs/defconfig.$TARGET"
 
     # Target Features Configs
     for target_json in `jq -c '.targets[]' configs/builds.json`; do
         target=$(echo "$target_json" | jq -c '.target' | tr -d '"')
-        if [ "$TARGET" == "$target" ]; then
-            for defconf in `echo "$target_json" | jq -c '.features[]' | tr -d '"'`; do
-                configs="$configs;configs/defconfig.$defconf"
-            done
+
+        # Check if $target is in the $TARGET array
+        target_in_array=false
+        for item in "${TARGET[@]}"; do
+            if [ "$item" = "$target" ]; then
+                target_in_array=true
+                break
+            fi
+        done
+
+        if [ "$target_in_array" = false ]; then
+            # Skip building for targets that are not in the $TARGET array
+            continue
         fi
-    done
+                
+        configs="configs/defconfig.common;configs/defconfig.$target"
+        for defconf in `echo "$target_json" | jq -c '.features[]' | tr -d '"'`; do
+            configs="$configs;configs/defconfig.$defconf"
+        done
 
-    # Configs From Arguments
-    for conf in $CONFIGS; do
-        configs="$configs;configs/defconfig.$conf"
-    done
+        echo "* Building for $target"
 
-    echo "idf.py -DIDF_TARGET=\"$TARGET\" -DSDKCONFIG_DEFAULTS=\"$configs\" $BUILD_TYPE"
-    rm -rf build sdkconfig
-    idf.py -DIDF_TARGET="$TARGET" -DSDKCONFIG_DEFAULTS="$configs" $BUILD_TYPE
-    if [ $? -ne 0 ]; then exit 1; fi
+        # Configs From Arguments
+        for conf in $CONFIGS; do
+            configs="$configs;configs/defconfig.$conf"
+        done
+
+        echo "idf.py -DIDF_TARGET=\"$target\" -DSDKCONFIG_DEFAULTS=\"$configs\" $BUILD_TYPE"
+        rm -rf build sdkconfig
+        idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$configs" $BUILD_TYPE
+        if [ $? -ne 0 ]; then exit 1; fi
+    done
     exit 0
 fi
 
@@ -152,8 +170,28 @@ echo "Framework built from
 #targets_count=`jq -c '.targets[] | length' configs/builds.json`
 for target_json in `jq -c '.targets[]' configs/builds.json`; do
     target=$(echo "$target_json" | jq -c '.target' | tr -d '"')
+    target_skip=$(echo "$target_json" | jq -c '.skip // 0')
+
+    # Check if $target is in the $TARGET array if not "all"
+    if [ "$TARGET" != "all" ]; then
+        target_in_array=false
+        for item in "${TARGET[@]}"; do
+            if [ "$item" = "$target" ]; then
+                target_in_array=true
+                break
+            fi
+        done
 
-    if [ "$TARGET" != "all" ] && [ "$TARGET" != "$target" ]; then
+        # If $target is not in the $TARGET array, skip processing
+        if [ "$target_in_array" = false ]; then
+            echo "* Skipping Target: $target"
+            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
         echo "* Skipping Target: $target"
         continue
     fi
@@ -174,7 +212,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
 
     echo "* Build IDF-Libs: $idf_libs_configs"
     rm -rf build sdkconfig
-    idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf_libs
+    idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf-libs
     if [ $? -ne 0 ]; then exit 1; fi
 
     # Build Bootloaders
@@ -186,7 +224,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
 
         echo "* Build BootLoader: $bootloader_configs"
         rm -rf build sdkconfig
-        idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$bootloader_configs" copy_bootloader
+        idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$bootloader_configs" copy-bootloader
         if [ $? -ne 0 ]; then exit 1; fi
     done
 
@@ -199,7 +237,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
 
         echo "* Build Memory Variant: $mem_configs"
         rm -rf build sdkconfig
-        idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$mem_configs" mem_variant
+        idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$mem_configs" mem-variant
         if [ $? -ne 0 ]; then exit 1; fi
     done
 done
@@ -246,7 +284,7 @@ fi
 
 # Generate PlatformIO library manifest file
 if [ "$BUILD_TYPE" = "all" ]; then
-    python3 ./tools/gen_pio_lib_manifest.py -o "$TOOLS_JSON_OUT/" -s "$IDF_BRANCH" -c "$IDF_COMMIT"
+    python3 ./tools/gen_pio_lib_manifest.py -o "$TOOLS_JSON_OUT/" -s "v$IDF_VERSION" -c "$IDF_COMMIT"
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 
