From ec2c0cf4d7fd02972a254ce2ac68ef0ccb7bc119 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Sun, 29 Jan 2023 17:32:47 +0800 Subject: [PATCH] =?UTF-8?q?windows=E4=B8=80=E9=94=AE=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=99=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.bat | 138 +++++++++++++++++++++++++++++++++++++------------- build_all.bat | 8 ++- 2 files changed, 111 insertions(+), 35 deletions(-) diff --git a/build.bat b/build.bat index 73218676..28381626 100644 --- a/build.bat +++ b/build.bat @@ -11,7 +11,11 @@ if "%OEM%" == "hw" ( if "%OEM%" == "cts" ( MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=CTSRelease /p:Platform=%ARCH% ) else ( - MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=Release /p:Platform=%ARCH% + if "%OEM%" == "zj" ( + MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=ZJRelease /p:Platform=%ARCH% + ) else ( + MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=Release /p:Platform=%ARCH% + ) ) ) ) @@ -84,19 +88,42 @@ if "%OEM%" == "hw" ( MSBuild.exe CumtennScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% cd /d ../ ) else ( - mkdir HGScanner32 - cp HGScanner/HGScanner.pro HGScanner32/HGScanner.pro - if "%ARCH%" == "x64" ( - mkdir HGScanner64 - cp HGScanner32/HGScanner.pro HGScanner64/HGScanner.pro - cd /d HGScanner64 - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro + if "%OEM%" == "zj" ( + mkdir ZJScanner32 + cp HGScanner/HGScanner.pro ZJScanner32/HGScanner.pro + sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" ZJScanner32/HGScanner.pro + sed -i "s/HuaGoScan/MicrotekScan/g" ZJScanner32/HGScanner.pro + sed -i "s/huagao/microtek/g" ZJScanner32/HGScanner.pro + sed -i "s/HGBase/ZJBase/g" ZJScanner32/HGScanner.pro + sed -i "s/HGImgFmt/ZJImgFmt/g" ZJScanner32/HGScanner.pro + sed -i "s/HGImgProc/ZJImgProc/g" ZJScanner32/HGScanner.pro + sed -i "s/logo.ico/Microtek_logo.ico/g" ZJScanner32/HGScanner.pro + if "%ARCH%" == "x64" ( + mkdir ZJScanner64 + cp ZJScanner32/HGScanner.pro ZJScanner64/HGScanner.pro + cd /d ZJScanner64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro + ) else ( + cd /d ZJScanner32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro + ) + MSBuild.exe MicrotekScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( - cd /d HGScanner32 - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro + mkdir HGScanner32 + cp HGScanner/HGScanner.pro HGScanner32/HGScanner.pro + if "%ARCH%" == "x64" ( + mkdir HGScanner64 + cp HGScanner32/HGScanner.pro HGScanner64/HGScanner.pro + cd /d HGScanner64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro + ) else ( + cd /d HGScanner32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro + ) + MSBuild.exe HuaGoScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) - MSBuild.exe HuaGoScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% - cd /d ../ ) ) ) @@ -161,19 +188,40 @@ if "%OEM%" == "hw" ( MSBuild.exe CTSUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% cd /d ../ ) else ( - mkdir HGUpgrade32 - cp HGUpgrade/HGUpgrade.pro HGUpgrade32/HGUpgrade.pro - if "%ARCH%" == "x64" ( - mkdir HGUpgrade64 - cp HGUpgrade32/HGUpgrade.pro HGUpgrade64/HGUpgrade.pro - cd /d HGUpgrade64 - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro + if "%OEM%" == "zj" ( + mkdir ZJUpgrade32 + cp HGUpgrade/HGUpgrade.pro ZJUpgrade32/HGUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" ZJUpgrade32/HGUpgrade.pro + sed -i "s/HGUpgradeApp/ZJUpgradeApp/g" ZJUpgrade32/HGUpgrade.pro + sed -i "s/HGBase/ZJBase/g" ZJUpgrade32/HGUpgrade.pro + sed -i "s/HGVersion/ZJVersion/g" ZJUpgrade32/HGUpgrade.pro + sed -i "s/logo.ico/Microtek_logo.ico/g" ZJUpgrade32/HGUpgrade.pro + if "%ARCH%" == "x64" ( + mkdir ZJUpgrade64 + cp ZJUpgrade32/HGUpgrade.pro ZJUpgrade64/HGUpgrade.pro + cd /d ZJUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro + ) else ( + cd /d ZJUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro + ) + MSBuild.exe ZJUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( - cd /d HGUpgrade32 - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro + mkdir HGUpgrade32 + cp HGUpgrade/HGUpgrade.pro HGUpgrade32/HGUpgrade.pro + if "%ARCH%" == "x64" ( + mkdir HGUpgrade64 + cp HGUpgrade32/HGUpgrade.pro HGUpgrade64/HGUpgrade.pro + cd /d HGUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro + ) else ( + cd /d HGUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro + ) + MSBuild.exe HGUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) - MSBuild.exe HGUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% - cd /d ../ ) ) ) @@ -241,19 +289,41 @@ if "%OEM%" == "hw" ( MSBuild.exe CTSFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% cd /d ../ ) else ( - mkdir HGFWUpgrade32 - cp HGFWUpgrade/HGFWUpgrade.pro HGFWUpgrade32/HGFWUpgrade.pro - if "%ARCH%" == "x64" ( - mkdir HGFWUpgrade64 - cp HGFWUpgrade32/HGFWUpgrade.pro HGFWUpgrade64/HGFWUpgrade.pro - cd /d HGFWUpgrade64 - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro + if "%OEM%" == "zj" ( + mkdir ZJFWUpgrade32 + cp HGFWUpgrade/HGFWUpgrade.pro ZJFWUpgrade32/HGFWUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" ZJFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGFWUpgradeApp/ZJFWUpgradeApp/g" ZJFWUpgrade32/HGFWUpgrade.pro + sed -i "s/huagao/microtek/g" ZJFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGBase/ZJBase/g" ZJFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGVersion/ZJVersion/g" ZJFWUpgrade32/HGFWUpgrade.pro + sed -i "s/logo.ico/Microtek_logo.ico/g" ZJFWUpgrade32/HGFWUpgrade.pro + if "%ARCH%" == "x64" ( + mkdir ZJFWUpgrade64 + cp ZJFWUpgrade32/HGFWUpgrade.pro ZJFWUpgrade64/HGFWUpgrade.pro + cd /d ZJFWUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro + ) else ( + cd /d ZJFWUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro + ) + MSBuild.exe ZJFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( - cd /d HGFWUpgrade32 - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro + mkdir HGFWUpgrade32 + cp HGFWUpgrade/HGFWUpgrade.pro HGFWUpgrade32/HGFWUpgrade.pro + if "%ARCH%" == "x64" ( + mkdir HGFWUpgrade64 + cp HGFWUpgrade32/HGFWUpgrade.pro HGFWUpgrade64/HGFWUpgrade.pro + cd /d HGFWUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro + ) else ( + cd /d HGFWUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro + ) + MSBuild.exe HGFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) - MSBuild.exe HGFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% - cd /d ../ ) ) ) diff --git a/build_all.bat b/build_all.bat index e8aaa15b..dd9c3952 100644 --- a/build_all.bat +++ b/build_all.bat @@ -22,4 +22,10 @@ echo "step7" call .\build.bat cts x86 echo "step8" -call .\build.bat cts x64 \ No newline at end of file +call .\build.bat cts x64 + +echo "step9" +call .\build.bat zj x86 + +echo "step10" +call .\build.bat zj x64 \ No newline at end of file