Fixed EDKT118

[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 c01ca93985d94df73fbff40166bfdabba2c1a0b7..e968fce041ab36cf4eca61daa75e1fc8e9221367 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -16,6 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 package org.tianocore.build;\r
 \r
 import java.io.File;\r
+import java.util.ArrayList;\r
 import java.util.Hashtable;\r
 import java.util.Iterator;\r
 import java.util.LinkedHashSet;\r
@@ -194,14 +195,29 @@ public class GenBuildTask extends Ant {
         // If single module : intersection MSA supported ARCHs and tools def!!\r
         // else, get arch from pass down\r
         //\r
-        String[] archList = new String[0];\r
-        if ( getProject().getProperty("ARCH") != null ) {\r
-            archList = getProject().getProperty("ARCH").split(" ");\r
+        Set<String> archListSupByToolChain = new LinkedHashSet<String>(); \r
+        String[] archs = GlobalData.getToolChainInfo().getArchs(); \r
+        \r
+        for (int i = 0; i < archs.length; i ++) {\r
+            archListSupByToolChain.add(archs[i]);\r
+        }\r
+        \r
+        Set<String> archSet = new LinkedHashSet<String>();\r
+        \r
+        if ( getProject().getProperty("ARCH") != null) {\r
+            String[] fpdArchList = getProject().getProperty("ARCH").split(" ");\r
+            \r
+            for (int i = 0; i < fpdArchList.length; i++) {\r
+                if (archListSupByToolChain.contains(fpdArchList[i])) {\r
+                    archSet.add(fpdArchList[i]);\r
+                }\r
+            }\r
         }\r
         else {\r
-            archList = GlobalData.getToolChainInfo().getArchs();\r
+            archSet = archListSupByToolChain; \r
         }\r
-        \r
+  \r
+        String[] archList = archSet.toArray(new String[archSet.size()]);\r
         \r
         //\r
         // Judge if arch is all supported by current module. If not, throw Exception.\r
@@ -216,6 +232,7 @@ public class GenBuildTask extends Ant {
         }\r
         \r
         for (int k = 0; k < archList.length; k++) {\r
+            \r
             getProject().setProperty("ARCH", archList[k]);\r
             \r
             FpdModuleIdentification fpdModuleId = new FpdModuleIdentification(moduleId, archList[k]);\r
@@ -223,8 +240,9 @@ public class GenBuildTask extends Ant {
             //\r
             // Whether the module is built before\r
             //\r
-            if (GlobalData.isModuleBuilt(fpdModuleId)) {\r
-                return ;\r
+            if ((moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) \r
+                || GlobalData.isModuleBuilt(fpdModuleId)) {\r
+                return;\r
             }\r
             else {\r
                 GlobalData.registerBuiltModule(fpdModuleId);\r
@@ -247,7 +265,7 @@ public class GenBuildTask extends Ant {
                     // don't do anything if no tools found\r
                     // \r
                     if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {\r
-                        System.out.println("!!!Warning: No build issued. No tools found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r
+                        System.out.println("Warning: No build issued. No tools found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r
                         continue;\r
                     }\r
 \r
@@ -431,7 +449,6 @@ public class GenBuildTask extends Ant {
             key[4] = "NAME";\r
             String cmdName = GlobalData.getCommandSetting(key, fpdModuleId);\r
             File cmdFile = new File(cmdPath + File.separatorChar + cmdName);\r
-//            GlobalData.log.info("PATH: " + cmdFile.getPath());\r
             getProject().setProperty(cmd[m], cmdFile.getPath().replaceAll("(\\\\)", "/"));\r
             \r
             //\r
@@ -439,7 +456,6 @@ public class GenBuildTask extends Ant {
             //\r
             key[4] = "FLAGS";\r
             String cmdFlags = GlobalData.getCommandSetting(key, fpdModuleId);\r
-//            GlobalData.log.info("Flags: " + cmdFlags);\r
             Set<String> addset = new LinkedHashSet<String>();\r
             Set<String> subset = new LinkedHashSet<String>();\r
             putFlagsToSet(addset, cmdFlags);\r
@@ -450,7 +466,6 @@ public class GenBuildTask extends Ant {
             //\r
             key[4] = "EXT";\r
             String extName = GlobalData.getCommandSetting(key, fpdModuleId);\r
-//            GlobalData.log.info("Ext: " + extName);\r
             if ( extName != null && ! extName.equalsIgnoreCase("")) {\r
                 getProject().setProperty(cmd[m] + "_EXT", extName);\r
             }\r
@@ -463,7 +478,6 @@ public class GenBuildTask extends Ant {
             //\r
             key[4] = "FAMILY";\r
             String toolChainFamily = GlobalData.getCommandSetting(key, fpdModuleId);\r
-//            GlobalData.log.info("FAMILY: " + toolChainFamily);\r
             if (toolChainFamily != null) {\r
                 getProject().setProperty(cmd[m] + "_FAMILY", toolChainFamily);\r
             }\r
@@ -473,7 +487,6 @@ public class GenBuildTask extends Ant {
             //\r
             key[4] = "SPATH";\r
             String spath = GlobalData.getCommandSetting(key, fpdModuleId);\r
-//            GlobalData.log.info("SPATH: " + spath);\r
             if (spath != null) {\r
                 getProject().setProperty(cmd[m] + "_SPATH", spath.replaceAll("(\\\\)", "/"));\r
             }\r
@@ -486,7 +499,6 @@ public class GenBuildTask extends Ant {
             //\r
             key[4] = "DPATH";\r
             String dpath = GlobalData.getCommandSetting(key, fpdModuleId);\r
-//            GlobalData.log.info("DPATH: " + dpath);\r
             if (dpath != null) {\r
                 getProject().setProperty(cmd[m] + "_DPATH", dpath.replaceAll("(\\\\)", "/"));\r
             }\r
@@ -542,7 +554,7 @@ public class GenBuildTask extends Ant {
         // AutoGen\r
         //\r
         \r
-        AutoGen autogen = new AutoGen(getProject().getProperty("DEST_DIR_DEBUG"), fpdModuleId.getModule(),fpdModuleId.getArch());\r
+        AutoGen autogen = new AutoGen(getProject().getProperty("FV_DIR"), getProject().getProperty("DEST_DIR_DEBUG"), fpdModuleId.getModule(),fpdModuleId.getArch());\r
         autogen.genAutogen();\r
         \r
         \r