diff --git a/win/setup/scanner/MicrotekScan_Twain_Setup.iss b/win/setup/scanner/MicrotekScan_Twain_Setup.iss index 9033202..b3ea77e 100644 --- a/win/setup/scanner/MicrotekScan_Twain_Setup.iss +++ b/win/setup/scanner/MicrotekScan_Twain_Setup.iss @@ -48,6 +48,8 @@ chinese_simp.MyAppPublisher= [Files] +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; @@ -80,10 +82,10 @@ Source: "..\..\x64\Release\tessdata\*"; DestDir: "{win}\twain_64\MicrotekTwain\t Source: "..\..\x64\OEM\microtek\microtektwain9200.ds"; DestDir: "{win}\twain_64\MicrotekTwain\"; 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; -Source: "..\..\x86\Release\DPInst32.exe"; DestDir: "{app}\"; Flags: ignoreversion recursesubdirs; Check: not IsWin64 -Source: "..\..\x64\Release\DPInst64.exe"; DestDir: "{app}\"; Flags: ignoreversion recursesubdirs; Check: IsWin64 +Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.inf"; DestDir: "{win}\twain_32\MicrotekTwain\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.cat"; DestDir: "{win}\twain_32\MicrotekTwain\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\x86\Release\DPInst32.exe"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion recursesubdirs; Check: not IsWin64 +Source: "..\..\x64\Release\DPInst64.exe"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion recursesubdirs; Check: IsWin64 [INI] @@ -113,7 +115,7 @@ procedure CurPageChanged(CurPageID: Integer); begin if CurPageID = wpFinished then begin - SetUninstallIcon(ExpandConstant('{app}\MicrotekScan_App.ico')); + SetUninstallIcon(ExpandConstant('{win}\twain_32\MicrotekTwain\MicrotekScan_App.ico')); end; end; @@ -127,7 +129,7 @@ begin end; [Run] -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: "{win}\twain_32\MicrotekTwain\DPInst32"; Parameters: "/path ""{win}\twain_32\MicrotekTwain\driver"" /sw /se /lm /f"; Check: not IsWin64; Flags: runascurrentuser +Filename: "{win}\twain_32\MicrotekTwain\DPInst64"; Parameters: "/path ""{win}\twain_32\MicrotekTwain\driver"" /sw /se /lm /f"; Check: IsWin64; Flags: runascurrentuser -[UninstallRun] ;Filename: "{app}\DPInst32"; Parameters: "/u ""{app}\driver\Microtek_A3HG_scanner_usb.inf"" /q /d"; Check: not IsWin64; Flags: runascurrentuser ;Filename: "{app}\DPInst64"; Parameters: "/u ""{app}\driver\Microtek_A3HG_scanner_usb.inf"" /q /d"; Check: IsWin64; Flags: runascurrentuser \ No newline at end of file +[UninstallRun] ;Filename: "{win}\twain_32\MicrotekTwain\DPInst32"; Parameters: "/u ""{win}\twain_32\MicrotekTwain\driver\Microtek_A3HG_scanner_usb.inf"" /q /d"; Check: not IsWin64; Flags: runascurrentuser ;Filename: "{win}\twain_32\MicrotekTwain\DPInst64"; Parameters: "/u ""{win}\twain_32\MicrotekTwain\driver\Microtek_A3HG_scanner_usb.inf"" /q /d"; Check: IsWin64; Flags: runascurrentuser \ No newline at end of file