lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

按照新的版本规范定义软件版本

This commit is contained in:
gb 2022-05-17 17:21:01 +08:00
parent 9bddaf6f58
commit 6b43da8081
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
build.sh
View File

@ -1,22 +1,45 @@
if [ "${2}" == "" ]; then
echo "usage: build.sh <main ver> [minver 0] [hw | lsc]"
exit
fi
sysarch=$(arch)
sys=$(cat /etc/issue)
sys=${sys%% *}
echo "${1}"
if [ "${1}" == "hw" ]; then
mainverstr="s/ver_1/""${1}""/g"
minverstr="s/ver_2/"
oem="${2}"
if [ "$oem" == "minver" ]; then
minverstr=${minverstr}"${3}"
oem="${4}"
else
minverstr=${minverstr}"0"
fi
minverstr=${minverstr}"/g"
echo ${mainverstr}
echo ${minverstr}
sed -ibkp ${mainverstr} hgdriver/wrapper/CMakeLists.txt
sed -i ${minverstr} hgdriver/wrapper/CMakeLists.txt
if [ "$oem" == "hw" ]; then
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
sed -ibkp "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/hgdev/CMakeLists.txt
sed -ibkp "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/wrapper/CMakeLists.txt
sed -i "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/wrapper/CMakeLists.txt
sed -i "s/hgdriver/hwdriver/g" hgdriver/wrapper/CMakeLists.txt
elif [ "${1}" == "lsc" ]; then
sed -i "s/1%m%d/6%m%d/g" hgdriver/wrapper/CMakeLists.txt
elif [ "$oem" == "lsc" ]; then
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
sed -ibkp "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/hgdev/CMakeLists.txt
sed -ibkp "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/wrapper/CMakeLists.txt
sed -i "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/wrapper/CMakeLists.txt
sed -i "s/hgdriver/lscdriver/g" hgdriver/wrapper/CMakeLists.txt
sed -i "s/1%m%d/7%m%d/g" hgdriver/wrapper/CMakeLists.txt
fi
echo "------------------------------change cmake path:$1--------------------"

10
hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
View File

@ -4,13 +4,13 @@
#include <iostream>
#ifdef WIN32
#ifndef VERSION_MAJOR
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_YEAR 2022
#define VERSION_BUILD 10129
#endif
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define MAKE_VERSION(a, b, c, d) \
((((unsigned long long)(a) & 0x0ffff) << 48) \
| (((unsigned long long)(b) & 0x0ffff) << 32) \
@ -23,7 +23,7 @@ extern "C"
{
// hg_log::init(LOG_TYPE_CONSOLE);
hg_scanner_mgr::set_version(VERSION_MAJOR, VERSION_MINOR, VERSION_YEAR, VERSION_BUILD - 10000);
hg_scanner_mgr::set_version(VERSION_MAJOR, VERSION_MINOR, VERSION_YEAR, VERSION_BUILD);
hg_scanner_mgr::instance(callback);
return SCANNER_ERR_OK;
@ -35,7 +35,7 @@ extern "C"
unsigned long long hg_scanner_get_version(void)
{
return MAKE_VERSION(VERSION_MAJOR, VERSION_MINOR, VERSION_YEAR, VERSION_BUILD - 10000);
return MAKE_VERSION(VERSION_MAJOR, VERSION_MINOR, VERSION_YEAR, VERSION_BUILD);
}
scanner_err hg_scanner_enum(ScannerInfo* scanner_list, long* count, bool local_only)