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

调整紫光命名

This commit is contained in:
luoliangyi 2023-03-10 18:20:21 +08:00
parent 570ef4625a
commit 8958ebf9bb
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.bat
View File

@ -103,7 +103,7 @@ if "%OEM%" == "hw" (
cd /d ZGScanner32 cd /d ZGScanner32
%QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro
) )
MSBuild.exe UniscanScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% MSBuild.exe UniScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH%
cd /d ../ cd /d ../
) else ( ) else (
mkdir HGScanner32 mkdir HGScanner32

4
build/windows/HGScannerLib/HGScannerLib.vcxproj
View File

@ -380,7 +380,7 @@ copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\</
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC> <EnableUAC>false</EnableUAC>
<ModuleDefinitionFile>HGScannerLib.def</ModuleDefinitionFile> <ModuleDefinitionFile>HGScannerLib.def</ModuleDefinitionFile>
<AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/unis/sane.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
@ -592,7 +592,7 @@ copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x64\Release\</
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC> <EnableUAC>false</EnableUAC>
<ModuleDefinitionFile>HGScannerLib.def</ModuleDefinitionFile> <ModuleDefinitionFile>HGScannerLib.def</ModuleDefinitionFile>
<AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/unis/sane.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>

4
build/windows/HGWebScan/HGWebScan.vcxproj
View File

@ -370,7 +370,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel> <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
</Link> </Link>
@ -538,7 +538,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel> <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
</Link> </Link>

4
build/windows/HGWebService/HGWebService.vcxproj
View File

@ -391,7 +391,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel> <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
</Link> </Link>
@ -559,7 +559,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel> <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
</Link> </Link>

2
modules/version/HGVersion.h
View File

@ -13,7 +13,7 @@ HG_DECLARE_HANDLE(HGVersionMgr);
#define HGVERSION_OEMNAME_LANXUM "Lanxum" #define HGVERSION_OEMNAME_LANXUM "Lanxum"
#define HGVERSION_OEMNAME_CUMTENN "Cumtenn" #define HGVERSION_OEMNAME_CUMTENN "Cumtenn"
#define HGVERSION_OEMNAME_MICROTEK "Microtek" #define HGVERSION_OEMNAME_MICROTEK "Microtek"
#define HGVERSION_OEMNAME_UNISCAN "Uniscan" #define HGVERSION_OEMNAME_UNIS "Unis"
#pragma pack(push) #pragma pack(push)
#pragma pack(4) #pragma pack(4)

6
modules/version/HGVersionImpl.cpp
View File

@ -419,6 +419,8 @@ static std::string GetCurrVersion(const std::string& appName, const std::string&
regName = "SOFTWARE\\CumtennScan"; regName = "SOFTWARE\\CumtennScan";
else if (oemName == HGVERSION_OEMNAME_MICROTEK) else if (oemName == HGVERSION_OEMNAME_MICROTEK)
regName = "SOFTWARE\\MicrotekScan"; regName = "SOFTWARE\\MicrotekScan";
else if (oemName == HGVERSION_OEMNAME_UNIS)
regName = "SOFTWARE\\UniScan";
else else
regName = "SOFTWARE\\HuaGoScan"; regName = "SOFTWARE\\HuaGoScan";
@ -448,6 +450,8 @@ static std::string GetCurrVersion(const std::string& appName, const std::string&
appName = "com.cumtennchina.cumtennscan"; appName = "com.cumtennchina.cumtennscan";
else if (oemName == HGVERSION_OEMNAME_MICROTEK) else if (oemName == HGVERSION_OEMNAME_MICROTEK)
appName = "com.microtekchina.microtekscan"; appName = "com.microtekchina.microtekscan";
else if (oemName == HGVERSION_OEMNAME_UNIS)
appName = "com.unischina.uniscan";
else else
appName = "com.huagaochina.huagoscan"; appName = "com.huagaochina.huagoscan";
} }
@ -461,6 +465,8 @@ static std::string GetCurrVersion(const std::string& appName, const std::string&
appName = "scanner-driver-cumtenn"; appName = "scanner-driver-cumtenn";
else if (oemName == HGVERSION_OEMNAME_MICROTEK) else if (oemName == HGVERSION_OEMNAME_MICROTEK)
appName = "scanner-driver-microtek"; appName = "scanner-driver-microtek";
else if (oemName == HGVERSION_OEMNAME_UNIS)
appName = "scanner-driver-unis";
else else
appName = "scanner-driver-huagao"; appName = "scanner-driver-huagao";
} }