Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: installer/src/msi/adblockplusie.wxs

Issue 5117000430911488: Build for x64 CA library (Closed)
Patch Set: Created March 27, 2014, 5:43 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « installer/installer.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 <?endif?> 43 <?endif?>
44 44
45 <!-- 45 <!--
46 sys.BUILDARCH is set by the command line argument '-arch'. 46 sys.BUILDARCH is set by the command line argument '-arch'.
47 The default value to "x86" 47 The default value to "x86"
48 --> 48 -->
49 <?if $(sys.BUILDARCH)="x86"?> 49 <?if $(sys.BUILDARCH)="x86"?>
50 <?define Minimum_Version="100"?> 50 <?define Minimum_Version="100"?>
51 <?define Program_Files="ProgramFilesFolder"?> 51 <?define Program_Files="ProgramFilesFolder"?>
52 <?define Product_Name="!(loc.ProductName32)"?> 52 <?define Product_Name="!(loc.ProductName32)"?>
53 <?define build_dir="ia32"?>
53 <?elseif $(sys.BUILDARCH)="x64"?> 54 <?elseif $(sys.BUILDARCH)="x64"?>
54 <?define Minimum_Version="200"?> 55 <?define Minimum_Version="200"?>
55 <?define Program_Files="ProgramFiles64Folder"?> 56 <?define Program_Files="ProgramFiles64Folder"?>
56 <?define Product_Name="!(loc.ProductName64)"?> 57 <?define Product_Name="!(loc.ProductName64)"?>
58 <?define build_dir="x64"?>
57 <?else?> 59 <?else?>
58 <?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?> 60 <?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?>
59 <?endif?> 61 <?endif?>
60 62
61 <!-- 63 <!--
62 The current directory when the compiler runs is "installer/build/<arch>". 64 The current directory when the compiler runs is "installer/build/<arch>".
63 Most assets are based in the root directory, three levels up. 65 Most assets are based in the root directory, three levels up.
64 The custom action library is base in the installer directory, two levels up. 66 The custom action library is base in the installer directory, two levels up.
65 --> 67 -->
66 <?define plugin_dir="..\..\.." ?> 68 <?define plugin_dir="..\..\.." ?>
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 --> 154 -->
153 <CustomAction 155 <CustomAction
154 Id="Close_IE" 156 Id="Close_IE"
155 BinaryKey="installer_ca" 157 BinaryKey="installer_ca"
156 DllEntry="abp_close_ie" 158 DllEntry="abp_close_ie"
157 Return="check" 159 Return="check"
158 /> 160 />
159 <!-- 161 <!--
160 Note that we're using a 32-bit custom action library for both 32- and 64-b it installers. 162 Note that we're using a 32-bit custom action library for both 32- and 64-b it installers.
161 --> 163 -->
162 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\ia32\$(var. CA_Configuration)\installer-ca.dll"/> 164 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build _dir)\$(var.CA_Configuration)\installer-ca.dll"/>
163 <InstallUISequence> 165 <InstallUISequence>
164 <!-- 166 <!--
165 The LaunchConditions action occurs near the beginning, before any of the expensive operations. 167 The LaunchConditions action occurs near the beginning, before any of the expensive operations.
166 --> 168 -->
167 <Custom 169 <Custom
168 Action="Close_IE" 170 Action="Close_IE"
169 After="LaunchConditions" 171 After="LaunchConditions"
170 /> 172 />
171 </InstallUISequence> 173 </InstallUISequence>
172 174
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 </ComponentGroup> 820 </ComponentGroup>
819 <DirectoryRef Id="ABP_APPDATA_FOLDER"> 821 <DirectoryRef Id="ABP_APPDATA_FOLDER">
820 <Directory Id="ini" FileSource="$(var.plugin_dir)\files"> 822 <Directory Id="ini" FileSource="$(var.plugin_dir)\files">
821 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> 823 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66">
822 <File Name="settings.ini"/> 824 <File Name="settings.ini"/>
823 </Component> 825 </Component>
824 </Directory> 826 </Directory>
825 </DirectoryRef> 827 </DirectoryRef>
826 </Product> 828 </Product>
827 </Wix> 829 </Wix>
OLDNEW
« no previous file with comments | « installer/installer.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld