diff --git a/build.sh b/build.sh index 79e1dcb..6e3e4af 100755 --- a/build.sh +++ b/build.sh @@ -36,7 +36,7 @@ if [ "$oem" == "hw" ]; then sed -ibkp "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/hgdev/CMakeLists.txt sed -i "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/wrapper/CMakeLists.txt sed -i "s/hgdriver/hwdriver/g" hgdriver/wrapper/CMakeLists.txt - sed -i "s/1%m%d/6%m%d/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/1%m%d1/1%m%d6/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 @@ -44,7 +44,7 @@ elif [ "$oem" == "lsc" ]; then sed -ibkp "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/hgdev/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 + sed -i "s/1%m%d1/1%m%d7/g" hgdriver/wrapper/CMakeLists.txt fi echo "------------------------------change cmake path:$1--------------------" diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt index aad3184..82778db 100644 --- a/hgdriver/wrapper/CMakeLists.txt +++ b/hgdriver/wrapper/CMakeLists.txt @@ -1,6 +1,6 @@ project(hgdriver) string(TIMESTAMP CURRENT_YEAR "%Y") -string(TIMESTAMP MONTHDAY "1%m%d") +string(TIMESTAMP MONTHDAY "1%m%d1") add_definitions(-DVERSION_MAJOR=ver_1) add_definitions(-DVERSION_MINOR=ver_2) add_definitions(-DVERSION_YEAR=${CURRENT_YEAR}) diff --git a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp index 90ce025..c4df4f6 100644 --- a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp +++ b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp @@ -8,7 +8,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_YEAR 2022 -#define VERSION_BUILD 10129 +#define VERSION_BUILD 105181 #endif #define MAKE_VERSION(a, b, c, d) \ @@ -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); + hg_scanner_mgr::set_version(VERSION_MAJOR, VERSION_MINOR, VERSION_YEAR, VERSION_BUILD - 100000); 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); + return MAKE_VERSION(VERSION_MAJOR, VERSION_MINOR, VERSION_YEAR, VERSION_BUILD - 100000); } scanner_err hg_scanner_enum(ScannerInfo* scanner_list, long* count, bool local_only)