mirror of http://192.168.10.4:8099/sane/dpkg.git
调整so打包失败问题
This commit is contained in:
parent
b50b2c8b84
commit
c2c3574a07
21
build.sh
21
build.sh
|
@ -18,7 +18,7 @@ minver=${minver: -2}
|
||||||
minver=$(echo $minver)
|
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
|
then
|
||||||
echo "参数错误!!!"
|
echo "参数错误!!!"
|
||||||
echo "参数:华高:hg || hgweb 立思层:lsc || lscweb 汉王:hw || hwweb"
|
echo "参数:华高:hg || hgweb 立思层:lsc || lscweb 汉王:hw || hwweb"
|
||||||
|
@ -87,9 +87,9 @@ syspath="kylin"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ "$oem" == "lsc" ] || [ "$oem" == "lscweb" ] ;then
|
if [ "$oem" == "lsc" ] || [ "$oem" == "lscweb" ] || [ "$oem" == "lscso" ];then
|
||||||
ver3=14
|
ver3=14
|
||||||
elif [ "$oem" == "hw" ] || [ "$oem" == "hwweb" ] ;then
|
elif [ "$oem" == "hw" ] || [ "$oem" == "hwweb" ] || [ "$oem" == "hwso" ];then
|
||||||
ver3=16
|
ver3=16
|
||||||
fi
|
fi
|
||||||
ver3=$[$ver3 * 10]
|
ver3=$[$ver3 * 10]
|
||||||
|
@ -126,16 +126,21 @@ git pull
|
||||||
cd ../code_device
|
cd ../code_device
|
||||||
git checkout .
|
git checkout .
|
||||||
git pull
|
git pull
|
||||||
|
echo "222222222222222222222222222:$oem"
|
||||||
|
|
||||||
if [ "$oem" == "hgso" ] ;then
|
if [ "$oem" == "hgso" ] ;then
|
||||||
./build.sh hg
|
./build.sh hg
|
||||||
else if [ "$oem" == "hwso" ];then
|
elif [ "$oem" == "hwso" ];then
|
||||||
./build.sh hw
|
./build.sh hw
|
||||||
else if [ "$oem" == "lscso" ];then
|
elif [ "$oem" == "lscso" ];then
|
||||||
./build.sh lsc
|
./build.sh lsc
|
||||||
else
|
else
|
||||||
./build.sh $oem
|
./build.sh $oem
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
sleep 3
|
||||||
if [ $? -ne 0 ];then
|
if [ $? -ne 0 ];then
|
||||||
echo "code_device-------->编译失败"
|
echo "code_device-------->编译失败"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -146,9 +151,9 @@ git checkout .
|
||||||
git pull
|
git pull
|
||||||
if [ "$oem" == "hgso" ] ;then
|
if [ "$oem" == "hgso" ] ;then
|
||||||
./build.sh hg
|
./build.sh hg
|
||||||
else if [ "$oem" == "hwso" ];then
|
elif [ "$oem" == "hwso" ];then
|
||||||
./build.sh hw
|
./build.sh hw
|
||||||
else if [ "$oem" == "lscso" ];then
|
elif [ "$oem" == "lscso" ];then
|
||||||
./build.sh lsc
|
./build.sh lsc
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -189,7 +194,7 @@ fi
|
||||||
|
|
||||||
if [ "$oem" == "lscweb" ] || [ "$oem" == "hwweb" ] || [ "$oem" == "hgweb" ]; then
|
if [ "$oem" == "lscweb" ] || [ "$oem" == "hwweb" ] || [ "$oem" == "hgweb" ]; then
|
||||||
cp release/$syspath/$cpu/* dpkg/$syspath/$oem/opt/$dpkgpath/bin
|
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 release/$syspath/$cpu/* dpkg/$syspath/$oem/opt/$dpkgpath/lib
|
||||||
cp sdk/include/scannerlib/* dpkg/$syspath/$oem/opt/$dpkgpath/inculde
|
cp sdk/include/scannerlib/* dpkg/$syspath/$oem/opt/$dpkgpath/inculde
|
||||||
rm dpkg/$syspath/$oem/opt/$dpkgpath/lib/*Scan
|
rm dpkg/$syspath/$oem/opt/$dpkgpath/lib/*Scan
|
||||||
|
|
Loading…
Reference in New Issue