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

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

Issue 6505394822184960: Issue 1109 - Support notifications (Closed)
Left Patch Set: Created May 11, 2015, 10:01 a.m.
Right Patch Set: fix obtaining of DPI value of content (NotificationWindow) of NotificationBorderWindow Created Aug. 18, 2015, 9:43 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 <!-- 142 <!--
143 User interface 143 User interface
144 --> 144 -->
145 <UIRef Id="custom_WixUI_InstallDir"/> 145 <UIRef Id="custom_WixUI_InstallDir"/>
146 <UIRef Id="WixUI_ErrorProgressText"/> 146 <UIRef Id="WixUI_ErrorProgressText"/>
147 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/> 147 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
148 148
149 <!-- 149 <!--
150 Icon for Add/Remove Programs 150 Icon for Add/Remove Programs
151
152 It currently uses the blocking icon.
153 When #1538 is ready, we may have a separate icon file for this.
154 --> 151 -->
155 <Icon Id="program_icon" SourceFile="$(var.plugin_dir)\src\res\blocking.ico"/ > 152 <Icon Id="program_icon" SourceFile="$(var.plugin_dir)\src\res\blocking.ico"/ >
156 <Property Id="ARPPRODUCTICON" Value="program_icon"/> 153 <Property Id="ARPPRODUCTICON" Value="program_icon"/>
154 <Property Id="ARPURLINFOABOUT" Value="https://adblockplus.org/en/about"/>
155 <Property Id="ARPURLUPDATEINFO" Value="https://adblockplus.org/category/adbl ock-plus-ie/"/>
156 <Property Id="ARPHELPLINK" Value="https://adblockplus.org/en/bugs"/>
157 157
158 <!-- 158 <!--
159 Define and schedule a "Custom Action Type 1" to ensure that IE is closed b efore installation. 159 Define and schedule a "Custom Action Type 1" to ensure that IE is closed b efore installation.
160 Because WiX is closely tied to the MSI database format, there are multiple tags required to do this. 160 Because WiX is closely tied to the MSI database format, there are multiple tags required to do this.
161 The "CustomAction" tag defines the tag itself, but doesn't sequence it; 161 The "CustomAction" tag defines the tag itself, but doesn't sequence it;
162 it defines an entry in the "CustomAction" table. 162 it defines an entry in the "CustomAction" table.
163 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component. 163 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component.
164 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables. 164 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables.
165 165
166 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero, 166 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero,
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 <?include bho_registry_value.wxi ?> 333 <?include bho_registry_value.wxi ?>
334 </Component> 334 </Component>
335 <?endif?> 335 <?endif?>
336 336
337 <!-- 337 <!--
338 The engine must go into the same directory as the DLL, since that locati on is searched explicitly (and uniquely). 338 The engine must go into the same directory as the DLL, since that locati on is searched explicitly (and uniquely).
339 --> 339 -->
340 <?if $(sys.BUILDARCH)="x86"?> 340 <?if $(sys.BUILDARCH)="x86"?>
341 <Component Id="AdblockPlusEngine.exe" Guid="f45572c0-d712-11e2-8b8b-0800 200c9a66" Win64="no"> 341 <Component Id="AdblockPlusEngine.exe" Guid="f45572c0-d712-11e2-8b8b-0800 200c9a66" Win64="no">
342 <File Id="AdblockPlusEngine.exe" Source="$(var.plugin_dir)\build\ia32\ $(var.Configuration)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/> 342 <File Id="AdblockPlusEngine.exe" Source="$(var.plugin_dir)\build\ia32\ $(var.Configuration)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/>
343 <?include engine_registry_value.wxi ?>
344 </Component> 343 </Component>
345 <?elseif $(sys.BUILDARCH)="x64"?> 344 <?elseif $(sys.BUILDARCH)="x64"?>
346 <Component Id="AdblockPlusEngine.exe" Guid="fa8d65d0-d712-11e2-8b8b-0800 200c9a66" Win64="yes"> 345 <Component Id="AdblockPlusEngine.exe" Guid="fa8d65d0-d712-11e2-8b8b-0800 200c9a66" Win64="yes">
347 <File Id="AdblockPlusEngine.exe" Source="$(var.plugin_dir)\build\x64\$ (var.Configuration)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/> 346 <File Id="AdblockPlusEngine.exe" Source="$(var.plugin_dir)\build\x64\$ (var.Configuration)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/>
348 <?include engine_registry_value.wxi ?>
349 </Component> 347 </Component>
350 <?endif?> 348 <?endif?>
351 <Component Id="NotificationWindow.html" Guid="f45572c0-d712-11e2-8b8b-0800 200c9a67">
352 <File Id="NotificationWindow.html" Source="$(var.plugin_dir)\src\engine\ NotificationWindow.html" KeyPath="yes" Checksum="yes"/>
353 </Component>
354 </ComponentGroup> 349 </ComponentGroup>
355 350
356 <!-- 351 <!--
357 The HTML_Tree component group contains all the files in the HTML folder. 352 The HTML_Tree component group contains all the files in the HTML folder.
358 Individual file entries within a single component group must all be in the same directory. 353 Individual file entries within a single component group must all be in the same directory.
359 Also, ComponentGroup is not a valid child of ComponentGroup, so subdirecto ries are linked by reference. 354 Also, ComponentGroup is not a valid child of ComponentGroup, so subdirecto ries are linked by reference.
360 --> 355 -->
361 <ComponentGroup Id="HTML_Tree"> 356 <ComponentGroup Id="HTML_Tree">
362 <ComponentRef Id="html_static_css_firstRun.css"/> 357 <ComponentRef Id="html_static_css_firstRun.css"/>
363 <ComponentRef Id="html_static_css_settings.css"/> 358 <ComponentRef Id="html_static_css_settings.css"/>
(...skipping 13 matching lines...) Expand all
377 <ComponentRef Id="html_static_img_social_twitter.png"/> 372 <ComponentRef Id="html_static_img_social_twitter.png"/>
378 <ComponentRef Id="html_static_js_firstRun.js"/> 373 <ComponentRef Id="html_static_js_firstRun.js"/>
379 <ComponentRef Id="html_static_js_IESettings.js"/> 374 <ComponentRef Id="html_static_js_IESettings.js"/>
380 <ComponentRef Id="html_static_js_ieEventListenerPolyfill.js"/> 375 <ComponentRef Id="html_static_js_ieEventListenerPolyfill.js"/>
381 <ComponentRef Id="html_static_js_ieFirstRun.js"/> 376 <ComponentRef Id="html_static_js_ieFirstRun.js"/>
382 <ComponentRef Id="html_static_js_settings.js"/> 377 <ComponentRef Id="html_static_js_settings.js"/>
383 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> 378 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/>
384 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> 379 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/>
385 <ComponentRef Id="html_templates_firstRun.html"/> 380 <ComponentRef Id="html_templates_firstRun.html"/>
386 <ComponentRef Id="html_templates_index.html"/> 381 <ComponentRef Id="html_templates_index.html"/>
382 <ComponentRef Id="html_templates_NotificationWindow.html"/>
387 </ComponentGroup> 383 </ComponentGroup>
388 384
389 <DirectoryRef Id="HTML_Folder"> 385 <DirectoryRef Id="HTML_Folder">
390 <Directory Id="html" FileSource="$(var.plugin_dir)\html"> 386 <Directory Id="html" FileSource="$(var.plugin_dir)\html">
391 <Directory Name="static" Id="html_static"> 387 <Directory Name="static" Id="html_static">
392 <Directory Name="css" Id="html_static_css"> 388 <Directory Name="css" Id="html_static_css">
393 <Component Id="html_static_css_firstRun.css" Guid="facb02d0-f073-11e 2-b778-0800200c9a66"> 389 <Component Id="html_static_css_firstRun.css" Guid="facb02d0-f073-11e 2-b778-0800200c9a66">
394 <File Name="firstRun.css"/> 390 <File Name="firstRun.css"/>
395 </Component> 391 </Component>
396 <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e 2-8b8b-0800200c9a66"> 392 <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e 2-8b8b-0800200c9a66">
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 </Component> 468 </Component>
473 </Directory> 469 </Directory>
474 </Directory> 470 </Directory>
475 </Directory> 471 </Directory>
476 <Directory Name="templates" Id="html_templates"> 472 <Directory Name="templates" Id="html_templates">
477 <Component Id="html_templates_firstRun.html" Guid="3d423d40-f074-11e2- b778-0800200c9a66"> 473 <Component Id="html_templates_firstRun.html" Guid="3d423d40-f074-11e2- b778-0800200c9a66">
478 <File Name="firstRun.html"/> 474 <File Name="firstRun.html"/>
479 </Component> 475 </Component>
480 <Component Id="html_templates_index.html" Guid="ba2259a0-d713-11e2-8b8 b-0800200c9a66"> 476 <Component Id="html_templates_index.html" Guid="ba2259a0-d713-11e2-8b8 b-0800200c9a66">
481 <File Name="index.html"/> 477 <File Name="index.html"/>
478 </Component>
479 <Component Id="html_templates_NotificationWindow.html" Guid="f45572c0- d712-11e2-8b8b-0800200c9a67">
480 <File Id="NotificationWindow.html"/>
482 </Component> 481 </Component>
483 </Directory> 482 </Directory>
484 </Directory> 483 </Directory>
485 </DirectoryRef> 484 </DirectoryRef>
486 485
487 <!-- 486 <!--
488 Locale files 487 Locale files
489 --> 488 -->
490 <ComponentGroup Id="Locale_Files"> 489 <ComponentGroup Id="Locale_Files">
491 <ComponentRef Id="locales_af.ini"/> 490 <ComponentRef Id="locales_af.ini"/>
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> 827 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66">
829 <File Name="settings.ini"/> 828 <File Name="settings.ini"/>
830 </Component> 829 </Component>
831 </Directory> 830 </Directory>
832 </DirectoryRef> 831 </DirectoryRef>
833 832
834 <?include ../installer-lib/custom-i18n.wxi ?> 833 <?include ../installer-lib/custom-i18n.wxi ?>
835 <?include ../custom-action/close_ie.wxi ?> 834 <?include ../custom-action/close_ie.wxi ?>
836 </Product> 835 </Product>
837 </Wix> 836 </Wix>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld