Update copy-libs.sh

Author: Jason2866

tools/copy-libs.sh

@@ -322,7 +322,7 @@ mkdir -p "$AR_SDK"
 AR_PLATFORMIO_PY="$AR_SDK/pioarduino-build.py"
 cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"
 
-# include dirs - SAMMLE REL_INC für Include-Verkürzung
+# include dirs - SAMMLE REL_INC für Include-Verkürzung UND kopiere Header
 REL_INC=""
 set -- $INCLUDES
 
@@ -377,27 +377,23 @@ for item; do
 	fi
 done
 
-# ASFLAGS mit Include-Verkürzung basierend auf REL_INC
+# ASFLAGS mit Prefix-Logik
 echo "    ASFLAGS=[" >> "$AR_PLATFORMIO_PY"
 if [ "$IS_XTENSA" = "y" ]; then
 	echo "        \"-mlongcalls\"," >> "$AR_PLATFORMIO_PY"
 else
 	echo "        \"-march=rv32imc\"," >> "$AR_PLATFORMIO_PY"
 fi
-
-# Füge Include-Verkürzung aus REL_INC hinzu
 if [[ -n "$REL_INC" ]]; then
     echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
-    # Verarbeite REL_INC korrekt - Flag und Pfad sind getrennt
     IFS=' ' read -ra rel_inc_array <<< "$REL_INC"
     i=0
     while [ $i -lt ${#rel_inc_array[@]} ]; do
         if [[ "${rel_inc_array[$i]}" == "-iwithprefixbefore" ]]; then
-            # Nächstes Element ist der Pfad
             if [ $((i+1)) -lt ${#rel_inc_array[@]} ]; then
                 path="${rel_inc_array[$((i+1))]}"
-                echo "        \"-iwithprefix/$path\"," >> "$AR_PLATFORMIO_PY"
-                i=$((i+2))  # Überspringe Flag und Pfad
+                echo "        \"-iwithprefix\", \"include/$path\"," >> "$AR_PLATFORMIO_PY"
+                i=$((i+2))
             else
                 i=$((i+1))
             fi
@@ -406,7 +402,6 @@ if [[ -n "$REL_INC" ]]; then
         fi
     done
 fi
-
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
@@ -443,26 +438,22 @@ echo "        \"$last_item\"" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
-# CCFLAGS mit Include-Verkürzung basierend auf REL_INC
+# CCFLAGS mit Prefix-Logik
 echo "    CCFLAGS=[" >> "$AR_PLATFORMIO_PY"
 set -- $PIO_CC_FLAGS
 for item; do
 	echo "        \"$item\"," >> "$AR_PLATFORMIO_PY"
 done
-
-# Füge Include-Verkürzung aus REL_INC hinzu
 if [[ -n "$REL_INC" ]]; then
     echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
-    # Verarbeite REL_INC korrekt - Flag und Pfad sind getrennt
     IFS=' ' read -ra rel_inc_array <<< "$REL_INC"
     i=0
     while [ $i -lt ${#rel_inc_array[@]} ]; do
         if [[ "${rel_inc_array[$i]}" == "-iwithprefixbefore" ]]; then
-            # Nächstes Element ist der Pfad
             if [ $((i+1)) -lt ${#rel_inc_array[@]} ]; then
                 path="${rel_inc_array[$((i+1))]}"
-                echo "        \"-iwithprefix/include/$path\"," >> "$AR_PLATFORMIO_PY"
-                i=$((i+2))  # Überspringe Flag und Pfad
+                echo "        \"-iwithprefix\", \"include/$path\"," >> "$AR_PLATFORMIO_PY"
+                i=$((i+2))
             else
                 i=$((i+1))
             fi
@@ -471,7 +462,6 @@ if [[ -n "$REL_INC" ]]; then
         fi
     done
 fi
-
 echo "        \"-MMD\"" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
@@ -513,7 +503,6 @@ done
 
 set -- $LD_LIB_FILES
 for item; do
-	#echo "***** Stripping $item"
 	"$TOOLCHAIN-strip" -g "$item"
 	cp "$item" "$AR_SDK/lib/"
 done
@@ -548,13 +537,10 @@ for item; do
 	fi
 done
 
-# end generation of platformio-build.py
 cat configs/pio_end.txt >> "$AR_PLATFORMIO_PY"
 
-# replace double backslashes with single one
 DEFINES=`echo "$DEFINES" | tr -s '\'`
 
-# target flags files
 FLAGS_DIR="$AR_SDK/flags"
 mkdir -p "$FLAGS_DIR"
 echo -n "$DEFINES" > "$FLAGS_DIR/defines"
@@ -570,16 +556,9 @@ if [ -d "managed_components/espressif__esp32-camera/driver/private_include/" ];
 	cp -r "managed_components/espressif__esp32-camera/driver/private_include/cam_hal.h" "$AR_SDK/include/espressif__esp32-camera/driver/include/"
 fi
 
-# sdkconfig
 cp -f "sdkconfig" "$AR_SDK/sdkconfig"
-
-# dependencies.lock
 cp -f "dependencies.lock" "$AR_SDK/dependencies.lock"
 
-# gen_esp32part.py
-# cp "$IDF_PATH/components/partition_table/gen_esp32part.py" "$AR_GEN_PART_PY"
-
-# copy precompiled libs (if we need them)
 function copy_precompiled_lib(){
 	lib_file="$1"
 	lib_name="$(basename $lib_file)"
@@ -589,7 +568,6 @@ function copy_precompiled_lib(){
 	fi
 }
 
-# idf ld scripts
 mkdir -p "$AR_SDK/ld"
 set -- $LD_SCRIPT_DIRS
 for item; do
@@ -608,7 +586,6 @@ for lib in "openthread" "espressif__esp-tflite-micro" "bt" "espressif__esp_modem
 	fi
 done
 
-# Handle Mem Variants
 mkdir -p "$AR_SDK/$MEMCONF/include"
 mv "$PWD/build/config/sdkconfig.h" "$AR_SDK/$MEMCONF/include/sdkconfig.h"
 for mem_variant in `jq -c '.mem_variants_files[]' configs/builds.json`; do
@@ -627,6 +604,5 @@ for mem_variant in `jq -c '.mem_variants_files[]' configs/builds.json`; do
 	fi
 done;
 
-# Add IDF versions to sdkconfig
 echo "#define CONFIG_ARDUINO_IDF_COMMIT \"$IDF_COMMIT\"" >> "$AR_SDK/$MEMCONF/include/sdkconfig.h"
 echo "#define CONFIG_ARDUINO_IDF_BRANCH \"$IDF_BRANCH\"" >> "$AR_SDK/$MEMCONF/include/sdkconfig.h"