refactor(toolchain): 对stage4的头文件添加system和path选项支持

Author: QuantumMisaka

toolchain/scripts/stage4/install_cereal.sh

@@ -90,13 +90,25 @@ case "$with_cereal" in
             echo "--pack-run mode specified, skip system check"
             exit 0
         fi
-        add_include_from_paths CEREAL_CFLAGS "cereal/cereal.hpp" $INCLUDE_PATHS
+        # Find cereal header file and derive package root directory
+        cereal_header_path="$(find_in_paths "cereal/cereal.hpp" $INCLUDE_PATHS)"
+        if [ "$cereal_header_path" != "__FALSE__" ]; then
+            # Derive pkg_install_dir from found header path
+            # cereal/cereal.hpp -> remove /cereal/cereal.hpp -> get include dir -> get parent dir
+            cereal_include_dir="$(dirname "$(dirname "$cereal_header_path")")"
+            pkg_install_dir="$(dirname "$cereal_include_dir")"
+            echo "Found cereal at: $pkg_install_dir"
+            CEREAL_CFLAGS="-I'${cereal_include_dir}'"
+        else
+            report_error "Cannot find cereal/cereal.hpp in system paths"
+            exit 1
+        fi
         ;;
     __DONTUSE__) ;;
-
+    
     *)
         echo "==================== Linking CEREAL to user paths ===================="
-        pkg_install_dir="$with_cereal"
+        pkg_install_dir="${with_cereal}"
         check_dir "${pkg_install_dir}"
         CEREAL_CFLAGS="-I'${pkg_install_dir}'"
         ;;

toolchain/scripts/stage4/install_libcomm.sh

@@ -89,12 +89,25 @@ case "$with_libcomm" in
             echo "--pack-run mode specified, skip system check"
             exit 0
         fi
-        add_include_from_paths LIBCOMM_CFLAGS "comm/comm.h" $INCLUDE_PATHS
+        # Find libcomm header file and derive package root directory
+        libcomm_header_path="$(find_in_paths "Comm/Comm_Tools.h" $INCLUDE_PATHS)"
+        if [ "$libcomm_header_path" != "__FALSE__" ]; then
+            # Derive pkg_install_dir from found header path
+            # Comm/Comm_Tools.h -> remove /Comm/Comm_Tools.h -> get include dir -> get parent dir
+            libcomm_include_dir="$(dirname "$(dirname "$libcomm_header_path")")"
+            pkg_install_dir="$(dirname "$libcomm_include_dir")"
+            echo "Found libcomm at: $pkg_install_dir"
+            LIBCOMM_CFLAGS="-I'${libcomm_include_dir}'"
+        else
+            report_error "Cannot find Comm/Comm_Tools.h in system paths"
+            exit 1
+        fi
         ;;
     __DONTUSE__) ;;
 
     *)
         echo "==================== Linking LIBCOMM to user paths ===================="
+        pkg_install_dir="${with_libcomm}"
         check_dir "${pkg_install_dir}"
         LIBCOMM_CFLAGS="-I'${pkg_install_dir}'"
         ;;

toolchain/scripts/stage4/install_libnpy.sh

@@ -80,12 +80,25 @@ case "$with_libnpy" in
             echo "--pack-run mode specified, skip system check"
             exit 0
         fi
-        add_include_from_paths LIBNPY_CFLAGS "npy.hpp" $INCLUDE_PATHS
+        # Find libnpy header file and derive package root directory
+        libnpy_header_path="$(find_in_paths "npy.hpp" $INCLUDE_PATHS)"
+        if [ "$libnpy_header_path" != "__FALSE__" ]; then
+            # Derive pkg_install_dir from found header path
+            # npy.hpp -> get include dir -> get parent dir
+            libnpy_include_dir="$(dirname "$libnpy_header_path")"
+            pkg_install_dir="$(dirname "$libnpy_include_dir")"
+            echo "Found libnpy at: $pkg_install_dir"
+            LIBNPY_CFLAGS="-I'${libnpy_include_dir}'"
+        else
+            report_error "Cannot find npy.hpp in system paths"
+            exit 1
+        fi
         ;;
     __DONTUSE__) ;;
 
     *)
         echo "==================== Linking LIBNPY to user paths ===================="
+        pkg_install_dir="${with_libnpy}"
         check_dir "${pkg_install_dir}"
         LIBNPY_CFLAGS="-I'${pkg_install_dir}'"
         ;;

toolchain/scripts/stage4/install_libri.sh

@@ -88,12 +88,25 @@ case "$with_libri" in
             echo "--pack-run mode specified, skip system check"
             exit 0
         fi
-        add_include_from_paths LIBRI_CFLAGS "RI/RI.h" $INCLUDE_PATHS
+        # Find libri header file and derive package root directory
+        libri_header_path="$(find_in_paths "RI/version.h" $INCLUDE_PATHS)"
+        if [ "$libri_header_path" != "__FALSE__" ]; then
+            # Derive pkg_install_dir from found header path
+            # RI/version.h -> remove /RI/version.h -> get include dir -> get parent dir
+            libri_include_dir="$(dirname "$(dirname "$libri_header_path")")"
+            pkg_install_dir="$(dirname "$libri_include_dir")"
+            echo "Found libri at: $pkg_install_dir"
+            LIBRI_CFLAGS="-I'${libri_include_dir}'"
+        else
+            report_error "Cannot find RI/version.h in system paths"
+            exit 1
+        fi
         ;;
     __DONTUSE__) ;;
 
     *)
         echo "==================== Linking LIBRI to user paths ===================="
+        pkg_install_dir="${with_libri}"
         check_dir "${pkg_install_dir}"
         LIBRI_CFLAGS="-I'${pkg_install_dir}'"
         ;;

toolchain/scripts/stage4/install_rapidjson.sh

@@ -93,13 +93,25 @@ EOF
             echo "--pack-run mode specified, skip system check"
             exit 0
         fi
-        add_include_from_paths RAPIDJSON_CFLAGS "rapidjson/rapidjson.h" $INCLUDE_PATHS
+        # Find rapidjson header file and derive package root directory
+        rapidjson_header_path="$(find_in_paths "rapidjson/rapidjson.h" $INCLUDE_PATHS)"
+        if [ "$rapidjson_header_path" != "__FALSE__" ]; then
+            # Derive pkg_install_dir from found header path
+            # rapidjson/rapidjson.h -> remove /rapidjson/rapidjson.h -> get include dir -> get parent dir
+            rapidjson_include_dir="$(dirname "$(dirname "$rapidjson_header_path")")"
+            pkg_install_dir="$(dirname "$rapidjson_include_dir")"
+            echo "Found rapidjson at: $pkg_install_dir"
+            RAPIDJSON_CFLAGS="-I'${rapidjson_include_dir}'"
+        else
+            report_error "Cannot find rapidjson/rapidjson.h in system paths"
+            exit 1
+        fi
         ;;
     __DONTUSE__) ;;
 
     *)
         echo "==================== Linking RapidJSON to user paths ===================="
-        pkg_install_dir="$with_rapidjson"
+        pkg_install_dir="${with_rapidjson}"
         check_dir "${pkg_install_dir}"
         RAPIDJSON_CFLAGS="-I'${pkg_install_dir}/include'"
         ;;