Unified Diff: installer/src/msi/adblockplusie.wxs
Issue 5024350814076928:
Issue 1103 - Migrate Simple Adblock users
Patch Set: Make it less Simple Adblock specific, and add the FRP changes
Created April 16, 2015, 9:52 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« installer/src/custom-action/close_application.cpp ('K')
|
« installer/src/custom-action/close_application.cpp ('k')
|
locales/en.ini » ('j')
|
src/plugin/PluginClass.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: installer/src/msi/adblockplusie.wxs |
| =================================================================== |
| --- a/installer/src/msi/adblockplusie.wxs |
| +++ b/installer/src/msi/adblockplusie.wxs |
| @@ -134,9 +134,18 @@ |
| It's a shame that you to even explicitly make that choice. |
| --> |
| <MajorUpgrade |
| - Schedule="afterInstallExecute" |
| + Schedule="afterInstallInitialize" |
| AllowDowngrades="yes" |
| /> |
| + |
| + <!--Remove Simple Adblock--> |
| + <Property Id="SIMPLEADBLOCKDETECTED" Secure="yes"/> |
| + <Upgrade Id="27D7C170-67AA-40D9-978F-5F14B4D0FEEE"> |
| + <UpgradeVersion |
| + Minimum="0.7.0.0" Maximum="99.0.0.0" |
| + Property="SIMPLEADBLOCKDETECTED" |
| + IncludeMinimum="yes" IncludeMaximum="no" IgnoreRemoveFailure="no"/> |
| + </Upgrade> |
| <MediaTemplate EmbedCab="yes"/> |
| <!-- |
| @@ -173,12 +182,21 @@ |
| DllEntry="AbpCloseIe" |
| Return="check" |
| /> |
| + |
| + <CustomAction |
| + Id="CleanupSimpleAdblock" |
| + Directory="APP_DATA_FOLDER" |
| + ExeCommand="cmd /C "rmdir /s /q ".\Simple Adblock""" |
| + Execute="deferred" |
| + Return="ignore" |
| + HideTarget="no" |
| + Impersonate="no" /> |
| <!-- |
| We require a 32-bit DLL for the 32-bit installer, and likewise for 64-bit. |
| The 64-bit Close_IE action needs to examine 64-bit processes on the system, which are invisible to 32-bit processes. |
| --> |
| <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build_dir)\$(var.CA_Configuration)\installer-ca.dll"/> |
| - <InstallUISequence> |
| + <InstallExecuteSequence> |
| <!-- |
| The LaunchConditions action occurs near the beginning, before any of the expensive operations. |
| --> |
| @@ -186,7 +204,11 @@ |
| Action="Close_IE" |
| After="LaunchConditions" |
| /> |
| - </InstallUISequence> |
| + |
| + <Custom |
| + Action="CleanupSimpleAdblock" |
| + Before="InstallFinalize"><![CDATA[SIMPLEADBLOCKDETECTED <> ""]]></Custom> |
| + </InstallExecuteSequence> |
| <!-- |
| We have only a single feature, since there aren't any optional parts. |
| @@ -817,12 +839,17 @@ |
| --> |
| <ComponentGroup Id="INI_Files"> |
| <ComponentRef Id="ini_settings.ini"/> |
| + <ComponentRef Id="simpleAdblockPrefs"/> |
| </ComponentGroup> |
| <DirectoryRef Id="ABP_APPDATA_FOLDER"> |
| <Directory Id="ini" FileSource="$(var.plugin_dir)\files"> |
| <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9a66"> |
| <File Name="settings.ini"/> |
| </Component> |
| + <Component Id="simpleAdblockPrefs" Guid="cc30c3b0-c713-01e2-7b8b-1800200c9a65"> |
| + <Condition><![CDATA[SIMPLEADBLOCKDETECTED <> ""]]></Condition> |
| + <File Name="prefs.json"/> |
| + </Component> |
| </Directory> |
| </DirectoryRef> |
