diff options
author | hchen30 <hesheng.chen@intel.com> | 2018-08-08 11:18:06 +0800 |
---|---|---|
committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-08-16 09:42:55 +0800 |
commit | 855698fb69fdb85fa24c4374d07947106f4de828 (patch) | |
tree | 290571416f9c262c1fd967ac7a93eec5be6c84eb /BaseTools/Source/Python/Table | |
parent | af24640290a79e974710629db91fb39512d0b54b (diff) | |
download | edk2-855698fb69fdb85fa24c4374d07947106f4de828.zip edk2-855698fb69fdb85fa24c4374d07947106f4de828.tar.gz edk2-855698fb69fdb85fa24c4374d07947106f4de828.tar.bz2 |
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>
Diffstat (limited to 'BaseTools/Source/Python/Table')
-rw-r--r-- | BaseTools/Source/Python/Table/TableDataModel.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableDec.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableDsc.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableEotReport.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableFdf.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableFile.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableFunction.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableIdentifier.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableInf.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TablePcd.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableQuery.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Table/TableReport.py | 6 |
12 files changed, 14 insertions, 14 deletions
diff --git a/BaseTools/Source/Python/Table/TableDataModel.py b/BaseTools/Source/Python/Table/TableDataModel.py index ea0996f..b01c3ec 100644 --- a/BaseTools/Source/Python/Table/TableDataModel.py +++ b/BaseTools/Source/Python/Table/TableDataModel.py @@ -17,7 +17,7 @@ from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
import CommonDataClass.DataClass as DataClass
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString
## TableDataModel
diff --git a/BaseTools/Source/Python/Table/TableDec.py b/BaseTools/Source/Python/Table/TableDec.py index bbae3e8..1d887dc 100644 --- a/BaseTools/Source/Python/Table/TableDec.py +++ b/BaseTools/Source/Python/Table/TableDec.py @@ -17,7 +17,7 @@ from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
import CommonDataClass.DataClass as DataClass
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString
## TableDec
diff --git a/BaseTools/Source/Python/Table/TableDsc.py b/BaseTools/Source/Python/Table/TableDsc.py index 6436973..0a45f7f 100644 --- a/BaseTools/Source/Python/Table/TableDsc.py +++ b/BaseTools/Source/Python/Table/TableDsc.py @@ -17,7 +17,7 @@ from __future__ import absolute_import #
import Common.EdkLogger as EdkLogger
import CommonDataClass.DataClass as DataClass
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString
## TableDsc
diff --git a/BaseTools/Source/Python/Table/TableEotReport.py b/BaseTools/Source/Python/Table/TableEotReport.py index 0a49016..6f2fb37 100644 --- a/BaseTools/Source/Python/Table/TableEotReport.py +++ b/BaseTools/Source/Python/Table/TableEotReport.py @@ -17,7 +17,7 @@ from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
import Common.LongFilePathOs as os, time
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString2
import Eot.EotToolError as EotToolError
import Eot.EotGlobalData as EotGlobalData
diff --git a/BaseTools/Source/Python/Table/TableFdf.py b/BaseTools/Source/Python/Table/TableFdf.py index 80be953..668f562 100644 --- a/BaseTools/Source/Python/Table/TableFdf.py +++ b/BaseTools/Source/Python/Table/TableFdf.py @@ -17,7 +17,7 @@ from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
import CommonDataClass.DataClass as DataClass
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString
## TableFdf
diff --git a/BaseTools/Source/Python/Table/TableFile.py b/BaseTools/Source/Python/Table/TableFile.py index 689264c..805a528 100644 --- a/BaseTools/Source/Python/Table/TableFile.py +++ b/BaseTools/Source/Python/Table/TableFile.py @@ -16,7 +16,7 @@ #
from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString
import Common.LongFilePathOs as os
from CommonDataClass.DataClass import FileClass
diff --git a/BaseTools/Source/Python/Table/TableFunction.py b/BaseTools/Source/Python/Table/TableFunction.py index 1667180..ee677cf 100644 --- a/BaseTools/Source/Python/Table/TableFunction.py +++ b/BaseTools/Source/Python/Table/TableFunction.py @@ -16,7 +16,7 @@ #
from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString
## TableFunction
diff --git a/BaseTools/Source/Python/Table/TableIdentifier.py b/BaseTools/Source/Python/Table/TableIdentifier.py index 8b4dd1d..6b658cf 100644 --- a/BaseTools/Source/Python/Table/TableIdentifier.py +++ b/BaseTools/Source/Python/Table/TableIdentifier.py @@ -17,7 +17,7 @@ from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
from Common.StringUtils import ConvertToSqlString
-from .Table import Table
+from Table.Table import Table
## TableIdentifier
#
diff --git a/BaseTools/Source/Python/Table/TableInf.py b/BaseTools/Source/Python/Table/TableInf.py index a00096a..e0ffb17 100644 --- a/BaseTools/Source/Python/Table/TableInf.py +++ b/BaseTools/Source/Python/Table/TableInf.py @@ -17,7 +17,7 @@ from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
import CommonDataClass.DataClass as DataClass
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString
## TableInf
diff --git a/BaseTools/Source/Python/Table/TablePcd.py b/BaseTools/Source/Python/Table/TablePcd.py index d58a3ef..5096862 100644 --- a/BaseTools/Source/Python/Table/TablePcd.py +++ b/BaseTools/Source/Python/Table/TablePcd.py @@ -16,7 +16,7 @@ #
from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString
## TablePcd
diff --git a/BaseTools/Source/Python/Table/TableQuery.py b/BaseTools/Source/Python/Table/TableQuery.py index a991e61..8e7d313 100644 --- a/BaseTools/Source/Python/Table/TableQuery.py +++ b/BaseTools/Source/Python/Table/TableQuery.py @@ -17,7 +17,7 @@ from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
from Common.StringUtils import ConvertToSqlString
-from .Table import Table
+from Table.Table import Table
## TableQuery
#
diff --git a/BaseTools/Source/Python/Table/TableReport.py b/BaseTools/Source/Python/Table/TableReport.py index c4a6229..0002296 100644 --- a/BaseTools/Source/Python/Table/TableReport.py +++ b/BaseTools/Source/Python/Table/TableReport.py @@ -17,10 +17,10 @@ from __future__ import absolute_import
import Common.EdkLogger as EdkLogger
import Common.LongFilePathOs as os, time
-from .Table import Table
+from Table.Table import Table
from Common.StringUtils import ConvertToSqlString2
-import EccToolError as EccToolError
-import EccGlobalData as EccGlobalData
+import Ecc.EccToolError as EccToolError
+import Ecc.EccGlobalData as EccGlobalData
from Common.LongFilePathSupport import OpenLongFilePath as open
## TableReport
|