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

  1. Fix !include issues
  2. Fix Trim to skip the postfix 'U' for hexadecimal and decimal numbers
  3. Fix building error C2733 when building C++ code.
  4. Add GCC46 tool chain definition
  5. Add new RVCT and RVCTLINUX tool chains

Signed-off-by: lgao4


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12782 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 266 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py
index cd47b805e5..6f5f9fd0b5 100644
--- a/BaseTools/Source/Python/Ecc/Check.py
+++ b/BaseTools/Source/Python/Ecc/Check.py
@@ -580,6 +580,7 @@ class Check(object):
             pass

 

     # Check whether the unnecessary inclusion of library classes in the Inf file

+    # Check whether the unnecessary duplication of library classe names in the DSC file

     def MetaDataFileCheckLibraryNoUse(self):

         if EccGlobalData.gConfig.MetaDataFileCheckLibraryNoUse == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

             EdkLogger.quiet("Checking for library instance not used ...")

@@ -588,7 +589,20 @@ class Check(object):
             for Record in RecordSet:

                 if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_LIBRARY_NO_USE, Record[1]):

                     EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_LIBRARY_NO_USE, OtherMsg="The Library Class [%s] is not used in any platform" % (Record[1]), BelongsToTable='Inf', BelongsToItem=Record[0])

-

+            SqlCommand = """

+                         select A.ID, A.Value1, A.BelongsToFile, A.StartLine, B.StartLine from Dsc as A left join Dsc as B

+                         where A.Model = %s and B.Model = %s and A.Value3 = B.Value3 and A.Arch = B.Arch and A.ID <> B.ID

+                         and A.Value1 = B.Value1 and A.StartLine <> B.StartLine and B.BelongsToFile = A.BelongsToFile""" \

+                            % (MODEL_EFI_LIBRARY_CLASS, MODEL_EFI_LIBRARY_CLASS)

+            RecordSet = EccGlobalData.gDb.TblDsc.Exec(SqlCommand)

+            for Record in RecordSet:

+                if Record[3] and Record[4] and Record[3] != Record[4]:

+                    SqlCommand = """select FullPath from File where ID = %s""" % (Record[2])

+                    FilePathList = EccGlobalData.gDb.TblFile.Exec(SqlCommand)

+                    for FilePath in FilePathList:

+                        if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_LIBRARY_NAME_DUPLICATE, Record[1]):

+                            EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_LIBRARY_NAME_DUPLICATE, OtherMsg="The Library Class [%s] is duplicated in '%s' line %s and line %s." % (Record[1], FilePath, Record[3], Record[4]), BelongsToTable='Dsc', BelongsToItem=Record[0])

+                                                

     # Check whether an Inf file is specified in the FDF file, but not in the Dsc file, then the Inf file must be for a Binary module only

     def MetaDataFileCheckBinaryInfInFdf(self):

         if EccGlobalData.gConfig.MetaDataFileCheckBinaryInfInFdf == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

diff --git a/BaseTools/Source/Python/Ecc/EccToolError.py b/BaseTools/Source/Python/Ecc/EccToolError.py
index 48810e466c..4039f57bc6 100644
--- a/BaseTools/Source/Python/Ecc/EccToolError.py
+++ b/BaseTools/Source/Python/Ecc/EccToolError.py
@@ -94,6 +94,7 @@ ERROR_META_DATA_FILE_CHECK_DUPLICATE_PPI = 10013
 ERROR_META_DATA_FILE_CHECK_MODULE_FILE_NO_USE = 10014

 ERROR_META_DATA_FILE_CHECK_PCD_TYPE = 10015

 ERROR_META_DATA_FILE_CHECK_MODULE_FILE_GUID_DUPLICATION = 10016

+ERROR_META_DATA_FILE_CHECK_LIBRARY_NAME_DUPLICATE = 10017

 

 ERROR_SPELLING_CHECK_ALL = 11000

 

@@ -171,6 +172,7 @@ gEccErrorMessage = {
     ERROR_META_DATA_FILE_CHECK_LIBRARY_INSTANCE_DEPENDENT : "A library instance must be defined for all dependent library classes",

     ERROR_META_DATA_FILE_CHECK_LIBRARY_INSTANCE_ORDER : "The library Instances specified by the LibraryClasses sections should be listed in order of dependencies",

     ERROR_META_DATA_FILE_CHECK_LIBRARY_NO_USE : "There should be no unnecessary inclusion of library classes in the INF file",

+    ERROR_META_DATA_FILE_CHECK_LIBRARY_NAME_DUPLICATE : "Duplicate Library Class Name found",

     ERROR_META_DATA_FILE_CHECK_BINARY_INF_IN_FDF : "An INF file is specified in the FDF file, but not in the DSC file, therefore the INF file must be for a Binary module only",

     ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE : "Duplicate PCDs found",

     ERROR_META_DATA_FILE_CHECK_PCD_FLASH : "PCD settings in the FDF file should only be related to flash",

diff --git a/BaseTools/Source/Python/Ecc/Exception.py b/BaseTools/Source/Python/Ecc/Exception.py
index ff8736059f..ffbb62b3b0 100644
--- a/BaseTools/Source/Python/Ecc/Exception.py
+++ b/BaseTools/Source/Python/Ecc/Exception.py
@@ -14,7 +14,7 @@
 ##

 # Import Modules

 #

-from Common.XmlRoutines import *

+from Xml.XmlRoutines import *

 import os.path

 

 # ExceptionXml to parse Exception Node of XML file

diff --git a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py b/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py
new file mode 100644
index 0000000000..5823067056
--- /dev/null
+++ b/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py
@@ -0,0 +1,228 @@
+## @file

+# This is an XML API that uses a syntax similar to XPath, but it is written in

+# standard python so that no extra python packages are required to use it.

+#

+# Copyright (c) 2007, 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 xml.dom.minidom

+

+## Create a element of XML

+#

+# @param Name

+# @param String

+# @param NodeList

+# @param AttributeList

+#

+# @revel Element

+#

+def CreateXmlElement(Name, String, NodeList, AttributeList):

+    Doc = xml.dom.minidom.Document()

+    Element = Doc.createElement(Name)

+    if String != '' and String != None:

+        Element.appendChild(Doc.createTextNode(String))

+    

+    for Item in NodeList:

+        if type(Item) == type([]):

+            Key = Item[0]

+            Value = Item[1]

+            if Key != '' and Key != None and Value != '' and Value != None:

+                Node = Doc.createElement(Key)

+                Node.appendChild(Doc.createTextNode(Value))

+                Element.appendChild(Node)

+        else:

+            Element.appendChild(Item)

+    for Item in AttributeList:

+        Key = Item[0]

+        Value = Item[1]

+        if Key != '' and Key != None and Value != '' and Value != None:

+            Element.setAttribute(Key, Value)

+    

+    return Element

+

+## Get a list of XML nodes using XPath style syntax.

+#

+# Return a list of XML DOM nodes from the root Dom specified by XPath String.

+# If the input Dom or String is not valid, then an empty list is returned.

+#

+# @param  Dom                The root XML DOM node.

+# @param  String             A XPath style path.

+#

+# @revel  Nodes              A list of XML nodes matching XPath style Sting.

+#

+def XmlList(Dom, String):

+    if String == None or String == "" or Dom == None or Dom == "":

+        return []

+    if Dom.nodeType == Dom.DOCUMENT_NODE:

+        Dom = Dom.documentElement

+    if String[0] == "/":

+        String = String[1:]

+    TagList = String.split('/')

+    Nodes = [Dom]

+    Index = 0

+    End = len(TagList) - 1

+    while Index <= End:

+        ChildNodes = []

+        for Node in Nodes:

+            if Node.nodeType == Node.ELEMENT_NODE and Node.tagName == TagList[Index]:

+                if Index < End:

+                    ChildNodes.extend(Node.childNodes)

+                else:

+                    ChildNodes.append(Node)

+        Nodes = ChildNodes

+        ChildNodes = []

+        Index += 1

+

+    return Nodes

+

+

+## Get a single XML node using XPath style syntax.

+#

+# Return a single XML DOM node from the root Dom specified by XPath String.

+# If the input Dom or String is not valid, then an empty string is returned.

+#

+# @param  Dom                The root XML DOM node.

+# @param  String             A XPath style path.

+#

+# @revel  Node               A single XML node matching XPath style Sting.

+#

+def XmlNode(Dom, String):

+    if String == None or String == ""  or Dom == None or Dom == "":

+        return ""

+    if Dom.nodeType == Dom.DOCUMENT_NODE:

+        Dom = Dom.documentElement

+    if String[0] == "/":

+        String = String[1:]

+    TagList = String.split('/')

+    Index = 0

+    End = len(TagList) - 1

+    ChildNodes = [Dom]

+    while Index <= End:

+        for Node in ChildNodes:

+            if Node.nodeType == Node.ELEMENT_NODE and Node.tagName == TagList[Index]:

+                if Index < End:

+                    ChildNodes = Node.childNodes

+                else:

+                    return Node

+                break

+        Index += 1

+    return ""

+

+

+## Get a single XML element using XPath style syntax.

+#

+# Return a single XML element from the root Dom specified by XPath String.

+# If the input Dom or String is not valid, then an empty string is returned.

+#

+# @param  Dom                The root XML DOM object.

+# @param  Strin              A XPath style path.

+#

+# @revel  Element            An XML element matching XPath style Sting.

+#

+def XmlElement(Dom, String):

+    try:

+        return XmlNode(Dom, String).firstChild.data.strip()

+    except:

+        return ""

+

+

+## Get a single XML element of the current node.

+#

+# Return a single XML element specified by the current root Dom.

+# If the input Dom is not valid, then an empty string is returned.

+#

+# @param  Dom                The root XML DOM object.

+#

+# @revel  Element            An XML element in current root Dom.

+#

+def XmlElementData(Dom):

+    try:

+        return Dom.firstChild.data.strip()

+    except:

+        return ""

+

+

+## Get a list of XML elements using XPath style syntax.

+#

+# Return a list of XML elements from the root Dom specified by XPath String.

+# If the input Dom or String is not valid, then an empty list is returned.

+#

+# @param  Dom                The root XML DOM object.

+# @param  String             A XPath style path.

+#

+# @revel  Elements           A list of XML elements matching XPath style Sting.

+#

+def XmlElementList(Dom, String):

+    return map(XmlElementData, XmlList(Dom, String))

+

+

+## Get the XML attribute of the current node.

+#

+# Return a single XML attribute named Attribute from the current root Dom.

+# If the input Dom or Attribute is not valid, then an empty string is returned.

+#

+# @param  Dom                The root XML DOM object.

+# @param  Attribute          The name of Attribute.

+#

+# @revel  Element            A single XML element matching XPath style Sting.

+#

+def XmlAttribute(Dom, Attribute):

+    try:

+        return Dom.getAttribute(Attribute).strip()

+    except:

+        return ''

+

+

+## Get the XML node name of the current node.

+#

+# Return a single XML node name from the current root Dom.

+# If the input Dom is not valid, then an empty string is returned.

+#

+# @param  Dom                The root XML DOM object.

+#

+# @revel  Element            A single XML element matching XPath style Sting.

+#

+def XmlNodeName(Dom):

+    try:

+        return Dom.nodeName.strip()

+    except:

+        return ''

+

+## Parse an XML file.

+#

+# Parse the input XML file named FileName and return a XML DOM it stands for.

+# If the input File is not a valid XML file, then an empty string is returned.

+#

+# @param  FileName           The XML file name.

+#

+# @revel  Dom                The Dom object achieved from the XML file.

+#

+def XmlParseFile(FileName):

+    try:

+        XmlFile = open(FileName)

+        Dom = xml.dom.minidom.parse(XmlFile)

+        XmlFile.close()

+        return Dom

+    except Exception, X:

+        print X

+        return ""

+

+# This acts like the main() function for the script, unless it is 'import'ed

+# into another script.

+if __name__ == '__main__':

+    # Nothing to do here. Could do some unit tests.

+    A = CreateXmlElement('AAA', 'CCC',  [['AAA', '111'], ['BBB', '222']], [['A', '1'], ['B', '2']])

+    B = CreateXmlElement('ZZZ', 'CCC',  [['XXX', '111'], ['YYY', '222']], [['A', '1'], ['B', '2']])

+    C = CreateXmlList('DDD', 'EEE', [A, B], ['FFF', 'GGG'])

+    print C.toprettyxml(indent = " ")

+    pass

diff --git a/BaseTools/Source/Python/Ecc/Xml/__init__.py b/BaseTools/Source/Python/Ecc/Xml/__init__.py
new file mode 100644
index 0000000000..5d268d990b
--- /dev/null
+++ b/BaseTools/Source/Python/Ecc/Xml/__init__.py
@@ -0,0 +1,20 @@
+## @file
+# Python 'Library' package initialization file.
+#
+# This file is required to make Python interpreter treat the directory
+# as containing package.
+#
+# Copyright (c) 2011, 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.
+#
+
+'''
+Xml
+'''
\ No newline at end of file