From d7134512200bad3eff28e159ff7067ebd022ed91 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Thu, 19 Oct 2023 10:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=B7=A5=E5=85=B7=E3=80=81?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=A8=8B=E5=BA=8F=E5=92=8Cwebsdk=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/fwupgrade/resource.h | 16 +++ app/fwupgrade/resource.rc | 170 +++++++++++++++++++++++ app/upgrade/resource.h | 16 +++ app/upgrade/resource.rc | 170 +++++++++++++++++++++++ build.bat | 96 +++++++++++++ build2/qt/HGFWUpgrade/HGFWUpgrade.pro | 35 +---- build2/qt/HGUpgrade/HGUpgrade.pro | 35 +---- build2/qt/HGWebService/HGWebService.pro | 6 +- sdk/webservice/HGWebService.rc | 83 ------------ sdk/webservice/res/DeliScan_App.ico | Bin 0 -> 60038 bytes sdk/webservice/res/NeuScan_App.ico | Bin 0 -> 267230 bytes sdk/webservice/resource.rc | 172 ++++++++++++++++++++++++ 12 files changed, 655 insertions(+), 144 deletions(-) create mode 100644 app/fwupgrade/resource.h create mode 100644 app/fwupgrade/resource.rc create mode 100644 app/upgrade/resource.h create mode 100644 app/upgrade/resource.rc delete mode 100644 sdk/webservice/HGWebService.rc create mode 100644 sdk/webservice/res/DeliScan_App.ico create mode 100644 sdk/webservice/res/NeuScan_App.ico create mode 100644 sdk/webservice/resource.rc diff --git a/app/fwupgrade/resource.h b/app/fwupgrade/resource.h new file mode 100644 index 00000000..fe1b975f --- /dev/null +++ b/app/fwupgrade/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ 生成的包含文件。 +// 供 HGFWUpgrade.rc 使用 +// +#define IDI_ICON1 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/app/fwupgrade/resource.rc b/app/fwupgrade/resource.rc new file mode 100644 index 00000000..062637e4 --- /dev/null +++ b/app/fwupgrade/resource.rc @@ -0,0 +1,170 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// 中文(简体，中国) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +#pragma code_page(936) + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +#if defined(OEM_HANWANG) +IDI_ICON1 ICON "image_rsc\\logo\\Hanvon_logo1.ico" +#elif defined(OEM_LISICHENG) +IDI_ICON1 ICON "image_rsc\\logo\\Lanxum_logo.ico" +#elif defined(OEM_CANGTIAN) +IDI_ICON1 ICON "image_rsc\\logo\\Cumtenn_logo.ico" +#elif defined(OEM_ZHONGJING) +IDI_ICON1 ICON "image_rsc\\logo\\Microtek_logo.ico" +#elif defined(OEM_ZIGUANG) +IDI_ICON1 ICON "image_rsc\\logo\\uniscan.ico" +#elif defined(OEM_NEUTRAL) +IDI_ICON1 ICON "image_rsc\\logo\\NoBrand_logo.ico" +#elif defined(OEM_DELI) +IDI_ICON1 ICON "image_rsc\\logo\\deli.ico" +#else +IDI_ICON1 ICON "image_rsc\\logo\\logo.ico" +#endif + +#endif // 中文(简体，中国) resources +///////////////////////////////////////////////////////////////////////////// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,0,0,0 + PRODUCTVERSION 0,0,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000403a8" + BEGIN + VALUE "FileVersion", "0.0.0.0\0" + VALUE "ProductVersion", "0.0.0.0\0" +#if defined(OEM_HANWANG) + VALUE "ProductName", "HANVONSCAN\0" + VALUE "CompanyName", "汉王科技股份有限公司\0" + VALUE "FileDescription", "汉王扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) HANVONSCAN 2023\0" + VALUE "InternalName", "HWFWUpgrade.exe\0" + VALUE "OriginalFilename", "HWFWUpgrade.exe\0" +#elif defined(OEM_LISICHENG) + VALUE "ProductName", "LANXUMSCAN\0" + VALUE "CompanyName", "立思辰信息科技有限公司\0" + VALUE "FileDescription", "立思辰扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) LANXUMSCAN 2023\0" + VALUE "InternalName", "LSCFWUpgrade.exe\0" + VALUE "OriginalFilename", "LSCFWUpgrade.exe\0" +#elif defined(OEM_CANGTIAN) + VALUE "ProductName", "CUMTENNSCAN\0" + VALUE "CompanyName", "浙江沧田智能信息科技有限公司\0" + VALUE "FileDescription", "沧田扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) CUMTENNSCAN 2023\0" + VALUE "InternalName", "CTSFWUpgrade.exe\0" + VALUE "OriginalFilename", "CTSFWUpgrade.exe\0" +#elif defined(OEM_ZHONGJING) + VALUE "ProductName", "MICROTEKSCAN\0" + VALUE "CompanyName", "Microtek DocWizard EX\0" + VALUE "FileDescription", "Microtek DocWizard EX App\0" + VALUE "LegalCopyright", "Copyright (C) MICROTEKSCAN 2023\0" + VALUE "InternalName", "ZJFWUpgrade.exe\0" + VALUE "OriginalFilename", "ZJFWUpgrade.exe\0" +#elif defined(OEM_ZIGUANG) + VALUE "ProductName", "UNISCAN\0" + VALUE "CompanyName", "紫光股份有限公司\0" + VALUE "FileDescription", "紫光扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) UNISCAN 2023\0" + VALUE "InternalName", "ZGFWUpgrade.exe\0" + VALUE "OriginalFilename", "ZGFWUpgrade.exe\0" +#elif defined(OEM_NEUTRAL) + VALUE "ProductName", "SCANNER\0" + VALUE "CompanyName", "Scanner\0" + VALUE "FileDescription", "Scanner\0" + VALUE "LegalCopyright", "Copyright (C) SCANNER 2023\0" + VALUE "InternalName", "NEUFWUpgrade.exe\0" + VALUE "OriginalFilename", "NEUFWUpgrade.exe\0" +#elif defined(OEM_DELI) + VALUE "ProductName", "DELISCAN\0" + VALUE "CompanyName", "得力信息科技有限公司\0" + VALUE "FileDescription", "得力扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) DELISCAN 2023\0" + VALUE "InternalName", "DLFWUpgrade.exe\0" + VALUE "OriginalFilename", "DLFWUpgrade.exe\0" +#else + VALUE "ProductName", "HUAGOSCAN\0" + VALUE "CompanyName", "宁波华高信息科技有限公司\0" + VALUE "FileDescription", "华高扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) HUAGOSCAN 2023\0" + VALUE "InternalName", "HGFWUpgrade.exe\0" + VALUE "OriginalFilename", "HGFWUpgrade.exe\0" +#endif + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0004, 936 + END + END +/* End of Version info */ + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/app/upgrade/resource.h b/app/upgrade/resource.h new file mode 100644 index 00000000..074a9726 --- /dev/null +++ b/app/upgrade/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ 生成的包含文件。 +// 供 HGUpgrade.rc 使用 +// +#define IDI_ICON1 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/app/upgrade/resource.rc b/app/upgrade/resource.rc new file mode 100644 index 00000000..6568b557 --- /dev/null +++ b/app/upgrade/resource.rc @@ -0,0 +1,170 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// 中文(简体，中国) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +#pragma code_page(936) + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +#if defined(OEM_HANWANG) +IDI_ICON1 ICON "image_rsc\\logo\\Hanvon_logo1.ico" +#elif defined(OEM_LISICHENG) +IDI_ICON1 ICON "image_rsc\\logo\\Lanxum_logo.ico" +#elif defined(OEM_CANGTIAN) +IDI_ICON1 ICON "image_rsc\\logo\\Cumtenn_logo.ico" +#elif defined(OEM_ZHONGJING) +IDI_ICON1 ICON "image_rsc\\logo\\Microtek_logo.ico" +#elif defined(OEM_ZIGUANG) +IDI_ICON1 ICON "image_rsc\\logo\\uniscan.ico" +#elif defined(OEM_NEUTRAL) +IDI_ICON1 ICON "image_rsc\\logo\\NoBrand_logo.ico" +#elif defined(OEM_DELI) +IDI_ICON1 ICON "image_rsc\\logo\\deli.ico" +#else +IDI_ICON1 ICON "image_rsc\\logo\\logo.ico" +#endif + +#endif // 中文(简体，中国) resources +///////////////////////////////////////////////////////////////////////////// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,0,0,0 + PRODUCTVERSION 0,0,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000403a8" + BEGIN + VALUE "FileVersion", "0.0.0.0\0" + VALUE "ProductVersion", "0.0.0.0\0" +#if defined(OEM_HANWANG) + VALUE "ProductName", "HANVONSCAN\0" + VALUE "CompanyName", "汉王科技股份有限公司\0" + VALUE "FileDescription", "汉王扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) HANVONSCAN 2023\0" + VALUE "InternalName", "HWUpgrade.exe\0" + VALUE "OriginalFilename", "HWUpgrade.exe\0" +#elif defined(OEM_LISICHENG) + VALUE "ProductName", "LANXUMSCAN\0" + VALUE "CompanyName", "立思辰信息科技有限公司\0" + VALUE "FileDescription", "立思辰扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) LANXUMSCAN 2023\0" + VALUE "InternalName", "LSCUpgrade.exe\0" + VALUE "OriginalFilename", "LSCUpgrade.exe\0" +#elif defined(OEM_CANGTIAN) + VALUE "ProductName", "CUMTENNSCAN\0" + VALUE "CompanyName", "浙江沧田智能信息科技有限公司\0" + VALUE "FileDescription", "沧田扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) CUMTENNSCAN 2023\0" + VALUE "InternalName", "CTSUpgrade.exe\0" + VALUE "OriginalFilename", "CTSUpgrade.exe\0" +#elif defined(OEM_ZHONGJING) + VALUE "ProductName", "MICROTEKSCAN\0" + VALUE "CompanyName", "Microtek DocWizard EX\0" + VALUE "FileDescription", "Microtek DocWizard EX App\0" + VALUE "LegalCopyright", "Copyright (C) MICROTEKSCAN 2023\0" + VALUE "InternalName", "ZJUpgrade.exe\0" + VALUE "OriginalFilename", "ZJUpgrade.exe\0" +#elif defined(OEM_ZIGUANG) + VALUE "ProductName", "UNISCAN\0" + VALUE "CompanyName", "紫光股份有限公司\0" + VALUE "FileDescription", "紫光扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) UNISCAN 2023\0" + VALUE "InternalName", "ZGUpgrade.exe\0" + VALUE "OriginalFilename", "ZGUpgrade.exe\0" +#elif defined(OEM_NEUTRAL) + VALUE "ProductName", "SCANNER\0" + VALUE "CompanyName", "Scanner\0" + VALUE "FileDescription", "Scanner\0" + VALUE "LegalCopyright", "Copyright (C) SCANNER 2023\0" + VALUE "InternalName", "NEUUpgrade.exe\0" + VALUE "OriginalFilename", "NEUUpgrade.exe\0" +#elif defined(OEM_DELI) + VALUE "ProductName", "DELISCAN\0" + VALUE "CompanyName", "得力信息科技有限公司\0" + VALUE "FileDescription", "得力扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) DELISCAN 2023\0" + VALUE "InternalName", "DLUpgrade.exe\0" + VALUE "OriginalFilename", "DLUpgrade.exe\0" +#else + VALUE "ProductName", "HUAGOSCAN\0" + VALUE "CompanyName", "宁波华高信息科技有限公司\0" + VALUE "FileDescription", "华高扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) HUAGOSCAN 2023\0" + VALUE "InternalName", "HGUpgrade.exe\0" + VALUE "OriginalFilename", "HGUpgrade.exe\0" +#endif + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0004, 936 + END + END +/* End of Version info */ + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/build.bat b/build.bat index bba09445..05b539c8 100644 --- a/build.bat +++ b/build.bat @@ -6,6 +6,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_HANWANG USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 -oemName=OEM_HANWANG + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_HANWANG + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_HANWANG + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 -oemName=OEM_HANWANG MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 cd /d HGTwainUI %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_HANWANG" -r -tp vc HGTwainUI.pro @@ -15,6 +21,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_HANWANG USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -oemName=OEM_HANWANG + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -oemName=OEM_HANWANG + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -oemName=OEM_HANWANG + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -oemName=OEM_HANWANG MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release cd /d HGTwainUI %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_HANWANG" -r -tp vc HGTwainUI.pro @@ -25,6 +37,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_LISICHENG USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 -oemName=OEM_LISICHENG + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_LISICHENG + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_LISICHENG + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 -oemName=OEM_LISICHENG MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 cd /d HGTwainUI %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_LISICHENG" -r -tp vc HGTwainUI.pro @@ -34,6 +52,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_LISICHENG USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -oemName=OEM_LISICHENG + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -oemName=OEM_LISICHENG + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -oemName=OEM_LISICHENG + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -oemName=OEM_LISICHENG MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release cd /d HGTwainUI %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_LISICHENG" -r -tp vc HGTwainUI.pro @@ -44,6 +68,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_CANGTIAN USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 -oemName=OEM_CANGTIAN + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_CANGTIAN + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_CANGTIAN + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 -oemName=OEM_CANGTIAN MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 cd /d HGTwainUI %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_CANGTIAN" -r -tp vc HGTwainUI.pro @@ -53,6 +83,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_CANGTIAN USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -oemName=OEM_CANGTIAN + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -oemName=OEM_CANGTIAN + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -oemName=OEM_CANGTIAN + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -oemName=OEM_CANGTIAN MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release cd /d HGTwainUI %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_CANGTIAN" -r -tp vc HGTwainUI.pro @@ -63,6 +99,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_ZHONGJING USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 -oemName=OEM_ZHONGJING + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_ZHONGJING + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_ZHONGJING + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 -oemName=OEM_ZHONGJING MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 cd /d HGTwainUI %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_ZHONGJING" -r -tp vc HGTwainUI.pro @@ -72,6 +114,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_ZHONGJING USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -oemName=OEM_ZHONGJING + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -oemName=OEM_ZHONGJING + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -oemName=OEM_ZHONGJING + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -oemName=OEM_ZHONGJING MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release cd /d HGTwainUI %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_ZHONGJING" -r -tp vc HGTwainUI.pro @@ -82,6 +130,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_ZIGUANG USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 -oemName=OEM_ZIGUANG + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_ZIGUANG + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_ZIGUANG + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 -oemName=OEM_ZIGUANG MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 cd /d HGTwainUI %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGTwainUI.pro @@ -91,6 +145,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_ZIGUANG USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -oemName=OEM_ZIGUANG + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -oemName=OEM_ZIGUANG + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -oemName=OEM_ZIGUANG + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -oemName=OEM_ZIGUANG MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release cd /d HGTwainUI %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGTwainUI.pro @@ -101,6 +161,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_NEUTRAL USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 -oemName=OEM_NEUTRAL + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_NEUTRAL + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_NEUTRAL + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 -oemName=OEM_NEUTRAL MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 cd /d HGTwainUI %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGTwainUI.pro @@ -110,6 +176,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_NEUTRAL USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -oemName=OEM_NEUTRAL + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -oemName=OEM_NEUTRAL + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -oemName=OEM_NEUTRAL + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -oemName=OEM_NEUTRAL MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release cd /d HGTwainUI %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGTwainUI.pro @@ -120,6 +192,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_DELI USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 -oemName=OEM_DELI + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_DELI + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 -oemName=OEM_DELI + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 -oemName=OEM_DELI MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 cd /d HGTwainUI %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_DELI" -r -tp vc HGTwainUI.pro @@ -129,6 +207,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_DELI USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -oemName=OEM_DELI + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -oemName=OEM_DELI + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -oemName=OEM_DELI + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -oemName=OEM_DELI MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release cd /d HGTwainUI %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_DELI" -r -tp vc HGTwainUI.pro @@ -138,6 +222,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc -cpu=x64 + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc -cpu=x64 + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc -cpu=x64 + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc -cpu=x64 MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release /p:Platform=x64 cd /d HGTwainUI %QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro @@ -147,6 +237,12 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017/bin/qmake "DEFINES += USE_SCRIPT" -r -tp vc HGSolutionWin.pro cp %~dp0\app\scanner2\resource.rc %~dp0\app\scanner2\resourceTmp.rc %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\scanner2\resourceTmp.rc + cp %~dp0\app\fwupgrade\resource.rc %~dp0\app\fwupgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\fwupgrade\resourceTmp.rc + cp %~dp0\app\upgrade\resource.rc %~dp0\app\upgrade\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\app\upgrade\resourceTmp.rc + cp %~dp0\sdk\webservice\resource.rc %~dp0\sdk\webservice\resourceTmp.rc + %~dp0\tools\hgsetver\release\hgsetver.exe -brandFile=%~dp0\..\sdk\include\huagao\brand.h -resourceFile=%~dp0\sdk\webservice\resourceTmp.rc MSBuild.exe HGSolutionWin.sln -t:rebuild /m:8 /p:Configuration=Release cd /d HGTwainUI %QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro diff --git a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro index d204ed25..c8de3148 100644 --- a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro +++ b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro @@ -21,36 +21,6 @@ DEFINES += QT_NO_VERSION_TAGGING include($$PWD/../HGOEM.pri) -if (contains(DEFINES, OEM_HANWANG)) { - RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/Hanvon_logo1.ico -} else { - if (contains(DEFINES, OEM_LISICHENG)) { - RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/Lanxum_logo.ico - } else { - if (contains(DEFINES, OEM_CANGTIAN)) { - RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/Cumtenn_logo.ico - } else { - if (contains(DEFINES, OEM_ZHONGJING)) { - RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/Microtek_logo.ico - } else { - if (contains(DEFINES, OEM_ZIGUANG)) { - RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/uniscan.ico - } else { - if (contains(DEFINES, OEM_NEUTRAL)) { - RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/NoBrand_logo.ico - } else { - if (contains(DEFINES, OEM_DELI)) { - RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/deli.ico - } else { - RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/logo.ico - } - } - } - } - } - } -} - CONFIG(debug, debug|release) { MY_CONFIGURE = Debug } @@ -60,6 +30,11 @@ CONFIG(release, debug|release) { win32 { + if (contains(DEFINES, USE_SCRIPT)) { + RC_FILE += ../../../app/fwupgrade/resourceTmp.rc + } else { + RC_FILE += ../../../app/fwupgrade/resource.rc + } MY_OS = windows TARGET = $${OEM_PREFIX}FWUpgradeApp diff --git a/build2/qt/HGUpgrade/HGUpgrade.pro b/build2/qt/HGUpgrade/HGUpgrade.pro index 3d41fdfb..ac639f9d 100644 --- a/build2/qt/HGUpgrade/HGUpgrade.pro +++ b/build2/qt/HGUpgrade/HGUpgrade.pro @@ -21,36 +21,6 @@ DEFINES += QT_NO_VERSION_TAGGING include($$PWD/../HGOEM.pri) -if (contains(DEFINES, OEM_HANWANG)) { - RC_ICONS = ../../../app/upgrade/image_rsc/logo/Hanvon_logo1.ico -} else { - if (contains(DEFINES, OEM_LISICHENG)) { - RC_ICONS = ../../../app/upgrade/image_rsc/logo/Lanxum_logo.ico - } else { - if (contains(DEFINES, OEM_CANGTIAN)) { - RC_ICONS = ../../../app/upgrade/image_rsc/logo/Cumtenn_logo.ico - } else { - if (contains(DEFINES, OEM_ZHONGJING)) { - RC_ICONS = ../../../app/upgrade/image_rsc/logo/Microtek_logo.ico - } else { - if (contains(DEFINES, OEM_ZIGUANG)) { - RC_ICONS = ../../../app/upgrade/image_rsc/logo/uniscan.ico - } else { - if (contains(DEFINES, OEM_NEUTRAL)) { - RC_ICONS = ../../../app/upgrade/image_rsc/logo/NoBrand_logo.ico - } else { - if (contains(DEFINES, OEM_DELI)) { - RC_ICONS = ../../../app/upgrade/image_rsc/logo/deli.ico - } else { - RC_ICONS = ../../../app/upgrade/image_rsc/logo/logo.ico - } - } - } - } - } - } -} - CONFIG(debug, debug|release) { MY_CONFIGURE = Debug } @@ -60,6 +30,11 @@ CONFIG(release, debug|release) { win32 { + if (contains(DEFINES, USE_SCRIPT)) { + RC_FILE += ../../../app/upgrade/resourceTmp.rc + } else { + RC_FILE += ../../../app/upgrade/resource.rc + } MY_OS = windows TARGET = $${OEM_PREFIX}UpgradeApp diff --git a/build2/qt/HGWebService/HGWebService.pro b/build2/qt/HGWebService/HGWebService.pro index 95e0b5cd..01ce8c5e 100644 --- a/build2/qt/HGWebService/HGWebService.pro +++ b/build2/qt/HGWebService/HGWebService.pro @@ -27,7 +27,11 @@ CONFIG(release, debug|release) { win32 { - RC_FILE += ../../../sdk/webservice/HGWebService.rc + if (contains(DEFINES, USE_SCRIPT)) { + RC_FILE += ../../../sdk/webservice/resourceTmp.rc + } else { + RC_FILE += ../../../sdk/webservice/resource.rc + } DEFINES += CURL_STATICLIB DEFINES += ZIP_STATIC MY_OS = windows diff --git a/sdk/webservice/HGWebService.rc b/sdk/webservice/HGWebService.rc deleted file mode 100644 index e43f85a1..00000000 --- a/sdk/webservice/HGWebService.rc +++ /dev/null @@ -1,83 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// 中文(简体，中国) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -#if defined(OEM_HANWANG) -IDI_ICON_HGWEBSERVICE ICON "res\\HanvonScan_App.ico" -#elif defined(OEM_LISICHENG) -IDI_ICON_HGWEBSERVICE ICON "res\\LanxumScan_App.ico" -#elif defined(OEM_CANGTIAN) -IDI_ICON_HGWEBSERVICE ICON "res\\CumtennScan_App.ico" -#elif defined(OEM_ZHONGJING) -IDI_ICON_HGWEBSERVICE ICON "res\\MicrotekScan_App.ico" -#elif defined(OEM_ZIGUANG) -IDI_ICON_HGWEBSERVICE ICON "res\\UniScan_App.ico" -#else -IDI_ICON_HGWEBSERVICE ICON "res\\HuaGoScan_App.ico" -#endif - -#endif // 中文(简体，中国) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/sdk/webservice/res/DeliScan_App.ico b/sdk/webservice/res/DeliScan_App.ico new file mode 100644 index 0000000000000000000000000000000000000000..7fc788e45b8400c3d8823c36113a94ae80e3f6a7 GIT binary patch literal 60038 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 Z0j&Y80j&Y80j&Y80j&Y8fxv6v{{W7R*8>0m literal 0 HcmV?d00001 diff --git a/sdk/webservice/resource.rc b/sdk/webservice/resource.rc new file mode 100644 index 00000000..c47138cc --- /dev/null +++ b/sdk/webservice/resource.rc @@ -0,0 +1,172 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// 中文(简体，中国) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +#pragma code_page(936) + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +#if defined(OEM_HANWANG) +IDI_ICON_HGWEBSERVICE ICON "res\\HanvonScan_App.ico" +#elif defined(OEM_LISICHENG) +IDI_ICON_HGWEBSERVICE ICON "res\\LanxumScan_App.ico" +#elif defined(OEM_CANGTIAN) +IDI_ICON_HGWEBSERVICE ICON "res\\CumtennScan_App.ico" +#elif defined(OEM_ZHONGJING) +IDI_ICON_HGWEBSERVICE ICON "res\\MicrotekScan_App.ico" +#elif defined(OEM_ZIGUANG) +IDI_ICON_HGWEBSERVICE ICON "res\\UniScan_App.ico" +#elif defined(OEM_NEUTRAL) +IDI_ICON_HGWEBSERVICE ICON "res\\NeuScan_App.ico" +#elif defined(OEM_DELI) +IDI_ICON_HGWEBSERVICE ICON "res\\DeliScan_App.ico" +#else +IDI_ICON_HGWEBSERVICE ICON "res\\HuaGoScan_App.ico" +#endif + +#endif // 中文(简体，中国) resources +///////////////////////////////////////////////////////////////////////////// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,0,0,0 + PRODUCTVERSION 0,0,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000403a8" + BEGIN + VALUE "FileVersion", "0.0.0.0\0" + VALUE "ProductVersion", "0.0.0.0\0" +#if defined(OEM_HANWANG) + VALUE "ProductName", "HANVONSCAN\0" + VALUE "CompanyName", "汉王科技股份有限公司\0" + VALUE "FileDescription", "汉王扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) HANVONSCAN 2023\0" + VALUE "InternalName", "HWWebService.exe\0" + VALUE "OriginalFilename", "HWWebService.exe\0" +#elif defined(OEM_LISICHENG) + VALUE "ProductName", "LANXUMSCAN\0" + VALUE "CompanyName", "立思辰信息科技有限公司\0" + VALUE "FileDescription", "立思辰扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) LANXUMSCAN 2023\0" + VALUE "InternalName", "LSCWebService.exe\0" + VALUE "OriginalFilename", "LSCWebService.exe\0" +#elif defined(OEM_CANGTIAN) + VALUE "ProductName", "CUMTENNSCAN\0" + VALUE "CompanyName", "浙江沧田智能信息科技有限公司\0" + VALUE "FileDescription", "沧田扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) CUMTENNSCAN 2023\0" + VALUE "InternalName", "CTSWebService.exe\0" + VALUE "OriginalFilename", "CTSWebService.exe\0" +#elif defined(OEM_ZHONGJING) + VALUE "ProductName", "MICROTEKSCAN\0" + VALUE "CompanyName", "Microtek DocWizard EX\0" + VALUE "FileDescription", "Microtek DocWizard EX App\0" + VALUE "LegalCopyright", "Copyright (C) MICROTEKSCAN 2023\0" + VALUE "InternalName", "ZJWebService.exe\0" + VALUE "OriginalFilename", "ZJWebService.exe\0" +#elif defined(OEM_ZIGUANG) + VALUE "ProductName", "UNISCAN\0" + VALUE "CompanyName", "紫光股份有限公司\0" + VALUE "FileDescription", "紫光扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) UNISCAN 2023\0" + VALUE "InternalName", "ZGWebService.exe\0" + VALUE "OriginalFilename", "ZGWebService.exe\0" +#elif defined(OEM_NEUTRAL) + VALUE "ProductName", "SCANNER\0" + VALUE "CompanyName", "Scanner\0" + VALUE "FileDescription", "Scanner\0" + VALUE "LegalCopyright", "Copyright (C) SCANNER 2023\0" + VALUE "InternalName", "NEUWebService.exe\0" + VALUE "OriginalFilename", "NEUWebService.exe\0" +#elif defined(OEM_DELI) + VALUE "ProductName", "DELISCAN\0" + VALUE "CompanyName", "得力信息科技有限公司\0" + VALUE "FileDescription", "得力扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) DELISCAN 2023\0" + VALUE "InternalName", "DLWebService.exe\0" + VALUE "OriginalFilename", "DLWebService.exe\0" +#else + VALUE "ProductName", "HUAGOSCAN\0" + VALUE "CompanyName", "宁波华高信息科技有限公司\0" + VALUE "FileDescription", "华高扫描仪应用程序\0" + VALUE "LegalCopyright", "Copyright (C) HUAGOSCAN 2023\0" + VALUE "InternalName", "HGWebService.exe\0" + VALUE "OriginalFilename", "HGWebService.exe\0" +#endif + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0004, 936 + END + END +/* End of Version info */ + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED +