Unified Diff: installer/setup.wxs
Issue 11258006:
Bootstrapper (Closed)
Patch Set:
Created July 25, 2013, 9:47 p.m.
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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: installer/setup.wxs |
| =================================================================== |
| --- a/installer/setup.wxs |
| +++ b/installer/setup.wxs |
| @@ -16,6 +16,7 @@ |
| No good documentation for what it does, though. |
| --> |
| <Bundle |
| + Name="!(loc.BundleName)" |
| Version="$(var.Version)" |
| UpgradeCode="{17B47941-606A-456C-A225-FB597B05DA77}" |
| > |
| @@ -24,6 +25,7 @@ |
| When we replace the UI, we should be sure to change this symbol in both places to avoid inadvertently linking to the wrong object. |
| --> |
| <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense"> |
| + <Payload Name="abp-64.png" SourceFile="abp-64.png" /> |
| <!-- |
| The way to suppress the license in the UI sequence is to set the URL attribute to an empty string |
| and to leave out the file attribute entirely. |
| @@ -32,7 +34,13 @@ |
| <bal:WixStandardBootstrapperApplication |
| LicenseUrl="" |
| /> |
| + <!-- |
| + Localization payloads. See http://stackoverflow.com/a/11402260/1794538 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.
|
| + --> |
| + <Payload Name="1031\bootstrap-theme.wxl" SourceFile="1031\bootstrap-theme.wxl" /> |
| </BootstrapperApplicationRef> |
| + <WixVariable Id="WixStdbaThemeXml" Value="bootstrap-theme.xml" /> |
| + <WixVariable Id="WixStdbaThemeWxl" Value="bootstrap-theme.wxl" /> |
| <Chain> |
| <!-- |
| Note that use have DisplayInternalUI turned on. |
| @@ -40,14 +48,14 @@ |
| --> |
| <MsiPackage |
| DisplayName="Adblock Plus for IE (ia32)" |
| - DisplayInternalUI="yes" |
| + DisplayInternalUI="no" |
| Visible="yes" |
| SourceFile="..\build\ia32\adblockplusie-$(var.Version)-en-us-ia32.msi" |
| InstallCondition="Not VersionNT64" |
| /> |
| <MsiPackage |
| DisplayName="Adblock Plus for IE (x64)" |
| - DisplayInternalUI="yes" |
| + DisplayInternalUI="no" |
| Visible="yes" |
| SourceFile="..\build\x64\adblockplusie-$(var.Version)-en-us-x64.msi" |
| InstallCondition="VersionNT64" |
« installer/bootstrap-theme.xml ('K')
|
« installer/bootstrap-theme.xml ('k')
|
no next file »
|
no next file with comments »
