Skip to content

Commit c30722e

Browse files
authored
build_rule.template: Update version to 3.00 (#1475)
## Description Right now, the 2502 build_rule.template version is `2.04` while the 2405 file version is `2.24`. This causes users to not be informed that the file is different in their local workspace when they move to 2502 causing the build to use the incorrect (2405) build_rule file. This updates the version to `3.00`. Even if, 2405 continues to update the version (e.g. `2.25`), 2502 can update in the `3.xx` series independently and always be considered greater so when a user does transition they will be notified to update their Conf dir. - [ ] Impacts functionality? - [ ] Impacts security? - [ ] Breaking change? - [ ] Includes tests? - [ ] Includes documentation? - [x] Backport to release branch? ## How This Was Tested - Local build ## Integration Instructions - N/A - Users will now be informed they need to delete/update their local `Conf` directory Signed-off-by: Michael Kubacki <[email protected]>
1 parent 3f7ef5c commit c30722e

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

BaseTools/Conf/build_rule.template

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,9 @@
116116
# 2.01 - Add support for DEPS_FLAGS as well as
117117
# 2.03 - Add OemData Definitions
118118
# 2.04 - Rename OemData to ProductData.
119+
# 3.00 - Update the major version to differentiate 2502 changes from previous versions.
119120

120-
#!VERSION=2.04
121+
#!VERSION=3.00
121122

122123
[C-Code-File]
123124
<InputFile>
@@ -346,7 +347,7 @@
346347
<Command.GCC>
347348
$(RM) ${dst}
348349
"$(SLINK)" cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)
349-
350+
350351
<Command.XCODE>
351352
"$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST)
352353

@@ -374,8 +375,8 @@
374375

375376
<Command.XCODE>
376377
"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
377-
378-
378+
379+
379380
[Static-Library-File.SEC, Static-Library-File.PEI_CORE, Static-Library-File.PEIM]
380381
<InputFile>
381382
*.lib
@@ -438,8 +439,8 @@
438439

439440
<Command.XCODE>
440441
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
441-
442-
442+
443+
443444
[Dynamic-Library-File]
444445
<InputFile>
445446
?.dll
@@ -453,7 +454,7 @@
453454
$(CP) ${dst} $(DEBUG_DIR)
454455
$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
455456
-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
456-
-$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR)
457+
-$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR)
457458
<Command.GCC>
458459
$(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
459460
"$(OBJCOPY)" $(OBJCOPY_STRIPFLAG) ${src}
@@ -468,7 +469,7 @@
468469
$(CP) ${dst} $(DEBUG_DIR)
469470
$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
470471
-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
471-
472+
472473
<Command.XCODE>
473474
# tool to convert Mach-O to PE/COFF
474475
"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff
@@ -508,14 +509,14 @@
508509
<Command.MSFT, Command.INTEL>
509510
Trim --asl-file --asl-deps -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i -i $(INC_LIST) ${src}
510511
"$(ASLPP)" $(DEPS_FLAGS) $(ASLPP_FLAGS) $(INC) /I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
511-
Trim --source-code -l -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
512+
Trim --source-code -l -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
512513
"$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii
513514
$(CP) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.aml $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.amli
514515

515516
<Command.GCC>
516517
Trim --asl-file --asl-deps -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i -i $(INC_LIST) ${src}
517518
"$(ASLPP)" $(DEPS_FLAGS) $(ASLPP_FLAGS) $(INC) -I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
518-
Trim --source-code -l -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
519+
Trim --source-code -l -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
519520
"$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii
520521
$(CP) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.aml $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.amli
521522

@@ -574,7 +575,7 @@
574575
"$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
575576
"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
576577

577-
<Command.XCODE>
578+
<Command.XCODE>
578579
"$(ASLCC)" $(DEPS_FLAGS) -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(DEPS_FLAGS) $(INC) ${src}
579580
"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
580581
"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff
@@ -642,15 +643,15 @@
642643
Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.ii
643644
"$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii
644645
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) --start-group $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj --end-group
645-
646+
646647
<Command.XCODE>
647648
Trim --asm-file -o ${d_path}(+)${s_base}.i -i $(INC_LIST) ${src}
648649
"$(PP)" $(DEPS_FLAGS) $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.ii
649650
Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.ii
650651
"$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii
651652
"$(SLINK)" $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
652653
otool -t $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib | hex2bin.py ${dst}
653-
654+
654655
#MU_CHANGE
655656
# Build Rule to support using precompiled
656657
# LIB files. Just copies the LIB from src to output

0 commit comments

Comments
 (0)