Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: InnoSetup/AdblockPlus.iss

Issue 9422198: Exe updater support and bug fixes (Closed)
Patch Set: Created Feb. 28, 2013, 10:37 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « AdBlocker/AdBlocker.vcxproj ('k') | Shared/Config.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ; AdblockPlus installer for 32 & 64 1 ; AdblockPlus installer for 32 & 64
2 2
3 [Setup] 3 [Setup]
4 AppVerName=Adblock Plus 4 AppVerName=avast! Ad Blocker IE
5 AppName=Adblock Plus 5 AppName=avast! Adblocker IE
6 DefaultDirName={pf}\AdblockPlus 6 DefaultDirName={pf}\AVAST Software\avast! Adblocker IE
7 DisableProgramGroupPage=yes 7 DisableProgramGroupPage=yes
8 UninstallDisplayIcon={app}\AdblockPlus 8 UninstallDisplayIcon={app}\avast! Adblocker IE
9 DisableDirPage=yes 9 DisableDirPage=yes
10 LicenseFile={#file AddBackslash(SourcePath) + "License.txt"}
11 10
12 11
13 [Files] 12 [Files]
14 Source: "AdblockPlus32.dll"; DestDir: "{app}" 13 Source: "Adblocker32.dll"; DestDir: "{app}"
15 Source: "AdblockPlus64.dll"; DestDir: "{app}" 14 Source: "Adblocker64.dll"; DestDir: "{app}"
15 Source: "..\html\static\css\*"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Bl ocker\html\static\css"
16 Source: "..\html\static\img\*"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Bl ocker\html\static\img"
17 Source: "..\html\static\js\*"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Blo cker\html\static\js"
18 Source: "..\html\templates\*"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Blo cker\html\templates"
19 Source: "..\AdBlocker\files\settings.ini"; DestDir: "{userappdata}\..\LocalLow\a vast! Ad Blocker"
20 Source: "..\AdBlocker\files\dictionary_w.ini"; DestDir: "{userappdata}\..\LocalL ow\avast! Ad Blocker"
21 Source: "..\AdBlocker\files\settings_page_w.ini"; DestDir: "{userappdata}\..\Loc alLow\avast! Ad Blocker"
16 22
17 [Code] 23 [Code]
18 24
19 procedure CurStepChanged(CurStep: TSetupStep); 25 procedure CurStepChanged(CurStep: TSetupStep);
20 var 26 var
21 ResultCode: Integer; 27 ResultCode: Integer;
22 begin 28 begin
23 if CurStep = ssPostInstall then 29 if CurStep = ssPostInstall then
24 begin 30 begin
25 Exec(ExpandConstant('{sys}') + '\regsvr32', '/s ' + '"' + ExpandConstant('{a pp}') + '\AdblockPlus32.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, Re sultCode); 31 Exec(ExpandConstant('{sys}') + '\regsvr32', '/s ' + '"' + ExpandConstant('{a pp}') + '\Adblocker32.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, Resu ltCode);
26 if IsWin64 then 32 if IsWin64 then
27 Exec(ExpandConstant('{sys}') + '\regsvr32', '/s ' + '"' + ExpandConstant(' {app}') + '\AdblockPlus64.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode); 33 Exec(ExpandConstant('{sys}') + '\regsvr32', '/s ' + '"' + ExpandConstant(' {app}') + '\Adblocker64.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, Re sultCode);
28 end 34 end
29 end; 35 end;
30 36
31 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); 37 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
32 var 38 var
33 ResultCode: Integer; 39 ResultCode: Integer;
34 begin 40 begin
35 if CurUninstallStep = usUninstall then 41 if CurUninstallStep = usUninstall then
36 begin 42 begin
37 Exec(ExpandConstant('{sys}') + '\regsvr32', '/u /s ' + '"' + ExpandConstant( '{app}') + '\AdblockPlus32.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode); 43 Exec(ExpandConstant('{sys}') + '\regsvr32', '/u /s ' + '"' + ExpandConstant( '{app}') + '\Adblocker32.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, R esultCode);
38 if IsWin64 then 44 if IsWin64 then
39 Exec(ExpandConstant('{sys}') + '\regsvr32', '/u /s ' + '"' + ExpandConstan t('{app}') + '\AdblockPlus64.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminate d, ResultCode); 45 Exec(ExpandConstant('{sys}') + '\regsvr32', '/u /s ' + '"' + ExpandConstan t('{app}') + '\Adblocker64.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
40 end 46 end
41 end; 47 end;
OLDNEW
« no previous file with comments | « AdBlocker/AdBlocker.vcxproj ('k') | Shared/Config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld