BaseTools: remove unused file

ToolsDefClassObject didnt need Dictionary, it needed an import from there.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

2 files changed, 5 insertions, 78 deletions

diff --git a/BaseTools/Source/Python/Common/Dictionary.py b/BaseTools/Source/Python/Common/Dictionary.py
deleted file mode 100644
index f653275ff1..0000000000
--- a/BaseTools/Source/Python/Common/Dictionary.py
+++ /dev/null
@@ -1,76 +0,0 @@
-## @file

-# Define a dictionary structure

-#

-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>

-# This program and the accompanying materials

-# are licensed and made available under the terms and conditions of the BSD License

-# which accompanies this distribution.  The full text of the license may be found at

-# http://opensource.org/licenses/bsd-license.php

-#

-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-

-##

-# Import Modules

-#

-import EdkLogger

-from DataType import *

-from Common.LongFilePathSupport import OpenLongFilePath as open

-

-## Convert a text file to a dictionary

-#

-# Convert a text file to a dictionary of (name:value) pairs.

-#

-# @retval 0  Convert successful

-# @retval 1  Open file failed

-#

-def ConvertTextFileToDictionary(FileName, Dictionary, CommentCharacter, KeySplitCharacter, ValueSplitFlag, ValueSplitCharacter):

-    try:

-        F = open(FileName, 'r')

-        Keys = []

-        for Line in F:

-            if Line.startswith(CommentCharacter):

-                continue

-            LineList = Line.split(KeySplitCharacter, 1)

-            if len(LineList) >= 2:

-                Key = LineList[0].split()

-            if len(Key) == 1 and Key[0][0] != CommentCharacter and Key[0] not in Keys:

-                if ValueSplitFlag:

-                    Dictionary[Key[0]] = LineList[1].replace('\\', '/').split(ValueSplitCharacter)

-                else:

-                    Dictionary[Key[0]] = LineList[1].strip().replace('\\', '/')

-                Keys += [Key[0]]

-        F.close()

-        return 0

-    except:

-        EdkLogger.info('Open file failed')

-        return 1

-

-## Print the dictionary

-#

-# Print all items of dictionary one by one

-#

-# @param Dict:  The dictionary to be printed

-#

-def printDict(Dict):

-    if Dict is not None:

-        KeyList = Dict.keys()

-        for Key in KeyList:

-            if Dict[Key] != '':

-                print Key + ' = ' + str(Dict[Key])

-

-## Print the dictionary

-#

-# Print the items of dictionary which matched with input key

-#

-# @param list:  The dictionary to be printed

-# @param key:   The key of the item to be printed

-#

-def printList(Key, List):

-    if type(List) == type([]):

-        if len(List) > 0:

-            if Key.find(TAB_SPLIT) != -1:

-                print "\n" + Key

-                for Item in List:

-                    print Item

diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseTools/Source/Python/Common/ToolDefClassObject.py
index 1ab848f1ec..73ebdaf6b1 100644
--- a/BaseTools/Source/Python/Common/ToolDefClassObject.py
+++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py
@@ -1,7 +1,7 @@
 ## @file

 # This file is used to define each component of tools_def.txt file

 #

-# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -18,7 +18,6 @@ import Common.LongFilePathOs as os
 import re

 import EdkLogger

 

-from Dictionary import *

 from BuildToolError import *

 from TargetTxtClassObject import *

 from Common.LongFilePathSupport import OpenLongFilePath as open

@@ -27,6 +26,10 @@ from Common.String import NormPath
 import Common.GlobalData as GlobalData

 from Common import GlobalData

 from Common.MultipleWorkspace import MultipleWorkspace as mws

+from DataType import TAB_TOD_DEFINES_TARGET,TAB_TOD_DEFINES_TOOL_CHAIN_TAG,\

+                     TAB_TOD_DEFINES_TARGET_ARCH,TAB_TOD_DEFINES_COMMAND_TYPE\

+                     ,TAB_TOD_DEFINES_FAMILY,TAB_TOD_DEFINES_BUILDRULEFAMILY

+

 

 ##

 # Static variables used for pattern