From 079c2d6252a95368c80b8f5fe685fac82cc15dcd Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 22 Jan 2024 17:49:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BE=97=E5=8A=9B=E5=92=8C?= =?UTF-8?q?=E7=B4=AB=E5=85=89windows=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0sane.dll=E3=80=81scanner.dll?= =?UTF-8?q?=E7=AD=89=E5=BA=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- win/setup/scanner/DeliScan2_App_Setup.iss | 20 ++++++++++---------- win/setup/scanner/UniScan2_App_Setup.iss | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/win/setup/scanner/DeliScan2_App_Setup.iss b/win/setup/scanner/DeliScan2_App_Setup.iss index 5aebf7a..4f48072 100644 --- a/win/setup/scanner/DeliScan2_App_Setup.iss +++ b/win/setup/scanner/DeliScan2_App_Setup.iss @@ -1,6 +1,6 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#define MyAppVersion GetFileVersion('..\..\x64\OEM\deli\sane.dll') +#define MyAppVersion GetFileVersion('..\..\x64\OEM\deli\sanexy.dll') #define MyAppSetupName "DeliScan_App_Setup" #define MyAppDefSetupDir "DELI SCAN" @@ -85,9 +85,9 @@ Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\OEM\deli\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\OEM\deli\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\OEM\deli\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\OEM\deli\sanexy.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\OEM\deli\scannerqd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\OEM\deli\yuyanbao.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: not Is64BitInstallMode ; app64 @@ -125,9 +125,9 @@ Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\deli\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\deli\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\deli\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\deli\sanexy.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\deli\scannerqd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\deli\yuyanbao.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode ;TWAINDSM @@ -138,9 +138,9 @@ Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversio ; twain32 Source: "..\..\x86\Release\DLTwainUI.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\DeliScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\VC++\*"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\OEM\deli\sane.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\OEM\deli\scanner.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\OEM\deli\lang.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\OEM\deli\sanexy.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\OEM\deli\scannerqd.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\OEM\deli\yuyanbao.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{win}\twain_32\DeliTwain\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\Release\DLBase.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\Release\DLImgFmt.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode diff --git a/win/setup/scanner/UniScan2_App_Setup.iss b/win/setup/scanner/UniScan2_App_Setup.iss index 484dee1..8a370b5 100644 --- a/win/setup/scanner/UniScan2_App_Setup.iss +++ b/win/setup/scanner/UniScan2_App_Setup.iss @@ -1,7 +1,7 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "紫光扫描软件" -#define MyAppVersion GetFileVersion('..\..\x64\OEM\unis\sane.dll') +#define MyAppVersion GetFileVersion('..\..\x64\OEM\unis\sanexy.dll') #define MyAppSetupName "UniScan_App_Setup" #define MyAppDefSetupDir "UniScan" #define MyAppPublisher "紫光股份有限公司" @@ -79,9 +79,9 @@ Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\OEM\unis\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\OEM\unis\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\OEM\unis\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\OEM\unis\sanexy.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\OEM\unis\scannerqd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\OEM\unis\yuyanbao.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: not Is64BitInstallMode ; app64 Source: "..\..\x64\Release\ZGTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -119,9 +119,9 @@ Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\unis\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\unis\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\unis\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\unis\sanexy.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\unis\scannerqd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\unis\yuyanbao.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode ;TWAINDSM @@ -133,9 +133,9 @@ Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversio Source: "..\..\x86\Release\ZGTwainUI.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\UniScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\VC++\*"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\OEM\unis\sane.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\OEM\unis\scanner.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\OEM\unis\lang.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\OEM\unis\sanexy.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\OEM\unis\scannerqd.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\OEM\unis\yuyanbao.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{win}\twain_32\UnisTwain\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\Release\ZGBase.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\Release\ZGImgFmt.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode