Fixed EDKT102;

[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 1299e11059a27aac7017ae8c05a41168c3f4624e..bac506abfa3f0161ff999a6c096b326474b77f2a 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -158,7 +158,7 @@ public class GenBuildTask extends Ant {
             SurfaceAreaQuery.setDoc(doc);\r
             moduleId = SurfaceAreaQuery.getMsaHeader();\r
         }\r
-        String[] producedLibraryClasses = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED");\r
+        String[] producedLibraryClasses = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED",null);\r
         if (producedLibraryClasses.length == 0) {\r
             moduleId.setLibrary(false);\r
         }\r
@@ -242,6 +242,15 @@ public class GenBuildTask extends Ant {
                 getProject().setProperty("TARGET", targetList[i]);\r
                 String[] toolchainList = GlobalData.getToolChainInfo().getTagnames();\r
                 for(int j = 0; j < toolchainList.length; j ++){\r
+                    //\r
+                    // check if any tool is defined for current target + toolchain + arch\r
+                    // 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
+                        continue;\r
+                    }\r
+\r
                     //\r
                     // Prepare for toolchain related common properties\r
                     // TOOLCHAIN\r
@@ -282,7 +291,6 @@ public class GenBuildTask extends Ant {
         }\r
         popProperties();\r
         }catch (Exception e){\r
-            e.printStackTrace();\r
             throw new BuildException(e.getMessage());\r
         }\r
     }\r
@@ -423,7 +431,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
@@ -431,7 +438,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
@@ -442,7 +448,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
@@ -455,7 +460,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
@@ -465,7 +469,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
@@ -478,7 +481,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
@@ -534,7 +536,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