diff options
| author | Bob Feng <bob.c.feng@intel.com> | 2019-06-24 09:51:44 +0800 |
|---|---|---|
| committer | Feng, Bob C <bob.c.feng@intel.com> | 2019-06-25 09:23:57 +0800 |
| commit | b8ac0b7f284790c15af0e7bec08df43f8257f368 (patch) | |
| tree | efa484d1cd1e525717c2dc16c32c3a815b40763b /BaseTools/Source/Python/build/build.py | |
| parent | dc174cd9e5de5171a5c7729e765b3af8b9e347fd (diff) | |
| download | edk2-b8ac0b7f284790c15af0e7bec08df43f8257f368.tar.gz edk2-b8ac0b7f284790c15af0e7bec08df43f8257f368.tar.bz2 edk2-b8ac0b7f284790c15af0e7bec08df43f8257f368.zip | |
BaseTools: Move Build Cache related function out of CreateAsBuiltInf
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1932
There are two functions in current CreateAsBuiltInf, Copy Binary files
to build cache folder and create asbuild inf file.
This patch is to separate UpdateBuildCache and CreateAsBuiltInf into
two functions.
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Steven Shi <steven.shi@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Christian Rodriguez <christian.rodriguez@intel.com>
Reviewed-by: Steven Shi <steven.shi@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/build/build.py')
| -rw-r--r-- | BaseTools/Source/Python/build/build.py | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 3ece4d4c61..8c3315619a 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -1250,6 +1250,9 @@ class Build(): BuildCommand = BuildCommand + [Target]
LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
self.CreateAsBuiltInf()
+ if GlobalData.gBinCacheDest:
+ self.UpdateBuildCache()
+ self.BuildModules = []
return True
# build library
@@ -1268,6 +1271,9 @@ class Build(): NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Mod, makefile)), 'pbuild']
LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)
self.CreateAsBuiltInf()
+ if GlobalData.gBinCacheDest:
+ self.UpdateBuildCache()
+ self.BuildModules = []
return True
# cleanlib
@@ -1361,6 +1367,9 @@ class Build(): BuildCommand = BuildCommand + [Target]
AutoGenObject.BuildTime = LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
self.CreateAsBuiltInf()
+ if GlobalData.gBinCacheDest:
+ self.UpdateBuildCache()
+ self.BuildModules = []
return True
# genfds
@@ -1874,6 +1883,9 @@ class Build(): ExitFlag.set()
BuildTask.WaitForComplete()
self.CreateAsBuiltInf()
+ if GlobalData.gBinCacheDest:
+ self.UpdateBuildCache()
+ self.BuildModules = []
self.MakeTime += int(round((time.time() - MakeContiue)))
if BuildTask.HasError():
self.invalidateHash()
@@ -2074,6 +2086,9 @@ class Build(): ExitFlag.set()
BuildTask.WaitForComplete()
self.CreateAsBuiltInf()
+ if GlobalData.gBinCacheDest:
+ self.UpdateBuildCache()
+ self.BuildModules = []
self.MakeTime += int(round((time.time() - MakeContiue)))
#
# Check for build error, and raise exception if one
@@ -2213,24 +2228,25 @@ class Build(): RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), True)
def CreateAsBuiltInf(self):
+ for Module in self.BuildModules:
+ Module.CreateAsBuiltInf()
+
+ def UpdateBuildCache(self):
all_lib_set = set()
all_mod_set = set()
for Module in self.BuildModules:
- Module.CreateAsBuiltInf()
+ Module.CopyModuleToCache()
all_mod_set.add(Module)
for Module in self.HashSkipModules:
- if GlobalData.gBinCacheDest:
- Module.CopyModuleToCache()
+ Module.CopyModuleToCache()
all_mod_set.add(Module)
for Module in all_mod_set:
for lib in Module.LibraryAutoGenList:
all_lib_set.add(lib)
for lib in all_lib_set:
- if GlobalData.gBinCacheDest:
- lib.CopyModuleToCache()
+ lib.CopyModuleToCache()
all_lib_set.clear()
all_mod_set.clear()
- self.BuildModules = []
self.HashSkipModules = []
## Do some clean-up works when error occurred
def Relinquish(self):
|