BaseTools: fix imports
1 - Some of these imports are cascaded from another file. Import them locally. 2 - Some of these imports are not used. Remove them. 3 - Some of these were missing the namespace used to import them. These changes facilitate optimization of BaseTools: https://bugzilla.tianocore.org/show_bug.cgi?id=42 Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
## @file
|
||||
# Generate AutoGen.h, AutoGen.c and *.depex files
|
||||
#
|
||||
# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
|
||||
# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
|
||||
# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<BR>
|
||||
#
|
||||
# This program and the accompanying materials
|
||||
@ -52,6 +52,7 @@ from .GenVar import VariableMgr, var_info
|
||||
from collections import OrderedDict
|
||||
from collections import defaultdict
|
||||
from Workspace.WorkspaceCommon import OrderedListDict
|
||||
from Common.ToolDefClassObject import gDefaultToolsDefFile
|
||||
|
||||
from Common.caching import cached_property, cached_class_function
|
||||
|
||||
@ -85,9 +86,6 @@ gMakeTypeMap = {TAB_COMPILER_MSFT:"nmake", "GCC":"gmake"}
|
||||
## Build rule configuration file
|
||||
gDefaultBuildRuleFile = 'build_rule.txt'
|
||||
|
||||
## Tools definition configuration file
|
||||
gDefaultToolsDefFile = 'tools_def.txt'
|
||||
|
||||
## Build rule default version
|
||||
AutoGenReqBuildRuleVerNum = "0.1"
|
||||
|
||||
|
@ -18,7 +18,7 @@ import string
|
||||
import collections
|
||||
import struct
|
||||
from Common import EdkLogger
|
||||
|
||||
from Common import GlobalData
|
||||
from Common.BuildToolError import *
|
||||
from Common.DataType import *
|
||||
from Common.Misc import *
|
||||
|
@ -22,6 +22,9 @@ from Common.VariableAttributes import VariableAttributes
|
||||
import copy
|
||||
from struct import unpack
|
||||
from Common.DataType import *
|
||||
from Common import GlobalData
|
||||
from Common import EdkLogger
|
||||
import Common.LongFilePathOs as os
|
||||
|
||||
DATABASE_VERSION = 7
|
||||
|
||||
|
Reference in New Issue
Block a user