Compile bundle authoring in the wixlib.
Sean Hall committed
Dec 11, 2019 at 16:23 UTC
58243de7b503690d8794d6a7479cd49c370639f4
6 files changed
+71
-32
src/mbahost/mbahost.vcxproj
+8
@@ -50,6 +50,10 @@
50
<None Include="packages.config" />
51
</ItemGroup>
52
53
+ <ItemGroup>
54
+ <MbaHostDependency Include="..\..\packages\WixToolset.BootstrapperCore.4.0.5\lib\net20\WixToolset.BootstrapperCore.dll" />
55
+ </ItemGroup>
56
+
57
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
58
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
59
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -61,4 +65,8 @@
65
<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
66
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
67
</Target>
68
+
69
+ <Target Name="CopyMbaHostDependencies" AfterTargets="Build">
70
+ <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(MbaHostDependency)" SkipUnchangedFiles="true" />
71
+ </Target>
72
</Project>
src/wixlib/Mba.wxs
+27
-27
@@ -40,39 +40,39 @@
40
41
<Fragment>
42
<PayloadGroup Id='Mba'>
43
- <Payload Compressed='yes' SourceFile='BootstrapperCore.dll' />
43
+ <Payload Compressed='yes' SourceFile='WixToolset.BootstrapperCore.dll' />
44
<Payload Compressed='yes' SourceFile='wixstdba.dll' Name='mbapreq.dll' />
45
</PayloadGroup>
46
</Fragment>
47
48
<Fragment>
49
<PayloadGroup Id='MbaPreqStandard'>
50
- <Payload Name='mbapreq.thm' Compressed='yes' SourceFile='!(wix.PreqbaThemeXml=SourceDir\WixstdbaResources\mbapreq.thm)' />
51
- <Payload Name='mbapreq.png' Compressed='yes' SourceFile='!(wix.PreqbaLogo=SourceDir\WixstdbaResources\mbapreq.png)' />
52
- <Payload Name='mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl=SourceDir\WixstdbaResources\mbapreq.wxl)' />
53
- <Payload Name='1028\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1028=SourceDir\WixstdbaResources\1028\mbapreq.wxl)' />
54
- <Payload Name='1029\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1029=SourceDir\WixstdbaResources\1029\mbapreq.wxl)' />
55
- <Payload Name='1030\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1030=SourceDir\WixstdbaResources\1030\mbapreq.wxl)' />
56
- <Payload Name='1031\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1031=SourceDir\WixstdbaResources\1031\mbapreq.wxl)' />
57
- <Payload Name='1032\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1032=SourceDir\WixstdbaResources\1032\mbapreq.wxl)' />
58
- <Payload Name='1035\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1035=SourceDir\WixstdbaResources\1035\mbapreq.wxl)' />
59
- <Payload Name='1036\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1036=SourceDir\WixstdbaResources\1036\mbapreq.wxl)' />
60
- <Payload Name='1038\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1038=SourceDir\WixstdbaResources\1038\mbapreq.wxl)' />
61
- <Payload Name='1040\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1040=SourceDir\WixstdbaResources\1040\mbapreq.wxl)' />
62
- <Payload Name='1041\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1041=SourceDir\WixstdbaResources\1041\mbapreq.wxl)' />
63
- <Payload Name='1042\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1042=SourceDir\WixstdbaResources\1042\mbapreq.wxl)' />
64
- <Payload Name='1043\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1043=SourceDir\WixstdbaResources\1043\mbapreq.wxl)' />
65
- <Payload Name='1044\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1044=SourceDir\WixstdbaResources\1044\mbapreq.wxl)' />
66
- <Payload Name='1045\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1045=SourceDir\WixstdbaResources\1045\mbapreq.wxl)' />
67
- <Payload Name='1046\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1046=SourceDir\WixstdbaResources\1046\mbapreq.wxl)' />
68
- <Payload Name='1049\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1049=SourceDir\WixstdbaResources\1049\mbapreq.wxl)' />
69
- <Payload Name='1051\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1051=SourceDir\WixstdbaResources\1051\mbapreq.wxl)' />
70
- <Payload Name='1053\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1053=SourceDir\WixstdbaResources\1053\mbapreq.wxl)' />
71
- <Payload Name='1055\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1055=SourceDir\WixstdbaResources\1055\mbapreq.wxl)' />
72
- <Payload Name='1060\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1060=SourceDir\WixstdbaResources\1060\mbapreq.wxl)' />
73
- <Payload Name='2052\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl2052=SourceDir\WixstdbaResources\2052\mbapreq.wxl)' />
74
- <Payload Name='2070\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl2070=SourceDir\WixstdbaResources\2070\mbapreq.wxl)' />
75
- <Payload Name='3082\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl3082=SourceDir\WixstdbaResources\3082\mbapreq.wxl)' />
50
+ <Payload Name='mbapreq.thm' Compressed='yes' SourceFile='!(wix.PreqbaThemeXml=SourceDir\mbapreq.thm)' />
51
+ <Payload Name='mbapreq.png' Compressed='yes' SourceFile='!(wix.PreqbaLogo=SourceDir\mbapreq.png)' />
52
+ <Payload Name='mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl=SourceDir\mbapreq.wxl)' />
53
+ <Payload Name='1028\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1028=SourceDir\1028\mbapreq.wxl)' />
54
+ <Payload Name='1029\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1029=SourceDir\1029\mbapreq.wxl)' />
55
+ <Payload Name='1030\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1030=SourceDir\1030\mbapreq.wxl)' />
56
+ <Payload Name='1031\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1031=SourceDir\1031\mbapreq.wxl)' />
57
+ <Payload Name='1032\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1032=SourceDir\1032\mbapreq.wxl)' />
58
+ <Payload Name='1035\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1035=SourceDir\1035\mbapreq.wxl)' />
59
+ <Payload Name='1036\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1036=SourceDir\1036\mbapreq.wxl)' />
60
+ <Payload Name='1038\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1038=SourceDir\1038\mbapreq.wxl)' />
61
+ <Payload Name='1040\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1040=SourceDir\1040\mbapreq.wxl)' />
62
+ <Payload Name='1041\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1041=SourceDir\1041\mbapreq.wxl)' />
63
+ <Payload Name='1042\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1042=SourceDir\1042\mbapreq.wxl)' />
64
+ <Payload Name='1043\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1043=SourceDir\1043\mbapreq.wxl)' />
65
+ <Payload Name='1044\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1044=SourceDir\1044\mbapreq.wxl)' />
66
+ <Payload Name='1045\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1045=SourceDir\1045\mbapreq.wxl)' />
67
+ <Payload Name='1046\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1046=SourceDir\1046\mbapreq.wxl)' />
68
+ <Payload Name='1049\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1049=SourceDir\1049\mbapreq.wxl)' />
69
+ <Payload Name='1051\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1051=SourceDir\1051\mbapreq.wxl)' />
70
+ <Payload Name='1053\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1053=SourceDir\1053\mbapreq.wxl)' />
71
+ <Payload Name='1055\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1055=SourceDir\1055\mbapreq.wxl)' />
72
+ <Payload Name='1060\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1060=SourceDir\1060\mbapreq.wxl)' />
73
+ <Payload Name='2052\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl2052=SourceDir\2052\mbapreq.wxl)' />
74
+ <Payload Name='2070\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl2070=SourceDir\2070\mbapreq.wxl)' />
75
+ <Payload Name='3082\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl3082=SourceDir\3082\mbapreq.wxl)' />
76
</PayloadGroup>
77
</Fragment>
78
</Wix>
src/wixlib/NetFx4AsPrereq.wxs
+1
-1
@@ -62,7 +62,7 @@
62
63
<!-- Not sure why we have to redefine the table here. -->
64
<Fragment>
65
- <CustomTable Id='WixMbaPrereqInformation' BootstrapperApplicationData='yes'>
65
+ <CustomTable Id='WixMbaPrereqInformation' Unreal='yes'>
66
<Column Id='PackageId' Category='Identifier' Type='string' Width='72' PrimaryKey ='yes'/>
67
<Column Id='LicenseUrl' Category='Formatted' Type='string' Width='0' Nullable='yes'/>
68
<Column Id='LicenseFile' Category='Formatted' Type='string' Width='0' Nullable='yes'/>
src/wixlib/bal.wixproj
+6
-3
@@ -14,7 +14,6 @@
14
15
<ItemGroup>
16
<Compile Include="BalExtension.wxs" />
17
- <!-- TODO: Reenable when compiling Bundle elements is supported
17
<Compile Include="Mba.wxs" />
18
<Compile Include="NetFx4AsPrereq.wxs" />
19
<Compile Include="NetFx45AsPrereq.wxs" />
@@ -25,7 +24,11 @@
24
<Compile Include="NetFx462AsPrereq.wxs" />
25
<Compile Include="wixstdba.wxs" />
26
<Compile Include="wixstdba_x86.wxs" />
28
- -->
27
+ </ItemGroup>
28
+
29
+ <ItemGroup>
30
+ <None Include="caSuffix.wxi" />
31
+ <None Include="wixstdba_platform.wxi" />
32
</ItemGroup>
33
34
<ItemGroup>
@@ -33,7 +36,7 @@
36
</ItemGroup>
37
38
<ItemGroup>
36
- <BindInputPaths Include="$(OutputPath)WixstdbaResources\" />
39
+ <BindInputPaths Include="..\wixstdba\Resources\" />
40
</ItemGroup>
41
42
<ItemGroup>
src/wixlib/caSuffix.wxi
new
+28
@@ -0,0 +1,28 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
+
4
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
+ <?ifndef platform ?>
6
+ <?error Required value "platform" not defined in include caSuffix.wxi ?>
7
+ <?endif ?>
8
+
9
+ <?ifdef Suffix ?>
10
+ <?undef Suffix ?>
11
+ <?undef DeferredSuffix ?>
12
+ <?endif ?>
13
+
14
+ <?if $(var.platform)="x86" ?>
15
+ <?define Suffix="" ?>
16
+ <?define DeferredSuffix="" ?>
17
+ <?endif ?>
18
+
19
+ <?if $(var.platform)="x64" ?>
20
+ <?define Suffix="_x64" ?>
21
+ <?define DeferredSuffix="_64" ?>
22
+ <?endif ?>
23
+
24
+ <?if $(var.platform)="arm" ?>
25
+ <?define Suffix="_ARM" ?>
26
+ <?define DeferredSuffix="_ARM" ?>
27
+ <?endif ?>
28
+</Include>
src/wixlib/wixstdba.wxs
+1
-1
@@ -85,7 +85,7 @@
85
86
<!-- BootstrapperApplicationData tables definition -->
87
<Fragment>
88
- <CustomTable Id='WixStdbaInformation' BootstrapperApplicationData='yes'>
88
+ <CustomTable Id='WixStdbaInformation' Unreal='yes'>
89
<Column Id='LicenseFile' Category='Text' Type='string' Width='0' Nullable='yes' PrimaryKey='yes' />
90
<Column Id='LicenseUrl' Category='Text' Type='string' Width='0' Nullable='yes' PrimaryKey='yes' />
91
</CustomTable>