Fixed grammar in messages.

[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 1f020b3cc15df0b17b2d66dd247f1901a25b8f4c..cdccfa5c096ed929bb11f4f4bf1cda36db1ce8a6 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -16,7 +16,6 @@ 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
@@ -145,7 +144,7 @@ public class GenBuildTask extends Ant {
             String packageGuid = getProject().getProperty("PACKAGE_GUID");\r
             String packageVersion = getProject().getProperty("PACKAGE_VERSION");\r
             if (moduleGuid == null || packageGuid == null) {\r
-                throw new BuildException("GenBuild parameters error. ");\r
+                throw new BuildException("GenBuild parameter error.");\r
             }\r
             PackageIdentification packageId = new PackageIdentification(packageGuid, packageVersion);\r
             moduleId = new ModuleIdentification(moduleGuid, moduleVersion);\r
@@ -226,7 +225,7 @@ public class GenBuildTask extends Ant {
         if (moduleSupportedArchs != null) {\r
             for (int k = 0; k < archList.length; k++) {\r
                 if ( ! moduleSupportedArchs.contains(archList[k])) {\r
-                    throw new BuildException("ARCH [" + archList[k] + "] is not supported by " + moduleId + ". " + moduleId + " only supports [" + moduleSupportedArchs + "].");\r
+                    throw new BuildException("Specified architecture [" + archList[k] + "] is not supported by " + moduleId + ". The module " + moduleId + " only supports [" + moduleSupportedArchs + "] architectures.");\r
                 }\r
             }\r
         }\r
@@ -240,11 +239,12 @@ public class GenBuildTask extends Ant {
             //\r
             // Whether the module is built before\r
             //\r
-            if ((moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) \r
-                || GlobalData.isModuleBuilt(fpdModuleId)) {\r
+            if (moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) {\r
+                System.out.println("\nWARNING: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");\r
                 continue;\r
-            }\r
-            else {\r
+            } else if (GlobalData.isModuleBuilt(fpdModuleId)) {\r
+                return;\r
+            } else {\r
                 GlobalData.registerBuiltModule(fpdModuleId);\r
             }\r
             \r
@@ -265,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 were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r
                         continue;\r
                     }\r
 \r
@@ -285,7 +285,6 @@ public class GenBuildTask extends Ant {
                     // MODULE or BASE_NAME, GUID or FILE_GUID, VERSION, MODULE_TYPE\r
                     // MODULE_DIR, MODULE_RELATIVE_DIR\r
                     // SUBSYSTEM, ENTRYPOINT, EBC_TOOL_LIB_PATH\r
-                    // LIBS, OBJECTS, SDB_FILES\r
                     //\r
                     setModuleCommonProperties(archList[k]);\r
                     \r
@@ -337,7 +336,7 @@ public class GenBuildTask extends Ant {
         String filename = getProject().getProperty("PLATFORM_FILE");\r
         \r
         if (filename == null){\r
-            throw new BuildException("Plese set ACTIVE_PLATFORM if you want to build a single module. ");\r
+            throw new BuildException("Please set ACTIVE_PLATFORM in the file: Tools/Conf/target.txt if you want to build a single module!");\r
         }\r
         \r
         PlatformIdentification platformId = GlobalData.getPlatform(filename);\r
@@ -429,12 +428,7 @@ public class GenBuildTask extends Ant {
             getProject().setProperty("ENTRYPOINT", "_ModuleEntryPoint");\r
         }\r
         \r
-        //\r
-        // LIBS, OBJECTS, SDB_FILES\r
-        //\r
         getProject().setProperty("OBJECTS", "");\r
-        getProject().setProperty("SDB_FILES", "");\r
-        getProject().setProperty("LIBS", "");\r
     }\r
 \r
     private void getCompilerFlags(String target, String toolchain, FpdModuleIdentification fpdModuleId) throws EdkException {\r
@@ -614,7 +608,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.\r
         //\r
         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
-            GlobalData.log.info("Call user-defined " + moduleId.getName() + "_build.xml");\r
+            GlobalData.log.info("Calling user-defined " + moduleId.getName() + "_build.xml");\r
             Ant ant = new Ant();\r
             ant.setProject(getProject());\r
             ant.setAntfile(getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml");\r
@@ -644,7 +638,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.\r
         //\r
         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
-            GlobalData.log.info("Call user-defined " + moduleId.getName() + "_build.xml");\r
+            GlobalData.log.info("Calling user-defined " + moduleId.getName() + "_build.xml");\r
             Ant ant = new Ant();\r
             ant.setProject(getProject());\r
             ant.setAntfile(getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml");\r
@@ -718,60 +712,6 @@ public class GenBuildTask extends Ant {
         return result;\r
     }\r
 \r
-    /**\r
-      Generate the flags string with original format. The format is defined by \r
-      Java Regulation Expression "[^\\\\]?(\".*?[^\\\\]\")[ \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 add the add flags set\r
-      @param sub the sub flags set\r
-      @return flags with original format\r
-    **/\r
-    private String getRawFlags(Set<String> add, Set<String> sub) {\r
-        String result = null;\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
-    private String parseOptionString(String optionString, Set<String> addSet, Set<String> subSet) {\r
-        boolean overrideOption = false;\r
-        Pattern pattern = Pattern.compile("ADD\\.\\[(.+)\\]");\r
-        Matcher matcher = pattern.matcher(optionString);\r
-\r
-        while (matcher.find()) {\r
-            overrideOption = true;\r
-            String addOption = optionString.substring(matcher.start(1), matcher.end(1)).trim();\r
-            putFlagsToSet(addSet, addOption);\r
-            \r
-        }\r
-\r
-        pattern = Pattern.compile("SUB\\.\\[(.+)\\]");\r
-        matcher = pattern.matcher(optionString);\r
-\r
-        while (matcher.find()) {\r
-            overrideOption = true;\r
-            String subOption = optionString.substring(matcher.start(1), matcher.end(1)).trim();\r
-            putFlagsToSet(subSet, subOption);\r
-        }\r
-\r
-        if (overrideOption == true) {\r
-            return null;\r
-        }\r
-\r
-        return optionString;\r
-    }\r
-    \r
     private void pushProperties() {\r
         backupPropertiesStack.push(getProject().getProperties());\r
     }\r