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

Delta Between Two Patch Sets: installer/src/msi/adblockplusie.wxs

Issue 5024350814076928: Issue 1103 - Migrate Simple Adblock users
Left Patch Set: Rebased Created July 28, 2015, 9:55 a.m.
Right Patch Set: Use registry instead of prefs for storing the Simple Adblock mark Created Aug. 7, 2015, 10:34 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 Compilation Note: 3 Compilation Note:
4 You may see linking errors that look like these: 4 You may see linking errors that look like these:
5 <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error code is 2738.</quote> 5 <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error code is 2738.</quote>
6 The documentation for this error code talks about custom actions, 6 The documentation for this error code talks about custom actions,
7 even though the CustomAction keyword does not appear in this source. 7 even though the CustomAction keyword does not appear in this source.
8 Certain WiX elements are implemented by MSI custom actions, 8 Certain WiX elements are implemented by MSI custom actions,
9 which means this source implicitly declares some insofar as the Windows Inst aller sees it. 9 which means this source implicitly declares some insofar as the Windows Inst aller sees it.
10 These errors are benign and can be avoided by some fiddling with the registry on the development machine. 10 These errors are benign and can be avoided by some fiddling with the registry on the development machine.
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 838
839 The settings.ini file should not be installed this way, since it contains user-generated data. 839 The settings.ini file should not be installed this way, since it contains user-generated data.
840 A component in Windows Installer represents a fixed piece of data with the MSI, not a changing one. 840 A component in Windows Installer represents a fixed piece of data with the MSI, not a changing one.
841 The present method of making settings.ini a component is simply an expedie nt for the present, 841 The present method of making settings.ini a component is simply an expedie nt for the present,
842 not a permanent solution. 842 not a permanent solution.
843 The correct solution requires the application to manage this file; the ins taller can't do it right. 843 The correct solution requires the application to manage this file; the ins taller can't do it right.
844 See http://stackoverflow.com/questions/357911/manage-configuration-files-w ith-wix 844 See http://stackoverflow.com/questions/357911/manage-configuration-files-w ith-wix
845 --> 845 -->
846 <ComponentGroup Id="INI_Files"> 846 <ComponentGroup Id="INI_Files">
847 <ComponentRef Id="ini_settings.ini"/> 847 <ComponentRef Id="ini_settings.ini"/>
848 <ComponentRef Id="simpleAdblockPrefs"/> 848 <ComponentRef Id="simpleAdblockMark"/>
849 </ComponentGroup> 849 </ComponentGroup>
850 <DirectoryRef Id="ABP_APPDATA_FOLDER"> 850 <DirectoryRef Id="ABP_APPDATA_FOLDER">
851 <Directory Id="ini" FileSource="$(var.plugin_dir)\files"> 851 <Directory Id="ini" FileSource="$(var.plugin_dir)\files">
852 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> 852 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66">
853 <File Name="settings.ini"/> 853 <File Name="settings.ini"/>
854 </Component> 854 </Component>
855 <Component Id="simpleAdblockPrefs" Guid="cc30c3b0-c713-01e2-7b8b-1800200 c9a65"> 855 <Component Id="simpleAdblockMark" Guid="cc30c3b0-c713-01e2-7b8b-1800200c 9a65">
856 <Condition><![CDATA[SIMPLEADBLOCKPRODUCTCODE <> ""]]></Condition> 856 <Condition><![CDATA[SIMPLEADBLOCKPRODUCTCODE <> ""]]></Condition>
857 <File Name="prefs.json"/> 857 <RegistryKey Root="HKCU" Key="Software\Adblock Plus for IE">
858 <RegistryKey Key="ConvertedFrom">
859 <RegistryValue Name="name" Type="string" Value="simpleadblock"/>
860 </RegistryKey>
861 </RegistryKey>
858 </Component> 862 </Component>
859 </Directory> 863 </Directory>
860 </DirectoryRef> 864 </DirectoryRef>
861 865
862 <?include ../installer-lib/custom-i18n.wxi ?> 866 <?include ../installer-lib/custom-i18n.wxi ?>
863 <?include ../custom-action/close_ie.wxi ?> 867 <?include ../custom-action/close_ie.wxi ?>
864 </Product> 868 </Product>
865 </Wix> 869 </Wix>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld