Browse Source

Added a new parameter "--skipUpdate" to the build scripts: Skip submodule update operation;

tags/1.2.0^2
huanghaiquan 4 years ago
parent
commit
ff57a6b525
3 changed files with 19 additions and 4 deletions
  1. +1
    -1
      build/build.sh
  2. +10
    -2
      build/env.sh
  3. +8
    -1
      build/update.sh

+ 1
- 1
build/build.sh View File

@@ -11,7 +11,7 @@ echo "主目录:$BASE_DIR"
#判断是否忽略测试; #判断是否忽略测试;
if [ $SKIP_TESTS == 1 ] if [ $SKIP_TESTS == 1 ]
then then
echo "过测试。。。"
echo "过测试。。。"
else else
#执行测试; #执行测试;
source $TEST_SHELL source $TEST_SHELL


+ 10
- 2
build/env.sh View File

@@ -46,15 +46,23 @@ TEST_DIR=$BASE_DIR/test
#初始化参数:是否略过测试步骤; #初始化参数:是否略过测试步骤;
SKIP_TESTS=0 SKIP_TESTS=0


#初始化参数:是否略过子项目的更新;
SKIP_SUBMODULES_UPDATE=0
#检查输入参数 #检查输入参数
for i in $*; do for i in $*; do
case $i in case $i in
"--skipTests") "--skipTests")
#忽略测试;
echo "收到参数 --skipTests 指示过测试环节。。。"
#跳过测试;
echo "收到参数 --skipTests 指示过测试环节。。。"


SKIP_TESTS=1 SKIP_TESTS=1
;; ;;
"--skipUpdate")
#跳过更新子模块;
echo "收到参数 --skipUpdate 指示跳过子模块源码更新环节。。。"

SKIP_SUBMODULES_UPDATE=1
;;
esac esac
done done




+ 8
- 1
build/update.sh View File

@@ -5,6 +5,13 @@ then
source `dirname $0`/env.sh "$*" source `dirname $0`/env.sh "$*"
fi fi


#检查是否要跳过子模块更新环节;
if [ $SKIP_SUBMODULES_UPDATE == 1 ]
then
echo "跳过子模块代码更新操作。。。"
${RTN}
fi

#初始化变量 SUBMODULES_UPDATED #初始化变量 SUBMODULES_UPDATED
if [ ! $SUBMODULES_UPDATED ] if [ ! $SUBMODULES_UPDATED ]
then then
@@ -13,7 +20,7 @@ fi


if [ $SUBMODULES_UPDATED == 1 ] if [ $SUBMODULES_UPDATED == 1 ]
then then
echo "代码库已经最新,过更新操作。。。"
echo "代码库已经最新,过更新操作。。。"
${RTN} ${RTN}
fi fi


Loading…
Cancel
Save