BaseTools: Fix --hash Package and Module hash value.

The order of List enumeration is arbitrary.
Need to be sorted while calculating Package/Module hash, otherwise it
generate different hash value even nothing changes.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Derek Lin <derek.lin2@hpe.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 54f6b1f173b2a237d79061bc1bd2ae9cce259012..1e6511cdb5d2eeaddabd862c99c09bf09f2b6a72 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -2,6 +2,8 @@
 # Generate AutoGen.h, AutoGen.c and *.depex files\r
 #\r
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<BR>\r
+#\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -670,6 +672,9 @@ class WorkspaceAutoGen(AutoGen):
         return True\r
 \r
     def _GenPkgLevelHash(self, Pkg):\r
+        if Pkg.PackageName in GlobalData.gPackageHash[Pkg.Arch]:\r
+            return\r
+\r
         PkgDir = os.path.join(self.BuildDir, Pkg.Arch, Pkg.PackageName)\r
         CreateDirectory(PkgDir)\r
         HashFile = os.path.join(PkgDir, Pkg.PackageName + '.hash')\r
@@ -681,17 +686,16 @@ class WorkspaceAutoGen(AutoGen):
         m.update(Content)\r
         # Get include files hash value\r
         if Pkg.Includes:\r
-            for inc in Pkg.Includes:\r
+            for inc in sorted(Pkg.Includes, key=lambda x: str(x)):\r
                 for Root, Dirs, Files in os.walk(str(inc)):\r
-                    for File in Files:\r
+                    for File in sorted(Files):\r
                         File_Path = os.path.join(Root, File)\r
                         f = open(File_Path, 'r')\r
                         Content = f.read()\r
                         f.close()\r
                         m.update(Content)\r
         SaveFileOnChange(HashFile, m.hexdigest(), True)\r
-        if Pkg.PackageName not in GlobalData.gPackageHash[Pkg.Arch]:\r
-            GlobalData.gPackageHash[Pkg.Arch][Pkg.PackageName] = m.hexdigest()\r
+        GlobalData.gPackageHash[Pkg.Arch][Pkg.PackageName] = m.hexdigest()\r
 \r
     def _GetMetaFiles(self, Target, Toolchain, Arch):\r
         AllWorkSpaceMetaFiles = set()\r
@@ -4432,13 +4436,13 @@ class ModuleAutoGen(AutoGen):
         m.update(GlobalData.gPlatformHash)\r
         # Add Package level hash\r
         if self.DependentPackageList:\r
-            for Pkg in self.DependentPackageList:\r
+            for Pkg in sorted(self.DependentPackageList, key=lambda x: x.PackageName):\r
                 if Pkg.PackageName in GlobalData.gPackageHash[self.Arch]:\r
                     m.update(GlobalData.gPackageHash[self.Arch][Pkg.PackageName])\r
 \r
         # Add Library hash\r
         if self.LibraryAutoGenList:\r
-            for Lib in self.LibraryAutoGenList:\r
+            for Lib in sorted(self.LibraryAutoGenList, key=lambda x: x.Name):\r
                 if Lib.Name not in GlobalData.gModuleHash[self.Arch]:\r
                     Lib.GenModuleHash()\r
                 m.update(GlobalData.gModuleHash[self.Arch][Lib.Name])\r
@@ -4450,7 +4454,7 @@ class ModuleAutoGen(AutoGen):
         m.update(Content)\r
         # Add Module's source files\r
         if self.SourceFileList:\r
-            for File in self.SourceFileList:\r
+            for File in sorted(self.SourceFileList, key=lambda x: str(x)):\r
                 f = open(str(File), 'r')\r
                 Content = f.read()\r
                 f.close()\r