X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FGenBuildTask.java;h=28bfb9efb51b3f5aeaf0c19facf339ba4f11d7ff;hp=2265d6ba05cbf2135505727ab0ff75a92b7f62e1;hb=de093b3c14eebd785c3cd0b73ca1ba0b2c98fb6e;hpb=98840b104906f4c811868722e6a4bf6ffe102ca1

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 2265d6ba05..28bfb9efb5 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -207,6 +207,7 @@ public class GenBuildTask extends Ant {
         } else {
             moduleId.setLibrary(true);
         }
+        moduleId.setBinary(saq.getBinaryModule());
 
         //
         // Judge whether it is single module build or not
@@ -231,7 +232,7 @@ public class GenBuildTask extends Ant {
 
         Set<String> archSet = new LinkedHashSet<String>();
         String archString = getProject().getProperty("ARCH");
-        if (archString != null) {
+        if (archString != null && archString.length() > 0) {
             String[] fpdArchList = archString.split(" ");
 
             for (int i = 0; i < fpdArchList.length; i++) {
@@ -327,10 +328,8 @@ public class GenBuildTask extends Ant {
 
                     if (type.equalsIgnoreCase("all") || type.equalsIgnoreCase("build")) {
                         applyBuild(targetList[i], toolchainList[j], fpdModuleId);
-                    } else if (type.equalsIgnoreCase("clean")) {
-                        applyClean(fpdModuleId);
-                    } else if (type.equalsIgnoreCase("cleanall")) {
-                        applyCleanall(fpdModuleId);
+                    } else {
+                        applyNonBuildTarget(fpdModuleId);
                     }
                 }
             }
@@ -675,6 +674,24 @@ public class GenBuildTask extends Ant {
         antCall(antFilename, null);
     }
 
+    private void applyNonBuildTarget(FpdModuleIdentification fpdModuleId){
+        //
+        // if it is CUSTOM_BUILD
+        // then call the exist BaseName_build.xml directly.
+        //
+        if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {
+            EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");
+            
+            String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";
+            antCall(antFilename, this.type);
+            
+            return ;
+        }
+
+        String antFilename = getProject().getProperty("DEST_DIR_OUTPUT") + File.separatorChar + moduleId.getName() + "_build.xml";
+        antCall(antFilename, this.type);
+    }
+
     private void applyClean(FpdModuleIdentification fpdModuleId){
         //
         // if it is CUSTOM_BUILD