BaseTools: Fix some build and report file issue

1. increment build not skip make file when not change any file
2. report file generate abundant blank line
3. Build encounter Database is locked on some platform, using database
   auto commit
4. Fv BaseAddress must have if set

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 0051aaf41f..2f6fe06764 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -917,7 +917,7 @@ cleanlib:
         #

         # Extract common files list in the dependency files

         #

-        for File in DepSet:

+        for File in sorted(DepSet, key=lambda x: str(x)):

             self.CommonFileDependency.append(self.PlaceMacro(File.Path, self.Macros))

 

         for File in FileDependencyDict:

@@ -926,11 +926,11 @@ cleanlib:
                 continue

             NewDepSet = set(FileDependencyDict[File])

             NewDepSet -= DepSet

-            FileDependencyDict[File] = ["$(COMMON_DEPS)"] + list(NewDepSet)

+            FileDependencyDict[File] = ["$(COMMON_DEPS)"] + sorted(NewDepSet, key=lambda x: str(x))

 

         # Convert target description object to target string in makefile

         for Type in self._AutoGenObject.Targets:

-            for T in self._AutoGenObject.Targets[Type]:

+            for T in sorted(self._AutoGenObject.Targets[Type], key=lambda x: str(x)):

                 # Generate related macros if needed

                 if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros:

                     self.FileListMacros[T.FileListMacro] = []

@@ -1097,7 +1097,7 @@ cleanlib:
         DependencySet.update(ForceList)

         if File in DependencySet:

             DependencySet.remove(File)

-        DependencyList = list(DependencySet)  # remove duplicate ones

+        DependencyList = sorted(DependencySet, key=lambda x: str(x))  # remove duplicate ones

 

         return DependencyList