[PATCH 1/2] BaseTools: Fix build fail after clean or cleanall target.

[PATCH 1/2] BaseTools: Fix build fail after clean or cleanall target.

[Yonghong Zhu]

From: Derek Lin <derek.lin2@hpe.com>

Remove module AutoGenTimeStamp file during clean or cleanall.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Derek Lin <derek.lin2@hpe.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/AutoGen/GenMake.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index ea07b97786..ac24bd8bbe 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -386,7 +386,7 @@ ${END}
 #
 clean:
 \t${BEGIN}${clean_command}
-\t${END}
+\t${END}\t$(RM) AutoGenTimeStamp
 
 #
 # clean all generated files
@@ -395,6 +395,7 @@ cleanall:
 ${BEGIN}\t${cleanall_command}
 ${END}\t$(RM) *.pdb *.idb > NUL 2>&1
 \t$(RM) $(BIN_DIR)${separator}$(MODULE_NAME).efi
+\t$(RM) AutoGenTimeStamp
 
 #
 # clean all dependent libraries built
-- 
2.11.1.windows.1

[PATCH 2/2] BaseTools: Fix re-build issue after tools_def/build_rule updated.

[Yonghong Zhu]

From: Derek Lin <derek.lin2@hpe.com>

Add tools_def.txt and build_rule.txt to workspace autogen timestamp file.
Now it will not skip autogen if this two file is updated.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Derek Lin <derek.lin2@hpe.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/AutoGen/AutoGen.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 70c6c91186..3d3dfefdbc 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -64,6 +64,9 @@ gMakeTypeMap = {"MSFT":"nmake", "GCC":"gmake"}
 ## Build rule configuration file
 gDefaultBuildRuleFile = 'Conf/build_rule.txt'
 
+## Tools definition configuration file
+gDefaultToolsDefFile = 'Conf/tools_def.txt'
+
 ## Build rule default version
 AutoGenReqBuildRuleVerNum = "0.1"
 
@@ -721,6 +724,11 @@ class WorkspaceAutoGen(AutoGen):
         AllWorkSpaceMetaFiles.add(self.MetaFile.Path)
 
         #
+        # add build_rule.txt & tools_def.txt
+        #
+        AllWorkSpaceMetaFiles.add(gDefaultBuildRuleFile)
+        AllWorkSpaceMetaFiles.add(gDefaultToolsDefFile)
+
         # add BuildOption metafile
         #
         AllWorkSpaceMetaFiles.add(os.path.join(self.BuildDir, 'BuildOptions'))
-- 
2.11.1.windows.1

Re: [PATCH 2/2] BaseTools: Fix re-build issue after tools_def/build_rule updated.

[Gao, Liming]

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: Tuesday, April 11, 2017 2:44 PM
>To: edk2-devel@lists.01.org
>Cc: Derek Lin <derek.lin2@hpe.com>
>Subject: [edk2] [PATCH 2/2] BaseTools: Fix re-build issue after
>tools_def/build_rule updated.
>
>From: Derek Lin <derek.lin2@hpe.com>
>
>Add tools_def.txt and build_rule.txt to workspace autogen timestamp file.
>Now it will not skip autogen if this two file is updated.
>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Derek Lin <derek.lin2@hpe.com>
>Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/AutoGen/AutoGen.py | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
>b/BaseTools/Source/Python/AutoGen/AutoGen.py
>index 70c6c91186..3d3dfefdbc 100644
>--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
>+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
>@@ -64,6 +64,9 @@ gMakeTypeMap = {"MSFT":"nmake", "GCC":"gmake"}
> ## Build rule configuration file
> gDefaultBuildRuleFile = 'Conf/build_rule.txt'
>
>+## Tools definition configuration file
>+gDefaultToolsDefFile = 'Conf/tools_def.txt'
>+
> ## Build rule default version
> AutoGenReqBuildRuleVerNum = "0.1"
>
>@@ -721,6 +724,11 @@ class WorkspaceAutoGen(AutoGen):
>         AllWorkSpaceMetaFiles.add(self.MetaFile.Path)
>
>         #
>+        # add build_rule.txt & tools_def.txt
>+        #
>+        AllWorkSpaceMetaFiles.add(gDefaultBuildRuleFile)
>+        AllWorkSpaceMetaFiles.add(gDefaultToolsDefFile)
>+
>         # add BuildOption metafile
>         #
>         AllWorkSpaceMetaFiles.add(os.path.join(self.BuildDir, 'BuildOptions'))
>--
>2.11.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel

Re: [PATCH 1/2] BaseTools: Fix build fail after clean or cleanall target.

[Gao, Liming]

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: Tuesday, April 11, 2017 2:44 PM
>To: edk2-devel@lists.01.org
>Cc: Derek Lin <derek.lin2@hpe.com>
>Subject: [edk2] [PATCH 1/2] BaseTools: Fix build fail after clean or cleanall
>target.
>
>From: Derek Lin <derek.lin2@hpe.com>
>
>Remove module AutoGenTimeStamp file during clean or cleanall.
>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Derek Lin <derek.lin2@hpe.com>
>Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/AutoGen/GenMake.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py
>b/BaseTools/Source/Python/AutoGen/GenMake.py
>index ea07b97786..ac24bd8bbe 100644
>--- a/BaseTools/Source/Python/AutoGen/GenMake.py
>+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
>@@ -386,7 +386,7 @@ ${END}
> #
> clean:
> \t${BEGIN}${clean_command}
>-\t${END}
>+\t${END}\t$(RM) AutoGenTimeStamp
>
> #
> # clean all generated files
>@@ -395,6 +395,7 @@ cleanall:
> ${BEGIN}\t${cleanall_command}
> ${END}\t$(RM) *.pdb *.idb > NUL 2>&1
> \t$(RM) $(BIN_DIR)${separator}$(MODULE_NAME).efi
>+\t$(RM) AutoGenTimeStamp
>
> #
> # clean all dependent libraries built
>--
>2.11.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel