[edk2-DscSpecification PATCH] Allow nested !include statements

[edk2-DscSpecification PATCH] Allow nested !include statements

[Michael Kinney]

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

GitHub branch for review:

* https://github.com/mdkinney/edk2-DscSpecification/tree/Bugzilla_353_AllowNestedIncludes

GitHub word diff view of the patches in this series:

* [1/1] https://github.com/mdkinney/edk2-DscSpecification/commit/31f0efdc84a2df01c6b45a8e20efb900d82186e7?w=1

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>

Michael Kinney (1):
  Allow nested !include statements

 2_dsc_overview/22_build_description_file_format.md     | 2 --
 3_edk_ii_dsc_file_format/33_platform_dsc_definition.md | 2 --
 README.md                                              | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)

-- 
2.6.3.windows.1

[edk2-DscSpecification PATCH] Allow nested !include statements

[Michael Kinney]

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

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>
---
 2_dsc_overview/22_build_description_file_format.md     | 2 --
 3_edk_ii_dsc_file_format/33_platform_dsc_definition.md | 2 --
 README.md                                              | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/2_dsc_overview/22_build_description_file_format.md b/2_dsc_overview/22_build_description_file_format.md
index d32c9b0..9c5c9f8 100644
--- a/2_dsc_overview/22_build_description_file_format.md
+++ b/2_dsc_overview/22_build_description_file_format.md
@@ -240,8 +240,6 @@ for macros. The system environment variables `$(WORKSPACE)`, `$(EDK_SOURCE)`,
 `$(EFI_SOURCE)`, and `$(ECP_SOURCE)` may also be used; only these system
 environment variables are permitted to start the path of the included file.
 
-Files specified by `!include` statements may not contain `!include` statements.
-
 Statements in `!include` files must not break the integrity of the DSC file,
 the included file is read in by tools in the exact position of the file, and is
 functionally equivalent of copying the contents of the included file and
diff --git a/3_edk_ii_dsc_file_format/33_platform_dsc_definition.md b/3_edk_ii_dsc_file_format/33_platform_dsc_definition.md
index 1ed3f7e..bfe730c 100644
--- a/3_edk_ii_dsc_file_format/33_platform_dsc_definition.md
+++ b/3_edk_ii_dsc_file_format/33_platform_dsc_definition.md
@@ -665,8 +665,6 @@ tools attempt to find the file in a WORKSPACE (or a directory listed in the
 PACKAGES_PATH) relative path. If the file cannot be found, the build system
 must exit with an appropriate error message.
 
-The `!include` file cannot contain additional `!include` statements.
-
 Statements in the include file are permitted to override previous definitions
 as well as to define new entries.
 
diff --git a/README.md b/README.md
index 31eebe4..1d1f99c 100644
--- a/README.md
+++ b/README.md
@@ -179,3 +179,4 @@ Copyright (c) 2006-2017, Intel Corporation. All rights reserved.
 | 1.27       | Convert to GitBooks                                                                                                                                                                                                                                                                          | April 2017     |
 |            | [#351](https://bugzilla.tianocore.org/show_bug.cgi?id=351) [DSC Spec] Extend macro usage in the !include statement                                                                                                                                                                           |                |
 |            | [#484](https://bugzilla.tianocore.org/show_bug.cgi?id=484) DSC spec: support Prebuild and Postbuild in the [Defines] section                                                                                                                                                                 |                |
+|            | [#353](https://bugzilla.tianocore.org/show_bug.cgi?id=353) Build spec: Allow nested includes in DSC and FDF files                                                                                                                                                                            |               |
-- 
2.6.3.windows.1

Re: [edk2-DscSpecification PATCH] Allow nested !include statements

[Zhu, Yonghong]

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> 

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Kinney, Michael D 
Sent: Wednesday, April 26, 2017 4:29 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-DscSpecification PATCH] Allow nested !include statements

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

GitHub branch for review:

* https://github.com/mdkinney/edk2-DscSpecification/tree/Bugzilla_353_AllowNestedIncludes

GitHub word diff view of the patches in this series:

* [1/1] https://github.com/mdkinney/edk2-DscSpecification/commit/31f0efdc84a2df01c6b45a8e20efb900d82186e7?w=1

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>

Michael Kinney (1):
  Allow nested !include statements

 2_dsc_overview/22_build_description_file_format.md     | 2 --
 3_edk_ii_dsc_file_format/33_platform_dsc_definition.md | 2 --
 README.md                                              | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)

-- 
2.6.3.windows.1