mv correct_pc to install module

Author: debugly

do-install/correct-pc.sh

@@ -0,0 +1,49 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 2022 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" 
+
+function correct_pc_file(){
+    local fix_path="$1"
+    local dir=${PWD}
+    
+    echo "fix pc files in folder: $fix_path"
+    cd "$fix_path"
+
+    for pc in `find . -type f -name "*.pc"` ;
+    do
+        local pkgconfig=$(cd $(dirname "$pc"); pwd)
+        local lib_dir=$(cd $(dirname "$pkgconfig"); pwd)
+        local base_dir=$(cd $(dirname "$lib_dir"); pwd)
+        local include_dir="${base_dir}/include"
+        local bin_dir="${base_dir}/bin"
+
+        my_sed_i "s|^prefix=.*|prefix=$base_dir|" "$pc"
+        my_sed_i "s|^exec_prefix=[^$].*|exec_prefix=$bin_dir|" $pc
+        my_sed_i "s|^libdir=[^$].*|libdir=$lib_dir|" "$pc"
+        my_sed_i "s|^includedir=[^$].*include|includedir=$include_dir|" "$pc"
+        my_sed_i "s|-L/[^ ]*lib|-L$lib_dir|" "$pc"
+        my_sed_i "s|-I/[^ ]*include|-I$include_dir|" "$pc"
+    done
+    
+    cd "$dir"
+}
+
+correct_pc_file "$1"

do-install/main.sh

@@ -23,10 +23,10 @@ THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 cd "$THIS_DIR"
 
 function parse_lib_config() {
-
+    
     local t=$(echo "PRE_COMPILE_TAG_$MR_PLAT" | tr '[:lower:]' '[:upper:]')
     local vt=$(eval echo "\$$t")
-
+    
     if test -z $vt ;then
         echo "$t can't be nil"
         exit
@@ -42,28 +42,36 @@ function parse_lib_config() {
     local temp=${TAG#$prefix}
     # 去掉后缀
     VER=${temp%$suffix}
-
+    
     export VER
     export LIB_NAME
 }
 
-# 循环编译所有的库
-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;)
+function install_libs()
+{
+    # 循环安装所有的库
+    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"
+        parse_lib_config
+        if [[ $FORCE_XCFRAMEWORK ]];then
+            ./install-pre-xcf.sh
+        else
+            ./install-pre-lib.sh
+        fi
+        echo "===================================="
+    done
 
-    echo "===[install $lib]===================="
-    source "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh"
-    parse_lib_config
-    if [[ $FORCE_XCFRAMEWORK ]];then
-        ./install-pre-xcf.sh
-    else
-        ./install-pre-lib.sh
+    if [[ ! "$FORCE_XCFRAMEWORK" ]];then
+        ./correct-pc.sh "$MR_WORKSPACE/product/$MR_PLAT"
     fi
-    echo "===================================="
-done
+}
 
-if [[ ! "$FORCE_XCFRAMEWORK" ]];then
-    correct_pc_file "$MR_WORKSPACE/product/$MR_PLAT"
+if [[ -n $MR_PC_FILE_DIR ]];then
+    ./correct-pc.sh "$MR_PC_FILE_DIR"
+else
+    install_libs    
 fi
-

tools/parse-arguments.sh

@@ -86,32 +86,6 @@ OPTIONS:
 EOF
 }
 
-function correct_pc_file(){
-    local fix_path="$1"
-    local dir=${PWD}
-    
-    echo "fix pc files in folder: $fix_path"
-    cd "$fix_path"
-
-    for pc in `find . -type f -name "*.pc"` ;
-    do
-        local pkgconfig=$(cd $(dirname "$pc"); pwd)
-        local lib_dir=$(cd $(dirname "$pkgconfig"); pwd)
-        local base_dir=$(cd $(dirname "$lib_dir"); pwd)
-        local include_dir="${base_dir}/include"
-        local bin_dir="${base_dir}/bin"
-
-        my_sed_i "s|^prefix=.*|prefix=$base_dir|" "$pc"
-        my_sed_i "s|^exec_prefix=[^$].*|exec_prefix=$bin_dir|" $pc
-        my_sed_i "s|^libdir=[^$].*|libdir=$lib_dir|" "$pc"
-        my_sed_i "s|^includedir=[^$].*include|includedir=$include_dir|" "$pc"
-        my_sed_i "s|-L/[^ ]*lib|-L$lib_dir|" "$pc"
-        my_sed_i "s|-I/[^ ]*include|-I$include_dir|" "$pc"
-    done
-    
-    cd "$dir"
-}
-
 function parse_path()
 {
     local p="$1"
@@ -149,6 +123,7 @@ arch=
 libs=
 workspace=
 debug=
+pc_file_dir=
 
 case $1 in
     init | install)
@@ -166,7 +141,6 @@ case $1 in
     ;;
 esac
 
-export -f correct_pc_file
 export MR_ACTION=$action
 
 while [[ $# -gt 0 ]]; do
@@ -213,8 +187,7 @@ while [[ $# -gt 0 ]]; do
         ;;
         -correct-pc)
             shift
-            correct_pc_file "$1"
-            exit 0
+            pc_file_dir="$1"
         ;;
         **)
             echo "unkonwn option:$1"
@@ -224,6 +197,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 if [[ -z "$platform" ]];then
+    echo "platform can't empty"
     help
     exit 1
 fi
@@ -233,7 +207,9 @@ if [[ "$platform" != 'ios' && "$platform" != 'macos' && "$platform" != 'tvos' &&
     exit 1
 fi
 
-if [[ -z "$libs" ]];then
+export MR_PC_FILE_DIR="$pc_file_dir"
+
+if [[ -z "$MR_PC_FILE_DIR" && -z "$libs" ]];then
     echo "libs can't be nil, use -l specify libs"
     exit 1
 fi
@@ -293,6 +269,7 @@ else
     done
 fi
 
+
 echo "MR_ACTION       : [$MR_ACTION]"
 echo "MR_PLAT         : [$MR_PLAT]"
 echo "MR_CMD          : [$MR_CMD]"
@@ -304,5 +281,6 @@ echo "MR_INIT_CFLAGS  : [$MR_INIT_CFLAGS]"
 echo "SKIP_PULL_BASE  : [$SKIP_PULL_BASE]"
 echo "SKIP_FFMPEG_PATHCHES : [$SKIP_FFMPEG_PATHCHES]"
 echo "MR_SKIP_MAKE_XCFRAMEWORK" : [$MR_SKIP_MAKE_XCFRAMEWORK]
+[[ -n $MR_PC_FILE_DIR ]] && echo "MR_PC_FILE_DIR : [$MR_PC_FILE_DIR]"
 
-unset platform cmd arch libs workspace debug action cflags
+unset platform cmd arch libs workspace debug action cflags pc_file_dir