lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1）打包脚本中对HGTwainUI链接QT静态库 

2）将windows和linux的工程分开
This commit is contained in:
luoliangyi 2023-05-26 14:54:55 +08:00
parent 723166e710
commit 8402070b49
4 changed files with 164 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
build.bat
View File

@ -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
)
)
)

12
build.sh
View File

@ -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

82
build2/qt/HGSolutionLinux.pro Normal file
View File

@ -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

11
build2/qt/HGSolution.pro → build2/qt/HGSolutionWin.pro
View File

@ -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