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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 The present installer is a per-machine installer. | 207 The present installer is a per-machine installer. |
208 That means it writes to HKEY_LOCAL_MACHINE, so that all users on the machi
ne will have the BHO installed. | 208 That means it writes to HKEY_LOCAL_MACHINE, so that all users on the machi
ne will have the BHO installed. |
209 It's possible to write keys to HKEY_CURRENT_USER in a situation where that
's not desirable, if needed. | 209 It's possible to write keys to HKEY_CURRENT_USER in a situation where that
's not desirable, if needed. |
210 --> | 210 --> |
211 <ComponentGroup Id="Binaries" Directory="INSTALLFOLDER"> | 211 <ComponentGroup Id="Binaries" Directory="INSTALLFOLDER"> |
212 <!-- | 212 <!-- |
213 The 32-bit version of the DLL is included in both 32- and 64-bit install
ers. | 213 The 32-bit version of the DLL is included in both 32- and 64-bit install
ers. |
214 We need an explicit value for attribute @Win64 so that the ARCH argument
does not override its implicit value. | 214 We need an explicit value for attribute @Win64 so that the ARCH argument
does not override its implicit value. |
215 --> | 215 --> |
216 <Component Id="AdblockPlus32.dll" Guid="d9a35780-d712-11e2-8b8b-0800200c9a
66" Win64="no"> | 216 <Component Id="AdblockPlus32.dll" Guid="d9a35780-d712-11e2-8b8b-0800200c9a
66" Win64="no"> |
217 <File Id="AdblockPlus32.dll" Source="..\build\ia32\$(var.Configuration)\
AdblockPlus.dll" KeyPath="yes" Checksum="yes"> | 217 <File Id="AdblockPlus32.dll" Name="AdblockPlus32.dll" Source="..\build\i
a32\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum="yes"> |
218 <?include dll_class.wxi ?> | 218 <?include dll_class.wxi ?> |
219 </File> | 219 </File> |
220 <?include bho_registry_value.wxi ?> | 220 <?include bho_registry_value.wxi ?> |
221 </Component> | 221 </Component> |
222 <!-- | 222 <!-- |
223 The 64-bit version of the DLL is only included in the 64-bit installer. | 223 The 64-bit version of the DLL is only included in the 64-bit installer. |
224 We don't really need an explicit value for attribute @Win64, but it's th
ere for resilience. | 224 We don't really need an explicit value for attribute @Win64, but it's th
ere for resilience. |
225 | 225 |
226 Note that the <Class> element and the <RegistryKey> element are duplicat
ed from the 32-bit version. | 226 Note that the <Class> element and the <RegistryKey> element are duplicat
ed from the 32-bit version. |
227 We use "include" directives to ensure that they are identical. | 227 We use "include" directives to ensure that they are identical. |
228 They have to be the same to support both the 32- and 64-bit versions of
Internet Explorer on a 64-bit system. | 228 They have to be the same to support both the 32- and 64-bit versions of
Internet Explorer on a 64-bit system. |
229 IE uses the same algorithm to search for BHO regardless of platform, | 229 IE uses the same algorithm to search for BHO regardless of platform, |
230 so with two versions of IE, we need two identical registrations. | 230 so with two versions of IE, we need two identical registrations. |
231 The 32-bit version on a 64-bit system will be registered under "Wow6432N
ode" translated keys, | 231 The 32-bit version on a 64-bit system will be registered under "Wow6432N
ode" translated keys, |
232 while the 64-bit version will be under the keys as they appear in this
source, not translated. | 232 while the 64-bit version will be under the keys as they appear in this
source, not translated. |
233 We don't need to put in the "Wow6432Node" registry key explicitly; | 233 We don't need to put in the "Wow6432Node" registry key explicitly; |
234 something in Windows Installer takes care of the mapping transparently
. | 234 something in Windows Installer takes care of the mapping transparently
. |
235 --> | 235 --> |
236 <?if $(sys.BUILDARCH)="x64"?> | 236 <?if $(sys.BUILDARCH)="x64"?> |
237 <Component Id="AdblockPlus64.dll" Guid="ed77a2c0-d712-11e2-8b8b-0800200c
9a66" Win64="yes"> | 237 <Component Id="AdblockPlus64.dll" Guid="ed77a2c0-d712-11e2-8b8b-0800200c
9a66" Win64="yes"> |
238 <File Id="AdblockPlus64.dll" Source="..\build\x64\$(var.Configuration)
\AdblockPlusx64.dll" KeyPath="yes" Checksum="yes"> | 238 <File Id="AdblockPlus64.dll" Name="AdblockPlus64.dll" Source="..\build
\x64\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum="yes"> |
239 <?include dll_class.wxi ?> | 239 <?include dll_class.wxi ?> |
240 </File> | 240 </File> |
241 <?include bho_registry_value.wxi ?> | 241 <?include bho_registry_value.wxi ?> |
242 </Component> | 242 </Component> |
243 <?endif?> | 243 <?endif?> |
244 | 244 |
245 <!-- | 245 <!-- |
246 The engine must go into the same directory as the DLL, since that locati
on is searched explicitly (and uniquely). | 246 The engine must go into the same directory as the DLL, since that locati
on is searched explicitly (and uniquely). |
247 --> | 247 --> |
248 <?if $(sys.BUILDARCH)="x86"?> | 248 <?if $(sys.BUILDARCH)="x86"?> |
(...skipping 26 matching lines...) Expand all Loading... |
275 <ComponentRef Id="html_static_img_social_gplus.png"/> | 275 <ComponentRef Id="html_static_img_social_gplus.png"/> |
276 <ComponentRef Id="html_static_img_social_twitter.png"/> | 276 <ComponentRef Id="html_static_img_social_twitter.png"/> |
277 <ComponentRef Id="html_static_js_IESettings.js"/> | 277 <ComponentRef Id="html_static_js_IESettings.js"/> |
278 <ComponentRef Id="html_static_js_settings.js"/> | 278 <ComponentRef Id="html_static_js_settings.js"/> |
279 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> | 279 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> |
280 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> | 280 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> |
281 <ComponentRef Id="html_templates_index.html"/> | 281 <ComponentRef Id="html_templates_index.html"/> |
282 </ComponentGroup> | 282 </ComponentGroup> |
283 | 283 |
284 <DirectoryRef Id="HTML_Folder"> | 284 <DirectoryRef Id="HTML_Folder"> |
285 <Directory Id="html" FileSource="SourceDir\..\html"> | 285 <Directory Id="html" FileSource="..\html"> |
286 <Directory Name="static" Id="html_static"> | 286 <Directory Name="static" Id="html_static"> |
287 <Directory Name="css" Id="html_static_css"> | 287 <Directory Name="css" Id="html_static_css"> |
288 <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e
2-8b8b-0800200c9a66"> | 288 <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e
2-8b8b-0800200c9a66"> |
289 <File Name="settings.css"/> | 289 <File Name="settings.css"/> |
290 </Component> | 290 </Component> |
291 </Directory> | 291 </Directory> |
292 <Directory Name="img" Id="html_static_img"> | 292 <Directory Name="img" Id="html_static_img"> |
293 <Component Id="html_static_img_abp.128.png" Guid="0d86ba60-d713-11e2
-8b8b-0800200c9a66"> | 293 <Component Id="html_static_img_abp.128.png" Guid="0d86ba60-d713-11e2
-8b8b-0800200c9a66"> |
294 <File Name="abp-128.png"/> | 294 <File Name="abp-128.png"/> |
295 </Component> | 295 </Component> |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 </DirectoryRef> | 356 </DirectoryRef> |
357 | 357 |
358 <!-- | 358 <!-- |
359 Locale files | 359 Locale files |
360 --> | 360 --> |
361 <ComponentGroup Id="Locale_Files"> | 361 <ComponentGroup Id="Locale_Files"> |
362 <ComponentRef Id="locales_en.ini"/> | 362 <ComponentRef Id="locales_en.ini"/> |
363 <ComponentRef Id="locales_ru.ini"/> | 363 <ComponentRef Id="locales_ru.ini"/> |
364 </ComponentGroup> | 364 </ComponentGroup> |
365 <DirectoryRef Id="Locales_Folder"> | 365 <DirectoryRef Id="Locales_Folder"> |
366 <Directory Id="locales" FileSource="SourceDir\..\locales"> | 366 <Directory Id="locales" FileSource="..\locales"> |
367 <Component Id="locales_en.ini" Guid="c5622430-d713-11e2-8b8b-0800200c9a6
6"> | 367 <Component Id="locales_en.ini" Guid="c5622430-d713-11e2-8b8b-0800200c9a6
6"> |
368 <File Name="en.ini"/> | 368 <File Name="en.ini"/> |
369 </Component> | 369 </Component> |
370 <Component Id="locales_ru.ini" Guid="d06e3490-d713-11e2-8b8b-0800200c9a6
6"> | 370 <Component Id="locales_ru.ini" Guid="d06e3490-d713-11e2-8b8b-0800200c9a6
6"> |
371 <File Name="ru.ini"/> | 371 <File Name="ru.ini"/> |
372 </Component> | 372 </Component> |
373 </Directory> | 373 </Directory> |
374 </DirectoryRef> | 374 </DirectoryRef> |
375 | 375 |
376 <!-- | 376 <!-- |
377 INI files | 377 INI files |
378 | 378 |
379 The settings.ini file should not be installed this way, since it contains
user-generated data. | 379 The settings.ini file should not be installed this way, since it contains
user-generated data. |
380 A component in Windows Installer represents a fixed piece of data with the
MSI, not a changing one. | 380 A component in Windows Installer represents a fixed piece of data with the
MSI, not a changing one. |
381 The present method of making settings.ini a component is simply an expedie
nt for the present, | 381 The present method of making settings.ini a component is simply an expedie
nt for the present, |
382 not a permanent solution. | 382 not a permanent solution. |
383 The correct solution requires the application to manage this file; the ins
taller can't do it right. | 383 The correct solution requires the application to manage this file; the ins
taller can't do it right. |
384 See http://stackoverflow.com/questions/357911/manage-configuration-files-w
ith-wix | 384 See http://stackoverflow.com/questions/357911/manage-configuration-files-w
ith-wix |
385 --> | 385 --> |
386 <ComponentGroup Id="INI_Files"> | 386 <ComponentGroup Id="INI_Files"> |
387 <ComponentRef Id="ini_settings.ini"/> | 387 <ComponentRef Id="ini_settings.ini"/> |
388 </ComponentGroup> | 388 </ComponentGroup> |
389 <DirectoryRef Id="ABP_APPDATA_FOLDER"> | 389 <DirectoryRef Id="ABP_APPDATA_FOLDER"> |
390 <Directory Id="ini" FileSource="SourceDir\..\files"> | 390 <Directory Id="ini" FileSource="..\files"> |
391 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
a66"> | 391 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
a66"> |
392 <File Name="settings.ini"/> | 392 <File Name="settings.ini"/> |
393 </Component> | 393 </Component> |
394 </Directory> | 394 </Directory> |
395 </DirectoryRef> | 395 </DirectoryRef> |
396 </Product> | 396 </Product> |
397 </Wix> | 397 </Wix> |
OLD | NEW |