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

Side by Side Diff: WixInstaller/adblockplusie.wxs

Issue 10897028: Create a shared dictionary class for plugin and engine (Closed)
Patch Set: Created June 7, 2013, 12:42 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 cod e is 2738.</quote> 5 <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error cod e 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 Installer sees it. 9 which means this source implicitly declares some insofar as the Windows Installer sees it.
10 These errors are benign and can be avoided by some fiddling with the registr y on the development machine. 10 These errors are benign and can be avoided by some fiddling with the registr y on the development machine.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 <!-- 48 <!--
49 User interface 49 User interface
50 --> 50 -->
51 <UIRef Id="custom_WixUI_InstallDir"/> 51 <UIRef Id="custom_WixUI_InstallDir"/>
52 <UIRef Id="WixUI_ErrorProgressText"/> 52 <UIRef Id="WixUI_ErrorProgressText"/>
53 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/> 53 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
54 54
55 <!-- 55 <!--
56 We have only a single feature, since there aren't any optional parts . 56 We have only a single feature, since there aren't any optional parts .
57 The display is hidden for the same reason; there's nothing to choose from. 57 The display is hidden for the same reason; there's nothing to choose from.
58 --> 58 -->
Eric 2013/06/07 14:06:23 These installer changes are LGTM. Pretty much ide
59 <Feature Id="ProductFeature" 59 <Feature Id="ProductFeature"
60 Title="!(loc.Title)" Description="!(loc.UI_Description)" 60 Title="!(loc.Title)" Description="!(loc.UI_Description)"
61 Display="hidden" 61 Display="hidden"
62 ConfigurableDirectory="INSTALLFOLDER"> 62 ConfigurableDirectory="INSTALLFOLDER">
63 <ComponentGroupRef Id="Installation_Folders"/> 63 <ComponentGroupRef Id="Installation_Folders"/>
64 <ComponentGroupRef Id="Binaries"/> 64 <ComponentGroupRef Id="Binaries"/>
65 <ComponentGroupRef Id="HTML_Tree"/> 65 <ComponentGroupRef Id="HTML_Tree"/>
66 <ComponentGroupRef Id="Locale_Files"/>
66 <ComponentGroupRef Id="INI_Files"/> 67 <ComponentGroupRef Id="INI_Files"/>
67 </Feature> 68 </Feature>
68 69
69 <!-- 70 <!--
70 Remove the "Modify" button from our control panel entry. 71 Remove the "Modify" button from our control panel entry.
71 Since we only have a single feature, there's only a single way o f installing the plugin, 72 Since we only have a single feature, there's only a single way o f installing the plugin,
72 and thus modifying the installation can't possibly do an ything. 73 and thus modifying the installation can't possibly do an ything.
73 This is currently set by the WiXUI property WIXUI_INSTALLDIR, so it' s commented out now. 74 This is currently set by the WiXUI property WIXUI_INSTALLDIR, so it' s commented out now.
74 <Property Id="ARPNOMODIFY" Value="1"/> 75 <Property Id="ARPNOMODIFY" Value="1"/>
75 --> 76 -->
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 The top-level directory structure. 141 The top-level directory structure.
141 --> 142 -->
142 <Directory Id="TARGETDIR" Name="SourceDir"> 143 <Directory Id="TARGETDIR" Name="SourceDir">
143 <Directory Id="$(var.Program_Files)"> 144 <Directory Id="$(var.Program_Files)">
144 <!-- 145 <!--
145 INSTALLFOLDER is within ProgramFilesFolder, which is a prote cted directory. 146 INSTALLFOLDER is within ProgramFilesFolder, which is a prote cted directory.
146 As a result, this installer requires elevated permissions to operate. 147 As a result, this installer requires elevated permissions to operate.
147 --> 148 -->
148 <Directory Id="INSTALLFOLDER" Name="Adblock Plus for IE"> 149 <Directory Id="INSTALLFOLDER" Name="Adblock Plus for IE">
149 <Directory Id="HTML_Folder" Name="html"></Directory> 150 <Directory Id="HTML_Folder" Name="html"></Directory>
151 <Directory Id="Locales_Folder" Name="locales"></Directory>
150 </Directory> 152 </Directory>
151 <Directory Id="APP_DATA_FOLDER"> 153 <Directory Id="APP_DATA_FOLDER">
152 <Directory Id="ABP_APPDATA_FOLDER" Name="Adblock Plus for IE "></Directory> 154 <Directory Id="ABP_APPDATA_FOLDER" Name="Adblock Plus for IE "></Directory>
153 </Directory> 155 </Directory>
154 </Directory> 156 </Directory>
155 </Directory> 157 </Directory>
156 158
157 <!-- 159 <!--
158 The Binaries component group contains the DLL's. 160 The Binaries component group contains the DLL's.
159 64-bit versions of Windows ship with both 32-bit and 64-bit versions of Internet Explorer. 161 64-bit versions of Windows ship with both 32-bit and 64-bit versions of Internet Explorer.
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 </Directory> 275 </Directory>
274 </Directory> 276 </Directory>
275 </Directory> 277 </Directory>
276 <Directory Name="templates" Id="html_templates"> 278 <Directory Name="templates" Id="html_templates">
277 <Component Id="html_templates_index.html"><File Name="index. html"/></Component> 279 <Component Id="html_templates_index.html"><File Name="index. html"/></Component>
278 </Directory> 280 </Directory>
279 </Directory> 281 </Directory>
280 </DirectoryRef> 282 </DirectoryRef>
281 283
282 <!-- 284 <!--
285 Locale files
286 -->
287 <ComponentGroup Id="Locale_Files">
288 <ComponentRef Id="locales_en.ini"/>
289 <ComponentRef Id="locales_ru.ini"/>
290 </ComponentGroup>
291 <DirectoryRef Id="Locales_Folder">
292 <Directory Id="locales" FileSource="SourceDir\..\locales">
293 <Component Id="locales_en.ini"><File Name="en.ini"/></Component>
294 <Component Id="locales_ru.ini"><File Name="ru.ini"/></Component>
295 </Directory>
296 </DirectoryRef>
297
298 <!--
283 INI files 299 INI files
284 300
285 The settings.ini file should not be installed this way, since it con tains user-generated data. 301 The settings.ini file should not be installed this way, since it con tains user-generated data.
286 A component in Windows Installer represents a fixed piece of data wi th the MSI, not a changing one. 302 A component in Windows Installer represents a fixed piece of data wi th the MSI, not a changing one.
287 The present method of making settings.ini a component is simply an e xpedient for the present, 303 The present method of making settings.ini a component is simply an e xpedient for the present,
288 not a permanent solution. 304 not a permanent solution.
289 The correct solution requires the application to manage this file; t he installer can't do it right. 305 The correct solution requires the application to manage this file; t he installer can't do it right.
290 See http://stackoverflow.com/questions/357911/manage-configuration-f iles-with-wix 306 See http://stackoverflow.com/questions/357911/manage-configuration-f iles-with-wix
291 --> 307 -->
292 <ComponentGroup Id="INI_Files"> 308 <ComponentGroup Id="INI_Files">
293 <ComponentRef Id="ini_settings.page.w.ini"/>
294 <ComponentRef Id="ini_dictionary.w.ini"/>
295 <ComponentRef Id="ini_settings.ini"/> 309 <ComponentRef Id="ini_settings.ini"/>
296 </ComponentGroup> 310 </ComponentGroup>
297 <DirectoryRef Id="ABP_APPDATA_FOLDER"> 311 <DirectoryRef Id="ABP_APPDATA_FOLDER">
298 <Directory Id="ini" FileSource="SourceDir\..\files"> 312 <Directory Id="ini" FileSource="SourceDir\..\files">
299 <Component Id="ini_settings.page.w.ini"><File Name="settings_pag e_w.ini"/></Component>
300 <Component Id="ini_dictionary.w.ini"><File Name="dictionary_w.in i"/></Component>
301 <Component Id="ini_settings.ini"><File Name="settings.ini"/></Co mponent> 313 <Component Id="ini_settings.ini"><File Name="settings.ini"/></Co mponent>
302 </Directory> 314 </Directory>
303 </DirectoryRef> 315 </DirectoryRef>
304 </Product> 316 </Product>
305 </Wix> 317 </Wix>
OLDNEW
« no previous file with comments | « AdblockPlusPlugin.vcxproj ('k') | adblockplus.gyp » ('j') | src/plugin/AdblockPlusClient.cpp » ('J')

Powered by Google App Engine
This is Rietveld