diff --git a/win/setup/scannerlib/CumtennScannerLib_Setup.iss b/win/setup/scannerlib/CumtennScannerLib_Setup.iss index 078252a..629456e 100644 --- a/win/setup/scannerlib/CumtennScannerLib_Setup.iss +++ b/win/setup/scannerlib/CumtennScannerLib_Setup.iss @@ -51,11 +51,24 @@ Source: "..\..\x86\OEM\cumtenn\sane.dll"; DestDir: "{app}\bin\x86\"; Flags: igno Source: "..\..\x86\OEM\cumtenn\scanner.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\OEM\cumtenn\lang.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; Source: "..\..\..\lang\*"; DestDir: "{app}\bin\x86\lang\"; Flags: ignoreversion; +Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\ExportFile.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\FormEx.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\GetPdf.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\GetRtf.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\GetXls.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\hanwangOCRdetect.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\hasp_windows_113819.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\HwOcrSdk.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\libmupdf.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\libzip.org.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\mp30.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\ofd.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; +Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\..\..\sdk\lib\win\x64\Release\CTSScannerLib.lib"; DestDir: "{app}\lib\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\bin\x64\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: IsWin64 @@ -67,12 +80,24 @@ Source: "..\..\x64\OEM\cumtenn\sane.dll"; DestDir: "{app}\bin\x64\"; Flags: igno Source: "..\..\x64\OEM\cumtenn\scanner.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\OEM\cumtenn\lang.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\..\lang\*"; DestDir: "{app}\bin\x64\lang\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\cnocr.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\doc_seg.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\ExportFile.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\FormEx.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\GetPdf.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\GetRtf.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\GetXls.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\hanwangOCRdetect.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\hasp_windows_x64_113819.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\HwOcrSdk.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\libmupdf.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\libzip.org.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\mp30.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\ofd.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 ;拷贝驱动 Source: "..\..\usb\cumtenn\ctsusbscan.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; diff --git a/win/setup/scannerlib/HanvonScannerLib_Setup.iss b/win/setup/scannerlib/HanvonScannerLib_Setup.iss index a7bc573..65dfe28 100644 --- a/win/setup/scannerlib/HanvonScannerLib_Setup.iss +++ b/win/setup/scannerlib/HanvonScannerLib_Setup.iss @@ -70,9 +70,6 @@ Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignore Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; Source: "..\..\..\..\sdk\lib\win\x64\Release\HWScannerLib.lib"; DestDir: "{app}\lib\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\bin\x64\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: IsWin64 @@ -103,10 +100,6 @@ Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignore Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 ;拷贝驱动 Source: "..\..\usb\hanvon\hanvonusbscan.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; diff --git a/win/setup/scannerlib/HuaGoScannerLib_Setup.iss b/win/setup/scannerlib/HuaGoScannerLib_Setup.iss index 329668f..cbe05d5 100644 --- a/win/setup/scannerlib/HuaGoScannerLib_Setup.iss +++ b/win/setup/scannerlib/HuaGoScannerLib_Setup.iss @@ -70,9 +70,6 @@ Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignore Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; Source: "..\..\..\..\sdk\lib\win\x64\Release\HGScannerLib.lib"; DestDir: "{app}\lib\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\bin\x64\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: IsWin64 @@ -103,10 +100,6 @@ Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignore Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 ;拷贝驱动 Source: "..\..\usb\huagao\huagaousb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; diff --git a/win/setup/scannerlib/LanxumScannerLib_Setup.iss b/win/setup/scannerlib/LanxumScannerLib_Setup.iss index 1af3679..359d875 100644 --- a/win/setup/scannerlib/LanxumScannerLib_Setup.iss +++ b/win/setup/scannerlib/LanxumScannerLib_Setup.iss @@ -51,11 +51,24 @@ Source: "..\..\x86\OEM\lanxum\sane.dll"; DestDir: "{app}\bin\x86\"; Flags: ignor Source: "..\..\x86\OEM\lanxum\scanner.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\OEM\lanxum\lang.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; Source: "..\..\..\lang\*"; DestDir: "{app}\bin\x86\lang\"; Flags: ignoreversion; +Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\ExportFile.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\FormEx.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\GetPdf.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\GetRtf.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\GetXls.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\hanwangOCRdetect.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\hasp_windows_113819.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\HwOcrSdk.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\libmupdf.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\libzip.org.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\mp30.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\ofd.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; +Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion +Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\..\..\sdk\lib\win\x64\Release\LSCScannerLib.lib"; DestDir: "{app}\lib\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\bin\x64\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: IsWin64 @@ -67,12 +80,24 @@ Source: "..\..\x64\OEM\lanxum\sane.dll"; DestDir: "{app}\bin\x64\"; Flags: ignor Source: "..\..\x64\OEM\lanxum\scanner.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\OEM\lanxum\lang.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\..\lang\*"; DestDir: "{app}\bin\x64\lang\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\cnocr.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\doc_seg.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\ExportFile.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\FormEx.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\GetPdf.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\GetRtf.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\GetXls.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\hanwangOCRdetect.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\hasp_windows_x64_113819.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\HwOcrSdk.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\libmupdf.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\libzip.org.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\mp30.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\ofd.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 +Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 ;拷贝驱动 Source: "..\..\usb\lanxum\lanxumusb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; diff --git a/win/setup/scannerlib/MicrotekScannerLib_Setup.iss b/win/setup/scannerlib/MicrotekScannerLib_Setup.iss index a22f427..18997f0 100644 --- a/win/setup/scannerlib/MicrotekScannerLib_Setup.iss +++ b/win/setup/scannerlib/MicrotekScannerLib_Setup.iss @@ -70,9 +70,6 @@ Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignore Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\bin\x86\"; Flags: ignoreversion; Source: "..\..\..\..\sdk\lib\win\x64\Release\ZJScannerLib.lib"; DestDir: "{app}\lib\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\bin\x64\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: IsWin64 @@ -103,10 +100,6 @@ Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignore Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 ;拷贝驱动 Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; diff --git a/win/setup/webscan/LanxumWebScan_Setup.iss b/win/setup/webscan/LanxumWebScan_Setup.iss index 1a59690..efa690d 100644 --- a/win/setup/webscan/LanxumWebScan_Setup.iss +++ b/win/setup/webscan/LanxumWebScan_Setup.iss @@ -35,9 +35,7 @@ Name: "zn"; MessagesFile: "compiler:Languages/ChineseSimp.isl" ; app Source: ".\LanxumWebScan.ico"; DestDir: "{app}\"; Flags: ignoreversion - Source: "..\..\x86\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion -Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion Source: "..\..\x86\Release\LSCWebScan.exe"; DestDir: "{app}\"; Flags: ignoreversion Source: "..\..\..\..\code_app\doc\webscan\国产化设备接口函数标准0816.doc"; DestDir: "{app}\doc\"; Flags: ignoreversion @@ -50,14 +48,9 @@ Source: "..\..\x86\OEM\lanxum\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion Source: "..\..\x86\OEM\lanxum\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion Source: "..\..\x86\OEM\lanxum\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; - Source: "..\..\x86\Release\libmupdf.dll"; DestDir: "{app}\"; Flags: ignoreversion Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; - ;拷贝驱动 Source: "..\..\usb\lanxum\lanxumusb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; Source: "..\..\usb\lanxum\lanxumusb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -80,24 +73,16 @@ Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: [Code] -// 卸载前判断进程是否在运行 -function RunTaskU(FileName: string; bFullpath: Boolean): Boolean; - external 'RunTask@{app}/ISTask.dll stdcall delayload uninstallonly'; -function KillTaskU(ExeFileName: string): Integer; - external 'KillTask@{app}/ISTask.dll stdcall delayload uninstallonly'; - function InitializeUninstall(): Boolean; +var + ErrorCode: Integer; +begin + Result := true; + if Exec(ExpandConstant('taskkill.exe'), '/f /im LSCWebScan.exe', '', SW_HIDE, ewWaitUntilTerminated, ErrorCode) then begin - Result:= true; - if RunTaskU('LSCWebScan.exe', false) then - begin - KillTaskU('LSCWebScan.exe'); - Result:= true; - end - else - Result:= true; - UnloadDll(ExpandConstant('{app}/ISTask.dll')); - end; + Result := true; + end +end; function SetUninstallIcon(iconPath:string): Boolean; var diff --git a/win/setup/webservice/CumtennWebSdk_Setup.iss b/win/setup/webservice/CumtennWebSdk_Setup.iss index 4d8d3d1..90024e7 100644 --- a/win/setup/webservice/CumtennWebSdk_Setup.iss +++ b/win/setup/webservice/CumtennWebSdk_Setup.iss @@ -43,7 +43,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; ; app32 Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\CTSWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: not Is64BitInstallMode Source: "..\..\x86\Release\CTSBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -70,14 +69,10 @@ Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode ; app64 Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\CTSWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: Is64BitInstallMode Source: "..\..\x64\Release\CTSBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -104,13 +99,6 @@ Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode - -Source: "..\..\vs\vc_redist.x86.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\vs\vc_redist.x64.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode ;拷贝驱动 Source: "..\..\usb\cumtenn\ctsusbscan.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -171,8 +159,6 @@ begin end; [Run] -Filename: "{app}\vc_redist.x86.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: not Is64BitInstallMode -Filename: "{app}\vc_redist.x64.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: Is64BitInstallMode Filename: "{app}\DPInst32"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: not IsWin64; Flags: runascurrentuser Filename: "{app}\DPInst64"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: IsWin64; Flags: runascurrentuser Filename: "{app}\CTSWebService.exe"; Description: "{cm:LaunchProgram, {#MyAppName}}"; Flags: nowait runascurrentuser \ No newline at end of file diff --git a/win/setup/webservice/HanvonWebSdk_Setup.iss b/win/setup/webservice/HanvonWebSdk_Setup.iss index dcc6c4f..5161a28 100644 --- a/win/setup/webservice/HanvonWebSdk_Setup.iss +++ b/win/setup/webservice/HanvonWebSdk_Setup.iss @@ -43,7 +43,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; ; app32 Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\HWWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: not Is64BitInstallMode Source: "..\..\x86\Release\HWBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -70,14 +69,10 @@ Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode ; app64 Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\HWWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: Is64BitInstallMode Source: "..\..\x64\Release\HWBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -104,13 +99,6 @@ Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode - -Source: "..\..\vs\vc_redist.x86.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\vs\vc_redist.x64.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode ;拷贝驱动 Source: "..\..\usb\hanvon\hanvonusbscan.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -171,8 +159,6 @@ begin end; [Run] -Filename: "{app}\vc_redist.x86.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: not Is64BitInstallMode -Filename: "{app}\vc_redist.x64.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: Is64BitInstallMode Filename: "{app}\DPInst32"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: not IsWin64; Flags: runascurrentuser Filename: "{app}\DPInst64"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: IsWin64; Flags: runascurrentuser Filename: "{app}\HWWebService.exe"; Description: "{cm:LaunchProgram, {#MyAppName}}"; Flags: nowait runascurrentuser \ No newline at end of file diff --git a/win/setup/webservice/HuaGoWebSdk_Setup.iss b/win/setup/webservice/HuaGoWebSdk_Setup.iss index c1aa60b..e658f8d 100644 --- a/win/setup/webservice/HuaGoWebSdk_Setup.iss +++ b/win/setup/webservice/HuaGoWebSdk_Setup.iss @@ -43,7 +43,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; ; app32 Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\HGWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: not Is64BitInstallMode Source: "..\..\x86\Release\HGBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -70,14 +69,10 @@ Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode ; app64 Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\HGWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: Is64BitInstallMode Source: "..\..\x64\Release\HGBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -104,13 +99,6 @@ Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode - -Source: "..\..\vs\vc_redist.x86.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\vs\vc_redist.x64.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode ;拷贝驱动 Source: "..\..\usb\huagao\huagaousb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -170,8 +158,6 @@ begin end; [Run] -Filename: "{app}\vc_redist.x86.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: not Is64BitInstallMode -Filename: "{app}\vc_redist.x64.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: Is64BitInstallMode Filename: "{app}\DPInst32"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: not IsWin64; Flags: runascurrentuser Filename: "{app}\DPInst64"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: IsWin64; Flags: runascurrentuser Filename: "{app}\HGWebService.exe"; Description: "{cm:LaunchProgram, {#MyAppName}}"; Flags: nowait runascurrentuser \ No newline at end of file diff --git a/win/setup/webservice/LanxumWebSdk_Setup.iss b/win/setup/webservice/LanxumWebSdk_Setup.iss index 9e1e68f..ed6714a 100644 --- a/win/setup/webservice/LanxumWebSdk_Setup.iss +++ b/win/setup/webservice/LanxumWebSdk_Setup.iss @@ -43,7 +43,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; ; app32 Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\LSCWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: not Is64BitInstallMode Source: "..\..\x86\Release\LSCBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -70,14 +69,10 @@ Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode ; app64 Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\LSCWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: Is64BitInstallMode Source: "..\..\x64\Release\LSCBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -104,13 +99,6 @@ Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode - -Source: "..\..\vs\vc_redist.x86.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\vs\vc_redist.x64.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode ;拷贝驱动 Source: "..\..\usb\lanxum\lanxumusb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -171,8 +159,6 @@ begin end; [Run] -Filename: "{app}\vc_redist.x86.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: not Is64BitInstallMode -Filename: "{app}\vc_redist.x64.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: Is64BitInstallMode Filename: "{app}\DPInst32"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: not IsWin64; Flags: runascurrentuser Filename: "{app}\DPInst64"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: IsWin64; Flags: runascurrentuser Filename: "{app}\LSCWebService.exe"; Description: "{cm:LaunchProgram, {#MyAppName}}"; Flags: nowait runascurrentuser \ No newline at end of file diff --git a/win/setup/webservice/MicrotekWebSdk_Setup.iss b/win/setup/webservice/MicrotekWebSdk_Setup.iss index bfd8399..a3f79c0 100644 --- a/win/setup/webservice/MicrotekWebSdk_Setup.iss +++ b/win/setup/webservice/MicrotekWebSdk_Setup.iss @@ -43,7 +43,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; ; app32 Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\ZJWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: not Is64BitInstallMode Source: "..\..\x86\Release\ZJBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -70,14 +69,10 @@ Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode ; app64 Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\宋体.ttf"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -;Source: "..\..\x86\Release\IsTask.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\ZJWebService.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion createallsubdirs recursesubdirs; Check: Is64BitInstallMode Source: "..\..\x64\Release\ZJBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -104,13 +99,6 @@ Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140_1.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode - -Source: "..\..\vs\vc_redist.x86.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\vs\vc_redist.x64.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode ;拷贝驱动 Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -171,8 +159,6 @@ begin end; [Run] -Filename: "{app}\vc_redist.x86.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: not Is64BitInstallMode -Filename: "{app}\vc_redist.x64.exe"; Parameters: "/s"; Flags: runascurrentuser; Check: Is64BitInstallMode Filename: "{app}\DPInst32"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: not IsWin64; Flags: runascurrentuser Filename: "{app}\DPInst64"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: IsWin64; Flags: runascurrentuser Filename: "{app}\ZJWebService.exe"; Description: "{cm:LaunchProgram, {#MyAppName}}"; Flags: nowait runascurrentuser \ No newline at end of file