Left: | ||
Right: |
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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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 | 151 |
152 It currently uses the blocking icon. | 152 It currently uses the blocking icon. |
153 When #1538 is ready, we may have a separate icon file for this. | 153 When #1538 is ready, we may have a separate icon file for this. |
154 --> | 154 --> |
Eric
2015/03/13 16:37:11
Can we kill this comment now?
| |
155 <Icon Id="program_icon" SourceFile="$(var.plugin_dir)\src\res\blocking.ico"/ > | 155 <Icon Id="program_icon" SourceFile="$(var.plugin_dir)\src\res\blocking.ico"/ > |
156 <Property Id="ARPPRODUCTICON" Value="program_icon"/> | 156 <Property Id="ARPPRODUCTICON" Value="program_icon"/> |
157 <Property Id="ARPURLINFOABOUT" Value="https://adblockplus.org/en/about"/> | |
158 <Property Id="ARPURLUPDATEINFO" Value="https://adblockplus.org/category/adbl ock-plus-ie/"/> | |
159 <Property Id="ARPHELPLINK" Value="https://adblockplus.org/en/bugs"/> | |
Eric
2015/03/13 16:37:11
We could usefully add ARPSIZE here as well. For wh
Oleksandr
2015/03/20 04:44:33
I'd rather not. Currently the correct size is disp
| |
160 | |
161 | |
157 | 162 |
158 <!-- | 163 <!-- |
159 Define and schedule a "Custom Action Type 1" to ensure that IE is closed b efore installation. | 164 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. | 165 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; | 166 The "CustomAction" tag defines the tag itself, but doesn't sequence it; |
162 it defines an entry in the "CustomAction" table. | 167 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. | 168 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. | 169 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables. |
165 | 170 |
166 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero, | 171 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero, |
(...skipping 656 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 |