Side by Side Diff: installer/src/msi/adblockplusie.wxs
Issue 5752158993514496:
Issue 1578 - Add notransforms installer for installations using Group Policy Object (Closed)
Patch Set:
Created Dec. 11, 2014, 3:01 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« installer/installer.gyp ('K')
|
« installer/msibuild.cmd ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 53 <?define build_dir="ia32"?> | 53 <?define build_dir="ia32"?> |
| 54 <?elseif $(sys.BUILDARCH)="x64"?> | 54 <?elseif $(sys.BUILDARCH)="x64"?> |
| 55 <?define Minimum_Version="200"?> | 55 <?define Minimum_Version="200"?> |
| 56 <?define Program_Files="ProgramFiles64Folder"?> | 56 <?define Program_Files="ProgramFiles64Folder"?> |
| 57 <?define Product_Name="!(loc.ProductName64)"?> | 57 <?define Product_Name="!(loc.ProductName64)"?> |
| 58 <?define build_dir="x64"?> | 58 <?define build_dir="x64"?> |
| 59 <?else?> | 59 <?else?> |
| 60 <?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?> | 60 <?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?> |
| 61 <?endif?> | 61 <?endif?> |
| 62 | 62 |
| 63 <?ifdef NoTransforms?> | |
| 64 <?define SupportedLanguages="9"?> | |
| 65 <?else?> | |
| 66 <?define SupportedLanguages="9,1,7,12,16,19,1026,1027,1029,1030,1032,1034,1035 ,1037,1038,1041,1044,1045,1046,1048,1049,1050,1051,1053,1054,1055,1058,1061,2052 ,2070"?> | |
| 67 <?endif?> | |
| 68 | |
| 63 <!-- | 69 <!-- |
| 64 The current directory when the compiler runs is "installer/build/<arch>". | 70 The current directory when the compiler runs is "installer/build/<arch>". |
| 65 Most assets are based in the root directory, three levels up. | 71 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. | 72 The custom action library is base in the installer directory, two levels up. |
| 67 --> | 73 --> |
| 68 <?define plugin_dir="..\..\.." ?> | 74 <?define plugin_dir="..\..\.." ?> |
| 69 <?define installer_dir="..\.." ?> | 75 <?define installer_dir="..\.." ?> |
| 70 | 76 |
| 71 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> | 77 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> |
| 72 <!-- | 78 <!-- |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 105 The build system presently embeds transforms for them, but without their L CID in this list, they won't be recognized. | 111 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. | 112 These embedded transforms, however, can be explicitly applied on the comma nd line of msiexec. |
| 107 --> | 113 --> |
| 108 <Package | 114 <Package |
| 109 SummaryCodepage="1252" | 115 SummaryCodepage="1252" |
| 110 Keywords="Installer, Adblock Plus" | 116 Keywords="Installer, Adblock Plus" |
| 111 Description="Adblock Plus for IE" | 117 Description="Adblock Plus for IE" |
| 112 Comments="Thank you for using Adblock Plus." | 118 Comments="Thank you for using Adblock Plus." |
| 113 Manufacturer="Eyeo GmbH" | 119 Manufacturer="Eyeo GmbH" |
| 114 InstallerVersion="$(var.Minimum_Version)" | 120 InstallerVersion="$(var.Minimum_Version)" |
| 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" | 121 Languages="$(var.SupportedLanguages)" |
| 116 Compressed="yes" | 122 Compressed="yes" |
| 117 InstallScope="perMachine" InstallPrivileges="elevated" | 123 InstallScope="perMachine" InstallPrivileges="elevated" |
| 118 /> | 124 /> |
| 119 <!-- | 125 <!-- |
| 120 The MajorUpgrade tag allows us to specify the relationship between our | 126 The MajorUpgrade tag allows us to specify the relationship between our |
| 121 version number and the one installed. The attribute Disallow="no" is | 127 version number and the one installed. The attribute Disallow="no" is |
| 122 implied and allows major upgrades to be performed. Downgrades aren't | 128 implied and allows major upgrades to be performed. Downgrades aren't |
| 123 allowed by default. | 129 allowed by default. |
| 124 | 130 |
| 125 The @Schedule attribute looks a little opaque. | 131 The @Schedule attribute looks a little opaque. |
| (...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 808 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> | 814 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> |
| 809 <File Name="settings.ini"/> | 815 <File Name="settings.ini"/> |
| 810 </Component> | 816 </Component> |
| 811 </Directory> | 817 </Directory> |
| 812 </DirectoryRef> | 818 </DirectoryRef> |
| 813 | 819 |
| 814 <?include ../installer-lib/custom-i18n.wxi ?> | 820 <?include ../installer-lib/custom-i18n.wxi ?> |
| 815 <?include ../custom-action/close_ie.wxi ?> | 821 <?include ../custom-action/close_ie.wxi ?> |
| 816 </Product> | 822 </Product> |
| 817 </Wix> | 823 </Wix> |
| OLD | NEW |
« installer/installer.gyp ('K')
|
« installer/msibuild.cmd ('k')
|
no next file »
|
no next file with comments »
