Update copy-libs.sh

Author: Jason2866

tools/copy-libs.sh

@@ -80,6 +80,9 @@ PIO_LD_FLAGS="-flto "
 PIO_LD_FUNCS=""
 PIO_LD_SCRIPTS=""
 
+# Variable für Include-Verkürzung
+SHORTENED_INCLUDES=""
+
 TOOLCHAIN_PREFIX=""
 if [ "$IS_XTENSA" = "y" ]; then
 	TOOLCHAIN="xtensa-$IDF_TARGET-elf"
@@ -316,23 +319,66 @@ done
 # END OF DATA EXTRACTION FROM CMAKE
 #
 
+# SAMMLE INCLUDE-PFADE FÜR VERKÜRZUNG (VOR der pioarduino-build.py Generierung)
+set -- $INCLUDES
+for item; do
+	if [[ "$item" != $PWD ]]; then
+		ipath="$item"
+		fname=`basename "$ipath"`
+		dname=`basename $(dirname "$ipath")`
+		if [[ "$fname" == "main" && "$dname" == $(basename "$PWD") ]]; then
+			continue
+		fi
+		while [[ "$dname" != "components" && "$dname" != "managed_components" && "$dname" != "build" ]]; do
+			ipath=`dirname "$ipath"`
+			fname=`basename "$ipath"`
+			dname=`basename $(dirname "$ipath")`
+		done
+		if [[ "$fname" == "arduino" ]]; then
+			continue
+		fi
+		if [[ "$fname" == "config" ]]; then
+			continue
+		fi
+
+		out_sub="${item#*$ipath}"
+		
+		# SAMMLE FÜR INCLUDE-VERKÜRZUNG
+		if [ "$out_sub" = "" ]; then
+			SHORTENED_INCLUDES+=" -iwithprefix/include/$fname"
+		else
+			sub_clean="${out_sub#/}"  # Entferne führenden Slash
+			SHORTENED_INCLUDES+=" -iwithprefix/include/$fname/$sub_clean"
+		fi
+	fi
+done
+
 mkdir -p "$AR_SDK"
 
 # start generation of pioarduino-build.py
 AR_PLATFORMIO_PY="$AR_SDK/pioarduino-build.py"
 cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"
 
-# Sammle Include-Pfade für Verkürzung
-SHORTENED_INCLUDES=""
-
+# ASFLAGS mit Include-Verkürzung - KORRIGIERT
 echo "    ASFLAGS=[" >> "$AR_PLATFORMIO_PY"
 if [ "$IS_XTENSA" = "y" ]; then
-	echo "        \"-mlongcalls\"" >> "$AR_PLATFORMIO_PY"
+	echo "        \"-mlongcalls\"," >> "$AR_PLATFORMIO_PY"
 else
-	echo "        \"-march=rv32imc\"" >> "$AR_PLATFORMIO_PY"
+	echo "        \"-march=rv32imc\"," >> "$AR_PLATFORMIO_PY"
+fi
+
+# Füge Include-Verkürzung direkt hinzu - KORRIGIERT
+if [[ -n "$SHORTENED_INCLUDES" ]]; then
+    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
+    # KORREKT: Verwende array statt while-loop
+    IFS=' ' read -ra shortened_array <<< "$SHORTENED_INCLUDES"
+    for flag in "${shortened_array[@]}"; do
+        if [[ -n "$flag" ]]; then
+            echo "        \"$flag\"," >> "$AR_PLATFORMIO_PY"
+        fi
+    done
 fi
 
-# Include-Verkürzung wird später hinzugefügt
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
@@ -369,13 +415,25 @@ echo "        \"$last_item\"" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
+# CCFLAGS mit Include-Verkürzung - KORRIGIERT
 echo "    CCFLAGS=[" >> "$AR_PLATFORMIO_PY"
 set -- $PIO_CC_FLAGS
 for item; do
 	echo "        \"$item\"," >> "$AR_PLATFORMIO_PY"
 done
 
-# Include-Verkürzung wird später hinzugefügt
+# Füge Include-Verkürzung direkt hinzu - KORRIGIERT
+if [[ -n "$SHORTENED_INCLUDES" ]]; then
+    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
+    # KORREKT: Verwende array statt while-loop
+    IFS=' ' read -ra shortened_array <<< "$SHORTENED_INCLUDES"
+    for flag in "${shortened_array[@]}"; do
+        if [[ -n "$flag" ]]; then
+            echo "        \"$flag\"," >> "$AR_PLATFORMIO_PY"
+        fi
+    done
+fi
+
 echo "        \"-MMD\"" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
@@ -398,12 +456,16 @@ echo "        '-Wl,-Map=\"%s\"' % join(\"\${BUILD_DIR}\", \"\${PROGNAME}.map\")"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
-# include dirs - HIER WIRD DIE VERKÜRZUNG IMPLEMENTIERT
-REL_INC=""
+# CPPPATH - NUR Arduino Core (KEINE Framework-Headers!)
 echo "    CPPPATH=[" >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")), \"include\")," >> "$AR_PLATFORMIO_PY"
+echo "        join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
+echo "    ]," >> "$AR_PLATFORMIO_PY"
+echo "" >> "$AR_PLATFORMIO_PY"
 
+# KOPIERE HEADER-DATEIEN (nach der Include-Sammlung)
+REL_INC=""
 set -- $INCLUDES
-
 for item; do
 	if [[ "$item" != $PWD ]]; then
 		ipath="$item"
@@ -426,16 +488,9 @@ for item; do
 
 		out_sub="${item#*$ipath}"
 		out_cpath="$AR_SDK/include/$fname$out_sub"
+		REL_INC+="-iwithprefixbefore $fname$out_sub "
 
-		# Sammle für Include-Verkürzung: Konvertiere zu relativem Pfad
-		if [ "$out_sub" = "" ]; then
-			SHORTENED_INCLUDES+=" -iwithprefix/include/$fname"
-		else
-			sub_clean="${out_sub#/}"  # Entferne führenden Slash
-			SHORTENED_INCLUDES+=" -iwithprefix/include/$fname/$sub_clean"
-		fi
-		
-		# Headers kopieren (wie bisher)
+		# KOPIERE HEADER-DATEIEN
 		for f in `find "$item" -name '*.h'`; do
 			rel_f=${f#*$item}
 			rel_p=${rel_f%/*}
@@ -462,55 +517,6 @@ for item; do
 	fi
 done
 
-# Nur Arduino Core und Memory-Variant in CPPPATH (NICHT die Framework-Headers!)
-echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")), \"include\")," >> "$AR_PLATFORMIO_PY"
-echo "        join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
-echo "    ]," >> "$AR_PLATFORMIO_PY"
-echo "" >> "$AR_PLATFORMIO_PY"
-
-# JETZT: Füge Include-Verkürzung zu CCFLAGS und ASFLAGS hinzu
-if [[ -n "$SHORTENED_INCLUDES" ]]; then
-    # Aktualisiere CCFLAGS
-    sed -i '/CCFLAGS=\[/,/\]/{ 
-        /"-MMD"/i\
-        "-iprefix", join(FRAMEWORK_DIR, "tools", "sdk", "'$IDF_TARGET'"),
-    }' "$AR_PLATFORMIO_PY"
-    
-    # Füge iwithprefix Flags hinzu
-    IFS=' ' read -ra shortened_array <<< "$SHORTENED_INCLUDES"
-    for flag in "${shortened_array[@]}"; do
-        if [[ -n "$flag" ]]; then
-            sed -i '/CCFLAGS=\[/,/\]/{ 
-                /"-MMD"/i\
-                "'$flag'",
-            }' "$AR_PLATFORMIO_PY"
-        fi
-    done
-    
-    # Aktualisiere ASFLAGS
-    if [ "$IS_XTENSA" = "y" ]; then
-        sed -i '/ASFLAGS=\[/,/\]/{ 
-            /"-mlongcalls"/a\
-        "-iprefix", join(FRAMEWORK_DIR, "tools", "sdk", "'$IDF_TARGET'"),
-        }' "$AR_PLATFORMIO_PY"
-    else
-        sed -i '/ASFLAGS=\[/,/\]/{ 
-            /"-march=rv32imc"/a\
-        "-iprefix", join(FRAMEWORK_DIR, "tools", "sdk", "'$IDF_TARGET'"),
-        }' "$AR_PLATFORMIO_PY"
-    fi
-    
-    # Füge iwithprefix Flags zu ASFLAGS hinzu
-    for flag in "${shortened_array[@]}"; do
-        if [[ -n "$flag" ]]; then
-            sed -i '/ASFLAGS=\[/,/\]/{ 
-                $i\
-                "'$flag'",
-            }' "$AR_PLATFORMIO_PY"
-        fi
-    done
-fi
-
 AR_LIBS="$LD_LIBS"
 PIO_LIBS=""
 set -- $LD_LIBS