BaseTools: Fix a cleanall issue.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <yingke.d.liu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16338 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Yingke Liu 2014-11-12 08:26:03 +00:00 committed by yingke
parent 6da5153cfc
commit bcbdc75535
1 changed files with 4 additions and 10 deletions

View File

@ -997,11 +997,6 @@ class Build():
try: try:
#os.rmdir(AutoGenObject.BuildDir) #os.rmdir(AutoGenObject.BuildDir)
RemoveDirectory(AutoGenObject.BuildDir, True) RemoveDirectory(AutoGenObject.BuildDir, True)
#
# First should close DB.
#
self.Db.Close()
RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), True)
except WindowsError, X: except WindowsError, X:
EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X)) EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))
return True return True
@ -1091,11 +1086,6 @@ class Build():
try: try:
#os.rmdir(AutoGenObject.BuildDir) #os.rmdir(AutoGenObject.BuildDir)
RemoveDirectory(AutoGenObject.BuildDir, True) RemoveDirectory(AutoGenObject.BuildDir, True)
#
# First should close DB.
#
self.Db.Close()
RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), True)
except WindowsError, X: except WindowsError, X:
EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X)) EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))
return True return True
@ -1805,6 +1795,10 @@ class Build():
self.SpawnMode = False self.SpawnMode = False
self._BuildModule() self._BuildModule()
if self.Target == 'cleanall':
self.Db.Close()
RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), True)
def CreateAsBuiltInf(self): def CreateAsBuiltInf(self):
for Module in self.BuildModules: for Module in self.BuildModules:
Module.CreateAsBuiltInf() Module.CreateAsBuiltInf()