Fix conditional statement examples

[edk2] [edk2-FdfSpecification PATCH] Fix conditional statement examples

Posted by Michael Kinney 7 years, 6 months ago

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

* Removge space between !if and else
* Add $() around BARFOO

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_fdf_design_discussion/22_flash_description_file_format.md | 4 ++--
 README.md                                                   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/2_fdf_design_discussion/22_flash_description_file_format.md b/2_fdf_design_discussion/22_flash_description_file_format.md
index 9c993f4..dfbd889 100644
--- a/2_fdf_design_discussion/22_flash_description_file_format.md
+++ b/2_fdf_design_discussion/22_flash_description_file_format.md
@@ -600,7 +600,7 @@ The following is an example of conditional statements.
 ```ini
 !if ("MSFT" in $(FAMILY)) or ("INTEL" in $(FAMILY))
 ... statements
-!else if $(FAMILY) == "GCC"
+!elseif $(FAMILY) == "GCC"
 ... statements
 !endif
 
@@ -610,7 +610,7 @@ The following is an example of conditional statements.
   !else
     # FOO defined, BAR is defined
   !endif
-!elseif BARFOO
+!elseif $(BARFOO)
   # FOO is not defined, BARFOO is defined as TRUE
 !elseif $(BARFOO) == "FOOBAR"
   # FOO is not defined, BARFOO is defined as FOOBAR
diff --git a/README.md b/README.md
index 9a7f13a..74269dc 100644
--- a/README.md
+++ b/README.md
@@ -196,3 +196,4 @@ Copyright (c) 2006-2017, Intel Corporation. All rights reserved.
 |            | Clarified [UserExtensions] content in chapter 2 (to match implementation)                                                                                                  |               |
 | 1.28       | Convert to GitBooks                                                                                                                                                        | March 2017    |
 |            | [#426](https://bugzilla.tianocore.org/show_bug.cgi?id=426) IMAGE_TYPE_ID must be provided with value, FDF should mark it as required section                               |               |
+|            | [#373](https://bugzilla.tianocore.org/show_bug.cgi?id=373) Conditional statement examples incorrect                                                                        |               |
-- 
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-FdfSpecification PATCH] Fix conditional statement examples

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: Friday, April 7, 2017 5:56 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-FdfSpecification PATCH] Fix conditional statement examples

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

* Removge space between !if and else
* Add $() around BARFOO

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_fdf_design_discussion/22_flash_description_file_format.md | 4 ++--
 README.md                                                   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/2_fdf_design_discussion/22_flash_description_file_format.md b/2_fdf_design_discussion/22_flash_description_file_format.md
index 9c993f4..dfbd889 100644
--- a/2_fdf_design_discussion/22_flash_description_file_format.md
+++ b/2_fdf_design_discussion/22_flash_description_file_format.md
@@ -600,7 +600,7 @@ The following is an example of conditional statements.
 ```ini
 !if ("MSFT" in $(FAMILY)) or ("INTEL" in $(FAMILY))  ... statements -!else if $(FAMILY) == "GCC"
+!elseif $(FAMILY) == "GCC"
 ... statements
 !endif
 
@@ -610,7 +610,7 @@ The following is an example of conditional statements.
   !else
     # FOO defined, BAR is defined
   !endif
-!elseif BARFOO
+!elseif $(BARFOO)
   # FOO is not defined, BARFOO is defined as TRUE  !elseif $(BARFOO) == "FOOBAR"
   # FOO is not defined, BARFOO is defined as FOOBAR diff --git a/README.md b/README.md index 9a7f13a..74269dc 100644
--- a/README.md
+++ b/README.md
@@ -196,3 +196,4 @@ Copyright (c) 2006-2017, Intel Corporation. All rights reserved.
 |            | Clarified [UserExtensions] content in chapter 2 (to match implementation)                                                                                                  |               |
 | 1.28       | Convert to GitBooks                                                                                                                                                        | March 2017    |
 |            | [#426](https://bugzilla.tianocore.org/show_bug.cgi?id=426) IMAGE_TYPE_ID must be provided with value, FDF should mark it as required section                               |               |
+|            | [#373](https://bugzilla.tianocore.org/show_bug.cgi?id=373) Conditional statement examples incorrect                                                                        |               |
--
2.6.3.windows.1

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