diff --git a/build.sh b/build.sh index 6d2cb74..4cf7737 100755 --- a/build.sh +++ b/build.sh @@ -18,7 +18,7 @@ minver=${minver: -2} minver=$(echo $minver) -if [ "$oem" != "hg" ] && [ "$oem" != "lsc" ] && [ "$oem" != "hw" ] && [ "$oem" != ""hgweb ] && [ "$oem" != ""lscweb ] && [ "$oem" != ""hwweb ] && [ "$oem" != ""hgso ] && [ "$oem" != ""lscso ] && [ "$oem" != ""hwso ]; +if [ "$oem" != "hg" ] && [ "$oem" != "lsc" ] && [ "$oem" != "hw" ] && [ "$oem" != "hgweb" ] && [ "$oem" != "lscweb" ] && [ "$oem" != "hwweb" ] && [ "$oem" != "hgso" ] && [ "$oem" != "lscso" ] && [ "$oem" != "hwso" ]; then echo "参数错误!!!" echo "参数:华高:hg || hgweb 立思层:lsc || lscweb 汉王:hw || hwweb" @@ -87,9 +87,9 @@ syspath="kylin" fi -if [ "$oem" == "lsc" ] || [ "$oem" == "lscweb" ] ;then +if [ "$oem" == "lsc" ] || [ "$oem" == "lscweb" ] || [ "$oem" == "lscso" ];then ver3=14 -elif [ "$oem" == "hw" ] || [ "$oem" == "hwweb" ] ;then +elif [ "$oem" == "hw" ] || [ "$oem" == "hwweb" ] || [ "$oem" == "hwso" ];then ver3=16 fi ver3=$[$ver3 * 10] @@ -126,16 +126,21 @@ git pull cd ../code_device git checkout . git pull +echo "222222222222222222222222222:$oem" + if [ "$oem" == "hgso" ] ;then ./build.sh hg -else if [ "$oem" == "hwso" ];then +elif [ "$oem" == "hwso" ];then ./build.sh hw -else if [ "$oem" == "lscso" ];then +elif [ "$oem" == "lscso" ];then ./build.sh lsc else ./build.sh $oem fi + + +sleep 3 if [ $? -ne 0 ];then echo "code_device-------->编译失败" exit 1 @@ -146,9 +151,9 @@ git checkout . git pull if [ "$oem" == "hgso" ] ;then ./build.sh hg -else if [ "$oem" == "hwso" ];then +elif [ "$oem" == "hwso" ];then ./build.sh hw -else if [ "$oem" == "lscso" ];then +elif [ "$oem" == "lscso" ];then ./build.sh lsc fi @@ -189,7 +194,7 @@ fi if [ "$oem" == "lscweb" ] || [ "$oem" == "hwweb" ] || [ "$oem" == "hgweb" ]; then cp release/$syspath/$cpu/* dpkg/$syspath/$oem/opt/$dpkgpath/bin -else if [ "$oem" == "hgso" ] || [ "$oem" == "hwso" ] || [ "$oem" == "lscso" ];then +elif [ "$oem" == "hgso" ] || [ "$oem" == "hwso" ] || [ "$oem" == "lscso" ];then cp release/$syspath/$cpu/* dpkg/$syspath/$oem/opt/$dpkgpath/lib cp sdk/include/scannerlib/* dpkg/$syspath/$oem/opt/$dpkgpath/inculde rm dpkg/$syspath/$oem/opt/$dpkgpath/lib/*Scan