BaseTools: refine CreateAsBuiltInf function

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1932
ModuleAutogen.CreateAsBuiltInf IsOnlyCopy parameter
and related function can be moved out of CreateAsBuiltInf,
so that CreateAsBuiltInf is more clean.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Steven Shi <steven.shi@intel.com>
Cc: Christian Rodriguez <christian.rodriguez@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Steven Shi <steven.shi@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index f50941d42295ad30357f992e9f48262c1cf4eab6..45b81ed660e9d7815b83c65f45e5331e39d35da8 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -3581,11 +3581,8 @@ class ModuleAutoGen(AutoGen):
 \r
     ## Create AsBuilt INF file the module\r
     #\r
-    def CreateAsBuiltInf(self, IsOnlyCopy = False):\r
+    def CreateAsBuiltInf(self):\r
         self.OutputFile = set()\r
-        if IsOnlyCopy and GlobalData.gBinCacheDest:\r
-            self.CopyModuleToCache()\r
-            return\r
 \r
         if self.IsAsBuiltInfCreated:\r
             return\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 2dca3c7b34201e35abbf7982e704eda990dd94f6..3ece4d4c615830630f3dfbdaf38cf5cfae214a86 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2219,13 +2219,15 @@ class Build():
             Module.CreateAsBuiltInf()\r
             all_mod_set.add(Module)\r
         for Module in self.HashSkipModules:\r
-            Module.CreateAsBuiltInf(True)\r
+            if  GlobalData.gBinCacheDest:\r
+                Module.CopyModuleToCache()\r
             all_mod_set.add(Module)\r
         for Module in all_mod_set:\r
             for lib in Module.LibraryAutoGenList:\r
                 all_lib_set.add(lib)\r
         for lib in all_lib_set:\r
-            lib.CreateAsBuiltInf(True)\r
+            if  GlobalData.gBinCacheDest:\r
+                lib.CopyModuleToCache()\r
         all_lib_set.clear()\r
         all_mod_set.clear()\r
         self.BuildModules = []\r