| OLD | NEW |
| 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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 ?> |
| 343 </Component> | 344 </Component> |
| 344 <?elseif $(sys.BUILDARCH)="x64"?> | 345 <?elseif $(sys.BUILDARCH)="x64"?> |
| 345 <Component Id="AdblockPlusEngine.exe" Guid="fa8d65d0-d712-11e2-8b8b-0800
200c9a66" Win64="yes"> | 346 <Component Id="AdblockPlusEngine.exe" Guid="fa8d65d0-d712-11e2-8b8b-0800
200c9a66" Win64="yes"> |
| 346 <File Id="AdblockPlusEngine.exe" Source="$(var.plugin_dir)\build\x64\$
(var.Configuration)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/> | 347 <File Id="AdblockPlusEngine.exe" Source="$(var.plugin_dir)\build\x64\$
(var.Configuration)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/> |
| 348 <?include engine_registry_value.wxi ?> |
| 347 </Component> | 349 </Component> |
| 348 <?endif?> | 350 <?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> |
| 349 </ComponentGroup> | 354 </ComponentGroup> |
| 350 | 355 |
| 351 <!-- | 356 <!-- |
| 352 The HTML_Tree component group contains all the files in the HTML folder. | 357 The HTML_Tree component group contains all the files in the HTML folder. |
| 353 Individual file entries within a single component group must all be in the
same directory. | 358 Individual file entries within a single component group must all be in the
same directory. |
| 354 Also, ComponentGroup is not a valid child of ComponentGroup, so subdirecto
ries are linked by reference. | 359 Also, ComponentGroup is not a valid child of ComponentGroup, so subdirecto
ries are linked by reference. |
| 355 --> | 360 --> |
| 356 <ComponentGroup Id="HTML_Tree"> | 361 <ComponentGroup Id="HTML_Tree"> |
| 357 <ComponentRef Id="html_static_css_firstRun.css"/> | 362 <ComponentRef Id="html_static_css_firstRun.css"/> |
| 358 <ComponentRef Id="html_static_css_settings.css"/> | 363 <ComponentRef Id="html_static_css_settings.css"/> |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 823 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
a66"> | 828 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
a66"> |
| 824 <File Name="settings.ini"/> | 829 <File Name="settings.ini"/> |
| 825 </Component> | 830 </Component> |
| 826 </Directory> | 831 </Directory> |
| 827 </DirectoryRef> | 832 </DirectoryRef> |
| 828 | 833 |
| 829 <?include ../installer-lib/custom-i18n.wxi ?> | 834 <?include ../installer-lib/custom-i18n.wxi ?> |
| 830 <?include ../custom-action/close_ie.wxi ?> | 835 <?include ../custom-action/close_ie.wxi ?> |
| 831 </Product> | 836 </Product> |
| 832 </Wix> | 837 </Wix> |
| OLD | NEW |