If "SupArchList" is defined for a PCD in MSA, should check current arch is in the...

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / global / SurfaceAreaQuery.java

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 6afeb30f5a5b5b8251e037f6c7cc41eede187556..17f7541e093594c61d767d03efd4f976f7e7e925 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -76,8 +76,7 @@ public class SurfaceAreaQuery {
     //\r
     // keep the namep declaration for xmlbeans Xpath query\r
     //\r
-    private String queryDeclaration = null;\r
-\r
+    private String queryDeclaration = null;    \r
     private StringBuffer normQueryString = new StringBuffer(4096);\r
     private Pattern xPathPattern = Pattern.compile("([^/]*)(/|//)([^/]+)");\r
 \r
@@ -492,6 +491,22 @@ public class SurfaceAreaQuery {
 \r
         return getOptions("PlatformSurfaceArea", xPath, toolChainFamilyFlag);\r
     }\r
+    \r
+    public String[][] getMsaBuildOptions(boolean toolChainFamilyFlag) {\r
+        String[] xPath;\r
+        \r
+        if (toolChainFamilyFlag == true) {\r
+            xPath = new String[] {\r
+                    "/Options/Option[not(@ToolChainFamily) and not(@TagName)]",\r
+                    "/Options/Option[@ToolChainFamily]", };\r
+        } else {\r
+            xPath = new String[] {\r
+                    "/Options/Option[not(@ToolChainFamily) and not(@TagName)]",\r
+                    "/Options/Option[@TagName]", };\r
+        }\r
+\r
+        return getOptions("ModuleBuildOptions", xPath, toolChainFamilyFlag);\r
+    }\r
 \r
     public ToolChainInfo getFpdToolChainInfo() {\r
         String[] xPath = new String[] { "/PlatformDefinitions" };\r
@@ -1932,30 +1947,56 @@ public class SurfaceAreaQuery {
         return new ModuleSADocument.ModuleSA[0];\r
 \r
     }\r
+ \r
     /**\r
-    Get name array of PCD in a module. In one module, token space\r
-    is same, and token name should not be conflicted.\r
-\r
-    @return String[]\r
+       Get name array who contains all PCDs in a module according to specified arch.\r
+       \r
+       @param arch          The specified architecture type.\r
+       \r
+       @return String[]     return all PCDs name into array, if no any PCD used by\r
+                            this module, a String[0] array is returned.\r
     **/\r
-    public String[] getModulePcdEntryNameArray() {\r
+    public String[] getModulePcdEntryNameArray(String arch) {\r
         PcdCodedDocument.PcdCoded.PcdEntry[] pcdEntries  = null;\r
-        String[]            results;\r
-        int                 index;\r
-        String[]            xPath       = new String[] {"/PcdEntry"};\r
-        Object[]         returns     = get ("PcdCoded", xPath);\r
+        java.util.List                       archList    = null;\r
+        java.util.List<String>               results     = new java.util.ArrayList<String> ();\r
+        int                                  index;\r
+        String[]                             xPath       = new String[] {"/PcdEntry"};\r
+        Object[]                             returns     = get ("PcdCoded", xPath);\r
 \r
         if (returns == null) {\r
             return new String[0];\r
         }\r
 \r
-        pcdEntries = (PcdCodedDocument.PcdCoded.PcdEntry[])returns;\r
-        results    = new String[pcdEntries.length];\r
+        pcdEntries  = (PcdCodedDocument.PcdCoded.PcdEntry[])returns;\r
 \r
         for (index = 0; index < pcdEntries.length; index ++) {\r
-            results[index] = pcdEntries[index].getCName();\r
+            archList        = pcdEntries[index].getSupArchList();\r
+            //\r
+            // If the ArchList is specified in MSA for this PCD, need check\r
+            // current arch whether can support by this PCD.\r
+            // \r
+            if (archList != null) {\r
+                if (archList.contains(arch)) {\r
+                    results.add(new String(pcdEntries[index].getCName()));\r
+                }\r
+            } else {\r
+                //\r
+                // If no ArchList is specificied in MSA for this PCD, that means\r
+                // this PCD support all architectures.\r
+                // \r
+                results.add(new String(pcdEntries[index].getCName()));\r
+            }\r
+        }\r
+\r
+        if (results.size() == 0) {\r
+            return new String[0];\r
         }\r
-        return results;\r
+\r
+        String[]    retArray = new String[results.size()];\r
+        results.toArray(retArray);\r
+\r
+        return retArray;        \r
     }\r
 \r
     /**\r
@@ -1995,6 +2036,32 @@ public class SurfaceAreaQuery {
                }\r
        }\r
     \r
+    public Node getPeiApriori(String fvName) {\r
+        String[] xPath = new String[] { "/BuildOptions/UserExtensions[@UserID='APRIORI' and @Identifier='0' and ./FvName='" + fvName + "']" };\r
+        Object[] result = get("PlatformSurfaceArea", xPath);\r
+        \r
+        if (result == null || result.length == 0) {\r
+            return null;\r
+        }\r
+        \r
+        UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)result[0];\r
+        \r
+        return a.getDomNode();\r
+    }\r
+    \r
+    public Node getDxeApriori(String fvName) {\r
+        String[] xPath = new String[] { "/BuildOptions/UserExtensions[@UserID='APRIORI' and @Identifier='1' and ./FvName='" + fvName + "']" };\r
+        Object[] result = get("PlatformSurfaceArea", xPath);\r
+        \r
+        if (result == null || result.length == 0) {\r
+            return null;\r
+        }\r
+        \r
+        UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)result[0];\r
+        \r
+        return a.getDomNode();\r
+    }\r
+    \r
     public Node getFpdModuleSequence(String fvName) {\r
         String[] xPath = new String[] { "/BuildOptions/UserExtensions[@UserID='IMAGES' and @Identifier='1' and ./FvName='" + fvName + "']" };\r
         Object[] result = get("PlatformSurfaceArea", xPath);\r
@@ -2007,4 +2074,25 @@ public class SurfaceAreaQuery {
         \r
         return a.getDomNode();\r
     }\r
+\r
+    /**\r
+     Get the value of PCD by PCD cName\r
+\r
+     @return PcdValue         String of PcdComponentName\r
+                null         If don't find ComponentName Pcd\r
+    **/\r
+    public String getPcdValueBycName(String cName){\r
+        String[] xPath = new String[] { "/PcdData" };\r
+        Object[] returns = get("PcdBuildDefinition", xPath);\r
+       if (returns == null || returns.length == 0) {\r
+           return  null;\r
+       } \r
+       for (int i = 0; i < returns.length; i++) {\r
+            PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData)returns[i];\r
+           if (pcdData.getCName().equalsIgnoreCase(cName)){\r
+               return pcdData.getValue();\r
+            }\r
+        }\r
+        return null;\r
+    }\r
 }\r