From 4b9694e8e84aa9ff6ea519b5943c4a262b40f53f Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Fri, 10 Mar 2023 17:39:05 +0800 Subject: [PATCH] change build bat script for oem unis and hgsetver tool code --- build_all.bat | 20 ++++++++++++++++++- build_base.bat | 5 +++++ build_ds.bat | 8 +++++++- sln/Release/hgsetver.exe | Bin 84992 -> 85504 bytes sln/hgsetver/hgsetver.cpp | 40 +++++++++++++++++++++++++++++++++++--- 5 files changed, 68 insertions(+), 5 deletions(-) diff --git a/build_all.bat b/build_all.bat index 5493d4a..b072d3b 100644 --- a/build_all.bat +++ b/build_all.bat @@ -8,6 +8,7 @@ set BUILD_HW=false set BUILD_LSC=false set BUILD_CTS=false set BUILD_ZJ=false +set BUILD_ZG=false set BUILD_X86=true set BUILD_X64=true @@ -21,7 +22,9 @@ if "%OEM%"=="hw" ( set BUILD_CTS=true ) else if "%OEM%" == "zj" ( set BUILD_ZJ=true -) else if "%OEM%" == "all" ( +)else if "%OEM%" == "zg" ( + set BUILD_ZG=true +)else if "%OEM%" == "all" ( set BUILD_HG=true set BUILD_HW=true set BUILD_LSC=true @@ -83,6 +86,12 @@ if "%BUILD_ZJ%"=="true" ( if "%BUILD_X64%"=="true" call :compile_zj zj x64 if %ERRORLEVEL% neq 0 goto end ) +if "%BUILD_ZG%"=="true" ( + if "%BUILD_X86%"=="true" call :compile_zg zg x86 + if %ERRORLEVEL% neq 0 goto end + if "%BUILD_X64%"=="true" call :compile_zg zg x64 + if %ERRORLEVEL% neq 0 goto end +) if "%BUILD_HG%"=="true" ( if "%BUILD_X86%"=="true" call :compile_hg hg x86 if %ERRORLEVEL% neq 0 goto end @@ -160,6 +169,15 @@ EXIT /B 0 EXIT /B 0 +:compile_zg + call build_base.bat %1 %2 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% + call build_ds.bat %1 %2 200 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% + call build_ds.bat %1 %2 210 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% +EXIT /B 0 + :end echo final result = %ERRORLEVEL% diff --git a/build_base.bat b/build_base.bat index 401b975..c93b1b8 100644 --- a/build_base.bat +++ b/build_base.bat @@ -32,6 +32,11 @@ if "%OEM%" equ "zj" ( set CL=/DOEM_ZHONGJING /DBACKEND_NAME=zjsane goto oem ) +if "%OEM%" equ "zg" ( + set OEM_DIR=unis + set CL=/DOEM_ZIGUANG /DBACKEND_NAME=unissane + goto oem +) if "%OEM%" equ "cts" ( set OEM_DIR=cumtenn set CL=/DOEM_CANGTIAN /DBACKEND_NAME=ctssane diff --git a/build_ds.bat b/build_ds.bat index ea20725..6084456 100644 --- a/build_ds.bat +++ b/build_ds.bat @@ -1,5 +1,5 @@ @echo off -echo "Parameter 1:hg | lsc| hw | zj | cts" +echo "Parameter 1:hg | lsc| hw | zj | cts | zg" echo "Parameter 2:x86 | x64 " echo "Parameter 3: 100 | 200 ... " @@ -38,6 +38,12 @@ if "%OEM%" equ "zj" ( set NAME=microtek%NAME% goto oem ) +if "%OEM%" equ "zg" ( + set OEM_DIR=unis + set CL=/DOEM_ZIGUANG /DPRODUCT_ID=%PID% + set NAME=unis%NAME% + goto oem +) if "%OEM%" equ "cts" ( set OEM_DIR=cumtenn set CL=/DOEM_CANGTIAN /DPRODUCT_ID=%PID% diff --git a/sln/Release/hgsetver.exe b/sln/Release/hgsetver.exe index 8bb30d06989e6c0efa098677008677f1e83d7be9..9d037b74b1acad83ac5df213bd1b5745583638c6 100644 GIT binary patch delta 19609 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
kbER;iv*HLAW-U02Z zKBGOU{k}-c>qNSzbop_r9WH4SjRhla8kyx0sRYx;|7WG4`V@*iM^~Vk?=z4 zVd-ON+Arke6-yNR6>iGW%B9Nn$_g~=e&t0~pgLBas@|%uRUcP3saw?-)ECurHM=wy zG{M>h+C1GGx({`~=vF3_BpgZjHDPk1C9yQ|W};d@P5-d|OZ^r7RsGNU-}N4b2*X8# zpE1F>*4Sk1G#2@qqD@*;ifN81+f-}1#+ot{s~NCV`nL3vG*eb8i802{h>Og>CkM~Ue`wGX6Sb6cI%Go z-q*G1h9yKK#3lTmAWA%%_+#QM{j>U7{Vn}HhS`R-hRucw!vf=KW0`TMvC3FuY&L#p zl$eIIN)%&B1>ToFB>zFNM)iRD3w45aj&`B;UTv$^OBbqJj?pGdC`wDnOW2-pCgEyA zqJB4$zM}t5->dgF6dLLbKNyHa>m8cI_=~v~G-UiEg`YFIpueVQNBl zLO}vaj7OVH*5~Pc4KhQn;UJp%OT%@;pN2uk7^6~{!tthQrsbwproE;ErZbo+f10>D ztdPiOgj6L>lNP-q{Y7?G7|G)mNs85qZHmiEh3YxXTpx9WTCRRYeM23j8KFtQlzCkf zhbFAiUBEE=JYli^q(0k_Z+H!Tn`E4Ce98E_(bII?^u6gf6W4@wADK*+{wh_=X2|Bq zR>&TdJtjLX8zNsIUoF2XpQ4zrP%ED=QhuQc)W&MR*DgtTI^kGCbHbMiy$N24Llg58 zo6+Ct`Xc=<{nKc)_w>#B&-6nKa^rIJ_M662#>>Lw{K@#6@lPW$1)9d1q3Q|hCF(5oTD89> zTobFw)Z`RtHfXkJc50r{e55(2xu|hye$n`AL$zbHN^OGHtev8rshz7`q+PDf(&lK_ zX*X)OXt!z0wL7%Cuz=QRU(z1YzNT%^zN>B4eynZNUeI3Beyg=>|D)~E-qgD53Upg_ zS9C)Yk`f+CXitbsygxBgzY23`gdy4RfMJ)R=p(~W%*%9Ry-{wu-*kwL^G@dgNt9Me z_eo!tzAk-F`jPZ=G~W->pQV3FJ!HNz8CHdMS*U!e`~~!7sA4Hr!DEUOigRcIU*&M+ zNaYx%T&Y(+sC-yiqI_KWq;ik)tny3cRpq~xKe5jx-8dHjT~(i@kg-KllM+1#KZg(c z_$!h6OM|6h(kN++G+sJRDn$=!rFyAZnk=0ror!UqE?p$ekY-A=q!#oo+YPfFyB>~?iznhuqI5S)Mzzn=%Xx6u4bJkPg8)7D%I@K9MLptnlx>ib}U!jnjVc< zE7AIE!?aQ8vSjTvbXbK&mQLs^KG#jTG7a6x0OO4x&yNr8`2aHFI$Bm6x(^`!kSS2`<*fb8Ulwry;<(l$L zTTG>UMW>3E3=fj$^vDz@_@2g*{1APid7QTIF(eD zrpi^VQx&L+RpqMfs$F;&?@=8;6cnrY;9xBmmpD-j(4 delta 19397 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"-oem"), L"zj") == 0) vendor = OEM_ZHONGJING; + else if (wcsicmp(cmd->parameter(L"-oem"), L"zg") == 0) + vendor = OEM_ZIGUANG; else std::wcout << L" OEM '" << cmd->parameter(L"-oem") << L"' is not supported! set as OEM_NONE.\r\n"; } @@ -144,6 +147,7 @@ static std::wstring oem_str(oem o) GET_ENUM_NAME_W(OEM_LISICHENG, o); GET_ENUM_NAME_W(OEM_CANGTIAN, o); GET_ENUM_NAME_W(OEM_ZHONGJING, o); + GET_ENUM_NAME_W(OEM_ZIGUANG, o); } static oem from_str(const wchar_t* str) { @@ -153,6 +157,7 @@ static oem from_str(const wchar_t* str) GET_ENUM_VALUE_W(OEM_LISICHENG, s); GET_ENUM_VALUE_W(OEM_CANGTIAN, s); GET_ENUM_VALUE_W(OEM_ZHONGJING, s); + GET_ENUM_VALUE_W(OEM_ZIGUANG, s); return OEM_NOT; } static int oem_code(oem o) @@ -165,6 +170,8 @@ static int oem_code(oem o) return 18; else if (o == OEM_ZHONGJING) return 20; + else if (o == OEM_ZIGUANG) + return 17; else return 10; } @@ -178,6 +185,8 @@ static oem oem_from_code(int code) return OEM_CANGTIAN; else if (code == 20) return OEM_ZHONGJING; + else if (code == 17) + return OEM_ZIGUANG; else return OEM_NONE; } @@ -745,6 +754,8 @@ namespace rc os = L"cumtenn"; else if (o == OEM_ZHONGJING) os = L"microtek"; + else if (o == OEM_ZIGUANG) + os = L"unis"; while (len > bgn) { bgn += first.length(); @@ -774,6 +785,8 @@ namespace rc os = L"cumtenn"; else if (o == OEM_ZHONGJING) os = L"microtek"; + else if (o == OEM_ZIGUANG) + os = L"unis"; while (len > bgn) { bgn += first.length(); @@ -944,6 +957,8 @@ namespace rc backend = L"cts"; else if (o == OEM_ZHONGJING) backend = L"zj"; + else if (o == OEM_ZIGUANG) + backend = L"unis"; else backend = L"hg"; backend += L"sane"; @@ -1007,6 +1022,8 @@ namespace rc backend.insert(0, L"_cts"); else if (o == OEM_ZHONGJING) backend.insert(0, L"_zj"); + else if (o == OEM_ZIGUANG) + backend.insert(0, L"_unis"); else backend.insert(0, L"_hg"); @@ -1026,7 +1043,13 @@ namespace rc { prev = L"_zjsane_"; if (cont.find(prev) == std::wstring::npos) - return false; + { + prev = L"_unissane_"; + if (cont.find(prev) == std::wstring::npos) + { + return false; + } + } } } @@ -1056,6 +1079,8 @@ namespace rc backend.insert(0, L"cts"); else if (o == OEM_ZHONGJING) backend.insert(0, L"zj"); + else if (o == OEM_ZIGUANG) + backend.insert(0, L"unis"); else backend.insert(0, L"hg"); @@ -1072,9 +1097,14 @@ namespace rc { prev = L"cts_scanner_"; if (cont.find(prev) == std::wstring::npos) - return false; + { + prev = L"unis_scanner_"; + if (cont.find(prev) == std::wstring::npos) + { + return false; + } + } } - } } @@ -1103,6 +1133,8 @@ namespace rc target += L"cumtenn\\"; else if (o == OEM_ZHONGJING) target += L"microtek\\"; + else if (o == OEM_ZIGUANG) + target += L"unis\\"; else target += L"huagao\\"; @@ -1136,6 +1168,8 @@ namespace rc target = L"cumtenn"; else if (param->o == OEM_ZHONGJING) target = L"microtek"; + else if (param->o == OEM_ZIGUANG) + target = L"unis"; target += tail; while ((bgn = cont.find(first, bgn)) != std::wstring::npos)