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