From 8402070b49aeb1f93b73a507804d3b75f14aeb75 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Fri, 26 May 2023 14:54:55 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=89=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E5=AF=B9HGTwainUI=E9=93=BE=E6=8E=A5QT=E9=9D=99?= =?UTF-8?q?=E6=80=81=E5=BA=93=202=EF=BC=89=E5=B0=86windows=E5=92=8Clinux?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E7=A8=8B=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.bat | 104 +++++++++++++----- build.sh | 12 +- build2/qt/HGSolutionLinux.pro | 82 ++++++++++++++ .../qt/{HGSolution.pro => HGSolutionWin.pro} | 11 -- 4 files changed, 164 insertions(+), 45 deletions(-) create mode 100644 build2/qt/HGSolutionLinux.pro rename build2/qt/{HGSolution.pro => HGSolutionWin.pro} (88%) diff --git a/build.bat b/build.bat index 88f77494..01052b55 100644 --- a/build.bat +++ b/build.bat @@ -3,45 +3,93 @@ set OEM=%1 cd /d ./build2/qt if "%OEM%" == "hw" ( - %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_HANWANG" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release - %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_HANWANG" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_HANWANG" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_HANWANG" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + + cd /d HGTwainUI + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_HANWANG" -r -tp vc HGTwainUI.pro + MSBuild.exe HWTwainUI.vcxproj /m:8 /p:Configuration=Release + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_HANWANG" -r -tp vc HGTwainUI.pro + MSBuild.exe HWTwainUI.vcxproj /m:8 /p:Configuration=Release + cd /d ../ ) else ( if "%OEM%" == "lsc" ( - %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_LISICHENG" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release - %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_LISICHENG" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_LISICHENG" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_LISICHENG" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + + cd /d HGTwainUI + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_LISICHENG" -r -tp vc HGTwainUI.pro + MSBuild.exe LSCTwainUI.vcxproj /m:8 /p:Configuration=Release + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_LISICHENG" -r -tp vc HGTwainUI.pro + MSBuild.exe LSCTwainUI.vcxproj /m:8 /p:Configuration=Release + cd /d ../ ) else ( if "%OEM%" == "cts" ( - %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_CANGTIAN" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release - %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_CANGTIAN" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_CANGTIAN" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_CANGTIAN" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + + cd /d HGTwainUI + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_CANGTIAN" -r -tp vc HGTwainUI.pro + MSBuild.exe CTSTwainUI.vcxproj /m:8 /p:Configuration=Release + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_CANGTIAN" -r -tp vc HGTwainUI.pro + MSBuild.exe CTSTwainUI.vcxproj /m:8 /p:Configuration=Release + cd /d ../ ) else ( if "%OEM%" == "zj" ( - %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_ZHONGJING" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release - %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_ZHONGJING" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_ZHONGJING" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_ZHONGJING" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + + cd /d HGTwainUI + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_ZHONGJING" -r -tp vc HGTwainUI.pro + MSBuild.exe ZJTwainUI.vcxproj /m:8 /p:Configuration=Release + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_ZHONGJING" -r -tp vc HGTwainUI.pro + MSBuild.exe ZJTwainUI.vcxproj /m:8 /p:Configuration=Release + cd /d ../ ) else ( if "%OEM%" == "zg" ( - %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release - %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + + cd /d HGTwainUI + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGTwainUI.pro + MSBuild.exe ZGTwainUI.vcxproj /m:8 /p:Configuration=Release + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGTwainUI.pro + MSBuild.exe ZGTwainUI.vcxproj /m:8 /p:Configuration=Release + cd /d ../ ) else ( if "%OEM%" == "neu" ( - %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release - %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + + cd /d HGTwainUI + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGTwainUI.pro + MSBuild.exe NEUTwainUI.vcxproj /m:8 /p:Configuration=Release + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGTwainUI.pro + MSBuild.exe NEUTwainUI.vcxproj /m:8 /p:Configuration=Release + cd /d ../ ) else ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGSolutionWin.pro + MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release + + cd /d HGTwainUI + %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro + MSBuild.exe HGTwainUI.vcxproj /m:8 /p:Configuration=Release + %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro + MSBuild.exe HGTwainUI.vcxproj /m:8 /p:Configuration=Release ) ) ) diff --git a/build.sh b/build.sh index c045477d..5ac11951 100755 --- a/build.sh +++ b/build.sh @@ -28,7 +28,7 @@ if [ "${1}" == "hwall" ] || [ "${1}" == "hw" ]|| [ "${1}" == "hwweb" ] || [ "${ if [ "${1}" == "hwall" ]; then - qmake -qt=qt5 -makefile "DEFINES += OEM_HANWANG" HGSolution.pro + qmake -qt=qt5 -makefile "DEFINES += OEM_HANWANG" HGSolutionLinux.pro make -j8 else @@ -76,7 +76,7 @@ elif [ "${1}" == "lscall" ] || [ "${1}" == "lsc" ] || [ "${1}" == "lscweb" ] || if [ "${1}" == "lscall" ]; then - qmake -qt=qt5 -makefile "DEFINES += OEM_LISICHENG" HGSolution.pro + qmake -qt=qt5 -makefile "DEFINES += OEM_LISICHENG" HGSolutionLinux.pro make -j8 else @@ -124,7 +124,7 @@ elif [ "${1}" == "ctsall" ] || [ "${1}" == "cts" ] || [ "${1}" == "ctsweb" ] || if [ "${1}" == "ctsall" ]; then - qmake -qt=qt5 -makefile "DEFINES += OEM_CANGTIAN" HGSolution.pro + qmake -qt=qt5 -makefile "DEFINES += OEM_CANGTIAN" HGSolutionLinux.pro make -j8 else @@ -172,7 +172,7 @@ elif [ "${1}" == "zjall" ] || [ "${1}" == "zj" ] || [ "${1}" == "zjweb" ] || [ " if [ "${1}" == "zjall" ]; then - qmake -qt=qt5 -makefile "DEFINES += OEM_ZHONGJING" HGSolution.pro + qmake -qt=qt5 -makefile "DEFINES += OEM_ZHONGJING" HGSolutionLinux.pro make -j8 else @@ -220,7 +220,7 @@ elif [ "${1}" == "zgall" ] || [ "${1}" == "zg" ] || [ "${1}" == "zgweb" ] || [ " if [ "${1}" == "zgall" ]; then - qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGSolution.pro + qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGSolutionLinux.pro make -j8 else @@ -318,7 +318,7 @@ else else - qmake -qt=qt5 -makefile HGSolution.pro + qmake -qt=qt5 -makefile HGSolutionLinux.pro make -j8 fi diff --git a/build2/qt/HGSolutionLinux.pro b/build2/qt/HGSolutionLinux.pro new file mode 100644 index 00000000..57cabee0 --- /dev/null +++ b/build2/qt/HGSolutionLinux.pro @@ -0,0 +1,82 @@ +TEMPLATE = subdirs + +SUBDIRS += \ + HGBase \ + HGImgFmt \ + HGImgProc \ + HGSaneUI \ + HGSaneUser \ + HGVersion \ + HGScannerLib \ + HGUpload \ + HGWebScan \ + HGWebService \ + HGDemo \ + HGUpgrade \ + HGFWUpgrade \ + HGScanner \ + HGScanner2 + +HGImgFmt.depends = \ + HGBase + +HGImgProc.depends = \ + HGBase \ + HGImgFmt + +HGSaneUI.depends = \ + HGBase + +HGSaneUser.depends = \ + HGBase \ + HGSaneUI + +HGVersion.depends = \ + HGBase + +HGScannerLib.depends = \ + HGBase \ + HGImgFmt \ + HGImgProc + +HGUpload.depends = \ + HGBase + +HGWebScan.depends = \ + HGBase \ + HGImgFmt \ + HGImgProc + +HGWebService.depends = \ + HGBase \ + HGImgFmt \ + HGImgProc + +HGDemo.depends = \ + HGBase \ + HGImgFmt \ + HGImgProc \ + HGSaneUser + +HGUpgrade.depends = \ + HGBase \ + HGVersion + +HGFWUpgrade.depends = \ + HGBase \ + HGImgFmt \ + HGImgProc \ + HGVersion + +HGScanner.depends = \ + HGBase \ + HGImgFmt \ + HGImgProc \ + HGVersion + +HGScanner2.depends = \ + HGBase \ + HGImgFmt \ + HGImgProc \ + HGVersion \ + HGSaneUser diff --git a/build2/qt/HGSolution.pro b/build2/qt/HGSolutionWin.pro similarity index 88% rename from build2/qt/HGSolution.pro rename to build2/qt/HGSolutionWin.pro index aa647182..007f6765 100644 --- a/build2/qt/HGSolution.pro +++ b/build2/qt/HGSolutionWin.pro @@ -4,8 +4,6 @@ SUBDIRS += \ HGBase \ HGImgFmt \ HGImgProc \ - HGSaneUI \ - HGSaneUser \ HGTwainUI \ HGTwainUser \ HGVersion \ @@ -25,13 +23,6 @@ HGImgFmt.depends = \ HGImgProc.depends = \ HGBase \ HGImgFmt - -HGSaneUI.depends = \ - HGBase - -HGSaneUser.depends = \ - HGBase \ - HGSaneUI HGTwainUI.depends = \ HGBase @@ -65,7 +56,6 @@ HGDemo.depends = \ HGBase \ HGImgFmt \ HGImgProc \ - HGSaneUser \ HGTwainUser HGUpgrade.depends = \ @@ -89,5 +79,4 @@ HGScanner2.depends = \ HGImgFmt \ HGImgProc \ HGVersion \ - HGSaneUser \ HGTwainUser