From 9eead04e8ea52b4c5b9269f9efc5401f90079705 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 20 Apr 2023 17:35:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E6=80=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_all.bat | 16 ++++++++-------- build_base.bat | 8 ++++---- build_ds.bat | 8 ++++---- sln/Release/hgsetver.exe | Bin 84992 -> 84992 bytes sln/hgsetver/hgsetver.cpp | 26 +++++++++++++------------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build_all.bat b/build_all.bat index 49c3708..a12d9ad 100644 --- a/build_all.bat +++ b/build_all.bat @@ -9,7 +9,7 @@ set BUILD_LSC=false set BUILD_CTS=false set BUILD_ZJ=false set BUILD_ZG=false -set BUILD_HGNEU=false +set BUILD_NEU=false set BUILD_X86=true set BUILD_X64=true @@ -25,8 +25,8 @@ if "%OEM%"=="hw" ( set BUILD_ZJ=true )else if "%OEM%" == "zg" ( set BUILD_ZG=true -)else if "%OEM%" == "hgneu" ( - set BUILD_HGNEU=true +)else if "%OEM%" == "neu" ( + set BUILD_NEU=true )else if "%OEM%" == "all" ( set BUILD_HG=true set BUILD_HW=true @@ -34,7 +34,7 @@ if "%OEM%"=="hw" ( set BUILD_CTS=true set BUILD_ZJ=true set BUILD_ZG=true - set BUILD_HGNEU=true + set BUILD_NEU=true )else ( set BUILD_HG=true set OEM=hg @@ -102,10 +102,10 @@ if "%BUILD_HG%"=="true" ( if %ERRORLEVEL% neq 0 goto end if "%BUILD_X64%"=="true" call :compile_hg hg x64 ) -if "%BUILD_HGNEU%"=="true" ( - if "%BUILD_X86%"=="true" call :compile_hgneu hgneu x86 +if "%BUILD_NEU%"=="true" ( + if "%BUILD_X86%"=="true" call :compile_neu neu x86 if %ERRORLEVEL% neq 0 goto end - if "%BUILD_X64%"=="true" call :compile_hgneu hgneu x64 + if "%BUILD_X64%"=="true" call :compile_neu neu x64 if %ERRORLEVEL% neq 0 goto end ) goto end @@ -127,7 +127,7 @@ REM parameters for all OEM compiling procedure are: oem cpu if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% EXIT /B 0 -:compile_hgneu +:compile_neu call build_base.bat %1 %2 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% call build_ds.bat %1 %2 100 diff --git a/build_base.bat b/build_base.bat index 793c5e8..3941e5f 100644 --- a/build_base.bat +++ b/build_base.bat @@ -1,5 +1,5 @@ @echo off -echo "Parameter 1:hg | lsc| hw | zj | cts | hgneu" +echo "Parameter 1:hg | lsc| hw | zj | cts | neu" echo "Parameter 2:x86 | x64 " set OEM=%1 @@ -42,9 +42,9 @@ if "%OEM%" equ "cts" ( set CL=/DOEM_CANGTIAN /DBACKEND_NAME=ctssane goto oem ) -if "%OEM%" equ "hgneu" ( - set OEM_DIR=huagaoneu - set CL=/DOEM_HUAGAO_NEU /DBACKEND_NAME=hgsane +if "%OEM%" equ "neu" ( + set OEM_DIR=neutral + set CL=/DOEM_NEUTRAL /DBACKEND_NAME=hgsane goto oem ) echo "Parameter 1:oem is fail" diff --git a/build_ds.bat b/build_ds.bat index 4cfa020..ab0703d 100644 --- a/build_ds.bat +++ b/build_ds.bat @@ -50,10 +50,10 @@ if "%OEM%" equ "cts" ( set NAME=cumtenn%NAME% goto oem ) -if "%OEM%" equ "hgneu" ( - set OEM_DIR=huagaoneu - set CL=/DOEM_HUAGAO_NEU /DPRODUCT_ID=%PID% - set NAME=%NAME% +if "%OEM%" equ "neu" ( + set OEM_DIR=neutral + set CL=/DOEM_NEUTRAL /DPRODUCT_ID=%PID% + set NAME=neu%NAME% goto oem ) echo "Parameter 1:oem is fail" diff --git a/sln/Release/hgsetver.exe b/sln/Release/hgsetver.exe index 260f06106837a80a017ccef6d1049239abcb280f..b088dcfc6fdbe8d7c97997f5f19f7b45205e9c24 100644 GIT binary patch delta 4604 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 diff --git a/sln/hgsetver/hgsetver.cpp b/sln/hgsetver/hgsetver.cpp index f616fb4..6301d88 100644 --- a/sln/hgsetver/hgsetver.cpp +++ b/sln/hgsetver/hgsetver.cpp @@ -18,7 +18,7 @@ enum oem OEM_CANGTIAN, OEM_ZHONGJING, OEM_ZIGUANG, - OEM_HUAGAO_NEU + OEM_NEUTRAL }; #define GET_ENUM_NAME_W(e, v) \ if(e == v) return L###e; @@ -100,8 +100,8 @@ int main() vendor = OEM_ZHONGJING; else if (wcsicmp(cmd->parameter(L"-oem"), L"zg") == 0) vendor = OEM_ZIGUANG; - else if (wcsicmp(cmd->parameter(L"-oem"), L"hgneu") == 0) - vendor = OEM_HUAGAO_NEU; + else if (wcsicmp(cmd->parameter(L"-oem"), L"neu") == 0) + vendor = OEM_NEUTRAL; else std::wcout << L" OEM '" << cmd->parameter(L"-oem") << L"' is not supported! set as OEM_NONE.\r\n"; @@ -152,7 +152,7 @@ static std::wstring oem_str(oem o) GET_ENUM_NAME_W(OEM_CANGTIAN, o); GET_ENUM_NAME_W(OEM_ZHONGJING, o); GET_ENUM_NAME_W(OEM_ZIGUANG, o); - GET_ENUM_NAME_W(OEM_HUAGAO_NEU, o); + GET_ENUM_NAME_W(OEM_NEUTRAL, o); } static oem from_str(const wchar_t* str) { @@ -163,7 +163,7 @@ static oem from_str(const wchar_t* str) GET_ENUM_VALUE_W(OEM_CANGTIAN, s); GET_ENUM_VALUE_W(OEM_ZHONGJING, s); GET_ENUM_VALUE_W(OEM_ZIGUANG, s); - GET_ENUM_VALUE_W(OEM_HUAGAO_NEU, s); + GET_ENUM_VALUE_W(OEM_NEUTRAL, s); return OEM_NOT; } static int oem_code(oem o) @@ -762,8 +762,8 @@ namespace rc os = L"microtek"; else if (o == OEM_ZIGUANG) os = L"unis"; - else if (o == OEM_HUAGAO_NEU) - os = L"huagaoneu"; + else if (o == OEM_NEUTRAL) + os = L"neutral"; while (len > bgn) { bgn += first.length(); @@ -795,8 +795,8 @@ namespace rc os = L"microtek"; else if (o == OEM_ZIGUANG) os = L"unis"; - else if (o == OEM_HUAGAO_NEU) - os = L"huagaoneu"; + else if (o == OEM_NEUTRAL) + os = L"neutral"; while (len > bgn) { bgn += first.length(); @@ -1145,8 +1145,8 @@ namespace rc target += L"microtek\\"; else if (o == OEM_ZIGUANG) target += L"unis\\"; - else if (o == OEM_HUAGAO_NEU) - target += L"huagaoneu\\"; + else if (o == OEM_NEUTRAL) + target += L"neutral\\"; else target += L"huagao\\"; @@ -1182,8 +1182,8 @@ namespace rc target = L"microtek"; else if (param->o == OEM_ZIGUANG) target = L"unis"; - else if (param->o == OEM_HUAGAO_NEU) - target = L"huagaoneu"; + else if (param->o == OEM_NEUTRAL) + target = L"neutral"; target += tail; while ((bgn = cont.find(first, bgn)) != std::wstring::npos)