From 46d3a6361aea0d5b5915c42b45349fbc657717f4 Mon Sep 17 00:00:00 2001 From: lizw Date: Fri, 11 Mar 2022 09:49:38 +0800 Subject: [PATCH 1/5] wms8 build.sh --- wms8/build.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/wms8/build.sh b/wms8/build.sh index f7f10bc..0555051 100644 --- a/wms8/build.sh +++ b/wms8/build.sh @@ -8,6 +8,7 @@ gitUrlArr=( "http://git.yvanui.com/jztd/yvan-ext.git" "www@git.yvanui.com:lizhiwei/yvan-framework.git" "http://git.galaxis.yvanui.com/wms8/wms-core.git" + "http://git.yvanui.com/jztd/yvan-ext-mobile.git" ) branchArr=( @@ -15,12 +16,14 @@ branchArr=( "master" "master" "master" + "master" ) positionArr=( "." "yvan-ext" "yvan-framework" "wms-core" + "yvan-ext-mobile" ) # 是否需要构建,-1:自动;0:不需要;1:需要 needBuild=( @@ -28,6 +31,7 @@ needBuild=( "-1" "-1" "-1" +"-1" ) echoPrefix="\033[36m+" @@ -95,6 +99,21 @@ buildCode() { echo "yvan-ext 文件未变化" fi + # 构建 yvan-ext-mobile + if [ "${needBuild[4]}" != "0" ]; then + echo -e "$echoPrefix cd $codePath/yvan-ext-mobile $echoSuffix" + cd "$codePath/yvan-ext-mobile" + echo -e "$echoPrefix yarn $echoSuffix" + yarn + echo -e "$echoPrefix yarn link $echoSuffix" + yarn link + echo -e "$echoPrefix yarn build $echoSuffix" + yarn build + echo "" + else + echo "yvan-ext-mobile 文件未变化" + fi + # 构建 wms-biz/bundle if [ "${needBuild[0]}" != "0" ]; then echo -e "$echoPrefix cd $codePath/wms-biz/bundle $echoSuffix" @@ -110,6 +129,21 @@ buildCode() { echo "wms-biz/bundle 文件未变化" fi + # 构建 wms-biz/pda-client + if [ "${needBuild[0]}" != "0" ]; then + echo -e "$echoPrefix cd $codePath/wms-biz/pda-client $echoSuffix" + cd "$codePath/wms-biz/pda-client" + echo -e "$echoPrefix yarn $echoSuffix" + yarn + echo -e "$echoPrefix yarn link yvan-ext-mobile $echoSuffix" + yarn link yvan-ext + echo -e "$echoPrefix yarn build $echoSuffix" + yarn build + echo "" + else + echo "wms-biz/pda-client 文件未变化" + fi + # 构建 java echo -e "$echoPrefix cd $codePath $echoSuffix" cd $codePath From 189725f0d17e44cfe624cdf96e19f05e9e5eeedc Mon Sep 17 00:00:00 2001 From: lizw Date: Fri, 11 Mar 2022 09:57:34 +0800 Subject: [PATCH 2/5] wms8 build.sh --- wms8/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wms8/build.sh b/wms8/build.sh index 0555051..da1ce08 100644 --- a/wms8/build.sh +++ b/wms8/build.sh @@ -8,7 +8,7 @@ gitUrlArr=( "http://git.yvanui.com/jztd/yvan-ext.git" "www@git.yvanui.com:lizhiwei/yvan-framework.git" "http://git.galaxis.yvanui.com/wms8/wms-core.git" - "http://git.yvanui.com/jztd/yvan-ext-mobile.git" + "www@git.yvanui.com:jztd/yvan-ext-mobile.git" ) branchArr=( From 26ee608ace39c379f1666405c8d5f8805fe20687 Mon Sep 17 00:00:00 2001 From: lizw Date: Fri, 11 Mar 2022 10:11:08 +0800 Subject: [PATCH 3/5] wms8 build.sh --- wms8/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wms8/build.sh b/wms8/build.sh index da1ce08..cada3bc 100644 --- a/wms8/build.sh +++ b/wms8/build.sh @@ -27,11 +27,11 @@ positionArr=( ) # 是否需要构建,-1:自动;0:不需要;1:需要 needBuild=( -"-1" -"-1" -"-1" -"-1" -"-1" +"1" +"1" +"1" +"1" +"1" ) echoPrefix="\033[36m+" From 826ecfd5c9bb099454e62721e110d908bfd3e699 Mon Sep 17 00:00:00 2001 From: lizw Date: Fri, 11 Mar 2022 10:16:14 +0800 Subject: [PATCH 4/5] wms8 build.sh --- wms8/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wms8/build.sh b/wms8/build.sh index cada3bc..02503b9 100644 --- a/wms8/build.sh +++ b/wms8/build.sh @@ -136,7 +136,7 @@ buildCode() { echo -e "$echoPrefix yarn $echoSuffix" yarn echo -e "$echoPrefix yarn link yvan-ext-mobile $echoSuffix" - yarn link yvan-ext + yarn link yvan-ext-mobile echo -e "$echoPrefix yarn build $echoSuffix" yarn build echo "" From 97b8ea241f27be346e0772ec2cd1944a337df729 Mon Sep 17 00:00:00 2001 From: lizw Date: Fri, 11 Mar 2022 11:55:38 +0800 Subject: [PATCH 5/5] wms8 build.sh --- wms8/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/wms8/build.sh b/wms8/build.sh index 02503b9..c3d3790 100644 --- a/wms8/build.sh +++ b/wms8/build.sh @@ -37,6 +37,7 @@ needBuild=( echoPrefix="\033[36m+" echoSuffix="\033[0m" +# 强制覆盖本地的代码 git fetch --all && git reset --hard origin/master isChange="1" # 仓库是否发生变化,0:未变化;非0:变化 pullCode() { # Usage: pullCode "codePath" "gitUrl" "branch" "position"