Sync BaseTool trunk (version r2460) into EDKII BaseTools. The change mainly includes:

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / WorkspaceDatabase.py

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
index 71e98a94bea556533cc350df3cbaee22872929f5..a8452a9f8442387e037691b7c873dddcde725089 100644 (file)
--- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
@@ -429,7 +429,7 @@ class DscBuildData(PlatformBuildClassObject):
                                     File=self.MetaFile, Line=Record[-1])\r
                 self._SkuIds[Record[1]] = Record[0]\r
             if 'DEFAULT' not in self._SkuIds:\r
-                self._SkuIds['DEFAULT'] = 0\r
+                self._SkuIds['DEFAULT'] = '0'\r
         return self._SkuIds\r
 \r
     ## Retrieve [Components] section information\r
@@ -1343,10 +1343,10 @@ class InfBuildData(ModuleBuildClassObject):
     def _GetMacros(self):\r
         if self.__Macros == None:\r
             self.__Macros = {}\r
-            # EDK_GLOBAL defined macros can be applied to EDK modoule\r
+            # EDK_GLOBAL defined macros can be applied to EDK module\r
             if self.AutoGenVersion < 0x00010005:\r
                 self.__Macros.update(GlobalData.gEdkGlobal)\r
-            self.__Macros.update(GlobalData.gGlobalDefines)\r
+                self.__Macros.update(GlobalData.gGlobalDefines)\r
         return self.__Macros\r
 \r
     ## Get architecture\r
@@ -1760,8 +1760,6 @@ class InfBuildData(ModuleBuildClassObject):
             self._Sources = []\r
             RecordList = self._RawData[MODEL_EFI_SOURCE_FILE, self._Arch, self._Platform]\r
             Macros = self._Macros\r
-            Macros["EDK_SOURCE"] = GlobalData.gEcpSource\r
-            Macros['PROCESSOR'] = self._Arch\r
             for Record in RecordList:\r
                 LineNo = Record[-1]\r
                 ToolChainFamily = Record[1]\r
@@ -1769,6 +1767,8 @@ class InfBuildData(ModuleBuildClassObject):
                 ToolCode = Record[3]\r
                 FeatureFlag = Record[4]\r
                 if self.AutoGenVersion < 0x00010005:\r
+                    Macros["EDK_SOURCE"] = GlobalData.gEcpSource\r
+                    Macros['PROCESSOR'] = self._Arch\r
                     # old module source files (Edk)\r
                     File = PathClass(NormPath(Record[0], Macros), self._ModuleDir, self._SourceOverridePath,\r
                                      '', False, self._Arch, ToolChainFamily, '', TagName, ToolCode)\r