Unified Diff: installer/adblockplusie.wxs
Issue 10945039:
Switch to gyp (Closed)
Patch Set: Final version
Created June 21, 2013, 2:16 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« installer/Makefile ('k')
|
src/plugin/AdblockPlus.rc » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: installer/adblockplusie.wxs |
| =================================================================== |
| --- a/installer/adblockplusie.wxs |
| +++ b/installer/adblockplusie.wxs |
| @@ -209,17 +209,17 @@ |
| It's possible to write keys to HKEY_CURRENT_USER in a situation where that's not desirable, if needed. |
| --> |
| <ComponentGroup Id="Binaries" Directory="INSTALLFOLDER"> |
| <!-- |
| The 32-bit version of the DLL is included in both 32- and 64-bit installers. |
| We need an explicit value for attribute @Win64 so that the ARCH argument does not override its implicit value. |
| --> |
| <Component Id="AdblockPlus32.dll" Guid="d9a35780-d712-11e2-8b8b-0800200c9a66" Win64="no"> |
| - <File Id="AdblockPlus32.dll" Source="..\build\ia32\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum="yes"> |
| + <File Id="AdblockPlus32.dll" Name="AdblockPlus32.dll" Source="..\build\ia32\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum="yes"> |
| <?include dll_class.wxi ?> |
| </File> |
| <?include bho_registry_value.wxi ?> |
| </Component> |
| <!-- |
| The 64-bit version of the DLL is only included in the 64-bit installer. |
| We don't really need an explicit value for attribute @Win64, but it's there for resilience. |
| @@ -230,17 +230,17 @@ |
| so with two versions of IE, we need two identical registrations. |
| The 32-bit version on a 64-bit system will be registered under "Wow6432Node" translated keys, |
| while the 64-bit version will be under the keys as they appear in this source, not translated. |
| We don't need to put in the "Wow6432Node" registry key explicitly; |
| something in Windows Installer takes care of the mapping transparently. |
| --> |
| <?if $(sys.BUILDARCH)="x64"?> |
| <Component Id="AdblockPlus64.dll" Guid="ed77a2c0-d712-11e2-8b8b-0800200c9a66" Win64="yes"> |
| - <File Id="AdblockPlus64.dll" Source="..\build\x64\$(var.Configuration)\AdblockPlusx64.dll" KeyPath="yes" Checksum="yes"> |
| + <File Id="AdblockPlus64.dll" Name="AdblockPlus64.dll" Source="..\build\x64\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum="yes"> |
| <?include dll_class.wxi ?> |
| </File> |
| <?include bho_registry_value.wxi ?> |
| </Component> |
| <?endif?> |
| <!-- |
| The engine must go into the same directory as the DLL, since that location is searched explicitly (and uniquely). |
| @@ -277,17 +277,17 @@ |
| <ComponentRef Id="html_static_js_IESettings.js"/> |
| <ComponentRef Id="html_static_js_settings.js"/> |
| <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> |
| <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> |
| <ComponentRef Id="html_templates_index.html"/> |
| </ComponentGroup> |
| <DirectoryRef Id="HTML_Folder"> |
| - <Directory Id="html" FileSource="SourceDir\..\html"> |
| + <Directory Id="html" FileSource="..\html"> |
| <Directory Name="static" Id="html_static"> |
| <Directory Name="css" Id="html_static_css"> |
| <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e2-8b8b-0800200c9a66"> |
| <File Name="settings.css"/> |
| </Component> |
| </Directory> |
| <Directory Name="img" Id="html_static_img"> |
| <Component Id="html_static_img_abp.128.png" Guid="0d86ba60-d713-11e2-8b8b-0800200c9a66"> |
| @@ -358,17 +358,17 @@ |
| <!-- |
| Locale files |
| --> |
| <ComponentGroup Id="Locale_Files"> |
| <ComponentRef Id="locales_en.ini"/> |
| <ComponentRef Id="locales_ru.ini"/> |
| </ComponentGroup> |
| <DirectoryRef Id="Locales_Folder"> |
| - <Directory Id="locales" FileSource="SourceDir\..\locales"> |
| + <Directory Id="locales" FileSource="..\locales"> |
| <Component Id="locales_en.ini" Guid="c5622430-d713-11e2-8b8b-0800200c9a66"> |
| <File Name="en.ini"/> |
| </Component> |
| <Component Id="locales_ru.ini" Guid="d06e3490-d713-11e2-8b8b-0800200c9a66"> |
| <File Name="ru.ini"/> |
| </Component> |
| </Directory> |
| </DirectoryRef> |
| @@ -382,16 +382,16 @@ |
| not a permanent solution. |
| The correct solution requires the application to manage this file; the installer can't do it right. |
| See http://stackoverflow.com/questions/357911/manage-configuration-files-with-wix |
| --> |
| <ComponentGroup Id="INI_Files"> |
| <ComponentRef Id="ini_settings.ini"/> |
| </ComponentGroup> |
| <DirectoryRef Id="ABP_APPDATA_FOLDER"> |
| - <Directory Id="ini" FileSource="SourceDir\..\files"> |
| + <Directory Id="ini" FileSource="..\files"> |
| <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9a66"> |
| <File Name="settings.ini"/> |
| </Component> |
| </Directory> |
| </DirectoryRef> |
| </Product> |
| </Wix> |
« no previous file with comments
|
« installer/Makefile ('k')
|
src/plugin/AdblockPlus.rc » ('j')
|
no next file with comments »
