Skip to content

[Packaging] Add No-asserts toolchain to setup #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 27 commits into
base: main
Choose a base branch
from
+1,161 −893
Draft

[Packaging] Add No-asserts toolchain to setup #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5ffba7e
Add option to install no-assert toolchain variant to installer ui
mhegazy May 19, 2025
61d6312
Split cli.msi into two msi's by variant
mhegazy May 19, 2025
dab2c7a
Install cli.noassert files to noassert directory layout
mhegazy May 19, 2025
6d43ed4
Pull cli.noassert files from the noaassert build output directory whe…
mhegazy May 19, 2025
9d10e4a
Split dbg.msi into two separate msi's by variant
mhegazy May 19, 2025
e97f514
Install dbg.noassert files to the noassert toolchain folder structure
mhegazy May 19, 2025
ba99d51
Pull dbg.noassert files from the noassert toolchain output folder whe…
mhegazy May 19, 2025
f3be6a7
Split ide.msi into two separate msi's by variant
mhegazy May 19, 2025
cf8f5f1
Install ide.noasserts files to the noassert toolchain folder
mhegazy May 19, 2025
92426da
Pull ide.noasserts.msi files from the noasserts toolchain output when…
mhegazy May 19, 2025
26bc1ef
Split bld.msi into two separate msi's based on variant
mhegazy May 19, 2025
4d78a33
Install bld.noassert.msi files to the noassert toolchain folders
mhegazy May 19, 2025
15d0085
Pull bld.noasserts.msi files from the noasserts output folder when av…
mhegazy May 19, 2025
4e76e5a
Make product names for noasserts msi uniform
mhegazy May 19, 2025
c8994cb
Only build the noasserts msi's if the INCLUDE_NOASSERTS property is set
mhegazy May 20, 2025
979dcc8
Only allow choosing variants if we are building with IncludeNoAsserts
mhegazy May 20, 2025
0ad2570
Set PATH env var for no-asserts toolchain if it is the only variant i…
mhegazy May 20, 2025
2dd961b
Change names of upgradeCodes and localization strings to reflect variant
mhegazy May 21, 2025
7daeb98
Add variant in product names
mhegazy May 21, 2025
5a02a68
Use variant-free names for UI for feature selection
mhegazy May 21, 2025
2ab0301
Use Asserts/NoAsserts uniformly in all Product Names
mhegazy May 21, 2025
c50c40e
Pass in an array of ToolchainVariants as input to the installer isnte…
mhegazy May 21, 2025
eae9891
Switch variable name casing
mhegazy May 21, 2025
4aba9d4
Fix file names with extra dot
mhegazy May 21, 2025
3846721
Use Install instead of Include
mhegazy May 21, 2025
c942d44
Fix typo
mhegazy May 21, 2025
2e5dfdb
Use condition correctelly in proj file
mhegazy May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions platforms/Windows/SideBySideUpgradeStrategy.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@
-->

<PropertyGroup>
<BldUpgradeCode>{7E95DC06-7F84-4E8E-A038-8304AF0468FB}</BldUpgradeCode>
<CliUpgradeCode>{87019842-3F3E-4227-B5C5-23A8EF72AD89}</CliUpgradeCode>
<DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
<IdeUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeUpgradeCode>
<BldAssertsUpgradeCode>{7E95DC06-7F84-4E8E-A038-8304AF0468FB}</BldAssertsUpgradeCode>
<BldNoAssertsUpgradeCode>{0F18B0C5-F6EE-46DE-A930-E666BEE6A9C3}</BldNoAssertsUpgradeCode>
<CliAssertsUpgradeCode>{87019842-3F3E-4227-B5C5-23A8EF72AD89}</CliAssertsUpgradeCode>
<CliNoAssertsUpgradeCode>{BBF4E043-FAB3-4E7A-9E6D-714E3F3EBA9C}</CliNoAssertsUpgradeCode>
<DbgAssertsUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgAssertsUpgradeCode>
<DbgNoAssertsUpgradeCode>{6F26625B-7662-4631-8E0E-F2244339ED37}</DbgNoAssertsUpgradeCode>
<IdeAssertsUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeAssertsUpgradeCode>
<IdeNoAssertsUpgradeCode>{C5519168-CF7B-4127-98B7-D886D9789B42}</IdeNoAssertsUpgradeCode>
<RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
<AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
<WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
Expand Down Expand Up @@ -54,10 +58,14 @@
<DefineConstants>
$(DefineConstants);
BundleUpgradeCode=$(BundleUpgradeCode);
BldUpgradeCode=$(BldUpgradeCode);
CliUpgradeCode=$(CliUpgradeCode);
DbgUpgradeCode=$(DbgUpgradeCode);
IdeUpgradeCode=$(IdeUpgradeCode);
BldAssertsUpgradeCode=$(BldAssertsUpgradeCode);
BldNoAssertsUpgradeCode=$(BldNoAssertsUpgradeCode);
CliAssertsUpgradeCode=$(CliAssertsUpgradeCode);
CliNoAssertsUpgradeCode=$(CliNoAssertsUpgradeCode);
DbgAssertsUpgradeCode=$(DbgAssertsUpgradeCode);
DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);
IdeAssertsUpgradeCode=$(IdeAssertsUpgradeCode);
IdeNoAssertsUpgradeCode=$(IdeNoAssertsUpgradeCode);
RtlUpgradeCode=$(RtlUpgradeCode);
AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
Expand Down
1 change: 1 addition & 0 deletions platforms/Windows/bld/bld.wixproj → ...s/Windows/bld/asserts/bld.asserts.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
_USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
_USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
</DefineConstants>
<OutputName>bld.asserts</OutputName>
</PropertyGroup>

<ItemGroup>
Expand Down
11 changes: 11 additions & 0 deletions platforms/Windows/bld/asserts/bld.asserts.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
<?define ToolchainVariantRoot = $(ToolchainRoot)?>
<?define VariantSuffix ?>
<?define VariantUpgradeCode = $(BldAssertsUpgradeCode)?>
<?define VariantProductName = !(loc.BldAsserts_ProductName)?>
<?define VariantCabName = bld.asserts.cab?>
<?define VariantEnvironmentComponentGUID = ab52b870-23ee-42e8-9581-3fcbdfb9228c?>

<?include ../bld.wxi ?>
</Wix>
Loading