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

Delta Between Two Patch Sets: installer/src/installer-lib/test/test-installer-lib.wxs

Issue 6003395731128320: Only take into account processes that have our plugin loaded (Closed)
Left Patch Set: Created March 27, 2014, 3:29 p.m.
Right Patch Set: Simplify Process_Closer constructor Created March 31, 2014, 8:31 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
LEFTRIGHT
(no file at all)
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <?define installer_dir="..\.." ?> 2 <?define installer_dir="..\.." ?>
3 <?define CA_Configuration="Debug" ?> 3 <?define CA_Configuration="Debug" ?>
4 4
5 <?if $(sys.BUILDARCH)="x86"?> 5 <?if $(sys.BUILDARCH)="x86"?>
6 <?define Program_Files="ProgramFilesFolder"?> 6 <?define Program_Files="ProgramFilesFolder"?>
7 <?define Product_Name="!(loc.ProductName32)"?> 7 <?define Product_Name="!(loc.ProductName32)"?>
8 <?define build_dir="ia32"?>
8 <?elseif $(sys.BUILDARCH)="x64"?> 9 <?elseif $(sys.BUILDARCH)="x64"?>
9 <?define Program_Files="ProgramFiles64Folder"?> 10 <?define Program_Files="ProgramFiles64Folder"?>
10 <?define Product_Name="!(loc.ProductName64)"?> 11 <?define Product_Name="!(loc.ProductName64)"?>
12 <?define build_dir="x64"?>
11 <?else?> 13 <?else?>
12 <?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?> 14 <?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?>
13 <?endif?> 15 <?endif?>
14 16
15 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> 17 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
16 <!-- 18 <!--
17 The attributes 'Language' and 'Codepage' are specifications for the database only. 19 The attributes 'Language' and 'Codepage' are specifications for the database only.
18 Codepage 65001 is UTF-8. 20 Codepage 65001 is UTF-8.
19 --> 21 -->
20 <Product 22 <Product
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 <!-- Always check the return of the "always fail" action; otherwise there's no point in running it. --> 72 <!-- Always check the return of the "always fail" action; otherwise there's no point in running it. -->
71 <CustomAction 73 <CustomAction
72 Id="Fail" 74 Id="Fail"
73 BinaryKey="installer_library_test_ca" 75 BinaryKey="installer_library_test_ca"
74 DllEntry="fail" 76 DllEntry="fail"
75 Return="check" 77 Return="check"
76 /> 78 />
77 <!-- 79 <!--
78 Note that we're using a 32-bit custom action library for both 32- and 64-b it installers. 80 Note that we're using a 32-bit custom action library for both 32- and 64-b it installers.
79 --> 81 -->
80 <Binary Id="installer_library_test_ca" SourceFile="$(var.installer_dir)\buil d\ia32\$(var.CA_Configuration)\installer-library-test-customactions.dll"/> 82 <Binary Id="installer_library_test_ca" SourceFile="$(var.installer_dir)\buil d\$(var.build_dir)\$(var.CA_Configuration)\installer-library-test-customactions. dll"/>
81 <!-- 83 <!--
82 The sequence of testing actions go here. 84 The sequence of testing actions go here.
83 Alter this sequence at will to test, exercise, observe, or debug custom ac tion code. 85 Alter this sequence at will to test, exercise, observe, or debug custom ac tion code.
84 The "Fail" action can be put at the end to ensure that the installer termi nates before actually trying to install anything. 86 The "Fail" action can be put at the end to ensure that the installer termi nates before actually trying to install anything.
85 Action might also be put into the InstallExecuteSequence, if needed. 87 Action might also be put into the InstallExecuteSequence, if needed.
86 --> 88 -->
87 <InstallUISequence> 89 <InstallUISequence>
88 <!-- 90 <!--
89 "LaunchConditions" occurs at the beginning of the InstallUISequence, bef ore any of the expensive operations. 91 "LaunchConditions" occurs at the beginning of the InstallUISequence, bef ore any of the expensive operations.
90 --> 92 -->
(...skipping 24 matching lines...) Expand all
115 </Directory> 117 </Directory>
116 </Directory> 118 </Directory>
117 119
118 <!-- 120 <!--
119 Unit tests verify the number of rows and columns of the table, as well as the presence of certain data. 121 Unit tests verify the number of rows and columns of the table, as well as the presence of certain data.
120 --> 122 -->
121 <?include ../custom-i18n.wxi ?> 123 <?include ../custom-i18n.wxi ?>
122 <?include ../../custom-action/close_ie.wxi ?> 124 <?include ../../custom-action/close_ie.wxi ?>
123 </Product> 125 </Product>
124 </Wix> 126 </Wix>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld