| 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. | 
| 11   See http://wix.sourceforge.net/faq.html#Error217 | 11   See http://blogs.msdn.com/b/heaths/archive/2007/05/31/windows-installer-errors
     -2738-and-2739-with-script-custom-actions.aspx | 
|  | 12     and http://blogs.msdn.com/b/astebner/archive/2007/06/07/3151752.aspx, | 
|  | 13     both taken from (must use the Wayback Machine) http://wix.sourceforge.net/fa
     q.html#Error217 | 
| 12 --> | 14 --> | 
| 13 <!-- | 15 <!-- | 
| 14   These definitions enable compiling multiple versions & Product ID's from the s
     ame file. | 16   These definitions enable compiling multiple versions & Product ID's from the s
     ame file. | 
| 15   This is to allow testing upgrade features without having to switch back and fo
     rth between working copies. | 17   This is to allow testing upgrade features without having to switch back and fo
     rth between working copies. | 
| 16 --> | 18 --> | 
| 17 <?ifdef Version ?> | 19 <?ifdef Version ?> | 
| 18   <!-- | 20   <!-- | 
| 19     If we're given a version on the command line, use it. | 21     If we're given a version on the command line, use it. | 
| 20     We use a short name on the command line for ease of use. | 22     We use a short name on the command line for ease of use. | 
| 21     We use a longer name within this file for clarity about which "version" it i
     s specifically | 23     We use a longer name within this file for clarity about which "version" it i
     s specifically | 
| 22   --> | 24   --> | 
| 23   <?define Product_Version=$(var.Version) ?> | 25   <?define Product_Version=$(var.Version) ?> | 
| 24 <?else?> | 26 <?else?> | 
| 25   <?error "Version" parameter is required ?> | 27   <?error "Version" parameter is required ?> | 
| 26 <?endif?> | 28 <?endif?> | 
| 27 | 29 | 
| 28 <?ifndef Configuration ?> | 30 <?ifndef Configuration ?> | 
| 29   <?error "Configuration" parameter is required ?> | 31   <?error "Configuration" parameter is required ?> | 
| 30 <?endif?> | 32 <?endif?> | 
| 31 | 33 | 
| 32 <!-- | 34 <!-- | 
|  | 35   CA_Configuration is the Visual Studio configuration for the Custom Action libr
     ary. | 
|  | 36   It's set to "Debug" while the installer with a CA is in development. | 
|  | 37   TODO. | 
|  | 38     First, set this variable based on the configuration in the VS solution. | 
|  | 39     Second, change the default to "Release" (or perhaps an error). | 
|  | 40 --> | 
|  | 41 <?ifndef CA_Configuration?> | 
|  | 42   <?define CA_Configuration="Release" ?> | 
|  | 43 <?endif?> | 
|  | 44 | 
|  | 45 <!-- | 
| 33   sys.BUILDARCH is set by the command line argument '-arch'. | 46   sys.BUILDARCH is set by the command line argument '-arch'. | 
| 34   The default value to "x86" | 47   The default value to "x86" | 
| 35 --> | 48 --> | 
| 36 <?if $(sys.BUILDARCH)="x86"?> | 49 <?if $(sys.BUILDARCH)="x86"?> | 
| 37   <?define Minimum_Version="100"?> | 50   <?define Minimum_Version="100"?> | 
| 38   <?define Program_Files="ProgramFilesFolder"?> | 51   <?define Program_Files="ProgramFilesFolder"?> | 
| 39   <?define Product_Name="!(loc.ProductName32)"?> | 52   <?define Product_Name="!(loc.ProductName32)"?> | 
|  | 53   <?define build_dir="ia32"?> | 
| 40 <?elseif $(sys.BUILDARCH)="x64"?> | 54 <?elseif $(sys.BUILDARCH)="x64"?> | 
| 41   <?define Minimum_Version="200"?> | 55   <?define Minimum_Version="200"?> | 
| 42   <?define Program_Files="ProgramFiles64Folder"?> | 56   <?define Program_Files="ProgramFiles64Folder"?> | 
| 43   <?define Product_Name="!(loc.ProductName64)"?> | 57   <?define Product_Name="!(loc.ProductName64)"?> | 
|  | 58   <?define build_dir="x64"?> | 
| 44 <?else?> | 59 <?else?> | 
| 45   <?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?> | 60   <?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?> | 
| 46 <?endif?> | 61 <?endif?> | 
| 47 | 62 | 
|  | 63 <!-- | 
|  | 64   The current directory when the compiler runs is "installer/build/<arch>". | 
|  | 65   Most assets are based in the root directory, three levels up. | 
|  | 66   The custom action library is base in the installer directory, two levels up. | 
|  | 67 --> | 
|  | 68 <?define plugin_dir="..\..\.." ?> | 
|  | 69 <?define installer_dir="..\.." ?> | 
|  | 70 | 
| 48 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> | 71 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> | 
|  | 72   <!-- | 
|  | 73     The attributes 'Language' and 'Codepage' are specifications for the database
      only. | 
|  | 74     Codepage 65001 is UTF-8. | 
|  | 75   --> | 
| 49   <Product | 76   <Product | 
| 50     Name="$(var.Product_Name)" | 77     Name="$(var.Product_Name)" | 
| 51     Manufacturer="Eyeo GmbH" | 78     Manufacturer="Eyeo GmbH" | 
| 52     Version="$(var.Product_Version)" | 79     Version="$(var.Product_Version)" | 
| 53     Language="!(loc.LANG)" Codepage="1252" | 80     Language="!(loc.LANG)" Codepage="1252" | 
| 54     Id="*" | 81     Id="*" | 
| 55     UpgradeCode="3a8e3ab4-762d-4641-806e-2dccb953d73f"> | 82     UpgradeCode="3a8e3ab4-762d-4641-806e-2dccb953d73f"> | 
| 56 | 83 | 
|  | 84     <!-- | 
|  | 85       Attribute @Languages | 
|  | 86         The list contains all the languages supported within the MSI, all but th
     e first as embedded transforms. | 
|  | 87         The first language code is the language of the base MSI. | 
|  | 88     --> | 
|  | 89     <!-- | 
|  | 90       At the present time, we are not localizing the summary information because
      of limitations | 
|  | 91         both in Windows Installer and in the tool chain. | 
|  | 92       At a later time, localizing this section requires setting an ANSI codepage | 
|  | 93         and the four attributes Keywords, Description, Comments, and Manufacture
     r. | 
|  | 94     --> | 
|  | 95     <!-- | 
|  | 96       For the present version, the following languages are omitted because the W
     iX UI extension has no localizations for them yet. | 
|  | 97       They can be added later, but the build script needs to be changed to accep
     t arguments for the extra localization source. | 
|  | 98         fil-PH. Filipino - Phillipines. LCID = 1124 | 
|  | 99         kn-IN. Kanada - India. LCID = 1099 | 
|  | 100         mr-IN.  Maratha - India. LCID = 1102 | 
|  | 101         ms. Malaysian - generic. LCID = 62 | 
|  | 102         nn-NO. Nynorsk - Norway. LCID = 2068 | 
|  | 103         ur-PK. Urdu - Pakistan. LCID = 1056 | 
|  | 104       They are being omitted by having their decimal LCID left out of the Packag
     es/@Languages attribute below. | 
|  | 105       The build system presently embeds transforms for them, but without their L
     CID in this list, they won't be recognized. | 
|  | 106       These embedded transforms, however, can be explicitly applied on the comma
     nd line of msiexec. | 
|  | 107     --> | 
| 57     <Package | 108     <Package | 
| 58       Keywords="!(loc.Keywords)" | 109       SummaryCodepage="1252" | 
| 59       Description="!(loc.Description)" | 110       Keywords="Installer, Adblock Plus" | 
| 60       Comments="!(loc.Comments)" | 111       Description="Adblock Plus for IE" | 
|  | 112       Comments="Thank you for using Adblock Plus." | 
|  | 113       Manufacturer="Eyeo GmbH" | 
| 61       InstallerVersion="$(var.Minimum_Version)" | 114       InstallerVersion="$(var.Minimum_Version)" | 
| 62       Languages="!(loc.LANG)" SummaryCodepage="!(loc.CODEPAGE)" | 115       Languages="9,1,7,12,16,19,1026,1027,1029,1030,1032,1034,1035,1037,1038,104
     1,1044,1045,1046,1048,1049,1050,1051,1053,1054,1055,1058,1061,2052,2070" | 
| 63       Compressed="yes" | 116       Compressed="yes" | 
| 64       InstallScope="perMachine" InstallPrivileges="elevated" | 117       InstallScope="perMachine" InstallPrivileges="elevated" | 
| 65     /> | 118     /> | 
| 66     <!-- | 119     <!-- | 
| 67       The MajorUpgrade tag allows us to specify the relationship between our | 120       The MajorUpgrade tag allows us to specify the relationship between our | 
| 68       version number and the one installed. The attribute Disallow="no" is | 121       version number and the one installed. The attribute Disallow="no" is | 
| 69       implied and allows major upgrades to be performed. Downgrades aren't | 122       implied and allows major upgrades to be performed. Downgrades aren't | 
| 70       allowed by default. | 123       allowed by default. | 
| 71 | 124 | 
| 72 |  | 
| 73       The @Schedule attribute looks a little opaque. | 125       The @Schedule attribute looks a little opaque. | 
| 74       Suffice it to say that it's the only option for scheduling where uninstall
     ation of the previous version | 126       Suffice it to say that it's the only option for scheduling where uninstall
     ation of the previous version | 
| 75         and installation of the present version is _always_ going to act atomica
     lly. | 127         and installation of the present version is _always_ going to act atomica
     lly. | 
| 76       It's a shame that you to even explicitly make that choice. | 128       It's a shame that you to even explicitly make that choice. | 
| 77     --> | 129     --> | 
| 78     <MajorUpgrade | 130     <MajorUpgrade | 
| 79       Schedule="afterInstallExecute" | 131       Schedule="afterInstallExecute" | 
| 80       DowngradeErrorMessage="!(loc.AlreadyInstalled)" | 132       DowngradeErrorMessage="!(loc.AlreadyInstalled)" | 
| 81     /> | 133     /> | 
| 82     <MediaTemplate EmbedCab="yes"/> | 134     <MediaTemplate EmbedCab="yes"/> | 
| 83 | 135 | 
| 84     <!-- | 136     <!-- | 
| 85       User interface | 137       User interface | 
| 86     --> | 138     --> | 
| 87     <UIRef Id="custom_WixUI_InstallDir"/> | 139     <UIRef Id="custom_WixUI_InstallDir"/> | 
| 88     <UIRef Id="WixUI_ErrorProgressText"/> | 140     <UIRef Id="WixUI_ErrorProgressText"/> | 
| 89     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/> | 141     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/> | 
| 90 | 142 | 
| 91     <!-- | 143     <!-- | 
| 92       Define and schedule a "Custom Action Type 1" to ensure that IE is closed b
     efore installation. | 144       Define and schedule a "Custom Action Type 1" to ensure that IE is closed b
     efore installation. | 
| 93       Because WiX is closely tied to the MSI database format, there are multiple
      tags required to do this. | 145       Because WiX is closely tied to the MSI database format, there are multiple
      tags required to do this. | 
| 94       The "CustomAction" tag defines the tag itself, but doesn't sequence it; | 146       The "CustomAction" tag defines the tag itself, but doesn't sequence it; | 
| 95         it defines an entry in the "CustomAction" table. | 147         it defines an entry in the "CustomAction" table. | 
| 96       The "Binary" tag describe an asset that's incorporated into the MSI but th
     at is not an installed component. | 148       The "Binary" tag describe an asset that's incorporated into the MSI but th
     at is not an installed component. | 
| 97       The "Custom" tag defines the sequencing of an action; | 149       The "Custom" tag defines when the action executes by defining an entry in 
     one of the sequence tables. | 
| 98         it defines an entry in one of the sequence tables (there are six). |  | 
| 99 | 150 | 
| 100       Attribute "Return" sets the "Custom Action Return Processing Options" to z
     ero, | 151       Attribute "Return" sets the "Custom Action Return Processing Options" to z
     ero, | 
| 101         which indicates to block the installer until the action completes | 152         which indicates to block the installer until the action completes | 
| 102         and to treat a non-zero return value from the action as an error. | 153         and to treat a non-zero return value from the action as an error. | 
| 103     --> | 154     --> | 
| 104     <CustomAction | 155     <CustomAction | 
| 105         Id="Close_IE" | 156         Id="Close_IE" | 
| 106         BinaryKey="installer_ca" | 157         BinaryKey="installer_ca" | 
| 107         DllEntry="abp_close_applications" | 158         DllEntry="abp_close_ie" | 
| 108         Return="check" | 159         Return="check" | 
| 109     /> | 160     /> | 
| 110     <Binary Id="installer_ca" SourceFile="build\ia32\Debug\installer-ca.dll"/> | 161     <!-- | 
|  | 162       We require a 32-bit DLL for the 32-bit installer, and likewise for 64-bit. | 
|  | 163       The 64-bit Close_IE action needs to examine 64-bit processes on the system
     , which are invisible to 32-bit processes. | 
|  | 164     --> | 
|  | 165     <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build
     _dir)\$(var.CA_Configuration)\installer-ca.dll"/> | 
| 111     <InstallUISequence> | 166     <InstallUISequence> | 
| 112       <!-- | 167       <!-- | 
| 113         The LaunchConditions action occurs near the beginning, before any of the
      expensive operations. | 168         The LaunchConditions action occurs near the beginning, before any of the
      expensive operations. | 
| 114       --> | 169       --> | 
| 115       <Custom | 170       <Custom | 
| 116         Action="Close_IE" | 171         Action="Close_IE" | 
| 117         After="LaunchConditions" | 172         After="LaunchConditions" | 
| 118       /> | 173       /> | 
| 119     </InstallUISequence> | 174     </InstallUISequence> | 
| 120 | 175 | 
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 237       The present installer is a per-machine installer. | 292       The present installer is a per-machine installer. | 
| 238       That means it writes to HKEY_LOCAL_MACHINE, so that all users on the machi
     ne will have the BHO installed. | 293       That means it writes to HKEY_LOCAL_MACHINE, so that all users on the machi
     ne will have the BHO installed. | 
| 239       It's possible to write keys to HKEY_CURRENT_USER in a situation where that
     's not desirable, if needed. | 294       It's possible to write keys to HKEY_CURRENT_USER in a situation where that
     's not desirable, if needed. | 
| 240     --> | 295     --> | 
| 241     <ComponentGroup Id="Binaries" Directory="INSTALLFOLDER"> | 296     <ComponentGroup Id="Binaries" Directory="INSTALLFOLDER"> | 
| 242       <!-- | 297       <!-- | 
| 243         The 32-bit version of the DLL is included in both 32- and 64-bit install
     ers. | 298         The 32-bit version of the DLL is included in both 32- and 64-bit install
     ers. | 
| 244         We need an explicit value for attribute @Win64 so that the ARCH argument
      does not override its implicit value. | 299         We need an explicit value for attribute @Win64 so that the ARCH argument
      does not override its implicit value. | 
| 245       --> | 300       --> | 
| 246       <Component Id="AdblockPlus32.dll" Guid="d9a35780-d712-11e2-8b8b-0800200c9a
     66" Win64="no"> | 301       <Component Id="AdblockPlus32.dll" Guid="d9a35780-d712-11e2-8b8b-0800200c9a
     66" Win64="no"> | 
| 247         <File Id="AdblockPlus32.dll" Name="AdblockPlus32.dll" Source="..\build\i
     a32\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum="yes"> | 302         <File Id="AdblockPlus32.dll" Name="AdblockPlus32.dll" Source="$(var.plug
     in_dir)\build\ia32\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum=
     "yes"> | 
| 248           <?include dll_class.wxi ?> | 303           <?include dll_class.wxi ?> | 
| 249         </File> | 304         </File> | 
| 250         <?include bho_registry_value.wxi ?> | 305         <?include bho_registry_value.wxi ?> | 
| 251       </Component> | 306       </Component> | 
| 252       <!-- | 307       <!-- | 
| 253         The 64-bit version of the DLL is only included in the 64-bit installer. | 308         The 64-bit version of the DLL is only included in the 64-bit installer. | 
| 254         We don't really need an explicit value for attribute @Win64, but it's th
     ere for resilience. | 309         We don't really need an explicit value for attribute @Win64, but it's th
     ere for resilience. | 
| 255 | 310 | 
| 256         Note that the <Class> element and the <RegistryKey> element are duplicat
     ed from the 32-bit version. | 311         Note that the <Class> element and the <RegistryKey> element are duplicat
     ed from the 32-bit version. | 
| 257         We use "include" directives to ensure that they are identical. | 312         We use "include" directives to ensure that they are identical. | 
| 258         They have to be the same to support both the 32- and 64-bit versions of 
     Internet Explorer on a 64-bit system. | 313         They have to be the same to support both the 32- and 64-bit versions of 
     Internet Explorer on a 64-bit system. | 
| 259         IE uses the same algorithm to search for BHO regardless of platform, | 314         IE uses the same algorithm to search for BHO regardless of platform, | 
| 260           so with two versions of IE, we need two identical registrations. | 315           so with two versions of IE, we need two identical registrations. | 
| 261         The 32-bit version on a 64-bit system will be registered under "Wow6432N
     ode" translated keys, | 316         The 32-bit version on a 64-bit system will be registered under "Wow6432N
     ode" translated keys, | 
| 262           while the 64-bit version will be under the keys as they appear in this
      source, not translated. | 317           while the 64-bit version will be under the keys as they appear in this
      source, not translated. | 
| 263         We don't need to put in the "Wow6432Node" registry key explicitly; | 318         We don't need to put in the "Wow6432Node" registry key explicitly; | 
| 264           something in Windows Installer takes care of the mapping transparently
     . | 319           something in Windows Installer takes care of the mapping transparently
     . | 
| 265       --> | 320       --> | 
| 266       <?if $(sys.BUILDARCH)="x64"?> | 321       <?if $(sys.BUILDARCH)="x64"?> | 
| 267         <Component Id="AdblockPlus64.dll" Guid="ed77a2c0-d712-11e2-8b8b-0800200c
     9a66" Win64="yes"> | 322         <Component Id="AdblockPlus64.dll" Guid="ed77a2c0-d712-11e2-8b8b-0800200c
     9a66" Win64="yes"> | 
| 268           <File Id="AdblockPlus64.dll" Name="AdblockPlus64.dll" Source="..\build
     \x64\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum="yes"> | 323           <File Id="AdblockPlus64.dll" Name="AdblockPlus64.dll" Source="$(var.pl
     ugin_dir)\build\x64\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum
     ="yes"> | 
| 269             <?include dll_class.wxi ?> | 324             <?include dll_class.wxi ?> | 
| 270           </File> | 325           </File> | 
| 271           <?include bho_registry_value.wxi ?> | 326           <?include bho_registry_value.wxi ?> | 
| 272         </Component> | 327         </Component> | 
| 273       <?endif?> | 328       <?endif?> | 
| 274 | 329 | 
| 275       <!-- | 330       <!-- | 
| 276         The engine must go into the same directory as the DLL, since that locati
     on is searched explicitly (and uniquely). | 331         The engine must go into the same directory as the DLL, since that locati
     on is searched explicitly (and uniquely). | 
| 277       --> | 332       --> | 
| 278       <?if $(sys.BUILDARCH)="x86"?> | 333       <?if $(sys.BUILDARCH)="x86"?> | 
| 279         <Component Id="AdblockPlusEngine.exe" Guid="f45572c0-d712-11e2-8b8b-0800
     200c9a66" Win64="no"> | 334         <Component Id="AdblockPlusEngine.exe" Guid="f45572c0-d712-11e2-8b8b-0800
     200c9a66" Win64="no"> | 
| 280           <File Id="AdblockPlusEngine.exe" Source="..\build\ia32\$(var.Configura
     tion)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/> | 335           <File Id="AdblockPlusEngine.exe" Source="$(var.plugin_dir)\build\ia32\
     $(var.Configuration)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/> | 
| 281         </Component> | 336         </Component> | 
| 282       <?elseif $(sys.BUILDARCH)="x64"?> | 337       <?elseif $(sys.BUILDARCH)="x64"?> | 
| 283         <Component Id="AdblockPlusEngine.exe" Guid="fa8d65d0-d712-11e2-8b8b-0800
     200c9a66" Win64="yes"> | 338         <Component Id="AdblockPlusEngine.exe" Guid="fa8d65d0-d712-11e2-8b8b-0800
     200c9a66" Win64="yes"> | 
| 284           <File Id="AdblockPlusEngine.exe" Source="..\build\x64\$(var.Configurat
     ion)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/> | 339           <File Id="AdblockPlusEngine.exe" Source="$(var.plugin_dir)\build\x64\$
     (var.Configuration)\AdblockPlusEngine.exe" KeyPath="yes" Checksum="yes"/> | 
| 285         </Component> | 340         </Component> | 
| 286       <?endif?> | 341       <?endif?> | 
| 287     </ComponentGroup> | 342     </ComponentGroup> | 
| 288 | 343 | 
| 289     <!-- | 344     <!-- | 
| 290       The HTML_Tree component group contains all the files in the HTML folder. | 345       The HTML_Tree component group contains all the files in the HTML folder. | 
| 291       Individual file entries within a single component group must all be in the
      same directory. | 346       Individual file entries within a single component group must all be in the
      same directory. | 
| 292       Also, ComponentGroup is not a valid child of ComponentGroup, so subdirecto
     ries are linked by reference. | 347       Also, ComponentGroup is not a valid child of ComponentGroup, so subdirecto
     ries are linked by reference. | 
| 293     --> | 348     --> | 
| 294     <ComponentGroup Id="HTML_Tree"> | 349     <ComponentGroup Id="HTML_Tree"> | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
| 315       <ComponentRef Id="html_static_js_IESettings.js"/> | 370       <ComponentRef Id="html_static_js_IESettings.js"/> | 
| 316       <ComponentRef Id="html_static_js_ieFirstRun.js"/> | 371       <ComponentRef Id="html_static_js_ieFirstRun.js"/> | 
| 317       <ComponentRef Id="html_static_js_settings.js"/> | 372       <ComponentRef Id="html_static_js_settings.js"/> | 
| 318       <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> | 373       <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> | 
| 319       <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> | 374       <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> | 
| 320       <ComponentRef Id="html_templates_firstRun.html"/> | 375       <ComponentRef Id="html_templates_firstRun.html"/> | 
| 321       <ComponentRef Id="html_templates_index.html"/> | 376       <ComponentRef Id="html_templates_index.html"/> | 
| 322     </ComponentGroup> | 377     </ComponentGroup> | 
| 323 | 378 | 
| 324     <DirectoryRef Id="HTML_Folder"> | 379     <DirectoryRef Id="HTML_Folder"> | 
| 325       <Directory Id="html" FileSource="..\html"> | 380       <Directory Id="html" FileSource="$(var.plugin_dir)\html"> | 
| 326         <Directory Name="static" Id="html_static"> | 381         <Directory Name="static" Id="html_static"> | 
| 327           <Directory Name="css" Id="html_static_css"> | 382           <Directory Name="css" Id="html_static_css"> | 
| 328             <Component Id="html_static_css_firstRun.css" Guid="facb02d0-f073-11e
     2-b778-0800200c9a66"> | 383             <Component Id="html_static_css_firstRun.css" Guid="facb02d0-f073-11e
     2-b778-0800200c9a66"> | 
| 329               <File Name="firstRun.css"/> | 384               <File Name="firstRun.css"/> | 
| 330             </Component> | 385             </Component> | 
| 331             <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e
     2-8b8b-0800200c9a66"> | 386             <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e
     2-8b8b-0800200c9a66"> | 
| 332               <File Name="settings.css"/> | 387               <File Name="settings.css"/> | 
| 333             </Component> | 388             </Component> | 
| 334           </Directory> | 389           </Directory> | 
| 335           <Directory Name="img" Id="html_static_img"> | 390           <Directory Name="img" Id="html_static_img"> | 
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 503         <ComponentRef Id="locales_ur_PK.ini"/> | 558         <ComponentRef Id="locales_ur_PK.ini"/> | 
| 504         <ComponentRef Id="locales_uz.ini"/> | 559         <ComponentRef Id="locales_uz.ini"/> | 
| 505         <ComponentRef Id="locales_vi.ini"/> | 560         <ComponentRef Id="locales_vi.ini"/> | 
| 506         <ComponentRef Id="locales_xh.ini"/> | 561         <ComponentRef Id="locales_xh.ini"/> | 
| 507         <ComponentRef Id="locales_zh_CN.ini"/> | 562         <ComponentRef Id="locales_zh_CN.ini"/> | 
| 508         <ComponentRef Id="locales_zh_HK.ini"/> | 563         <ComponentRef Id="locales_zh_HK.ini"/> | 
| 509         <ComponentRef Id="locales_zh_TW.ini"/> | 564         <ComponentRef Id="locales_zh_TW.ini"/> | 
| 510         <ComponentRef Id="locales_zu.ini"/> | 565         <ComponentRef Id="locales_zu.ini"/> | 
| 511     </ComponentGroup> | 566     </ComponentGroup> | 
| 512     <DirectoryRef Id="Locales_Folder"> | 567     <DirectoryRef Id="Locales_Folder"> | 
| 513       <Directory Id="locales" FileSource="..\locales"> | 568       <Directory Id="locales" FileSource="$(var.plugin_dir)\locales"> | 
| 514         <Component Id="locales_af.ini" Guid="0311a948-3e76-45e8-83c0-8455fa9083b
     7"> | 569         <Component Id="locales_af.ini" Guid="0311a948-3e76-45e8-83c0-8455fa9083b
     7"> | 
| 515           <RemoveFile Id="af.ini" Name="af.ini" On="install"/> | 570           <RemoveFile Id="af.ini" Name="af.ini" On="install"/> | 
| 516         </Component> | 571         </Component> | 
| 517         <Component Id="locales_am.ini" Guid="cca25e4e-9b74-4e99-a592-c54a310fe80
     6"> | 572         <Component Id="locales_am.ini" Guid="cca25e4e-9b74-4e99-a592-c54a310fe80
     6"> | 
| 518           <RemoveFile Id="am.ini" Name="am.ini" On="install"/> | 573           <RemoveFile Id="am.ini" Name="am.ini" On="install"/> | 
| 519         </Component> | 574         </Component> | 
| 520         <Component Id="locales_ar.ini" Guid="2e25459f-e7e0-40bf-b9d2-05a60be967f
     9"> | 575         <Component Id="locales_ar.ini" Guid="2e25459f-e7e0-40bf-b9d2-05a60be967f
     9"> | 
| 521           <File Name="ar.ini"/> | 576           <File Name="ar.ini"/> | 
| 522         </Component> | 577         </Component> | 
| 523         <Component Id="locales_as.ini" Guid="871517f1-be55-4b8c-83b9-5da89230de6
     b"> | 578         <Component Id="locales_as.ini" Guid="871517f1-be55-4b8c-83b9-5da89230de6
     b"> | 
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 758       A component in Windows Installer represents a fixed piece of data with the
      MSI, not a changing one. | 813       A component in Windows Installer represents a fixed piece of data with the
      MSI, not a changing one. | 
| 759       The present method of making settings.ini a component is simply an expedie
     nt for the present, | 814       The present method of making settings.ini a component is simply an expedie
     nt for the present, | 
| 760         not a permanent solution. | 815         not a permanent solution. | 
| 761       The correct solution requires the application to manage this file; the ins
     taller can't do it right. | 816       The correct solution requires the application to manage this file; the ins
     taller can't do it right. | 
| 762       See http://stackoverflow.com/questions/357911/manage-configuration-files-w
     ith-wix | 817       See http://stackoverflow.com/questions/357911/manage-configuration-files-w
     ith-wix | 
| 763     --> | 818     --> | 
| 764     <ComponentGroup Id="INI_Files"> | 819     <ComponentGroup Id="INI_Files"> | 
| 765       <ComponentRef Id="ini_settings.ini"/> | 820       <ComponentRef Id="ini_settings.ini"/> | 
| 766     </ComponentGroup> | 821     </ComponentGroup> | 
| 767     <DirectoryRef Id="ABP_APPDATA_FOLDER"> | 822     <DirectoryRef Id="ABP_APPDATA_FOLDER"> | 
| 768       <Directory Id="ini" FileSource="..\files"> | 823       <Directory Id="ini" FileSource="$(var.plugin_dir)\files"> | 
| 769         <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
     a66"> | 824         <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
     a66"> | 
| 770           <File Name="settings.ini"/> | 825           <File Name="settings.ini"/> | 
| 771         </Component> | 826         </Component> | 
| 772       </Directory> | 827       </Directory> | 
| 773     </DirectoryRef> | 828     </DirectoryRef> | 
|  | 829 | 
|  | 830     <?include ../installer-lib/custom-i18n.wxi ?> | 
|  | 831     <?include ../custom-action/close_ie.wxi ?> | 
| 774   </Product> | 832   </Product> | 
| 775 </Wix> | 833 </Wix> | 
| OLD | NEW | 
|---|