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

Unified Diff: installer/src/msi/adblockplusie.wxs

Issue 5024350814076928: Issue 1103 - Migrate Simple Adblock users
Patch Set: Created March 24, 2015, 7:44 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
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"
Eric 2015/03/27 12:51:45 Please see the comment immediately about about why
Oleksandr 2015/04/16 09:58:09 ABP for IE and SimpleAdblock have the same CLSID w
sergei 2015/04/22 10:37:08 "afterInstallInitialize" still implies that uninst
Oleksandr 2015/04/24 11:50:32 SimpleAdblock uninstall removes the registry keys
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,6 +182,15 @@
DllEntry="AbpCloseIe"
Return="check"
/>
+
+ <CustomAction
+ Id="CleanupSimpleAdblock"
+ Directory="APP_DATA_FOLDER"
+ ExeCommand="cmd /C &quot;rmdir /s /q &quot;.\Simple Adblock&quot;&quot;"
Eric 2015/03/27 12:51:45 Using "." for current directory is likely not to b
Oleksandr 2015/04/16 09:58:09 Why not? We are launching in APP_DATA_FOLDER
+ 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.
@@ -186,7 +204,10 @@
Action="Close_IE"
After="LaunchConditions"
/>
-
+
+ <Custom
+ Action="CleanupSimpleAdblock"
+ Before="InstallFinalize"><![CDATA[SIMPLEADBLOCKDETECTED <> ""]]></Custom>
</InstallExecuteSequence>
<!--
@@ -818,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>

Powered by Google App Engine
This is Rietveld