From 6b43da8081cef3a6b0e1eb7dd2e892d55de84d2b Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Tue, 17 May 2022 17:21:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=96=B0=E7=9A=84=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E8=A7=84=E8=8C=83=E5=AE=9A=E4=B9=89=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                                   | 33 ++++++++++++++++++----
 hgdriver/wrapper/huagaoxxx_warraper_ex.cpp | 10 +++----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/build.sh b/build.sh
index 4327718..fc918fa 100755
--- a/build.sh
+++ b/build.sh
@@ -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--------------------"
diff --git a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
index 8f237bb..90ce025 100644
--- a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
+++ b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
@@ -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)