Unified Diff: installer/src/msi/adblockplusie.wxs
Issue 5024350814076928:
Issue 1103 - Migrate Simple Adblock users
Patch Set: Rebase and cleanup
Created July 13, 2015, 3:44 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« html/static/js/ieFirstRun.js ('K')
|
« html/static/js/ieFirstRun.js ('k')
|
src/plugin/PluginClass.cpp » ('j')
|
no next file with comments »
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 |
| @@ -143,11 +143,11 @@ |
| /> |
| <!--Remove Simple Adblock--> |
| - <Property Id="SIMPLEADBLOCKDETECTED" Secure="yes"/> |
| + <Property Id="SIMPLEADBLOCKPRODUCTCODE" Secure="yes"/> |
| <Upgrade Id="27D7C170-67AA-40D9-978F-5F14B4D0FEEE"> |
| <UpgradeVersion |
| Minimum="0.7.0.0" Maximum="99.0.0.0" |
| - Property="SIMPLEADBLOCKDETECTED" |
| + Property="SIMPLEADBLOCKPRODUCTCODE" |
| IncludeMinimum="yes" IncludeMaximum="no" IgnoreRemoveFailure="no"/> |
| </Upgrade> |
| <MediaTemplate EmbedCab="yes"/> |
| @@ -199,8 +199,8 @@ |
| 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"/> |
| - <InstallExecuteSequence> |
| + <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build_dir)\$(var.CA_Configuration)\installer-ca.dll"/> |
| + <InstallUISequence> |
| <!-- |
| The LaunchConditions action occurs near the beginning, before any of the expensive operations. |
| --> |
| @@ -208,10 +208,12 @@ |
| Action="Close_IE" |
| After="LaunchConditions" |
| /> |
| + </InstallUISequence> |
| + <InstallExecuteSequence> |
| <Custom |
| Action="CleanupSimpleAdblock" |
| - Before="InstallFinalize"><![CDATA[SIMPLEADBLOCKDETECTED <> ""]]></Custom> |
| + Before="InstallFinalize"><![CDATA[SIMPLEADBLOCKPRODUCTCODE <> ""]]></Custom> |
| </InstallExecuteSequence> |
| <!-- |
| @@ -851,7 +853,7 @@ |
| <File Name="settings.ini"/> |
| </Component> |
| <Component Id="simpleAdblockPrefs" Guid="cc30c3b0-c713-01e2-7b8b-1800200c9a65"> |
| - <Condition><![CDATA[SIMPLEADBLOCKDETECTED <> ""]]></Condition> |
| + <Condition><![CDATA[SIMPLEADBLOCKPRODUCTCODE <> ""]]></Condition> |
| <File Name="prefs.json"/> |
| </Component> |
| </Directory> |
« html/static/js/ieFirstRun.js ('K')
|
« html/static/js/ieFirstRun.js ('k')
|
src/plugin/PluginClass.cpp » ('j')
|
no next file with comments »
