From acf689dfae42cdbef43f26685ebbf8eed2bf0223 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Fri, 3 Feb 2023 11:50:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4pro=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87qtcreator=E5=8F=AF=E4=BB=A5=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=90=84=E4=B8=AAoem=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HGSolution/HGFWUpgrade/HGFWUpgrade.pro | 124 ++++++++++++++---- build-qt/HGSolution/HGScanner/HGScanner.pro | 123 +++++++++++++---- build-qt/HGSolution/HGUpgrade/HGUpgrade.pro | 94 ++++++++++--- build.bat | 60 --------- build.sh | 44 ------- 5 files changed, 274 insertions(+), 171 deletions(-) diff --git a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro index e63f3ec7..82cca033 100644 --- a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro +++ b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro @@ -3,7 +3,7 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 - +QMAKE_CXXFLAGS += -std=c++0x # The following define makes your compiler emit warnings if you use # any Qt feature that has been marked deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the @@ -14,23 +14,33 @@ DEFINES += QT_NO_VERSION_TAGGING # OEM definition DEFINES += OEM_HUAGAO -RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/logo.ico - # You can also make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -TARGET = HGFWUpgradeApp +contains(DEFINES, OEM_HANWANG) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico +} +contains(DEFINES, OEM_LISICHENG) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Lanxum_logo.ico +} +contains(DEFINES, OEM_CANGTIAN) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Cumtenn_logo.ico +} +contains(DEFINES, OEM_ZHONGJING) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico +} else { + RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico +} win32 { DEFINES += _CRT_SECURE_NO_WARNINGS QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" - LIBS += -ladvapi32 -lpsapi + LIBS += -ladvapi32 -lpsapi -lsane contains(QT_ARCH, i386) { - LIBS += -L../../../../sdk/lib/win/x86/Release -lHGBase -lHGVersion - LIBS += -L../../../../sdk/lib/win/x86/OEM/huagao -lsane + LIBS += -L../../../../sdk/lib/win/x86/Release CONFIG(release, debug|release) { DESTDIR = ../../../../release/win/x86/Release/ } @@ -39,32 +49,100 @@ win32 { } } contains(QT_ARCH, x86_64){ - LIBS += -L../../../../sdk/lib/win/x64/Release -lHGBase -lHGVersion - LIBS += -L../../../../sdk/lib/win/x64/OEM/huagao -lsane + LIBS += -L../../../../sdk/lib/win/x64/Release CONFIG(release, debug|release) { DESTDIR = ../../../../release/win/x64/Release/ - } - CONFIG(debug, debug|release) { + } + CONFIG(debug, debug|release) { } - } + } + + contains(DEFINES, OEM_HANWANG) { + LIBS += -lHWBase -lHWVersion + TARGET = HWFWUpgradeApp + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/hanvon + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/hanvon + } + } + contains(DEFINES, OEM_LISICHENG) { + LIBS += -lLSCBase -lLSCVersion + TARGET = LSCFWUpgradeApp + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/lanxum + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/lanxum + } + } + contains(DEFINES, OEM_CANGTIAN) { + LIBS += -lCTSBase -lCTSVersion + TARGET = CTSFWUpgradeApp + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/cumtenn + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/cumtenn + } + } + contains(DEFINES, OEM_ZHONGJING) { + LIBS += -lZJBase -lZJVersion + TARGET = ZJFWUpgradeApp + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/microtek + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek + } + } else { + LIBS += -lHGBase -lHGVersion + TARGET = HGFWUpgradeApp + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/huagao + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/huagao + } + } } unix { - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc + LIBS += -llang + QMAKE_LFLAGS += -static-libstdc++ -static-libgcc DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1) message($$DISTRIBUTION) ARCH = $$system(arch) message($$ARCH) - - LIBS += -lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang QMAKE_LFLAGS += -Wl,-rpath=. + contains(DEFINES, OEM_HANWANG){ + LIBS += -lHwBase -lHwVersion -lsane-hwsane -lhwdriver + TARGET = HwFWUpgradeApp + } + contains(DEFINES, OEM_LISICHENG){ + LIBS += -lLscBase -lLscVersion -lsane-lscsane -llscdriver + TARGET = LscFWUpgradeApp + } + contains(DEFINES, OEM_CANGTIAN){ + LIBS += -lCtsBase -lCtsVersion -lsane-ctssane -lctsdriver + TARGET = CtsFWUpgradeApp + } + contains(DEFINES, OEM_ZHONGJING){ + LIBS += -lZjBase -lZjVersion -lsane-zjsane -lzjdriver + TARGET = ZjFWUpgradeApp + } else { + LIBS += -lHGBase -lHGVersion -lsane-hgsane -lhgdriver + TARGET = HGFWUpgradeApp + } + contains(DISTRIBUTION, UnionTech){ message('UOS') DEFINES += UOS contains(ARCH, x86_64){ - LIBS += -L../../../../release/uos/x86_64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/uos/x86_64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/x86_64/ } @@ -73,7 +151,7 @@ unix { } } contains(ARCH, aarch64){ - LIBS += -L../../../../release/uos/aarch64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/uos/aarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/aarch64/ } @@ -82,7 +160,7 @@ unix { } } contains(ARCH, mips64){ - LIBS += -L../../../../release/uos/mips64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/uos/mips64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/mips64/ } @@ -91,7 +169,7 @@ unix { } } contains(ARCH, loongarch64){ - LIBS += -L../../../../release/uos/loongarch64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/uos/loongarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/loongarch64/ } @@ -103,7 +181,7 @@ unix { message('KYLIN') DEFINES += KYLIN contains(ARCH, x86_64){ - LIBS += -L../../../../release/kylin/x86_64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/kylin/x86_64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/x86_64/ } @@ -112,7 +190,7 @@ unix { } } contains(ARCH, aarch64){ - LIBS += -L../../../../release/kylin/aarch64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/kylin/aarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/aarch64/ } @@ -121,7 +199,7 @@ unix { } } contains(ARCH, mips64){ - LIBS += -L../../../../release/kylin/mips64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/kylin/mips64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/mips64/ } @@ -130,7 +208,7 @@ unix { } } contains(ARCH, loongarch64){ - LIBS += -L../../../../release/kylin/loongarch64 #-lHGBase -lHGVersion -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/kylin/loongarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/loongarch64/ } diff --git a/build-qt/HGSolution/HGScanner/HGScanner.pro b/build-qt/HGSolution/HGScanner/HGScanner.pro index 466375e1..cc4207ac 100644 --- a/build-qt/HGSolution/HGScanner/HGScanner.pro +++ b/build-qt/HGSolution/HGScanner/HGScanner.pro @@ -14,22 +14,38 @@ DEFINES += QT_NO_VERSION_TAGGING # OEM definition DEFINES += OEM_HUAGAO -RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico - # You can also make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -TARGET = HuaGoScan +contains(DEFINES, OEM_HANWANG) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico + TARGET = HanvonScan +} +contains(DEFINES, OEM_LISICHENG) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Lanxum_logo.ico + TARGET = LanxumScan +} +contains(DEFINES, OEM_CANGTIAN) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Cumtenn_logo.ico + TARGET = CumtennScan +} +contains(DEFINES, OEM_ZHONGJING) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico + TARGET = MicrotekScan +} else { + RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico + TARGET = HuaGoScan +} win32 { DEFINES += _CRT_SECURE_NO_WARNINGS QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" + LIBS += -ladvapi32 -lpsapi -lsane contains(QT_ARCH, i386) { - LIBS += -L../../../../sdk/lib/win/x86/Release -lHGBase -lHGImgFmt -lHGImgProc - LIBS += -L../../../../sdk/lib/win/x86/OEM/huagao -lsane + LIBS += -L../../../../sdk/lib/win/x86/Release CONFIG(release, debug|release) { DESTDIR = ../../../../release/win/x86/Release/ } @@ -38,33 +54,93 @@ win32 { } } contains(QT_ARCH, x86_64){ - LIBS += -L../../../../sdk/lib/win/x64/Release -lHGBase -lHGImgFmt -lHGImgProc - LIBS += -L../../../../sdk/lib/win/x64/OEM/huagao -lsane + LIBS += -L../../../../sdk/lib/win/x64/Release CONFIG(release, debug|release) { DESTDIR = ../../../../release/win/x64/Release/ - } - CONFIG(debug, debug|release) { + } + CONFIG(debug, debug|release) { } - } + } + + contains(DEFINES, OEM_HANWANG) { + LIBS += -lHWBase -lHWImgFmt -lHWImgProc + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/hanvon + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/hanvon + } + } + contains(DEFINES, OEM_LISICHENG) { + LIBS += -lLSCBase -lLSCImgFmt -lLSCImgProc + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/lanxum + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/lanxum + } + } + contains(DEFINES, OEM_CANGTIAN) { + LIBS += -lCTSBase -lCTSImgFmt -lCTSImgProc + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/cumtenn + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/cumtenn + } + } + contains(DEFINES, OEM_ZHONGJING) { + LIBS += -lZJBase -lZJImgFmt -lZJImgProc + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/microtek + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek + } + } else { + LIBS += -lHGBase -lHGImgFmt -lHGImgProc + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/huagao + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/huagao + } + } } unix { - LIBS += -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang + LIBS += -llang QMAKE_LFLAGS += -static-libstdc++ -static-libgcc DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1) message($$DISTRIBUTION) ARCH = $$system(arch) message($$ARCH) - QMAKE_LFLAGS += -Wl,-rpath=. + contains(DEFINES, OEM_HANWANG){ + LIBS += -lHwBase -lHwImgFmt -lHwImgProc -lsane-hwsane -lhwdriver + } + contains(DEFINES, OEM_LISICHENG){ + LIBS += -lLscBase -lLscImgFmt -lLscImgProc -lsane-lscsane -llscdriver + } + contains(DEFINES, OEM_CANGTIAN){ + LIBS += -lCtsBase -lCtsImgFmt -lCtsImgProc -lsane-ctssane -lctsdriver + } + contains(DEFINES, OEM_ZHONGJING){ + LIBS += -lZjBase -lZjImgFmt -lCZjImgProc -lsane-zjsane -lzjdriver + } + else { + LIBS += -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver + } + contains(DISTRIBUTION, UnionTech){ message('UOS') - DEFINES += UOS + DEFINES += UOS + contains(ARCH, x86_64){ DEFINES += x86_64 - LIBS += -L../../../../release/uos/x86_64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/uos/x86_64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/x86_64/ } @@ -74,7 +150,7 @@ unix { } contains(ARCH, aarch64){ DEFINES += aarch64 - LIBS += -L../../../../release/uos/aarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/uos/aarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/aarch64/ } @@ -84,7 +160,7 @@ unix { } contains(ARCH, mips64){ DEFINES += mips64 - LIBS += -L../../../../release/uos/mips64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/uos/mips64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/mips64/ } @@ -94,7 +170,7 @@ unix { } contains(ARCH, loongarch64){ DEFINES += loongarch64 - LIBS += -L../../../../release/uos/loongarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/uos/loongarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/loongarch64/ } @@ -104,10 +180,11 @@ unix { } }else{ message('KYLIN') - DEFINES += KYLIN + DEFINES += KYLIN + contains(ARCH, x86_64){ DEFINES += x86_64 - LIBS += -L../../../../release/kylin/x86_64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/kylin/x86_64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/x86_64/ } @@ -117,7 +194,7 @@ unix { } contains(ARCH, aarch64){ DEFINES += aarch64 - LIBS += -L../../../../release/kylin/aarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/kylin/aarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/aarch64/ } @@ -127,7 +204,7 @@ unix { } contains(ARCH, mips64){ DEFINES += mips64 - LIBS += -L../../../../release/kylin/mips64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/kylin/mips64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/mips64/ } @@ -135,9 +212,9 @@ unix { } } - contains(ARCH, loongarch64){ + contains(ARCH, loongarch64){ DEFINES += loongarch64 - LIBS += -L../../../../release/kylin/loongarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang + LIBS += -L../../../../release/kylin/loongarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/loongarch64/ } diff --git a/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro b/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro index 1bf0514f..c81fd3f3 100644 --- a/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro +++ b/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro @@ -3,7 +3,7 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 - +QMAKE_CXXFLAGS += -std=c++0x # The following define makes your compiler emit warnings if you use # any Qt feature that has been marked deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the @@ -14,14 +14,25 @@ DEFINES += QT_NO_VERSION_TAGGING # OEM definition DEFINES += OEM_HUAGAO -RC_ICONS = ../../../app/upgrade/image_rsc/logo/logo.ico - # You can also make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -TARGET = HGUpgradeApp +contains(DEFINES, OEM_HANWANG) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico +} +contains(DEFINES, OEM_LISICHENG) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Lanxum_logo.ico +} +contains(DEFINES, OEM_CANGTIAN) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Cumtenn_logo.ico +} +contains(DEFINES, OEM_ZHONGJING) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico +} else { + RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico +} win32 { DEFINES += _CRT_SECURE_NO_WARNINGS @@ -29,7 +40,7 @@ win32 { LIBS += -ladvapi32 -lpsapi contains(QT_ARCH, i386) { - LIBS += -L../../../../sdk/lib/win/x86/Release -lHGBase -lHGVersion + LIBS += -L../../../../sdk/lib/win/x86/Release CONFIG(release, debug|release) { DESTDIR = ../../../../release/win/x86/Release/ } @@ -38,30 +49,70 @@ win32 { } } contains(QT_ARCH, x86_64){ - LIBS += -L../../../../sdk/lib/win/x64/Release -lHGBase -lHGVersion + LIBS += -L../../../../sdk/lib/win/x64/Release CONFIG(release, debug|release) { DESTDIR = ../../../../release/win/x64/Release/ - } - CONFIG(debug, debug|release) { + } + CONFIG(debug, debug|release) { } - } + } + + contains(DEFINES, OEM_HANWANG) { + LIBS += -lHWBase -lHWVersion + TARGET = HWUpgradeApp + } + contains(DEFINES, OEM_LISICHENG) { + LIBS += -lLSCBase -lLSCVersion + TARGET = LSCUpgradeApp + } + contains(DEFINES, OEM_CANGTIAN) { + LIBS += -lCTSBase -lCTSVersion + TARGET = CTSUpgradeApp + } + contains(DEFINES, OEM_ZHONGJING) { + LIBS += -lZJBase -lZJVersion + TARGET = ZJUpgradeApp + } else { + LIBS += -lHGBase -lHGVersion + TARGET = HGUpgradeApp + } } unix { - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc + QMAKE_LFLAGS += -static-libstdc++ -static-libgcc DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1) message($$DISTRIBUTION) ARCH = $$system(arch) message($$ARCH) - QMAKE_LFLAGS += -Wl,-rpath=. + contains(DEFINES, OEM_HANWANG){ + LIBS += -lHwBase -lHwVersion + TARGET = HwUpgradeApp + } + contains(DEFINES, OEM_LISICHENG){ + LIBS += -lLscBase -lLscVersion + TARGET = LscUpgradeApp + } + contains(DEFINES, OEM_CANGTIAN){ + LIBS += -lCtsBase -lCtsVersion + TARGET = CtsUpgradeApp + } + contains(DEFINES, OEM_ZHONGJING){ + LIBS += -lZjBase -lZjVersion + TARGET = ZjUpgradeApp + } else { + LIBS += -lHGBase -lHGVersion + TARGET = HGUpgradeApp + } + contains(DISTRIBUTION, UnionTech){ message('UOS') DEFINES += UOS + contains(ARCH, x86_64){ - LIBS += -L../../../../release/uos/x86_64 -lHGBase -lHGVersion + LIBS += -L../../../../release/uos/x86_64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/x86_64/ } @@ -70,7 +121,7 @@ unix { } } contains(ARCH, aarch64){ - LIBS += -L../../../../release/uos/aarch64 -lHGBase -lHGVersion + LIBS += -L../../../../release/uos/aarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/aarch64/ } @@ -79,7 +130,7 @@ unix { } } contains(ARCH, mips64){ - LIBS += -L../../../../release/uos/mips64 -lHGBase -lHGVersion + LIBS += -L../../../../release/uos/mips64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/mips64/ } @@ -87,8 +138,8 @@ unix { } } - contains(ARCH, loongarch64){ - LIBS += -L../../../../release/uos/loongarch64 -lHGBase -lHGVersion + contains(ARCH, loongarch64){ + LIBS += -L../../../../release/uos/loongarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/uos/loongarch64/ } @@ -99,8 +150,9 @@ unix { }else{ message('KYLIN') DEFINES += KYLIN + contains(ARCH, x86_64){ - LIBS += -L../../../../release/kylin/x86_64 -lHGBase -lHGVersion + LIBS += -L../../../../release/kylin/x86_64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/x86_64/ } @@ -109,7 +161,7 @@ unix { } } contains(ARCH, aarch64){ - LIBS += -L../../../../release/kylin/aarch64 -lHGBase -lHGVersion + LIBS += -L../../../../release/kylin/aarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/aarch64/ } @@ -118,7 +170,7 @@ unix { } } contains(ARCH, mips64){ - LIBS += -L../../../../release/kylin/mips64 -lHGBase -lHGVersion + LIBS += -L../../../../release/kylin/mips64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/mips64/ } @@ -126,8 +178,8 @@ unix { } } - contains(ARCH, loongarch64){ - LIBS += -L../../../../release/kylin/loongarch64 -lHGBase -lHGVersion + contains(ARCH, loongarch64){ + LIBS += -L../../../../release/kylin/loongarch64 CONFIG(release, debug|release) { DESTDIR = ../../../../release/kylin/loongarch64/ } diff --git a/build.bat b/build.bat index 28381626..d35442a8 100644 --- a/build.bat +++ b/build.bat @@ -26,12 +26,6 @@ if "%OEM%" == "hw" ( 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" ( mkdir HWScanner64 cp HWScanner32/HGScanner.pro HWScanner64/HGScanner.pro @@ -48,12 +42,6 @@ if "%OEM%" == "hw" ( 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" ( mkdir LSCScanner64 cp LSCScanner32/HGScanner.pro LSCScanner64/HGScanner.pro @@ -70,12 +58,6 @@ if "%OEM%" == "hw" ( 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" ( mkdir CTSScanner64 cp CTSScanner32/HGScanner.pro CTSScanner64/HGScanner.pro @@ -92,12 +74,6 @@ if "%OEM%" == "hw" ( 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 @@ -132,10 +108,6 @@ if "%OEM%" == "hw" ( 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" ( mkdir HWUpgrade64 cp HWUpgrade32/HGUpgrade.pro HWUpgrade64/HGUpgrade.pro @@ -152,10 +124,6 @@ if "%OEM%" == "hw" ( 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" ( mkdir LSCUpgrade64 cp LSCUpgrade32/HGUpgrade.pro LSCUpgrade64/HGUpgrade.pro @@ -172,10 +140,6 @@ if "%OEM%" == "hw" ( 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" ( mkdir CTSUpgrade64 cp CTSUpgrade32/HGUpgrade.pro CTSUpgrade64/HGUpgrade.pro @@ -192,10 +156,6 @@ if "%OEM%" == "hw" ( 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 @@ -230,11 +190,6 @@ if "%OEM%" == "hw" ( 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" ( mkdir HWFWUpgrade64 cp HWFWUpgrade32/HGFWUpgrade.pro HWFWUpgrade64/HGFWUpgrade.pro @@ -251,11 +206,6 @@ if "%OEM%" == "hw" ( 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" ( mkdir LSCFWUpgrade64 cp LSCFWUpgrade32/HGFWUpgrade.pro LSCFWUpgrade64/HGFWUpgrade.pro @@ -272,11 +222,6 @@ if "%OEM%" == "hw" ( 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" ( mkdir CTSFWUpgrade64 cp CTSFWUpgrade32/HGFWUpgrade.pro CTSFWUpgrade64/HGFWUpgrade.pro @@ -293,11 +238,6 @@ if "%OEM%" == "hw" ( 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 diff --git a/build.sh b/build.sh index 5950966f..30e228c7 100755 --- a/build.sh +++ b/build.sh @@ -227,40 +227,12 @@ else #APP cp HGScanner.pro HGScannerTmp.pro if [ "${1}" == "hw" ]; then sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HGScannerTmp.pro - sed -i "s/hgsane/hwsane/g" HGScannerTmp.pro - sed -i "s/hgdriver/hwdriver/g" HGScannerTmp.pro - sed -i "s/HuaGoScan/HanvonScan/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 elif [ "${1}" == "lsc" ]; then sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGScannerTmp.pro - sed -i "s/hgsane/lscsane/g" HGScannerTmp.pro - sed -i "s/hgdriver/lscdriver/g" HGScannerTmp.pro - sed -i "s/HuaGoScan/LanxumScan/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 elif [ "${1}" == "cts" ]; then sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGScannerTmp.pro - sed -i "s/hgsane/ctssane/g" HGScannerTmp.pro - sed -i "s/hgdriver/ctsdriver/g" HGScannerTmp.pro - sed -i "s/HuaGoScan/CumtennScan/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 elif [ "${1}" == "zj" ]; then sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" HGScannerTmp.pro - sed -i "s/hgsane/zjsane/g" HGScannerTmp.pro - sed -i "s/hgdriver/zjdriver/g" HGScannerTmp.pro - sed -i "s/HuaGoScan/MicrotekScan/g" HGScannerTmp.pro - sed -i "s/HGBase/ZjBase/g" HGScannerTmp.pro - sed -i "s/HGImgFmt/ZjImgFmt/g" HGScannerTmp.pro - sed -i "s/HGImgProc/ZjImgProc/g" HGScannerTmp.pro - sed -i "s/logo.ico/Microtek_logo.ico/g" HGScannerTmp.pro fi qmake -qt=qt5 -makefile HGScannerTmp.pro @@ -277,28 +249,12 @@ else #APP cp HGUpgrade.pro HGUpgradeTmp.pro if [ "${1}" == "hw" ]; then 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 elif [ "${1}" == "lsc" ]; then 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 elif [ "${1}" == "cts" ]; then 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 elif [ "${1}" == "zj" ]; then sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" HGUpgradeTmp.pro - sed -i "s/HGUpgradeApp/ZjUpgradeApp/g" HGUpgradeTmp.pro - sed -i "s/HGBase/ZjBase/g" HGUpgradeTmp.pro - sed -i "s/HGVersion/ZjVersion/g" HGUpgradeTmp.pro - sed -i "s/logo.ico/Microtek_logo.ico/g" HGUpgradeTmp.pro fi qmake -qt=qt5 -makefile HGUpgradeTmp.pro