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 00000000..7fc788e4 Binary files /dev/null and b/sdk/webservice/res/DeliScan_App.ico differ diff --git a/sdk/webservice/res/NeuScan_App.ico b/sdk/webservice/res/NeuScan_App.ico new file mode 100644 index 00000000..569a7ac5 Binary files /dev/null and b/sdk/webservice/res/NeuScan_App.ico differ 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 +