BaseTools/Ecc: Fix import issues
1. Complete the full path for import statement. Use "EccMain" to replace "Ecc" for the absolute path support. 2. Fix some issues on configuration file. 3. Fix an issue of RaiseError not working in EdkLogger. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hess Chen <hesheng.chen@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
@ -22,8 +22,8 @@ import copy
|
||||
|
||||
import Common.EdkLogger as EdkLogger
|
||||
import Common.GlobalData as GlobalData
|
||||
import EccGlobalData
|
||||
import EccToolError
|
||||
import Ecc.EccGlobalData as EccGlobalData
|
||||
import Ecc.EccToolError as EccToolError
|
||||
|
||||
from CommonDataClass.DataClass import *
|
||||
from Common.DataType import *
|
||||
@ -32,7 +32,7 @@ from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClas
|
||||
from Common.Expression import *
|
||||
from CommonDataClass.Exceptions import *
|
||||
|
||||
from .MetaFileTable import MetaFileStorage
|
||||
from Ecc.MetaFileWorkspace.MetaFileTable import MetaFileStorage
|
||||
from GenFds.FdfParser import FdfParser
|
||||
from Common.LongFilePathSupport import OpenLongFilePath as open
|
||||
from Common.LongFilePathSupport import CodecOpenLongFilePath
|
||||
|
@ -18,10 +18,10 @@ from __future__ import absolute_import
|
||||
import uuid
|
||||
|
||||
import Common.EdkLogger as EdkLogger
|
||||
import EccGlobalData
|
||||
import Ecc.EccGlobalData as EccGlobalData
|
||||
|
||||
from .MetaDataTable import Table
|
||||
from .MetaDataTable import ConvertToSqlString
|
||||
from Ecc.MetaFileWorkspace.MetaDataTable import Table
|
||||
from Ecc.MetaFileWorkspace.MetaDataTable import ConvertToSqlString
|
||||
from CommonDataClass.DataClass import MODEL_FILE_DSC, MODEL_FILE_DEC, MODEL_FILE_INF, \
|
||||
MODEL_FILE_OTHERS
|
||||
|
||||
|
Reference in New Issue
Block a user