[edk2] [Patch] BaseTools: Fix a bug for single module build with GenC/GenMake option

Yonghong Zhu posted 1 patch 6 years, 5 months ago
Failed in applying to current master (apply log)
BaseTools/Source/Python/build/build.py | 5 -----
1 file changed, 5 deletions(-)
[edk2] [Patch] BaseTools: Fix a bug for single module build with GenC/GenMake option
Posted by Yonghong Zhu 6 years, 5 months ago
when build a single module with GenC/GenMake option, currently it will
direct return after create Autogen code files, then it cause MaList is
empty, which cause an incorrect error message is reported.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/build/build.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 4f73bba..53f1245 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -1835,17 +1835,12 @@ class Build():
                             # Not to auto-gen for targets 'clean', 'cleanlib', 'cleanall', 'run', 'fds'
                             if self.Target not in ['clean', 'cleanlib', 'cleanall', 'run', 'fds']:
                                 # for target which must generate AutoGen code and makefile
                                 if not self.SkipAutoGen or self.Target == 'genc':
                                     Ma.CreateCodeFile(True)
-                                if self.Target == "genc":
-                                    continue
-
                                 if not self.SkipAutoGen or self.Target == 'genmake':
                                     Ma.CreateMakeFile(True)
-                                if self.Target == "genmake":
-                                    continue
                             MaList.append(Ma)
                             self.BuildModules.append(Ma)
                     self.AutoGenTime += int(round((time.time() - AutoGenStart)))
                     MakeStart = time.time()
                     for Ma in self.BuildModules:
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] BaseTools: Fix a bug for single module build with GenC/GenMake option
Posted by Gao, Liming 6 years, 4 months ago
Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Yonghong Zhu
>Sent: Friday, November 17, 2017 12:03 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [edk2] [Patch] BaseTools: Fix a bug for single module build with
>GenC/GenMake option
>
>when build a single module with GenC/GenMake option, currently it will
>direct return after create Autogen code files, then it cause MaList is
>empty, which cause an incorrect error message is reported.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/build/build.py | 5 -----
> 1 file changed, 5 deletions(-)
>
>diff --git a/BaseTools/Source/Python/build/build.py
>b/BaseTools/Source/Python/build/build.py
>index 4f73bba..53f1245 100644
>--- a/BaseTools/Source/Python/build/build.py
>+++ b/BaseTools/Source/Python/build/build.py
>@@ -1835,17 +1835,12 @@ class Build():
>                             # Not to auto-gen for targets 'clean', 'cleanlib', 'cleanall', 'run',
>'fds'
>                             if self.Target not in ['clean', 'cleanlib', 'cleanall', 'run', 'fds']:
>                                 # for target which must generate AutoGen code and makefile
>                                 if not self.SkipAutoGen or self.Target == 'genc':
>                                     Ma.CreateCodeFile(True)
>-                                if self.Target == "genc":
>-                                    continue
>-
>                                 if not self.SkipAutoGen or self.Target == 'genmake':
>                                     Ma.CreateMakeFile(True)
>-                                if self.Target == "genmake":
>-                                    continue
>                             MaList.append(Ma)
>                             self.BuildModules.append(Ma)
>                     self.AutoGenTime += int(round((time.time() - AutoGenStart)))
>                     MakeStart = time.time()
>                     for Ma in self.BuildModules:
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel