Side by Side Diff: installer/src/setup-exe/setup.wxs
Issue 5743142993133568:
Eliminate use of system restore point (Closed)
Patch Set:
Created March 18, 2014, 2:13 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
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"?> | 1 <?xml version="1.0"?> |
| 2 <!-- | 2 <!-- |
| 3 This version check is less extensive than the one than in the MSI source cod e. | 3 This version check is less extensive than the one than in the MSI source cod e. |
| 4 We partly rely on that it's already set up correctly for building the MSI fi les correctly. | 4 We partly rely on that it's already set up correctly for building the MSI fi les correctly. |
| 5 --> | 5 --> |
| 6 <?ifndef Version ?> | 6 <?ifndef Version ?> |
| 7 <?error No definition for WiX variable "Version" ?> | 7 <?error No definition for WiX variable "Version" ?> |
| 8 <?endif?> | 8 <?endif?> |
| 9 | 9 |
| 10 <Wix | 10 <Wix |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 <bal:WixStandardBootstrapperApplication | 34 <bal:WixStandardBootstrapperApplication |
| 35 LicenseUrl="" | 35 LicenseUrl="" |
| 36 /> | 36 /> |
| 37 <!-- | 37 <!-- |
| 38 Localization payloads. See http://stackoverflow.com/a/11402260/179 4538 for why it's done this way. | 38 Localization payloads. See http://stackoverflow.com/a/11402260/179 4538 for why it's done this way. |
| 39 --> | 39 --> |
| 40 <Payload Name="1031\bootstrap-theme.wxl" SourceFile="1031\bootstrap- theme.wxl" /> | 40 <Payload Name="1031\bootstrap-theme.wxl" SourceFile="1031\bootstrap- theme.wxl" /> |
| 41 </BootstrapperApplicationRef> | 41 </BootstrapperApplicationRef> |
| 42 <WixVariable Id="WixStdbaThemeXml" Value="bootstrap-theme.xml" /> | 42 <WixVariable Id="WixStdbaThemeXml" Value="bootstrap-theme.xml" /> |
| 43 <WixVariable Id="WixStdbaThemeWxl" Value="bootstrap-theme.wxl" /> | 43 <WixVariable Id="WixStdbaThemeWxl" Value="bootstrap-theme.wxl" /> |
| 44 <Chain> | 44 <Chain |
| 45 DisableSystemRestore="yes" | |
| 46 > | |
| 45 <!-- | 47 <!-- |
| 46 Note that use have DisplayInternalUI turned on. | 48 Note that use have DisplayInternalUI turned on. |
| 47 This avoids much (but not all) of the need to deal with the undo cumented 'burn' UI facility. | 49 This avoids much (but not all) of the need to deal with the undo cumented 'burn' UI facility. |
| 48 --> | 50 --> |
| 49 <MsiPackage | 51 <MsiPackage |
| 50 DisplayName="Adblock Plus for IE (ia32)" | 52 DisplayName="Adblock Plus for IE (ia32)" |
| 51 DisplayInternalUI="no" | 53 DisplayInternalUI="no" |
| 52 Visible="yes" | 54 Visible="yes" |
| 53 SourceFile="..\build\ia32\adblockplusie-$(var.Version)-en-us-ia3 2.msi" | 55 SourceFile="..\build\ia32\adblockplusie-$(var.Version)-en-us-ia3 2.msi" |
| 54 InstallCondition="Not VersionNT64" | 56 InstallCondition="Not VersionNT64" |
| 55 /> | 57 /> |
| 56 <MsiPackage | 58 <MsiPackage |
| 57 DisplayName="Adblock Plus for IE (x64)" | 59 DisplayName="Adblock Plus for IE (x64)" |
| 58 DisplayInternalUI="no" | 60 DisplayInternalUI="no" |
| 59 Visible="yes" | 61 Visible="yes" |
| 60 SourceFile="..\build\x64\adblockplusie-$(var.Version)-en-us-x64. msi" | 62 SourceFile="..\build\x64\adblockplusie-$(var.Version)-en-us-x64. msi" |
| 61 InstallCondition="VersionNT64" | 63 InstallCondition="VersionNT64" |
| 62 /> | 64 /> |
| 63 </Chain> | 65 </Chain> |
| 64 </Bundle> | 66 </Bundle> |
| 65 </Wix> | 67 </Wix> |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
