diff --git a/win/setup/scanner/CumtennScan_App_Setup.iss b/win/setup/scanner/CumtennScan_App_Setup.iss index 7e281f2..3e87cf8 100644 --- a/win/setup/scanner/CumtennScan_App_Setup.iss +++ b/win/setup/scanner/CumtennScan_App_Setup.iss @@ -79,9 +79,7 @@ Source: "..\..\x86\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode 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\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 +Source: "..\..\x86\VC++\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\cumtenn\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\cumtenn\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -119,10 +117,7 @@ Source: "..\..\x64\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode 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\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: "..\..\x64\VC++\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\cumtenn\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\cumtenn\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -130,9 +125,7 @@ Source: "..\..\x64\OEM\cumtenn\lang.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode ; twain32 Source: "..\..\..\..\code_app\doc\scanner\CumtennScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\VC++\*.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\cumtenn\sane.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\cumtenn\scanner.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\cumtenn\lang.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -153,9 +146,6 @@ Source: "..\..\x64\OEM\cumtenn\cumtenntwain238.ds"; DestDir: "{win}\twain_64\Cum Source: "..\..\x64\OEM\cumtenn\cumtenntwain6005.ds"; DestDir: "{win}\twain_64\CumtennTwain\"; Flags: ignoreversion; Components: TwainG6005; Check: Is64BitInstallMode Source: "..\..\x64\OEM\cumtenn\cumtenntwain6006.ds"; DestDir: "{win}\twain_64\CumtennTwain\"; Flags: ignoreversion; Components: TwainG6006; 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; Source: "..\..\usb\cumtenn\ctsusbscan.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -305,8 +295,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}\CTSUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Cumtenn -desc=install/upgrade"; Components: Upgrade; Flags: runascurrentuser diff --git a/win/setup/scanner/HanvonScan_App_Setup.iss b/win/setup/scanner/HanvonScan_App_Setup.iss index 0a645bc..581381a 100644 --- a/win/setup/scanner/HanvonScan_App_Setup.iss +++ b/win/setup/scanner/HanvonScan_App_Setup.iss @@ -80,9 +80,7 @@ Source: "..\..\x86\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode 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\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 +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\hanvon\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\hanvon\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -121,10 +119,7 @@ Source: "..\..\x64\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode 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\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: "..\..\x64\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\hanvon\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\hanvon\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -133,9 +128,7 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; twain32 Source: "..\..\..\..\code_app\doc\scanner\HanvonScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\VC++\*"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\hanvon\sane.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\hanvon\scanner.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\hanvon\lang.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -162,9 +155,6 @@ Source: "..\..\x64\OEM\hanvon\hanvontwain7039.ds"; DestDir: "{win}\twain_64\Hanv Source: "..\..\x64\OEM\hanvon\hanvontwain8000.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion; Components: Twain8000; Check: Is64BitInstallMode Source: "..\..\x64\OEM\hanvon\hanvontwain9000.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion; Components: Twain9000; 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; Source: "..\..\usb\hanvon\hanvonusbscan.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -319,8 +309,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}\HWUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Hanvon -desc=install/upgrade"; Components: Upgrade; Flags: runascurrentuser diff --git a/win/setup/scanner/HanvonScan_App_Setup2.iss b/win/setup/scanner/HanvonScan_App_Setup2.iss index 3306d4b..ce6312c 100644 --- a/win/setup/scanner/HanvonScan_App_Setup2.iss +++ b/win/setup/scanner/HanvonScan_App_Setup2.iss @@ -82,9 +82,7 @@ Source: "..\..\x86\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode 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\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 +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\hanvon\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\hanvon\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -126,10 +124,7 @@ Source: "..\..\x64\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode 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\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: "..\..\x64\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\hanvon\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\hanvon\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -139,9 +134,7 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; twain32 Source: "..\..\x86\Release\HWTwainUI.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\HanvonScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\VC++\*"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\hanvon\sane.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\hanvon\scanner.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\hanvon\lang.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -168,9 +161,6 @@ Source: "..\..\x64\OEM\hanvon\hanvontwain7039.ds"; DestDir: "{win}\twain_64\Hanv Source: "..\..\x64\OEM\hanvon\hanvontwain8000.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion; Components: Twain8000; Check: Is64BitInstallMode Source: "..\..\x64\OEM\hanvon\hanvontwain9000.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion; Components: Twain9000; 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; Source: "..\..\usb\hanvon\hanvonusbscan.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -325,8 +315,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}\HWUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Hanvon -desc=install/upgrade"; Components: Upgrade; Flags: runascurrentuser diff --git a/win/setup/scanner/HuaGoScan2_App_Setup.iss b/win/setup/scanner/HuaGoScan2_App_Setup.iss index 5b95aa1..346f01e 100644 --- a/win/setup/scanner/HuaGoScan2_App_Setup.iss +++ b/win/setup/scanner/HuaGoScan2_App_Setup.iss @@ -107,9 +107,7 @@ Source: "..\..\x86\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode 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\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 +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\huagao\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\huagao\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -152,10 +150,7 @@ Source: "..\..\x64\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode 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\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: "..\..\x64\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\huagao\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\huagao\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -165,9 +160,7 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; twain32 Source: "..\..\x86\Release\HGTwainUI.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\HuaGoScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\VC++\*"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\huagao\sane.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\huagao\scanner.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\huagao\lang.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -188,9 +181,6 @@ Source: "..\..\x64\OEM\huagao\huagaotwain200.ds"; DestDir: "{win}\twain_64\HuaGo Source: "..\..\x64\OEM\huagao\huagaotwain300.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion; Components: TwainG300; Check: Is64BitInstallMode Source: "..\..\x64\OEM\huagao\huagaotwain400.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion; Components: TwainG400; 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; Source: "..\..\usb\huagao\huagaousb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -358,8 +348,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}\HGUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Huago -desc=install/upgrade"; Components: Upgrade; Flags: runascurrentuser diff --git a/win/setup/scanner/HuaGoScan_App_Setup.iss b/win/setup/scanner/HuaGoScan_App_Setup.iss index 246f9ea..e654bc0 100644 --- a/win/setup/scanner/HuaGoScan_App_Setup.iss +++ b/win/setup/scanner/HuaGoScan_App_Setup.iss @@ -105,9 +105,7 @@ Source: "..\..\x86\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode 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\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 +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\huagao\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\huagao\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -147,10 +145,7 @@ Source: "..\..\x64\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode 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\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: "..\..\x64\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\huagao\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\huagao\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -159,9 +154,7 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; twain32 Source: "..\..\..\..\code_app\doc\scanner\HuaGoScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\VC++\*"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\huagao\sane.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\huagao\scanner.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\huagao\lang.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -182,9 +175,6 @@ Source: "..\..\x64\OEM\huagao\huagaotwain200.ds"; DestDir: "{win}\twain_64\HuaGo Source: "..\..\x64\OEM\huagao\huagaotwain300.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion; Components: TwainG300; Check: Is64BitInstallMode Source: "..\..\x64\OEM\huagao\huagaotwain400.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion; Components: TwainG400; 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; Source: "..\..\usb\huagao\huagaousb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -352,8 +342,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}\HGUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Huago -desc=install/upgrade"; Components: Upgrade; Flags: runascurrentuser diff --git a/win/setup/scanner/LanxumScan_App_Setup.iss b/win/setup/scanner/LanxumScan_App_Setup.iss index 1e769d5..f369e7c 100644 --- a/win/setup/scanner/LanxumScan_App_Setup.iss +++ b/win/setup/scanner/LanxumScan_App_Setup.iss @@ -81,9 +81,7 @@ Source: "..\..\x86\Release\LSCImgProc.dll"; DestDir: "{app}\"; Flags: ignorevers ;Source: "..\..\x86\Release\LSCVersion.dll"; DestDir: "{app}\"; Flags: ignoreversion; Components: Upgrade; Check: not Is64BitInstallMode Source: "..\..\x86\Release\libmupdf.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\pdflib.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 +Source: "..\..\x86\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\lanxum\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\lanxum\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\lanxum\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -122,10 +120,7 @@ Source: "..\..\x64\Release\LSCImgProc.dll"; DestDir: "{app}\"; Flags: ignorevers ;Source: "..\..\x64\Release\LSCVersion.dll"; DestDir: "{app}\"; Flags: ignoreversion; Components: Upgrade; Check: Is64BitInstallMode Source: "..\..\x64\Release\libmupdf.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\pdflib.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: "..\..\x64\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\lanxum\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\lanxum\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\lanxum\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -133,9 +128,7 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; twain32 Source: "..\..\..\..\code_app\doc\scanner\LanxumScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\VC++\*"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\lanxum\sane.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\lanxum\scanner.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\lanxum\lang.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -156,9 +149,6 @@ Source: "..\..\x64\OEM\lanxum\lanxumtwain8520.ds"; DestDir: "{win}\twain_64\Lanx Source: "..\..\x64\OEM\lanxum\lanxumtwain8620.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion; Components: TwainG62S; Check: Is64BitInstallMode Source: "..\..\x64\OEM\lanxum\lanxumtwain8730.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion; Components: TwainG73S; 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; Source: "..\..\usb\lanxum\lanxumusb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -322,8 +312,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}\LSCUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Lanxum -desc=install/upgrade"; Components: Upgrade; Flags: runascurrentuser diff --git a/win/setup/scanner/MicrotekScan_App_Setup.iss b/win/setup/scanner/MicrotekScan_App_Setup.iss index 1f65188..f260e95 100644 --- a/win/setup/scanner/MicrotekScan_App_Setup.iss +++ b/win/setup/scanner/MicrotekScan_App_Setup.iss @@ -95,9 +95,7 @@ Source: "..\..\x86\Release\ZJImgFmt.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x86\Release\ZJImgProc.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\libmupdf.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\pdflib.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 +Source: "..\..\x86\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\microtek\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\microtek\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\microtek\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -134,18 +132,12 @@ Source: "..\..\x64\Release\ZJImgFmt.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x64\Release\ZJImgProc.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\libmupdf.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\pdflib.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: "..\..\x64\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\microtek\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\microtek\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\microtek\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; 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; Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -296,8 +288,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}\MicrotekScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=english"; Flags: postinstall nowait skipifsilent runascurrentuser; Languages: english diff --git a/win/setup/scanner/MicrotekScan_Tools.iss b/win/setup/scanner/MicrotekScan_Tools.iss index 563c288..393c4b6 100644 --- a/win/setup/scanner/MicrotekScan_Tools.iss +++ b/win/setup/scanner/MicrotekScan_Tools.iss @@ -38,9 +38,7 @@ chinese_simp.MyAppPublisher= ; app Source: ".\MicrotekScan_App.ico"; DestDir: "{app}\"; Flags: ignoreversion Source: "..\..\x86\Release\microtek-tool\*"; DestDir: "{app}\"; Flags: ignoreversion recursesubdirs - -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: "..\..\x86\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion ;申唄駁強 Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -83,8 +81,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}\After_sales_tool.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Flags: postinstall nowait skipifsilent runascurrentuser; Languages: chinese_simp \ No newline at end of file diff --git a/win/setup/scanner/MicrotekScan_Twain_Setup.iss b/win/setup/scanner/MicrotekScan_Twain_Setup.iss index b5c233d..599ebee 100644 --- a/win/setup/scanner/MicrotekScan_Twain_Setup.iss +++ b/win/setup/scanner/MicrotekScan_Twain_Setup.iss @@ -51,9 +51,7 @@ chinese_simp.MyAppPublisher= Source: ".\MicrotekScan_App.ico"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion ; twain32 Source: "..\..\..\..\code_app\doc\scanner\MicrotekScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; +Source: "..\..\x86\VC++\*.dll"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; Source: "..\..\x86\OEM\microtek\sane.dll"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; Source: "..\..\x86\OEM\microtek\scanner.dll"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; Source: "..\..\x86\OEM\microtek\lang.dll"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; @@ -68,9 +66,7 @@ Source: "..\..\x86\Release\microtek-settings\*"; DestDir: "{win}\twain_32\Microt ; twain64 Source: "..\..\..\..\code_app\doc\scanner\MicrotekScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_64\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\msvcp140.dll"; DestDir: "{win}\twain_64\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\vcruntime140.dll"; DestDir: "{win}\twain_64\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\concrt140.dll"; DestDir: "{win}\twain_64\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\VC++\*"; DestDir: "{win}\twain_64\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\microtek\sane.dll"; DestDir: "{win}\twain_64\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\microtek\scanner.dll"; DestDir: "{win}\twain_64\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\microtek\lang.dll"; DestDir: "{win}\twain_64\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode diff --git a/win/setup/scanner/NeuScan_App_Setup.iss b/win/setup/scanner/NeuScan_App_Setup.iss index 7265ffd..54b7aca 100644 --- a/win/setup/scanner/NeuScan_App_Setup.iss +++ b/win/setup/scanner/NeuScan_App_Setup.iss @@ -83,9 +83,7 @@ Source: "..\..\x86\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode 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\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 +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\neutral\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\OEM\neutral\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -122,10 +120,7 @@ Source: "..\..\x64\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode 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\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: "..\..\x64\VC++\*"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\neutral\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\OEM\neutral\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -134,9 +129,7 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; twain32 Source: "..\..\..\..\code_app\doc\scanner\NeuScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\VC++\*"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\neutral\sane.dll"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\neutral\scanner.dll"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\OEM\neutral\lang.dll"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -156,9 +149,6 @@ Source: "..\..\x64\OEM\neutral\neutwain200.ds"; DestDir: "{win}\twain_64\NeuTwai Source: "..\..\x64\OEM\neutral\neutwain300.ds"; DestDir: "{win}\twain_64\NeuTwain\"; Flags: ignoreversion; Components: TwainG300; Check: Is64BitInstallMode Source: "..\..\x64\OEM\neutral\neutwain400.ds"; DestDir: "{win}\twain_64\NeuTwain\"; Flags: ignoreversion; Components: TwainG400; 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; Source: "..\..\usb\huagao\huagaousb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -309,8 +299,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}\NeuScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese"; Flags: postinstall nowait skipifsilent runascurrentuser; Languages: chinese_simp \ No newline at end of file diff --git a/win/setup/scanner/Readme.txt b/win/setup/scanner/Readme.txt index f279263..1720030 100644 --- a/win/setup/scanner/Readme.txt +++ b/win/setup/scanner/Readme.txt @@ -1,9 +1,17 @@ V4.50.23156 1twainsane薊怨・g筝鐚 2app劫鐚windows莪twain鐚巡婚膤紫莪sane鐚 -3appサ莅上鐚紜twain羣鐚サ緒 -4twain薊怨菴綺腓阪鐚綛倶丞ずキ上育鐚 -5莅上割篆≧菴莅丞舟∽ョ鐚 +3appサ莅上鐚紜莅上羣綣合緒 +4app絲弱肴上ュ薊怨ュ剛減桁絨九弱阪井絎綵鐚 +5割篆≧莪器篆≧割綣合Ŭ丞ずapp莉篁九堺篆≧鐚莅丞舟√割...丞ず莅上篆≧鐚 +6サ篋倶篆≧鎛壕罅鐚 +7颷腮紜菴綺腓阪鐚丞ず鋓≧キ筝篌・九丞育鐚 +8鎘菴綺腓阪筝腱渇鐚絋綣絽娯拭鐚荀傑渇鐚 +8鎘紜綣合莚∫膸х鮫鐚 +9app倶羔篋莅上綣腓削app羔篋莅上緒 +10app菴・膃筝佀綣莅上菴・筝罨≧綣莅上鐚 +11莅上羣綛倶綣絋紜綣合腓削 +12app∫罨≧九医上鐚膽ュ上莉順上鋇筝紫√阪傑逸篁ユゅ鎞√♂/鐚 V4.41.23107 1罨≧綣app菴・莅上鐚紜莅上紊筝腓削 diff --git a/win/setup/scanner/UniScan_App_Setup.iss b/win/setup/scanner/UniScan_App_Setup.iss index 9a7ca06..76edb9e 100644 --- a/win/setup/scanner/UniScan_App_Setup.iss +++ b/win/setup/scanner/UniScan_App_Setup.iss @@ -75,9 +75,7 @@ Source: "..\..\x86\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x86\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode 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\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 +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 @@ -115,10 +113,7 @@ Source: "..\..\x64\Release\ofd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Ch Source: "..\..\x64\Release\pdflib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode 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\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: "..\..\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 @@ -127,9 +122,7 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; twain32 Source: "..\..\..\..\code_app\doc\scanner\UniScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\UnisTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\Release\concrt140.dll"; 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 @@ -146,9 +139,6 @@ Source: "..\..\x86\OEM\unis\unistwain210.ds"; DestDir: "{win}\twain_32\UnisTwain Source: "..\..\x64\OEM\unis\unistwain200.ds"; DestDir: "{win}\twain_64\UnisTwain\"; Flags: ignoreversion; Components: TwainG200; Check: Is64BitInstallMode Source: "..\..\x64\OEM\unis\unistwain210.ds"; DestDir: "{win}\twain_64\UnisTwain\"; Flags: ignoreversion; Components: TwainG210; 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\uniscan\uniscanusb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; Source: "..\..\usb\uniscan\uniscanusb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; @@ -298,8 +288,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}\ZGUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Unis -desc=install/upgrade"; Components: Upgrade; Flags: runascurrentuser