BaseTools/Source/Python/AutoGen/GenMake.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
This patch is going to sort the file list in generated
Makefile. This change make the autogen makefile easy to
compare.
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@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 212ca0fa7f..031c0ae370 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -1024,11 +1024,12 @@ cleanlib:
self.FileListMacros[T.FileListMacro].append(NewFile)
elif T.GenFileListMacro:
self.FileListMacros[T.FileListMacro].append(NewFile)
else:
Deps.append(NewFile)
-
+ for key in self.FileListMacros:
+ self.FileListMacros[key].sort()
# Use file list macro as dependency
if T.GenFileListMacro:
Deps.append("$(%s)" % T.FileListMacro)
if Type in [TAB_OBJECT_FILE, TAB_STATIC_LIBRARY]:
Deps.append("$(%s)" % T.ListFileMacro)
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#43922): https://edk2.groups.io/g/devel/message/43922
Mute This Topic: https://groups.io/mt/32512789/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Liming Gao <liming.gao@intel.com> > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Bob Feng > Sent: Thursday, July 18, 2019 3:34 PM > To: devel@edk2.groups.io > Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com> > Subject: [edk2-devel] [Patch] BaseTools: Sort file list in Makefile > > This patch is going to sort the file list in generated > Makefile. This change make the autogen makefile easy to > compare. > > Cc: Liming Gao <liming.gao@intel.com> > Signed-off-by: Bob Feng <bob.c.feng@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 212ca0fa7f..031c0ae370 100644 > --- a/BaseTools/Source/Python/AutoGen/GenMake.py > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py > @@ -1024,11 +1024,12 @@ cleanlib: > self.FileListMacros[T.FileListMacro].append(NewFile) > elif T.GenFileListMacro: > self.FileListMacros[T.FileListMacro].append(NewFile) > else: > Deps.append(NewFile) > - > + for key in self.FileListMacros: > + self.FileListMacros[key].sort() > # Use file list macro as dependency > if T.GenFileListMacro: > Deps.append("$(%s)" % T.FileListMacro) > if Type in [TAB_OBJECT_FILE, TAB_STATIC_LIBRARY]: > Deps.append("$(%s)" % T.ListFileMacro) > -- > 2.18.0.windows.1 > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44253): https://edk2.groups.io/g/devel/message/44253 Mute This Topic: https://groups.io/mt/32512789/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
On 7/18/19 9:34 AM, Bob Feng wrote: > This patch is going to sort the file list in generated > Makefile. This change make the autogen makefile easy to > compare. Good idea. > > Cc: Liming Gao <liming.gao@intel.com> > Signed-off-by: Bob Feng <bob.c.feng@intel.com> Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.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 212ca0fa7f..031c0ae370 100644 > --- a/BaseTools/Source/Python/AutoGen/GenMake.py > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py > @@ -1024,11 +1024,12 @@ cleanlib: > self.FileListMacros[T.FileListMacro].append(NewFile) > elif T.GenFileListMacro: > self.FileListMacros[T.FileListMacro].append(NewFile) > else: > Deps.append(NewFile) > - > + for key in self.FileListMacros: > + self.FileListMacros[key].sort() > # Use file list macro as dependency > if T.GenFileListMacro: > Deps.append("$(%s)" % T.FileListMacro) > if Type in [TAB_OBJECT_FILE, TAB_STATIC_LIBRARY]: > Deps.append("$(%s)" % T.ListFileMacro) > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44311): https://edk2.groups.io/g/devel/message/44311 Mute This Topic: https://groups.io/mt/32512789/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.