Update GenBuild to append FLAGS from FPD files to the FLAGS defined in tools_def.txt

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / GenBuildTask.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index a541f877791dc6331e6aa7bb414033f553cec3a5..99767ab4f2278c156867ca00905797c630369bba 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -130,6 +130,7 @@ public class GenBuildTask extends Ant {
               From module build, exception from module surface area invalid.\r
     **/\r
     public void execute() throws BuildException {\r
+        this.setTaskName("GenBuild");\r
         try {\r
             processGenBuild();\r
         } catch (PcdAutogenException e) {\r
@@ -200,6 +201,7 @@ public class GenBuildTask extends Ant {
             Map<String, XmlObject> doc = GlobalData.getNativeMsa(msaFile);\r
             saq = new SurfaceAreaQuery(doc);\r
             moduleId = saq.getMsaHeader();\r
+            moduleId.setMsaFile(msaFile);\r
         }\r
         \r
         String[] producedLibraryClasses = saq.getLibraryClasses("ALWAYS_PRODUCED",null);\r
@@ -346,7 +348,6 @@ public class GenBuildTask extends Ant {
     private void prepareSingleModuleBuild() throws EdkException {\r
         //\r
         // Find out the package which the module belongs to\r
-        // TBD: Enhance it!!!!\r
         //\r
         PackageIdentification packageId = GlobalData.getPackageForModule(moduleId);\r
         GlobalData.refreshPackageIdentification(packageId);\r
@@ -487,10 +488,19 @@ public class GenBuildTask extends Ant {
             //\r
             key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_FLAGS;\r
             String cmdFlags = GlobalData.getCommandSetting(key, fpdModuleId);\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
+            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
+            {\r
+              getProject().setProperty(cmd[m] + "_FLAGS", "");\r
+            }\r
+\r
 \r
             //\r
             // Set CC_EXT\r
@@ -600,7 +610,7 @@ public class GenBuildTask extends Ant {
         ModuleIdentification[] libinstances = saq.getLibraryInstance(fpdModuleId.getArch());\r
         String propertyLibs = "";\r
         for (int i = 0; i < libinstances.length; i++) {\r
-            propertyLibs += " " + getProject().getProperty("BIN_DIR") + File.separatorChar + libinstances[i].getName() + ".lib";\r
+            propertyLibs += getProject().getProperty("BIN_DIR") + File.separatorChar + libinstances[i].getName() + ".lib" + " ";\r
         }\r
         getProject().setProperty("LIBS", propertyLibs.replaceAll("(\\\\)", "/"));\r
 \r