Update copy-libs.sh

Author: Jason2866

tools/copy-libs.sh

@@ -52,6 +52,81 @@ function get_actual_path(){
 	fi
 }
 
+# Include-Pfad-Verkürzung Funktionen (basierend auf pioarduino Python-Implementierung)
+IS_INTEGRATION_DUMP=${IS_INTEGRATION_DUMP:-false}
+
+# Das Framework SDK Verzeichnis für PlatformIO (Runtime)
+FRAMEWORK_SDK_DIR="$AR_SDK"
+
+# Das Build-Zeit Framework-Verzeichnis (ESP-IDF)
+if [ -n "$IDF_PATH" ]; then
+    BUILD_FRAMEWORK_DIR="$IDF_PATH"
+elif [ -d "../esp-idf" ]; then
+    BUILD_FRAMEWORK_DIR="$(realpath ../esp-idf)"
+else
+    BUILD_FRAMEWORK_DIR=$(dirname $(dirname "$PWD"))
+fi
+
+is_framework_subfolder() {
+    local potential_subfolder="$1"
+    
+    # Prüfe ob absoluter Pfad (analog zu os.path.isabs)
+    if [[ "$potential_subfolder" != /* ]]; then
+        return 1
+    fi
+    
+    # Prüfe ob auf gleichem Laufwerk (analog zu os.path.splitdrive)
+    local sdk_drive="${BUILD_FRAMEWORK_DIR%%:*}"
+    local sub_drive="${potential_subfolder%%:*}"
+    if [[ "$sdk_drive" != "$sub_drive" ]]; then
+        return 1
+    fi
+    
+    # Prüfe ob Unterordner (analog zu os.path.commonpath)
+    case "$potential_subfolder" in
+        "$BUILD_FRAMEWORK_DIR"*)
+            return 0
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+shorten_includes() {
+    local includes_str="$1"
+    
+    # Für IDE-Integration keine Verkürzung (analog zur Python-Funktion)
+    if [[ "$IS_INTEGRATION_DUMP" == "true" ]]; then
+        echo "$includes_str||"
+        return
+    fi
+    
+    local shortened_includes=""
+    local generic_includes=""
+    
+    # Konvertiere Include-String zu Array
+    IFS=' ' read -ra includes_array <<< "$includes_str"
+    
+    for inc in "${includes_array[@]}"; do
+        if [[ -n "$inc" ]]; then
+            if is_framework_subfolder "$inc"; then
+                # Berechne relativen Pfad (analog zu os.path.relpath)
+                local rel_path="${inc#$BUILD_FRAMEWORK_DIR}"
+                rel_path="${rel_path#/}"
+                if [[ -n "$rel_path" ]]; then
+                    shortened_includes+=" -iwithprefix/$rel_path"
+                fi
+            else
+                generic_includes+=" $inc"
+            fi
+        fi
+    done
+    
+    # Rückgabe: "generic_includes|shortened_includes|framework_dir"
+    echo "$generic_includes|$shortened_includes|$BUILD_FRAMEWORK_DIR"
+}
+
 #
 # START OF DATA EXTRACTION FROM CMAKE
 #
@@ -61,6 +136,7 @@ CPP_FLAGS=""
 AS_FLAGS=""
 
 INCLUDES=""
+INCLUDES_RAW=""
 DEFINES=""
 
 EXCLUDE_LIBS=";"
@@ -110,16 +186,19 @@ for item in "${@:2:${#@}-5}"; do
 		if [ "${item:0:1}" = "/" ]; then
 			item=`get_actual_path $item`
 			INCLUDES+="$item "
+			INCLUDES_RAW+="$item "
 		elif [ "${item:0:2}" = ".." ]; then
 			if [[ "${item:0:14}" = "../components/" && "${item:0:22}" != "../components/arduino/" ]] || [[ "${item:0:11}" = "../esp-idf/" ]] || [[ "${item:0:22}" = "../managed_components/" ]]; then
 				item="$PWD${item:2}"
 				item=`get_actual_path $item`
 				INCLUDES+="$item "
+				INCLUDES_RAW+="$item "
 			fi
 		else
 			item="$PWD/build/$item"
 			item=`get_actual_path $item`
 			INCLUDES+="$item "
+			INCLUDES_RAW+="$item "
 		fi
 	elif [ "$prefix" = "-D" ]; then
 		if [[ "${item:2:7}" != "ARDUINO" ]] && [[ "$item" != "-DESP32=ESP32" ]] && [[ "$item" != "-DNDEBUG" ]]; then #skip ARDUINO defines
@@ -134,6 +213,13 @@ for item in "${@:2:${#@}-5}"; do
 	fi
 done
 
+# Wende Include-Verkürzung an (analog zur Python-Funktion)
+SHORTENED_RESULT=$(shorten_includes "$INCLUDES_RAW")
+GENERIC_INCLUDES="${SHORTENED_RESULT%%|*}"
+SHORTENED_INCLUDES="${SHORTENED_RESULT#*|}"
+SHORTENED_INCLUDES="${SHORTENED_INCLUDES%%|*}"
+USED_FRAMEWORK_DIR="${SHORTENED_RESULT##*|}"
+
 #collect asm-flags
 str=`cat build/compile_commands.json | grep arduino-lib-builder-as.S | grep command | cut -d':' -f2 | cut -d',' -f1`
 str="${str:2:${#str}-1}" #remove leading space and quotes
@@ -322,12 +408,25 @@ mkdir -p "$AR_SDK"
 AR_PLATFORMIO_PY="$AR_SDK/pioarduino-build.py"
 cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"
 
+# ASFLAGS mit Include-Verkürzung (analog zur Python-Funktion)
 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 verkürzte Includes hinzu (analog zur Python-Implementierung)
+if [[ -n "$SHORTENED_INCLUDES" ]]; then
+    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
+    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 "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
@@ -364,11 +463,24 @@ echo "        \"$last_item\"" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
+# CCFLAGS mit Include-Verkürzung (analog zur Python-Funktion)
 echo "    CCFLAGS=[" >> "$AR_PLATFORMIO_PY"
 set -- $PIO_CC_FLAGS
 for item; do
 	echo "        \"$item\"," >> "$AR_PLATFORMIO_PY"
 done
+
+# Füge verkürzte Includes hinzu (analog zur Python-Implementierung)
+if [[ -n "$SHORTENED_INCLUDES" ]]; then
+    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
+    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"
@@ -391,10 +503,21 @@ echo "        '-Wl,-Map=\"%s\"' % join(\"\${BUILD_DIR}\", \"\${PROGNAME}.map\")"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
-# include dirs
-REL_INC=""
+# CPPPATH nur mit generischen Includes (analog zur Python-Funktion)
 echo "    CPPPATH=[" >> "$AR_PLATFORMIO_PY"
 
+# Füge generische Includes hinzu (nicht-Framework Pfade)
+if [[ -n "$GENERIC_INCLUDES" ]]; then
+    IFS=' ' read -ra generic_array <<< "$GENERIC_INCLUDES"
+    for inc in "${generic_array[@]}"; do
+        if [[ -n "$inc" ]]; then
+            echo "        \"$inc\"," >> "$AR_PLATFORMIO_PY"
+        fi
+    done
+fi
+
+# Bestehende Include-Verarbeitung für kopierte Headers
+REL_INC=""
 set -- $INCLUDES
 
 for item; do
@@ -522,6 +645,10 @@ echo -n "$LD_FLAGS" > "$FLAGS_DIR/ld_flags"
 echo -n "$LD_SCRIPTS" > "$FLAGS_DIR/ld_scripts"
 echo -n "$AR_LIBS" > "$FLAGS_DIR/ld_libs"
 
+# Speichere auch die verkürzten Includes in den Flags
+echo -n "$SHORTENED_INCLUDES" > "$FLAGS_DIR/shortened_includes"
+echo -n "$GENERIC_INCLUDES" > "$FLAGS_DIR/generic_includes"
+
 if [ -d "managed_components/espressif__esp32-camera/driver/private_include/" ]; then
 	cp -r "managed_components/espressif__esp32-camera/driver/private_include/cam_hal.h" "$AR_SDK/include/espressif__esp32-camera/driver/include/"
 fi