BaseTools: use built in OrderedDict instead of custom version.

[mirror_edk2.git] / BaseTools / Source / Python / Common / EdkIIWorkspaceBuild.py

diff --git a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
index c0966d5265190e748d90248f86d8b367d2284a0c..c4f45b7c59c223b1ea354e29b1dcea0573551b84 100644 (file)
--- a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
+++ b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
@@ -22,7 +22,7 @@ from DecClassObject import *
 from DscClassObject import *\r
 from String import *\r
 from BuildToolError import *\r
-from Misc import sdict\r
+from collections import OrderedDict\r
 import Database as Database\r
 import time as time\r
 \r
@@ -189,7 +189,7 @@ class ModuleBuildClassObject(object):
 \r
         self.Binaries                = []\r
         self.Sources                 = []\r
-        self.LibraryClasses          = sdict()\r
+        self.LibraryClasses          = OrderedDict()\r
         self.Libraries               = []\r
         self.Protocols               = []\r
         self.Ppis                    = []\r
@@ -955,8 +955,8 @@ class WorkspaceBuild(object):
         # EdkII module\r
         LibraryConsumerList = [Module]\r
         Constructor         = []\r
-        ConsumedByList      = sdict()\r
-        LibraryInstance     = sdict()\r
+        ConsumedByList      = OrderedDict()\r
+        LibraryInstance     = OrderedDict()\r
 \r
         EdkLogger.verbose("")\r
         EdkLogger.verbose("Library instances of module [%s] [%s]:" % (str(Module), Arch))\r
@@ -1097,7 +1097,7 @@ class WorkspaceBuild(object):
         # The DAG Topo sort produces the destructor order, so the list of constructors must generated in the reverse order\r
         #\r
         SortedLibraryList.reverse()\r
-        Module.LibraryClasses = sdict()\r
+        Module.LibraryClasses = OrderedDict()\r
         for L in SortedLibraryList:\r
             for Lc in L.LibraryClass:\r
                 Module.LibraryClasses[Lc.LibraryClass, ModuleType] = str(L)\r