aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Bal
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2022-02-10 00:38:43 -0500
committerBob Arnson <github@bobs.org>2022-02-10 13:17:31 -0500
commit091573d459d6ab4947bd39bd3bc8faee3d18b4fc (patch)
tree88bf9f32b63ad7173189ced351129d41596dd043 /src/ext/Bal
parent652719fc9d4a6afc9fb016d2d379a04c0bf40e04 (diff)
downloadwix-091573d459d6ab4947bd39bd3bc8faee3d18b4fc.tar.gz
wix-091573d459d6ab4947bd39bd3bc8faee3d18b4fc.tar.bz2
wix-091573d459d6ab4947bd39bd3bc8faee3d18b4fc.zip
Central caDecor and caErr.
Diffstat (limited to 'src/ext/Bal')
-rw-r--r--src/ext/Bal/wixlib/BalExtension_platform.wxi9
-rw-r--r--src/ext/Bal/wixlib/Mbahost_platform.wxi4
-rw-r--r--src/ext/Bal/wixlib/caDecor.wxi39
3 files changed, 11 insertions, 41 deletions
diff --git a/src/ext/Bal/wixlib/BalExtension_platform.wxi b/src/ext/Bal/wixlib/BalExtension_platform.wxi
index 6978ba99..e1d846ce 100644
--- a/src/ext/Bal/wixlib/BalExtension_platform.wxi
+++ b/src/ext/Bal/wixlib/BalExtension_platform.wxi
@@ -2,7 +2,8 @@
2 2
3 3
4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include caDecor.wxi ?> 5 <?include ..\..\caDecor.wxi ?>
6
6 <Fragment> 7 <Fragment>
7 <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)"> 8 <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)">
8 <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\dnchost.dll" /> 9 <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\dnchost.dll" />
@@ -10,6 +11,7 @@
10 <PayloadGroupRef Id="WixDotNetCoreBootstrapperApplicationHostManagedPayloads" /> 11 <PayloadGroupRef Id="WixDotNetCoreBootstrapperApplicationHostManagedPayloads" />
11 </BootstrapperApplication> 12 </BootstrapperApplication>
12 </Fragment> 13 </Fragment>
14
13 <Fragment> 15 <Fragment>
14 <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost.Standard$(var.Suffix)"> 16 <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost.Standard$(var.Suffix)">
15 <PayloadGroupRef Id="DncPreqStandardPayloads" /> 17 <PayloadGroupRef Id="DncPreqStandardPayloads" />
@@ -22,30 +24,35 @@
22 <BootstrapperApplicationDll Id="WixStandardBootstrapperApplication" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" /> 24 <BootstrapperApplicationDll Id="WixStandardBootstrapperApplication" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
23 </BootstrapperApplication> 25 </BootstrapperApplication>
24 </Fragment> 26 </Fragment>
27
25 <Fragment> 28 <Fragment>
26 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)"> 29 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)">
27 <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" /> 30 <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
28 </BootstrapperApplication> 31 </BootstrapperApplication>
29 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" /> 32 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
30 </Fragment> 33 </Fragment>
34
31 <Fragment> 35 <Fragment>
32 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)"> 36 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)">
33 <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" /> 37 <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
34 </BootstrapperApplication> 38 </BootstrapperApplication>
35 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" /> 39 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
36 </Fragment> 40 </Fragment>
41
37 <Fragment> 42 <Fragment>
38 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)"> 43 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)">
39 <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" /> 44 <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
40 </BootstrapperApplication> 45 </BootstrapperApplication>
41 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" /> 46 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
42 </Fragment> 47 </Fragment>
48
43 <Fragment> 49 <Fragment>
44 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)"> 50 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)">
45 <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" /> 51 <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
46 </BootstrapperApplication> 52 </BootstrapperApplication>
47 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" /> 53 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
48 </Fragment> 54 </Fragment>
55
49 <Fragment> 56 <Fragment>
50 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)"> 57 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)">
51 <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" /> 58 <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
diff --git a/src/ext/Bal/wixlib/Mbahost_platform.wxi b/src/ext/Bal/wixlib/Mbahost_platform.wxi
index 06d7f1fc..9a5241cf 100644
--- a/src/ext/Bal/wixlib/Mbahost_platform.wxi
+++ b/src/ext/Bal/wixlib/Mbahost_platform.wxi
@@ -2,7 +2,8 @@
2 2
3 3
4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include caDecor.wxi ?> 5 <?include ..\..\caDecor.wxi ?>
6
6 <Fragment> 7 <Fragment>
7 <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)"> 8 <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)">
8 <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" /> 9 <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" />
@@ -10,6 +11,7 @@
10 <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" /> 11 <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" />
11 </BootstrapperApplication> 12 </BootstrapperApplication>
12 </Fragment> 13 </Fragment>
14
13 <Fragment> 15 <Fragment>
14 <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)"> 16 <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)">
15 <PayloadGroupRef Id="MbaPreqStandardPayloads" /> 17 <PayloadGroupRef Id="MbaPreqStandardPayloads" />
diff --git a/src/ext/Bal/wixlib/caDecor.wxi b/src/ext/Bal/wixlib/caDecor.wxi
deleted file mode 100644
index b1711518..00000000
--- a/src/ext/Bal/wixlib/caDecor.wxi
+++ /dev/null
@@ -1,39 +0,0 @@
1<!-- 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. -->
2
3
4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?ifdef Prefix ?>
6 <?undef Prefix ?>
7 <?endif?>
8
9 <?define Prefix="Wix4" ?>
10
11 <?ifndef platform ?>
12 <?define platform="x86" ?>
13 <?endif?>
14
15 <?if $(var.platform)="" ?>
16 <?undef platform ?>
17 <?define platform="x86" ?>
18 <?endif?>
19
20 <?ifdef Suffix ?>
21 <?undef Suffix ?>
22 <?endif?>
23
24 <?if $(var.platform)~="x86" ?>
25 <?define Suffix="_X86" ?>
26 <?endif?>
27
28 <?if $(var.platform)~="x64" ?>
29 <?define Suffix="_X64" ?>
30 <?endif?>
31
32 <?if $(var.platform)~="arm" ?>
33 <?define Suffix="_A32" ?>
34 <?endif?>
35
36 <?if $(var.platform)~="arm64" ?>
37 <?define Suffix="_A64" ?>
38 <?endif?>
39</Include>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-29 16:29:30 +0000