From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1956621951C90 for ; Tue, 25 Apr 2017 13:29:12 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2017 13:29:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,251,1488873600"; d="scan'208";a="93741327" Received: from mdkinney-mobl.amr.corp.intel.com ([10.241.98.55]) by fmsmga005.fm.intel.com with ESMTP; 25 Apr 2017 13:29:11 -0700 From: Michael Kinney To: edk2-devel@lists.01.org Cc: Liming Gao , Yonghong Zhu , Kevin W Shaw Date: Tue, 25 Apr 2017 13:29:07 -0700 Message-Id: <1493152147-1220-2-git-send-email-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.6.3.windows.1 In-Reply-To: <1493152147-1220-1-git-send-email-michael.d.kinney@intel.com> References: <1493152147-1220-1-git-send-email-michael.d.kinney@intel.com> Subject: [edk2-DscSpecification PATCH] Allow nested !include statements X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2017 20:29:12 -0000 https://bugzilla.tianocore.org/show_bug.cgi?id=353 Cc: Liming Gao Cc: Yonghong Zhu Cc: Kevin W Shaw Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael Kinney --- 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