From 3d4d28aa65b02dc41116d4a7987e384a2cdc1ee7 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Fri, 6 Oct 2023 21:37:20 -0400 Subject: [PATCH] BaseTools/Conf: Update file versions for Rust changes (#587) ## Description By updating the version, users will be prompted to delete their Conf directory so the new files with Rust support can be copied over. - [ ] Impacts functionality? - **Functionality** - Does the change ultimately impact how firmware functions? - Examples: Add a new library, publish a new PPI, update an algorithm, ... - [ ] Impacts security? - **Security** - Does the change have a direct security impact on an application, flow, or firmware? - Examples: Crypto algorithm change, buffer overflow fix, parameter validation improvement, ... - [ ] Breaking change? - **Breaking change** - Will anyone consuming this change experience a break in build or boot behavior? - Examples: Add a new library class, move a module to a different repo, call a function in a new library class in a pre-existing module, ... - [ ] Includes tests? - **Tests** - Does the change include any explicit test code? - Examples: Unit tests, integration tests, robot tests, ... - [ ] Includes documentation? - **Documentation** - Does the change contain explicit documentation additions outside direct code modifications (and comments)? - Examples: Update readme file, add feature readme file, link to documentation on an a separate Web page, ... ## How This Was Tested - Local and CI build ## Integration Instructions N/A - Expect that users with existing Conf directories will be notified during build to delete the directory so the new file content can be copied over. Signed-off-by: Michael Kubacki --- BaseTools/Conf/build_rule.template | 3 ++- BaseTools/Conf/tools_def.template | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 89f71c2ad5..fd823a64b1 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -118,8 +118,9 @@ # 2.24 - Add .arc and .ver file type to add .rsrc sections to EFI images. # 2.25 - Split OemData rule into intermediate binary and final binary rules. # 2.26 - Rename OemData to ProductData. +# 2.27 - Add Rust build support. -#!VERSION=2.26 +#!VERSION=2.27 [C-Code-File] diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index dd451054bd..04eeaa62a0 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -23,8 +23,9 @@ # 2.41 - Can't have comment inline as it breaks concatenation see - # MU_CHANGE - Move GccLto to tools dir for better alignment # 2.42 - VS2022 toolchain incorrectly defined for ASL # 2.43 - Enable stack cookies to VS2019 and VS20222 X64 builds via /GS flag +# 2.44 - Add Rust build support # -#!VERSION=2.43 +#!VERSION=2.44 IDENTIFIER = Default TOOL_CHAIN_CONF @@ -3348,7 +3349,7 @@ DEBUG_*_*_RUST_TARGET = debug RELEASE_*_*_RUST_TARGET = release NOOPT_*_*_RUST_TARGET = debug -*_*_*_RUST_FLAGS = +*_*_*_RUST_FLAGS = #################### # CARGO defintions #