From 20f0b82850c5f1f8cc0fb908438c3b79c635bde0 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Thu, 4 Aug 2022 13:32:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=89=88=E6=9C=AC=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 73 +++++++++++++++------------------ hgdriver/wrapper/CMakeLists.txt | 11 +++-- 2 files changed, 38 insertions(+), 46 deletions(-) diff --git a/build.sh b/build.sh index 89f62e8..724d7ef 100755 --- a/build.sh +++ b/build.sh @@ -4,53 +4,17 @@ cpu=$(arch) #cpu架构 sys=$(cat /etc/issue) sys=${sys%% *} #操作系统 mainverstr="s/ver_1/4/g" #版本控制 -minver="06" +minver="07" minverstr="s/ver_2/" +verstr3="s/ver_3/" +ver3=10 #sudo apt install libudev-dev -if [ "$sys" == "UnionTech" ];then - # uos ... - - if [ "$cpu" == "x86_64" ]; then - minver="20"${minver} - elif [ "$cpu" == "aarch64" ]; then - minver="21"${minver} - elif [ "$cpu" == "mips64" ]; then - minver="22"${minver} - else - minver="29"${minver} - fi -elif [ "$sys" == "Kylin" ];then - # kylin ... - - if [ "$cpu" == "x86_64" ]; then - minver="30"${minver} - elif [ "$cpu" == "aarch64" ]; then - minver="31"${minver} - elif [ "$cpu" == "mips64" ]; then - minver="32"${minver} - else - minver="39"${minver} - fi -else - # unknown OS - if [ "$cpu" == "x86_64" ]; then - minver="90"${minver} - elif [ "$cpu" == "aarch64" ]; then - minver="91"${minver} - elif [ "$cpu" == "mips64" ]; then - minver="92"${minver} - else - minver="99"${minver} - fi -fi minverstr=${minverstr}${minver}"/g" echo "minor version replacing pattern: "${minverstr} -sed -ibkp ${mainverstr} hgdriver/wrapper/CMakeLists.txt -sed -i ${minverstr} hgdriver/wrapper/CMakeLists.txt - if [ "$oem" == "hw" ] || [ "$oem" == "hwweb" ]; then + ver3=16 sed -ibkp "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgsane/CMakeLists.txt sed -i "s/hgsane/hwsane/g" hgsane/CMakeLists.txt sed -i "s/hgdriver/hwdriver/g" hgsane/CMakeLists.txt @@ -59,6 +23,7 @@ if [ "$oem" == "hw" ] || [ "$oem" == "hwweb" ]; then sed -i "s/hgdriver/hwdriver/g" hgdriver/wrapper/CMakeLists.txt sed -i "s/1%m%d1/1%m%d6/g" hgdriver/wrapper/CMakeLists.txt elif [ "$oem" == "lsc" ] || [ "$oem" == "lscweb" ]; then + ver3=14 sed -ibkp "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgsane/CMakeLists.txt sed -i "s/hgsane/lscsane/g" hgsane/CMakeLists.txt sed -i "s/hgdriver/lscdriver/g" hgsane/CMakeLists.txt @@ -68,6 +33,34 @@ elif [ "$oem" == "lsc" ] || [ "$oem" == "lscweb" ]; then sed -i "s/1%m%d1/1%m%d7/g" hgdriver/wrapper/CMakeLists.txt fi +ver3=$[$ver3 * 10] +if [ "$cpu" == "x86_64" ]; then + ver3=$[$ver3 + 1] +elif [ "$cpu" == "aarch64" ]; then + ver3=$[$ver3 + 2] +elif [ "$cpu" == "mips64" ]; then + ver3=$[$ver3 + 3] +fi + +ver3=$[$ver3 * 100] +if [ "$sys" == "UnionTech" ];then + # uos ... + ver3=$[$ver3 + 20] +elif [ "$sys" == "Kylin" ];then + # kylin ... + ver3=$[$ver3 + 21] +else + # unknown OS, set as linux + ver3=$[$ver3 + 10] +fi + +verstr3=${verstr3}"${ver3}/g" +echo "3rd version replacing pattern: "${verstr3} +sed -ibkp ${mainverstr} hgdriver/wrapper/CMakeLists.txt +sed -i ${minverstr} hgdriver/wrapper/CMakeLists.txt +sed -i ${verstr3} hgdriver/wrapper/CMakeLists.txt + + if [ "$sys" == "UnionTech" ];then sed -i "s/kylin/uos/g" hgdriver/wrapper/CMakeLists.txt sed -i "s/KYLIN/UOS/g" hgdriver/hgdev/CMakeLists.txt diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt index c93e016..b603e0c 100644 --- a/hgdriver/wrapper/CMakeLists.txt +++ b/hgdriver/wrapper/CMakeLists.txt @@ -1,10 +1,10 @@ project(hgdriver) string(TIMESTAMP CURRENT_YEAR "%Y") -string(TIMESTAMP MONTHDAY "1%m%d1") +string(TIMESTAMP MONTHDAY "1%y%j") add_definitions(-DBACKEND_NAME=hgdriver) -add_definitions(-DVERSION_MAJOR=4) -add_definitions(-DVERSION_MINOR=3206) -add_definitions(-DVERSION_YEAR=${CURRENT_YEAR}) +add_definitions(-DVERSION_MAJOR=ver_1) +add_definitions(-DVERSION_MINOR=ver_2) +add_definitions(-DVERSION_YEAR=ver_3) add_definitions(-DVERSION_BUILD=${MONTHDAY}) add_definitions(-DOEM_HUAGAO) add_definitions(-Duos) @@ -51,8 +51,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libquirc.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libzlib.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/liblibwebp.a - ${PROJECT_SOURCE_DIR}/../../../sdk/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libusb-1.0.a #uos下放的先后顺序不对可能会导致库链接不上 - udev pthread dl m) + ${PROJECT_SOURCE_DIR}/../../../sdk/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libusb-1.0.a #uos下放的先后顺序不对可能会导致库链接不? udev pthread dl m) #勿修改下面预留行 if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64")