Side by Side Diff: installer/setup.wxs
Issue 11258006:
Bootstrapper (Closed)
Patch Set:
Created July 25, 2013, 9:47 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« installer/bootstrap-theme.xml ('K')
|
« installer/bootstrap-theme.xml ('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"?> | 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 |
| 11 xmlns="http://schemas.microsoft.com/wix/2006/wi" | 11 xmlns="http://schemas.microsoft.com/wix/2006/wi" |
| 12 xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" | 12 xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" |
| 13 > | 13 > |
| 14 <!-- | 14 <!-- |
| 15 'burn' requires its own UpgradeCode, as if it supports its own MajorUpgr ade. | 15 'burn' requires its own UpgradeCode, as if it supports its own MajorUpgr ade. |
| 16 No good documentation for what it does, though. | 16 No good documentation for what it does, though. |
| 17 --> | 17 --> |
| 18 <Bundle | 18 <Bundle |
| 19 Name="!(loc.BundleName)" | |
| 19 Version="$(var.Version)" | 20 Version="$(var.Version)" |
| 20 UpgradeCode="{17B47941-606A-456C-A225-FB597B05DA77}" | 21 UpgradeCode="{17B47941-606A-456C-A225-FB597B05DA77}" |
| 21 > | 22 > |
| 22 <!-- | 23 <!-- |
| 23 This is a reference to the standard UI library. | 24 This is a reference to the standard UI library. |
| 24 When we replace the UI, we should be sure to change this symbol in b oth places to avoid inadvertently linking to the wrong object. | 25 When we replace the UI, we should be sure to change this symbol in b oth places to avoid inadvertently linking to the wrong object. |
| 25 --> | 26 --> |
| 26 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Hyper linkLicense"> | 27 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Hyper linkLicense"> |
| 28 <Payload Name="abp-64.png" SourceFile="abp-64.png" /> | |
| 27 <!-- | 29 <!-- |
| 28 The way to suppress the license in the UI sequence is to set the URL attribute to an empty string | 30 The way to suppress the license in the UI sequence is to set the URL attribute to an empty string |
| 29 and to leave out the file attribute entirely. | 31 and to leave out the file attribute entirely. |
| 30 Not exactly a very expressive way of getting this result. | 32 Not exactly a very expressive way of getting this result. |
| 31 --> | 33 --> |
| 32 <bal:WixStandardBootstrapperApplication | 34 <bal:WixStandardBootstrapperApplication |
| 33 LicenseUrl="" | 35 LicenseUrl="" |
| 34 /> | 36 /> |
| 37 <!-- | |
| 38 Localization payloads. See http://stackoverflow.com/a/11402260/179 4538 for it's done this way. | |
|
Felix Dahlke
2013/08/01 09:51:21
"for *why* it's done this way"?
Eric
2013/08/01 18:58:37
Yes.
| |
| 39 --> | |
| 40 <Payload Name="1031\bootstrap-theme.wxl" SourceFile="1031\bootstrap- theme.wxl" /> | |
| 35 </BootstrapperApplicationRef> | 41 </BootstrapperApplicationRef> |
| 42 <WixVariable Id="WixStdbaThemeXml" Value="bootstrap-theme.xml" /> | |
| 43 <WixVariable Id="WixStdbaThemeWxl" Value="bootstrap-theme.wxl" /> | |
| 36 <Chain> | 44 <Chain> |
| 37 <!-- | 45 <!-- |
| 38 Note that use have DisplayInternalUI turned on. | 46 Note that use have DisplayInternalUI turned on. |
| 39 This avoids much (but not all) of the need to deal with the undo cumented 'burn' UI facility. | 47 This avoids much (but not all) of the need to deal with the undo cumented 'burn' UI facility. |
| 40 --> | 48 --> |
| 41 <MsiPackage | 49 <MsiPackage |
| 42 DisplayName="Adblock Plus for IE (ia32)" | 50 DisplayName="Adblock Plus for IE (ia32)" |
| 43 DisplayInternalUI="yes" | 51 DisplayInternalUI="no" |
| 44 Visible="yes" | 52 Visible="yes" |
| 45 SourceFile="..\build\ia32\adblockplusie-$(var.Version)-en-us-ia3 2.msi" | 53 SourceFile="..\build\ia32\adblockplusie-$(var.Version)-en-us-ia3 2.msi" |
| 46 InstallCondition="Not VersionNT64" | 54 InstallCondition="Not VersionNT64" |
| 47 /> | 55 /> |
| 48 <MsiPackage | 56 <MsiPackage |
| 49 DisplayName="Adblock Plus for IE (x64)" | 57 DisplayName="Adblock Plus for IE (x64)" |
| 50 DisplayInternalUI="yes" | 58 DisplayInternalUI="no" |
| 51 Visible="yes" | 59 Visible="yes" |
| 52 SourceFile="..\build\x64\adblockplusie-$(var.Version)-en-us-x64. msi" | 60 SourceFile="..\build\x64\adblockplusie-$(var.Version)-en-us-x64. msi" |
| 53 InstallCondition="VersionNT64" | 61 InstallCondition="VersionNT64" |
| 54 /> | 62 /> |
| 55 </Chain> | 63 </Chain> |
| 56 </Bundle> | 64 </Bundle> |
| 57 </Wix> | 65 </Wix> |
| OLD | NEW |
« installer/bootstrap-theme.xml ('K')
|
« installer/bootstrap-theme.xml ('k')
|
no next file »
|
no next file with comments »
