fix compile shell

debugly · debugly · commit 76d055210cc9 · 2025-01-20T15:28:09.000+08:00
diff --git a/configs/libs/yuv.sh b/configs/libs/yuv.sh
@@ -23,7 +23,7 @@ export LIB_DEPENDS_BIN="cmake"
 export GIT_LOCAL_REPO=extra/yuv
 export GIT_COMMIT=eb6e7bb
 export REPO_DIR=yuv
-export GIT_REPO_VERSION=stable
+export GIT_REPO_VERSION=stable-eb6e7bb
 export PRE_COMPILE_TAG=yuv-stable-250114175447
 
 # you can export GIT_YUV_UPSTREAM=git@xx:yy/yuv.git use your mirror
diff --git a/do-compile/android/ffmpeg.sh b/do-compile/android/ffmpeg.sh
@@ -31,8 +31,8 @@ THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 cd "$THIS_DIR"
 
 # ffmpeg config options
-source $THIS_DIR/../../configs/ffconfig/module.sh
-source $THIS_DIR/../../configs/ffconfig/auto-detect-third-libs.sh
+source $MR_SHELL_CONFIGS_DIR/ffconfig/module.sh
+source $MR_SHELL_CONFIGS_DIR/ffconfig/auto-detect-third-libs.sh
 
 CFG_FLAGS=
 CFG_FLAGS="$CFG_FLAGS $COMMON_FF_CFG_FLAGS"
diff --git a/do-compile/android/main.sh b/do-compile/android/main.sh
@@ -26,10 +26,10 @@ cd "$THIS_DIR"
 # 循环编译所有的库
 for lib in $MR_VENDOR_LIBS
 do
-    [[ ! -f "../../configs/libs/${lib}.sh" ]] && (echo "❌$lib config not exist,compile will stop.";exit 1;)
+    [[ ! -f "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh" ]] && (echo "❌$lib config not exist,compile will stop.";exit 1;)
 
     echo "===[$MR_CMD $lib]===================="
-    source "../../configs/libs/${lib}.sh"
+    source "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh"
     
     echo "LIB_NAME        : [$LIB_NAME]"
     echo "GIT_COMMIT      : [$GIT_COMMIT]"
diff --git a/do-compile/apple/dav1d.sh b/do-compile/apple/dav1d.sh
@@ -49,10 +49,10 @@ export CXX="$MR_CXX"
 if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]]; then
     if [[ $MR_IS_SIMULATOR != 1 ]]; then
         echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH."
-        CFG_FLAGS="$CFG_FLAGS --cross-file $THIS_DIR/../configs/meson-crossfiles/$MR_ARCH-$MR_PLAT.meson"
+        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT.meson"
     else
         echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH simulator."
-        CFG_FLAGS="$CFG_FLAGS --cross-file $THIS_DIR/../configs/meson-crossfiles/$MR_ARCH-$MR_PLAT-simulator.meson"
+        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT-simulator.meson"
     fi
 fi
 
diff --git a/do-compile/apple/ffmpeg.sh b/do-compile/apple/ffmpeg.sh
@@ -31,8 +31,8 @@ THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 cd "$THIS_DIR"
 
 # ffmpeg config options
-source $THIS_DIR/../../configs/ffconfig/module.sh
-source $THIS_DIR/../../configs/ffconfig/auto-detect-third-libs.sh
+source $MR_SHELL_CONFIGS_DIR/ffconfig/module.sh
+source $MR_SHELL_CONFIGS_DIR/ffconfig/auto-detect-third-libs.sh
 
 CFG_FLAGS=
 CFG_FLAGS="$CFG_FLAGS $COMMON_FF_CFG_FLAGS"
diff --git a/do-compile/apple/freetype.sh b/do-compile/apple/freetype.sh
@@ -48,10 +48,10 @@ export CXX="$MR_CXX"
 if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]]; then
     if [[ $MR_IS_SIMULATOR != 1 ]]; then
         echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH."
-        CFG_FLAGS="$CFG_FLAGS --cross-file $THIS_DIR/../configs/meson-crossfiles/$MR_ARCH-$MR_PLAT.meson"
+        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT.meson"
     else
         echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH simulator."
-        CFG_FLAGS="$CFG_FLAGS --cross-file $THIS_DIR/../configs/meson-crossfiles/$MR_ARCH-$MR_PLAT-simulator.meson"
+        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT-simulator.meson"
     fi
 fi
 
diff --git a/do-compile/apple/harfbuzz.sh b/do-compile/apple/harfbuzz.sh
@@ -63,10 +63,10 @@ export CXX="$MR_CXX"
 if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]]; then
     if [[ $MR_IS_SIMULATOR != 1 ]]; then
         echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH."
-        CFG_FLAGS="$CFG_FLAGS --cross-file $THIS_DIR/../configs/meson-crossfiles/$MR_ARCH-$MR_PLAT.meson"
+        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT.meson"
     else
         echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH simulator."
-        CFG_FLAGS="$CFG_FLAGS --cross-file $THIS_DIR/../configs/meson-crossfiles/$MR_ARCH-$MR_PLAT-simulator.meson"
+        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT-simulator.meson"
     fi
 fi
 
diff --git a/do-compile/apple/main.sh b/do-compile/apple/main.sh
@@ -25,10 +25,10 @@ cd "$THIS_DIR"
 # 循环编译所有的库
 for lib in $MR_VENDOR_LIBS
 do
-    [[ ! -f "../../configs/libs/${lib}.sh" ]] && (echo "❌$lib config not exist,compile will stop.";exit 1;)
+    [[ ! -f "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh" ]] && (echo "❌$lib config not exist,compile will stop.";exit 1;)
 
     echo "===[$MR_CMD $lib]===================="
-    source "../../configs/libs/${lib}.sh"
+    source "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh"
     
     echo "LIB_NAME        : [$LIB_NAME]"
     echo "GIT_COMMIT      : [$GIT_COMMIT]"
diff --git a/do-init/main.sh b/do-init/main.sh
@@ -25,8 +25,8 @@ cd "$THIS_DIR"
 for lib in $MR_VENDOR_LIBS
 do
     echo "===[init $lib]==========="
-    [[ ! -f "../configs/libs/${lib}.sh" ]] && (echo "❌$lib config not exist,init will stop.";exit 1;)
-    source "../configs/libs/${lib}.sh"
+    [[ ! -f "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh" ]] && (echo "❌$lib config not exist,init will stop.";exit 1;)
+    source "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh"
     ./init-repo.sh
     echo "========================="
 done
diff --git a/do-install/apple/download-uncompress.sh b/do-install/apple/download-uncompress.sh
diff --git a/do-install/apple/install-pre-lib.sh b/do-install/apple/install-pre-lib.sh
diff --git a/do-install/apple/install-pre-xcf.sh b/do-install/apple/install-pre-xcf.sh
diff --git a/do-install/apple/main.sh b/do-install/apple/main.sh
@@ -0,0 +1,43 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 2021 Matt Reach<qianlongxu@gmail.com>
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
+set -e
+
+# 当前脚本所在目录
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+cd "$THIS_DIR"
+
+# 循环编译所有的库
+for lib in $MR_VENDOR_LIBS
+do
+    [[ ! -f "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh" ]] && (echo "❌$lib config not exist,install will stop.";exit 1;)
+    
+    echo "===[install $lib]===================="
+    source "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh"
+    if [[ $FORCE_XCFRAMEWORK ]];then
+        ./install-pre-xcf.sh
+    else
+        ./install-pre-lib.sh
+    fi
+    echo "===================================="
+done
+
+if [[ ! "$FORCE_XCFRAMEWORK" ]];then
+    fix_prefix "$MR_WORKSPACE/product/$MR_PLAT"
+fi
+
diff --git a/do-install/main.sh b/do-install/main.sh
diff --git a/main.sh b/main.sh
@@ -23,6 +23,7 @@ THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 cd "$THIS_DIR"
 export MR_SHELL_ROOT_DIR="$THIS_DIR"
 export MR_SHELL_TOOLS_DIR="${THIS_DIR}/tools"
+export MR_SHELL_CONFIGS_DIR="${THIS_DIR}/configs"
 
 function elapsed()
 {
@@ -43,24 +44,23 @@ source $MR_SHELL_TOOLS_DIR/prepare-build-workspace.sh
 echo '--------------------'
 echo
 
-echo "---3.do $action-------------------------------"
+echo "---3.do $MR_ACTION-------------------------------"
 case $MR_PLAT in
     ios | macos | tvos)
-        if [[ $action == "init" ]];then
-            ./do-init/main.sh "$@"
-        else
-            ./do-compile/apple/main.sh "$@"
-        fi 
+        plat=apple
     ;;
     android)
-        if [[ $action == "init" ]];then
-            ./do-init/main.sh "$@"
-        else
-            ./do-compile/android/main.sh "$@"
-        fi
+        plat=android
     ;;
 esac
-echo "---3.$action end-------------------------------"
+
+if [[ "$MR_ACTION" == "init" ]];then
+    ./do-init/main.sh "$@"
+else
+    ./do-$MR_ACTION/$plat/main.sh "$@"
+fi 
+
+echo "---3.$MR_ACTION end-------------------------------"
 echo
 
 elapsed
diff --git a/tools/export-pkg-config-dir.sh b/tools/export-pkg-config-dir.sh
@@ -36,4 +36,6 @@ do
     fi
 done
 
-export PKG_CONFIG_LIBDIR="$pkg_cfg_dir"
+export PKG_CONFIG_LIBDIR="$pkg_cfg_dir"
+
+unset pkg_cfg_dir uni_dir
diff --git a/tools/parse-arguments.sh b/tools/parse-arguments.sh
