[edk2] [edk2-BuildSpecification PATCH] Use macros in !include file paths

Michael Kinney posted 1 patch 7 years, 6 months ago
Failed in applying to current master (apply log)
8_pre-build_autogen_stage/82_auto-generation_process.md | 4 ++--
README.md                                               | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
[edk2] [edk2-BuildSpecification PATCH] Use macros in !include file paths
Posted by Michael Kinney 7 years, 6 months ago
https://bugzilla.tianocore.org/show_bug.cgi?id=472

The EBNF already allows !include statements to use
$(MACRO) values in the file path.  This change updates
the description and examples for !include statements
to allow the use of macros and specific environment
variables in !include file paths.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
 8_pre-build_autogen_stage/82_auto-generation_process.md | 4 ++--
 README.md                                               | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/8_pre-build_autogen_stage/82_auto-generation_process.md b/8_pre-build_autogen_stage/82_auto-generation_process.md
index 84f6b6b..deb1c47 100644
--- a/8_pre-build_autogen_stage/82_auto-generation_process.md
+++ b/8_pre-build_autogen_stage/82_auto-generation_process.md
@@ -410,8 +410,8 @@ in the DSC file can be used for file names, paths, PCD values, in the
 conditional directives. Macros can also be defined or used in the `[Defines]`,
 `[LibraryClasses]`, `[Libraries]`, `[Components]` and all PCD sections.
 
-Macros defined by the user cannot be used in the !include statements in either
-the DSC or FDF file.
+Macros defined by the user may be used in the !include statements in DSC and
+FDF files.
 
 `EDK_GLOBAL` type macros defined in the DSC file can be used in later sections
 of the DSC, FDF and any of the included EDK INF files.
diff --git a/README.md b/README.md
index 3bd1d32..ce76bb4 100644
--- a/README.md
+++ b/README.md
@@ -200,4 +200,5 @@ Copyright (c) 2008-2017, Intel Corporation. All rights reserved.
 |            | Remove Unicode file storage requirement; refer to the Multi-String UNI File Format Specification instead.                                                                                                                                                                                                                                                           |               |
 |            | Clarify BUILDRULEORDER                                                                                                                                                                                                                                                                                                                                              |               |
 |            | Add support for INF statement in an FD region.                                                                                                                                                                                                                                                                                                                      |               |
-| 1.27       | Convert to Gitbook                                                                                                                                                                                                                                                                                                                                                  | March 2017    |
+| 1.27       | Convert to Gitbook                                                                                                                                                                                                                                                                                                                                                  | April 2017    |
+|            | [#472](https://bugzilla.tianocore.org/show_bug.cgi?id=472) [Build Spec] Extend macro usage in the !include statements for DSC/FDF files                                                                                                                                                                                                                             |               |
-- 
2.6.3.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [edk2-BuildSpecification PATCH] Use macros in !include file paths
Posted by Zhu, Yonghong 7 years, 6 months ago
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> 

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Kinney, Michael D 
Sent: Thursday, April 13, 2017 5:39 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Shaw, Kevin W <kevin.w.shaw@intel.com>
Subject: [edk2-BuildSpecification PATCH] Use macros in !include file paths

https://bugzilla.tianocore.org/show_bug.cgi?id=472

The EBNF already allows !include statements to use
$(MACRO) values in the file path.  This change updates the description and examples for !include statements to allow the use of macros and specific environment variables in !include file paths.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
 8_pre-build_autogen_stage/82_auto-generation_process.md | 4 ++--
 README.md                                               | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/8_pre-build_autogen_stage/82_auto-generation_process.md b/8_pre-build_autogen_stage/82_auto-generation_process.md
index 84f6b6b..deb1c47 100644
--- a/8_pre-build_autogen_stage/82_auto-generation_process.md
+++ b/8_pre-build_autogen_stage/82_auto-generation_process.md
@@ -410,8 +410,8 @@ in the DSC file can be used for file names, paths, PCD values, in the  conditional directives. Macros can also be defined or used in the `[Defines]`,  `[LibraryClasses]`, `[Libraries]`, `[Components]` and all PCD sections.
 
-Macros defined by the user cannot be used in the !include statements in either -the DSC or FDF file.
+Macros defined by the user may be used in the !include statements in 
+DSC and FDF files.
 
 `EDK_GLOBAL` type macros defined in the DSC file can be used in later sections  of the DSC, FDF and any of the included EDK INF files.
diff --git a/README.md b/README.md
index 3bd1d32..ce76bb4 100644
--- a/README.md
+++ b/README.md
@@ -200,4 +200,5 @@ Copyright (c) 2008-2017, Intel Corporation. All rights reserved.
 |            | Remove Unicode file storage requirement; refer to the Multi-String UNI File Format Specification instead.                                                                                                                                                                                                                                                           |               |
 |            | Clarify BUILDRULEORDER                                                                                                                                                                                                                                                                                                                                              |               |
 |            | Add support for INF statement in an FD region.                                                                                                                                                                                                                                                                                                                      |               |
-| 1.27       | Convert to Gitbook                                                                                                                                                                                                                                                                                                                                                  | March 2017    |
+| 1.27       | Convert to Gitbook                                                                                                                                                                                                                                                                                                                                                  | April 2017    |
+|            | [#472](https://bugzilla.tianocore.org/show_bug.cgi?id=472) [Build Spec] Extend macro usage in the !include statements for DSC/FDF files                                                                                                                                                                                                                             |               |
--
2.6.3.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel