Side by Side Diff: installer/src/installer-lib/test/test-installer-lib.wxs
Issue 5219280069066752:
Issue #1186 - Change names that appear in the custom action (Closed)
Patch Set:
Created Oct. 15, 2014, 3:29 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« installer/src/installer-lib/test/property_test.cpp ('k')
|
installer/src/installer-lib/test/test-installer-lib-ca.def » ('j')
|
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 <?define installer_dir="..\.." ?> | 2 <?define installer_dir="..\.." ?> |
| 3 <?define CA_Configuration="Release" ?> | 3 <?define CA_Configuration="Release" ?> |
| 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 <?define build_dir="ia32"?> |
| 9 <?elseif $(sys.BUILDARCH)="x64"?> | 9 <?elseif $(sys.BUILDARCH)="x64"?> |
| 10 <?define Program_Files="ProgramFiles64Folder"?> | 10 <?define Program_Files="ProgramFiles64Folder"?> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 59 --> | 59 --> |
| 60 <CustomAction | 60 <CustomAction |
| 61 Id="Sandbox" | 61 Id="Sandbox" |
| 62 BinaryKey="installer_library_test_ca" | 62 BinaryKey="installer_library_test_ca" |
| 63 DllEntry="sandbox" | 63 DllEntry="sandbox" |
| 64 Return="check" | 64 Return="check" |
| 65 /> | 65 /> |
| 66 <CustomAction | 66 <CustomAction |
| 67 Id="Close_IE" | 67 Id="Close_IE" |
| 68 BinaryKey="installer_library_test_ca" | 68 BinaryKey="installer_library_test_ca" |
| 69 DllEntry="abp_close_ie" | 69 DllEntry="AbpCloseIe" |
| 70 Return="check" | 70 Return="check" |
| 71 /> | 71 /> |
| 72 <!-- 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. --> |
| 73 <CustomAction | 73 <CustomAction |
| 74 Id="Fail" | 74 Id="Fail" |
| 75 BinaryKey="installer_library_test_ca" | 75 BinaryKey="installer_library_test_ca" |
| 76 DllEntry="fail" | 76 DllEntry="fail" |
| 77 Return="check" | 77 Return="check" |
| 78 /> | 78 /> |
| 79 <!-- | 79 <!-- |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 </Directory> | 117 </Directory> |
| 118 </Directory> | 118 </Directory> |
| 119 | 119 |
| 120 <!-- | 120 <!-- |
| 121 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. |
| 122 --> | 122 --> |
| 123 <?include ../custom-i18n.wxi ?> | 123 <?include ../custom-i18n.wxi ?> |
| 124 <?include ../../custom-action/close_ie.wxi ?> | 124 <?include ../../custom-action/close_ie.wxi ?> |
| 125 </Product> | 125 </Product> |
| 126 </Wix> | 126 </Wix> |
| OLD | NEW |
« no previous file with comments
|
« installer/src/installer-lib/test/property_test.cpp ('k')
|
installer/src/installer-lib/test/test-installer-lib-ca.def » ('j')
|
no next file with comments »
