Support MSA build options. Now the build options from four places: 1. tools_def.txt

2. MSA <ModuleBuildOptions>/<Options> 3. FPD <BuildOptions>/<Options> 4. FPD <FrameworkModules>/<ModuleSaBuildOptions>/<Options>. And we do not support "ABC", "XYZ" such format from now on, please only use the simple format like ABC XYZ.

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

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 9a847172f8f0ecfd17f3bc48248db1e34e209dca..389b8f12b1006d3751c74da1d7b0177f6d855097 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -23,8 +23,6 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.Set;\r
 import java.util.Vector;\r
-import java.util.regex.Matcher;\r
-import java.util.regex.Pattern;\r
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.BuildListener;\r
@@ -490,10 +488,6 @@ public class GenBuildTask extends Ant {
             String cmdFlags = GlobalData.getCommandSetting(key, fpdModuleId);\r
             if (cmdFlags != null) \r
             {\r
-//              Set<String> addset = new LinkedHashSet<String>();\r
-//              Set<String> subset = new LinkedHashSet<String>();\r
-//              putFlagsToSet(addset, cmdFlags);\r
-//              getProject().setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset)));\r
               getProject().setProperty(cmd[m] + "_FLAGS", cmdFlags);\r
             } \r
             else \r
@@ -501,7 +495,6 @@ public class GenBuildTask extends Ant {
               getProject().setProperty(cmd[m] + "_FLAGS", "");\r
             }\r
 \r
-\r
             //\r
             // Set CC_EXT\r
             //\r
@@ -718,54 +711,6 @@ public class GenBuildTask extends Ant {
         ant.execute();\r
     }\r
 \r
-\r
-    /**\r
-      Separate the string and instore in set.\r
-\r
-      <p> String is separated by Java Regulation Expression\r
-      "[^\\\\]?(\".*?[^\\\\]\")[ \t,]+". </p>\r
-\r
-      <p>For example: </p>\r
-\r
-      <pre>\r
-        "/nologo", "/W3", "/WX"\r
-        "/C", "/DSTRING_DEFINES_FILE=\"BdsStrDefs.h\""\r
-      </pre>\r
-\r
-      @param set store the separated string\r
-      @param str string to separate\r
-    **/\r
-    private void putFlagsToSet(Set<String> set, String str) {\r
-        if (str == null || str.length() == 0) {\r
-            return;\r
-        }\r
-\r
-        Pattern myPattern = Pattern.compile("[^\\\\]?(\".*?[^\\\\]\")[ \t,]+");\r
-        Matcher matcher = myPattern.matcher(str + " ");\r
-        while (matcher.find()) {\r
-            String item = str.substring(matcher.start(1), matcher.end(1));\r
-            set.add(item);\r
-        }\r
-    }\r
-\r
-    /**\r
-      Generate the final flags string will be used by compile command.\r
-\r
-      @param add the add flags set\r
-      @param sub the sub flags set\r
-      @return final flags after add set substract sub set\r
-    **/\r
-    private String getFlags(Set<String> add, Set<String> sub) {\r
-        String result = "";\r
-        add.removeAll(sub);\r
-        Iterator iter = add.iterator();\r
-        while (iter.hasNext()) {\r
-            String str = (String) iter.next();\r
-            result += str.substring(1, str.length() - 1) + " ";\r
-        }\r
-        return result;\r
-    }\r
-\r
     public void setSingleModuleBuild(boolean isSingleModuleBuild) {\r
         this.isSingleModuleBuild = isSingleModuleBuild;\r
     }\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java
index 93510a7727ffebaf108b35b236675bf955f406e2..a2f22c1b0b1db3ce4c33da126dc8c82468f1e265 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java
@@ -368,6 +368,13 @@ public class FpdParserForThread extends FpdParserTask {
             //\r
             GlobalData.addModuleToolChainOption(fpdModuleId, parseModuleBuildOptions(false));\r
             GlobalData.addModuleToolChainFamilyOption(fpdModuleId, parseModuleBuildOptions(true));\r
+            \r
+            //\r
+            // parse MSA build options\r
+            //\r
+            GlobalData.addMsaBuildOption(moduleId, parseMsaBuildOptions(false));\r
+            GlobalData.addMsaFamilyBuildOption(moduleId, parseMsaBuildOptions(true));\r
+\r
             saq.pop();\r
         }\r
     }\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index d45abcdcd8dfe713c8ed3b7fd807c6074994db68..28379796f48b531e0a9b17c9c5343d83b1531023 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -516,6 +516,13 @@ public class FpdParserTask extends Task {
             //\r
             GlobalData.addModuleToolChainOption(fpdModuleId, parseModuleBuildOptions(false));\r
             GlobalData.addModuleToolChainFamilyOption(fpdModuleId, parseModuleBuildOptions(true));\r
+            \r
+            //\r
+            // parse MSA build options\r
+            //\r
+            GlobalData.addMsaBuildOption(moduleId, parseMsaBuildOptions(false));\r
+            GlobalData.addMsaFamilyBuildOption(moduleId, parseMsaBuildOptions(true));\r
+    \r
             saq.pop();\r
         }\r
     }\r
@@ -536,6 +543,14 @@ public class FpdParserTask extends Task {
         return parseOptions(options);\r
     }\r
 \r
+    ToolChainMap parseMsaBuildOptions(boolean toolChainFamilyFlag) throws EdkException {\r
+        String[][] options = saq.getMsaBuildOptions(toolChainFamilyFlag);\r
+        if (options == null || options.length == 0) {\r
+            return new ToolChainMap();\r
+        }\r
+        return parseOptions(options);\r
+    }\r
+    \r
     private ToolChainMap parseOptions(String[][] options) throws EdkException {\r
         ToolChainMap map = new ToolChainMap();\r
         int flagIndex = ToolChainElement.ATTRIBUTE.value;\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
index 18ef849ed02a8b24c70b704317842f341d9ec44b..b1e119a501a0193f92a5cfef44d1272e02472503 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
@@ -45,11 +45,6 @@ public class GenBuildLogger extends DefaultLogger implements LogMethod {
     \r
     Project project = null;\r
     \r
-    ///\r
-    /// Time of the start of the build \r
-    ///\r
-    private long startTime = System.currentTimeMillis();\r
-    \r
     ///\r
     /// flag to present whether cache all msg or not\r
     /// true means to cache.\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index 310381bc14b527f16b8c7bd871dc7269dd1803e9..bf4cd430b07a210e18e17a3fb54624d93b64c70e 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -24,8 +24,6 @@ import java.util.Iterator;
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
-import java.util.regex.Matcher;\r
-import java.util.regex.Pattern;\r
 \r
 import org.apache.xmlbeans.XmlException;\r
 import org.apache.xmlbeans.XmlObject;\r
@@ -132,7 +130,10 @@ public class GlobalData {
     private static Map<FpdModuleIdentification, ToolChainMap> moduleToolChainOption = new HashMap<FpdModuleIdentification, ToolChainMap>();\r
     private static Map<FpdModuleIdentification, ToolChainMap> moduleToolChainFamilyOption = new HashMap<FpdModuleIdentification, ToolChainMap>();\r
 \r
-    private static Pattern flagPattern = Pattern.compile("[^\\\\]?(\".*?[^\\\\]\")[ \t,]+");\r
+    private static Map<ModuleIdentification, ToolChainMap> msaBuildOption = new HashMap<ModuleIdentification, ToolChainMap>();\r
+    private static Map<ModuleIdentification, ToolChainMap> msaFamilyBuildOption = new HashMap<ModuleIdentification, ToolChainMap>();\r
+\r
+//    private static Pattern flagPattern = Pattern.compile("[^\\\\]?(\".*?[^\\\\]\")[ \t,]+");\r
     /**\r
       Parse framework database (DB) and all SPD files listed in DB to initialize\r
       the environment for next build. This method will only be executed only once\r
@@ -437,6 +438,7 @@ public class GlobalData {
             msaMap.put("Guids", cloneXmlObject(msa.getGuids(), true));\r
             msaMap.put("Externs", cloneXmlObject(msa.getExterns(), true));\r
             msaMap.put("PcdCoded", cloneXmlObject(msa.getPcdCoded(), true));\r
+            msaMap.put("ModuleBuildOptions", cloneXmlObject(msa.getModuleBuildOptions(), true));\r
             return msaMap;\r
         } catch(IOException ex) {\r
             EdkException edkException = new EdkException("Parsing MSA file [" + msaFile.getPath() + "] error. \n" + ex.getMessage());\r
@@ -715,7 +717,17 @@ public class GlobalData {
         ToolChainMap toolChainOption) {\r
         moduleToolChainFamilyOption.put(fpdModuleId, toolChainOption);\r
     }\r
-\r
+    \r
+    public static void addMsaBuildOption(ModuleIdentification moduleId,\r
+        ToolChainMap toolChainOption) {\r
+        msaBuildOption.put(moduleId, toolChainOption);\r
+    }\r
+    \r
+    public static void addMsaFamilyBuildOption(ModuleIdentification moduleId,\r
+        ToolChainMap toolChainOption) {\r
+        msaFamilyBuildOption.put(moduleId, toolChainOption);\r
+    }\r
+    \r
     public static boolean isCommandSet(String target, String toolchain, String arch) {\r
         String[] commands = getToolChainInfo().getCommands();\r
 \r
@@ -729,6 +741,22 @@ public class GlobalData {
         return false;\r
     }\r
 \r
+    /**\r
+      Except FLAGS, all attribute are from TOOLS_DEF file. \r
+      \r
+      For FLAGS, information from four places, they are: \r
+      <pre>\r
+        1. tools_def.txt\r
+        2. MSA &lt;BuildOptions&gt;/&lt;Options&gt;\r
+        3. FPD &lt;BuildOptions&gt;/&lt;Options&gt;\r
+        4. FPD &lt;FrameworkModules&gt;/&lt;ModuleSaBuildOptions&gt;/&lt;Options&gt;\r
+      </pre>\r
+      \r
+      @param commandDescription Key: TARGET, TAGNAME, ARCH, COMMANDTYPE, ATTRIBUTE\r
+      @param fpdModuleId Module Identification with Arch\r
+      @return The corresponding String\r
+      @throws EdkException If build option definition error\r
+    **/\r
     public synchronized static String getCommandSetting(String[] commandDescription, FpdModuleIdentification fpdModuleId) throws EdkException {\r
         ToolChainKey toolChainKey = new ToolChainKey(commandDescription);\r
         ToolChainMap toolChainConfig = toolsDef.getConfig();\r
@@ -746,7 +774,7 @@ public class GlobalData {
         }\r
 \r
         //\r
-        // tool's option can be in .fpd and/or .msa file\r
+        // Tool's option can be in .fpd and/or .msa file\r
         //\r
         String optionString;\r
         ToolChainMap option = null;\r
@@ -757,6 +785,22 @@ public class GlobalData {
         toolChainFamilyKey.setKey(family, ToolChainElement.TOOLCHAIN.value);\r
         toolChainFamilyKey.setKey(ToolDefinitions.TOOLS_DEF_ATTRIBUTE_FLAGS, ToolChainElement.ATTRIBUTE.value);\r
 \r
+        //\r
+        // MSA's tool chain family option\r
+        //\r
+        option = msaFamilyBuildOption.get(fpdModuleId.getModule());\r
+        if (option != null && (optionString = option.get(toolChainFamilyKey)) != null) {\r
+            setting += (" " + optionString);\r
+        }\r
+        \r
+        //\r
+        // MSA's tool chain option\r
+        //\r
+        option = msaBuildOption.get(fpdModuleId.getModule());\r
+        if (option != null && (optionString = option.get(toolChainKey)) != null) {\r
+            setting += (" " + optionString);\r
+        }\r
+        \r
         //\r
         // Platform's tool chain family option\r
         //\r
@@ -770,10 +814,7 @@ public class GlobalData {
         //\r
         optionString = platformToolChainOption.get(toolChainKey);\r
         if (optionString != null) {\r
-            Matcher matcher = flagPattern.matcher(optionString + " ");\r
-            while (matcher.find()) {\r
-                setting += (" " + optionString.substring(matcher.start(1), matcher.end(1)));\r
-            }\r
+            setting += (" " + optionString);\r
         }\r
 \r
         //\r
@@ -781,10 +822,7 @@ public class GlobalData {
         //\r
         option = moduleToolChainFamilyOption.get(fpdModuleId);\r
         if (option != null && (optionString = option.get(toolChainFamilyKey)) != null) {\r
-            Matcher matcher = flagPattern.matcher(optionString + " ");\r
-            while (matcher.find()) {\r
-                setting += (" " + optionString.substring(matcher.start(1), matcher.end(1)));\r
-            }\r
+            setting += (" " + optionString);\r
         }\r
 \r
         //\r
@@ -792,10 +830,7 @@ public class GlobalData {
         //\r
         option = moduleToolChainOption.get(fpdModuleId);\r
         if (option != null && (optionString = option.get(toolChainKey)) != null) {\r
-            Matcher matcher = flagPattern.matcher(optionString + " ");\r
-            while (matcher.find()) {\r
-                setting += (" " + optionString.substring(matcher.start(1), matcher.end(1)));\r
-            }\r
+            setting += (" " + optionString);\r
         }\r
 \r
         return setting;\r

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..b927560564fb845480d15a6dd7511b410c25fe29 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -492,6 +492,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

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainMap.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainMap.java
index f3f07797bc2a41b6b49ab8bad26ed326adb2e1fb..18e664ccf86c75d5e6a200a9b870c99dc348231c 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainMap.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainMap.java
@@ -320,5 +320,9 @@ public class ToolChainMap {
     public Set<ToolChainKey> keySet() {\r
         return (Set<ToolChainKey>)map.keySet();\r
     }\r
+    \r
+    public String toString() {\r
+        return map + "";\r
+    }\r
 }\r
 \r