diff --git a/build.bat b/build.bat index 07a8e03c..73218676 100644 --- a/build.bat +++ b/build.bat @@ -3,207 +3,259 @@ set OEM=%1 set ARCH=%2 if "%OEM%" == "hw" ( - MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=HWRelease /p:Platform=%ARCH% + MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=HWRelease /p:Platform=%ARCH% ) else ( if "%OEM%" == "lsc" ( - MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=LSCRelease /p:Platform=%ARCH% + MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=LSCRelease /p:Platform=%ARCH% ) else ( if "%OEM%" == "cts" ( - MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=CTSRelease /p:Platform=%ARCH% + MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=CTSRelease /p:Platform=%ARCH% ) else ( - MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=Release /p:Platform=%ARCH% ) ) ) -cd /d ./build-qt/HGSolution/HGScanner -cp HGScanner.pro HGScannerTmp.pro +cd /d ./build-qt/HGSolution + if "%OEM%" == "hw" ( - sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HGScannerTmp.pro - sed -i "s/HuaGoScan/HanvonScan/g" HGScannerTmp.pro - sed -i "s/huagao/hanvon/g" HGScannerTmp.pro - sed -i "s/HGBase/HWBase/g" HGScannerTmp.pro - sed -i "s/HGImgFmt/HWImgFmt/g" HGScannerTmp.pro - sed -i "s/HGImgProc/HWImgProc/g" HGScannerTmp.pro - sed -i "s/logo.ico/Hanvon_logo1.ico/g" HGScannerTmp.pro + mkdir HWScanner32 + cp HGScanner/HGScanner.pro HWScanner32/HGScanner.pro + sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HWScanner32/HGScanner.pro + sed -i "s/HuaGoScan/HanvonScan/g" HWScanner32/HGScanner.pro + sed -i "s/huagao/hanvon/g" HWScanner32/HGScanner.pro + sed -i "s/HGBase/HWBase/g" HWScanner32/HGScanner.pro + sed -i "s/HGImgFmt/HWImgFmt/g" HWScanner32/HGScanner.pro + sed -i "s/HGImgProc/HWImgProc/g" HWScanner32/HGScanner.pro + sed -i "s/logo.ico/Hanvon_logo1.ico/g" HWScanner32/HGScanner.pro if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScannerTmp.pro + mkdir HWScanner64 + cp HWScanner32/HGScanner.pro HWScanner64/HGScanner.pro + cd /d HWScanner64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScannerTmp.pro + cd /d HWScanner32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro ) - MSBuild.exe HanvonScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe HanvonScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( if "%OEM%" == "lsc" ( - sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGScannerTmp.pro - sed -i "s/HuaGoScan/LanxumScan/g" HGScannerTmp.pro - sed -i "s/huagao/lanxum/g" HGScannerTmp.pro - sed -i "s/HGBase/LSCBase/g" HGScannerTmp.pro - sed -i "s/HGImgFmt/LSCImgFmt/g" HGScannerTmp.pro - sed -i "s/HGImgProc/LSCImgProc/g" HGScannerTmp.pro - sed -i "s/logo.ico/Lanxum_logo.ico/g" HGScannerTmp.pro + mkdir LSCScanner32 + cp HGScanner/HGScanner.pro LSCScanner32/HGScanner.pro + sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" LSCScanner32/HGScanner.pro + sed -i "s/HuaGoScan/LanxumScan/g" LSCScanner32/HGScanner.pro + sed -i "s/huagao/lanxum/g" LSCScanner32/HGScanner.pro + sed -i "s/HGBase/LSCBase/g" LSCScanner32/HGScanner.pro + sed -i "s/HGImgFmt/LSCImgFmt/g" LSCScanner32/HGScanner.pro + sed -i "s/HGImgProc/LSCImgProc/g" LSCScanner32/HGScanner.pro + sed -i "s/logo.ico/Lanxum_logo.ico/g" LSCScanner32/HGScanner.pro if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScannerTmp.pro + mkdir LSCScanner64 + cp LSCScanner32/HGScanner.pro LSCScanner64/HGScanner.pro + cd /d LSCScanner64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScannerTmp.pro + cd /d LSCScanner32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro ) - MSBuild.exe LanxumScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe LanxumScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( if "%OEM%" == "cts" ( - sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGScannerTmp.pro - sed -i "s/HuaGoScan/CumtennScan/g" HGScannerTmp.pro - sed -i "s/huagao/cumtenn/g" HGScannerTmp.pro - sed -i "s/HGBase/CTSBase/g" HGScannerTmp.pro - sed -i "s/HGImgFmt/CTSImgFmt/g" HGScannerTmp.pro - sed -i "s/HGImgProc/CTSImgProc/g" HGScannerTmp.pro - sed -i "s/logo.ico/Cumtenn_logo.ico/g" HGScannerTmp.pro + mkdir CTSScanner32 + cp HGScanner/HGScanner.pro CTSScanner32/HGScanner.pro + sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" CTSScanner32/HGScanner.pro + sed -i "s/HuaGoScan/CumtennScan/g" CTSScanner32/HGScanner.pro + sed -i "s/huagao/cumtenn/g" CTSScanner32/HGScanner.pro + sed -i "s/HGBase/CTSBase/g" CTSScanner32/HGScanner.pro + sed -i "s/HGImgFmt/CTSImgFmt/g" CTSScanner32/HGScanner.pro + sed -i "s/HGImgProc/CTSImgProc/g" CTSScanner32/HGScanner.pro + sed -i "s/logo.ico/Cumtenn_logo.ico/g" CTSScanner32/HGScanner.pro if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScannerTmp.pro + mkdir CTSScanner64 + cp CTSScanner32/HGScanner.pro CTSScanner64/HGScanner.pro + cd /d CTSScanner64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScannerTmp.pro + cd /d CTSScanner32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro ) - MSBuild.exe CumtennScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + 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" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScannerTmp.pro + mkdir HGScanner64 + cp HGScanner32/HGScanner.pro HGScanner64/HGScanner.pro + cd /d HGScanner64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScannerTmp.pro + cd /d HGScanner32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro ) - MSBuild.exe HuaGoScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe HuaGoScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) ) ) -del /f /s /q *.h -del /f /s /q .qmake.stash -del /f /s /q *.rc -del /f /s /q *.vcxproj.filters -del /f /s /q *.vcxproj -rd /s /q debug -rd /s /q release -del /f /s /q HGScannerTmp.pro - - -cd /d ../HGUpgrade - -cp HGUpgrade.pro HGUpgradeTmp.pro if "%OEM%" == "hw" ( - sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HGUpgradeTmp.pro - sed -i "s/HGUpgradeApp/HWUpgradeApp/g" HGUpgradeTmp.pro - sed -i "s/HGBase/HWBase/g" HGUpgradeTmp.pro - sed -i "s/HGVersion/HWVersion/g" HGUpgradeTmp.pro - sed -i "s/logo.ico/Hanvon_logo1.ico/g" HGUpgradeTmp.pro + mkdir HWUpgrade32 + cp HGUpgrade/HGUpgrade.pro HWUpgrade32/HGUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HWUpgrade32/HGUpgrade.pro + sed -i "s/HGUpgradeApp/HWUpgradeApp/g" HWUpgrade32/HGUpgrade.pro + sed -i "s/HGBase/HWBase/g" HWUpgrade32/HGUpgrade.pro + sed -i "s/HGVersion/HWVersion/g" HWUpgrade32/HGUpgrade.pro + sed -i "s/logo.ico/Hanvon_logo1.ico/g" HWUpgrade32/HGUpgrade.pro if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgradeTmp.pro + mkdir HWUpgrade64 + cp HWUpgrade32/HGUpgrade.pro HWUpgrade64/HGUpgrade.pro + cd /d HWUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgradeTmp.pro + cd /d HWUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro ) - MSBuild.exe HWUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe HWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( if "%OEM%" == "lsc" ( - sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGUpgradeTmp.pro - sed -i "s/HGUpgradeApp/LSCUpgradeApp/g" HGUpgradeTmp.pro - sed -i "s/HGBase/LSCBase/g" HGUpgradeTmp.pro - sed -i "s/HGVersion/LSCVersion/g" HGUpgradeTmp.pro - sed -i "s/logo.ico/Lanxum_logo.ico/g" HGUpgradeTmp.pro + mkdir LSCUpgrade32 + cp HGUpgrade/HGUpgrade.pro LSCUpgrade32/HGUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" LSCUpgrade32/HGUpgrade.pro + sed -i "s/HGUpgradeApp/LSCUpgradeApp/g" LSCUpgrade32/HGUpgrade.pro + sed -i "s/HGBase/LSCBase/g" LSCUpgrade32/HGUpgrade.pro + sed -i "s/HGVersion/LSCVersion/g" LSCUpgrade32/HGUpgrade.pro + sed -i "s/logo.ico/Lanxum_logo.ico/g" LSCUpgrade32/HGUpgrade.pro if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgradeTmp.pro + mkdir LSCUpgrade64 + cp LSCUpgrade32/HGUpgrade.pro LSCUpgrade64/HGUpgrade.pro + cd /d LSCUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgradeTmp.pro + cd /d LSCUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro ) - MSBuild.exe LSCUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe LSCUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( if "%OEM%" == "cts" ( - sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGUpgradeTmp.pro - sed -i "s/HGUpgradeApp/CTSUpgradeApp/g" HGUpgradeTmp.pro - sed -i "s/HGBase/CTSBase/g" HGUpgradeTmp.pro - sed -i "s/HGVersion/CTSVersion/g" HGUpgradeTmp.pro - sed -i "s/logo.ico/Cumtenn_logo.ico/g" HGUpgradeTmp.pro + mkdir CTSUpgrade32 + cp HGUpgrade/HGUpgrade.pro CTSUpgrade32/HGUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" CTSUpgrade32/HGUpgrade.pro + sed -i "s/HGUpgradeApp/CTSUpgradeApp/g" CTSUpgrade32/HGUpgrade.pro + sed -i "s/HGBase/CTSBase/g" CTSUpgrade32/HGUpgrade.pro + sed -i "s/HGVersion/CTSVersion/g" CTSUpgrade32/HGUpgrade.pro + sed -i "s/logo.ico/Cumtenn_logo.ico/g" CTSUpgrade32/HGUpgrade.pro if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgradeTmp.pro + mkdir CTSUpgrade64 + cp CTSUpgrade32/HGUpgrade.pro CTSUpgrade64/HGUpgrade.pro + cd /d CTSUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgradeTmp.pro + cd /d CTSUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro ) - MSBuild.exe CTSUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + 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" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgradeTmp.pro + mkdir HGUpgrade64 + cp HGUpgrade32/HGUpgrade.pro HGUpgrade64/HGUpgrade.pro + cd /d HGUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgradeTmp.pro + cd /d HGUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro ) - MSBuild.exe HGUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe HGUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) ) ) -del /f /s /q *.h -del /f /s /q .qmake.stash -del /f /s /q *.rc -del /f /s /q *.vcxproj.filters -del /f /s /q *.vcxproj -rd /s /q debug -rd /s /q release -del /f /s /q HGUpgradeTmp.pro -cd /d ../HGFWUpgrade - -cp HGFWUpgrade.pro HGFWUpgradeTmp.pro if "%OEM%" == "hw" ( - sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HGFWUpgradeTmp.pro - sed -i "s/HGFWUpgradeApp/HWFWUpgradeApp/g" HGFWUpgradeTmp.pro - sed -i "s/huagao/hanvon/g" HGFWUpgradeTmp.pro - sed -i "s/HGBase/HWBase/g" HGFWUpgradeTmp.pro - sed -i "s/HGVersion/HWVersion/g" HGFWUpgradeTmp.pro - sed -i "s/logo.ico/Hanvon_logo1.ico/g" HGFWUpgradeTmp.pro + mkdir HWFWUpgrade32 + cp HGFWUpgrade/HGFWUpgrade.pro HWFWUpgrade32/HGFWUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HWFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGFWUpgradeApp/HWFWUpgradeApp/g" HWFWUpgrade32/HGFWUpgrade.pro + sed -i "s/huagao/hanvon/g" HWFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGBase/HWBase/g" HWFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGVersion/HWVersion/g" HWFWUpgrade32/HGFWUpgrade.pro + sed -i "s/logo.ico/Hanvon_logo1.ico/g" HWFWUpgrade32/HGFWUpgrade.pro if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgradeTmp.pro + mkdir HWFWUpgrade64 + cp HWFWUpgrade32/HGFWUpgrade.pro HWFWUpgrade64/HGFWUpgrade.pro + cd /d HWFWUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgradeTmp.pro + cd /d HWFWUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro ) - MSBuild.exe HWFWUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe HWFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( if "%OEM%" == "lsc" ( - sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGFWUpgradeTmp.pro - sed -i "s/HGFWUpgradeApp/LSCFWUpgradeApp/g" HGFWUpgradeTmp.pro - sed -i "s/huagao/lanxum/g" HGFWUpgradeTmp.pro - sed -i "s/HGBase/LSCBase/g" HGFWUpgradeTmp.pro - sed -i "s/HGVersion/LSCVersion/g" HGFWUpgradeTmp.pro - sed -i "s/logo.ico/Lanxum_logo.ico/g" HGFWUpgradeTmp.pro + mkdir LSCFWUpgrade32 + cp HGFWUpgrade/HGFWUpgrade.pro LSCFWUpgrade32/HGFWUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" LSCFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGFWUpgradeApp/LSCFWUpgradeApp/g" LSCFWUpgrade32/HGFWUpgrade.pro + sed -i "s/huagao/lanxum/g" LSCFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGBase/LSCBase/g" LSCFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGVersion/LSCVersion/g" LSCFWUpgrade32/HGFWUpgrade.pro + sed -i "s/logo.ico/Lanxum_logo.ico/g" LSCFWUpgrade32/HGFWUpgrade.pro if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgradeTmp.pro + mkdir LSCFWUpgrade64 + cp LSCFWUpgrade32/HGFWUpgrade.pro LSCFWUpgrade64/HGFWUpgrade.pro + cd /d LSCFWUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgradeTmp.pro + cd /d LSCFWUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro ) - MSBuild.exe LSCFWUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe LSCFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( if "%OEM%" == "cts" ( - sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGFWUpgradeTmp.pro - sed -i "s/HGFWUpgradeApp/CTSFWUpgradeApp/g" HGFWUpgradeTmp.pro - sed -i "s/huagao/cumtenn/g" HGFWUpgradeTmp.pro - sed -i "s/HGBase/CTSBase/g" HGFWUpgradeTmp.pro - sed -i "s/HGVersion/CTSVersion/g" HGFWUpgradeTmp.pro - sed -i "s/logo.ico/Cumtenn_logo.ico/g" HGFWUpgradeTmp.pro + mkdir CTSFWUpgrade32 + cp HGFWUpgrade/HGFWUpgrade.pro CTSFWUpgrade32/HGFWUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" CTSFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGFWUpgradeApp/CTSFWUpgradeApp/g" CTSFWUpgrade32/HGFWUpgrade.pro + sed -i "s/huagao/cumtenn/g" CTSFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGBase/CTSBase/g" CTSFWUpgrade32/HGFWUpgrade.pro + sed -i "s/HGVersion/CTSVersion/g" CTSFWUpgrade32/HGFWUpgrade.pro + sed -i "s/logo.ico/Cumtenn_logo.ico/g" CTSFWUpgrade32/HGFWUpgrade.pro if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgradeTmp.pro + mkdir CTSFWUpgrade64 + cp CTSFWUpgrade32/HGFWUpgrade.pro CTSFWUpgrade64/HGFWUpgrade.pro + cd /d CTSFWUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgradeTmp.pro + cd /d CTSFWUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro ) - MSBuild.exe CTSFWUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + 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" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgradeTmp.pro + mkdir HGFWUpgrade64 + cp HGFWUpgrade32/HGFWUpgrade.pro HGFWUpgrade64/HGFWUpgrade.pro + cd /d HGFWUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgradeTmp.pro + cd /d HGFWUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro ) - MSBuild.exe HGFWUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe HGFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) ) ) -del /f /s /q *.h -del /f /s /q .qmake.stash -del /f /s /q *.rc -del /f /s /q *.vcxproj.filters -del /f /s /q *.vcxproj -rd /s /q debug -rd /s /q release -del /f /s /q HGFWUpgradeTmp.pro -cd /d ../../../ +cd /d ../../