Fixed grammar in messages.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1256 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
index 5541be4b94af66d983d97e21a69be32f2adbbd83..15f975901b73c2c5d9630e8f5582432bef633e57 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -164,7 +164,7 @@ public class FfsProcess {
             System.out.println("Warning: this module doesn't specify a FfsFormatKey. ");\r
             }\r
         else {\r
-            throw new BuildException("Can't find FfsFormatKey [" + buildType + "] in FPD file. ");            \r
+            throw new BuildException("Can't find the FfsFormatKey [" + buildType + "] attribute in the FPD file!");            \r
         }\r
 \r
         if (ffs == null) {\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index b2c3e15f00dc95396a36fa7c352045c079b5337e..2617f06bdd6961f87bfe1ebbdbb2ceae2c0bda94 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -112,10 +112,10 @@ public class FrameworkBuildTask extends Task{
         //\r
         File buildFile = null;\r
         if (msaFiles.size() > 1) {\r
-            throw new BuildException("More than one MSA file under current directory. It is not allowd. ");\r
+            throw new BuildException("Having more than one MSA file in a directory is not allowed!");\r
         }\r
         else if (msaFiles.size() == 1 && activePlatform == null) {\r
-            throw new BuildException("If try to build a single module, please set ACTIVE_PLATFORM in file [Tool/Conf/target.txt]. ");\r
+            throw new BuildException("If trying to build a single module, please set ACTIVE_PLATFORM in file [Tool/Conf/target.txt]. ");\r
         }\r
         else if (msaFiles.size() == 1 && activePlatform != null) {\r
             //\r
@@ -136,14 +136,14 @@ public class FrameworkBuildTask extends Task{
         // If there is no build files or FPD files or MSA files, stop build\r
         //\r
         else {\r
-            throw new BuildException("Can't find any FPD files or MSA files in current directory. ");\r
+            throw new BuildException("Can't find any FPD or MSA files in the current directory. ");\r
         }\r
 \r
         //\r
         // Build every FPD files (PLATFORM build)\r
         //\r
         if (buildFile.getName().endsWith(".fpd")) {\r
-            System.out.println("Start to build FPD file [" + buildFile.getPath() + "] ..>> ");\r
+            System.out.println("Processing the FPD file [" + buildFile.getPath() + "] ..>> ");\r
             FpdParserTask fpdParserTask = new FpdParserTask();\r
             fpdParserTask.setType(type);\r
             fpdParserTask.setProject(getProject());\r
@@ -156,8 +156,8 @@ public class FrameworkBuildTask extends Task{
         //\r
         else if (buildFile.getName().endsWith(".msa")) {\r
             File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);\r
-            System.out.println("Using FPD file [" + tmpFile.getPath() + "] as active platform. ");\r
-            System.out.println("Start to build MSA file [" + buildFile.getPath() + "] ..>> ");\r
+            System.out.println("Using the FPD file [" + tmpFile.getPath() + "] for the active platform. ");\r
+            System.out.println("Processing the MSA file [" + buildFile.getPath() + "] ..>> ");\r
             GenBuildTask genBuildTask = new GenBuildTask();\r
             genBuildTask.setSingleModuleBuild(true);\r
             genBuildTask.setType(type);\r
@@ -204,13 +204,13 @@ public class FrameworkBuildTask extends Task{
                 allFiles[index] = iter.next();\r
                 index++;\r
             }\r
-            System.out.println("Find " + allFiles.length + " FPD and MSA files: ");\r
+            System.out.println("Finding " + allFiles.length + " FPD and MSA files: ");\r
             for (int i = 0; i < allFiles.length; i++) {\r
                 System.out.println("[" + (i + 1) + "]: " + allFiles[i].getName());\r
             }\r
             \r
             boolean flag = true;\r
-            System.out.print("Please select one file to build:[1] ");\r
+            System.out.print("Please select one of the following FPD files to build:[1] ");\r
             do{\r
                 BufferedReader br = new BufferedReader(new InputStreamReader(System.in));\r
                 try {\r
@@ -293,7 +293,7 @@ public class FrameworkBuildTask extends Task{
             str = getValue("ACTIVE_PLATFORM", targetFileInfo);\r
             if (str != null && ! str.trim().equals("")) {\r
                 if ( ! str.endsWith(".fpd")) {\r
-                    throw new BuildException("FPD file's file extension must be \".fpd\"");\r
+                    throw new BuildException("FPD file's extension must be \".fpd\"!");\r
                 }\r
                 activePlatform = str;\r
             }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 7a9d7c4cce71f8a654e2decc9cbc3e0850c71e8f..cdccfa5c096ed929bb11f4f4bf1cda36db1ce8a6 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -144,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
@@ -225,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,7 +240,7 @@ public class GenBuildTask extends Ant {
             // Whether the module is built before\r
             //\r
             if (moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) {\r
-                System.out.println("\nWARNING: " + moduleId + " for " + archList[k] + " is not found in current platform\n");\r
+                System.out.println("\nWARNING: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");\r
                 continue;\r
             } else if (GlobalData.isModuleBuilt(fpdModuleId)) {\r
                 return;\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
@@ -336,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
@@ -608,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
@@ -638,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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
index cdd88147c3e9bf83b5a955def6e8f8ceea93845a..df1af186bf8960b4b4748e1d4b14c7db40d33a93 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
@@ -54,10 +54,10 @@ public class ModuleBuildFileGenerator {
     /// The information at the header of <em>build.xml</em>.\r
     ///\r
     private String info = "DO NOT EDIT \n"\r
-                        + "File auto-generated by build utility\n"\r
+                        + "This file is auto-generated by the build utility\n"\r
                         + "\n"\r
                         + "Abstract:\n"\r
-                        + "Auto-generated ANT build file for building of EFI Modules/Platforms\n";\r
+                        + "Auto-generated ANT build file for build EFI Modules and Platforms\n";\r
 \r
     private FpdModuleIdentification fpdModuleId;\r
     \r
@@ -224,7 +224,7 @@ public class ModuleBuildFileGenerator {
             xformer.setOutputProperty(OutputKeys.INDENT, "yes");\r
             xformer.transform(source, result);\r
         } catch (Exception ex) {\r
-            throw new BuildException("Module [" + fpdModuleId.getModule().getName() + "] generating build file failed.\n" + ex.getMessage());\r
+            throw new BuildException("Generating the module [" + fpdModuleId.getModule().getName() + "] build.xml file failed!.\n" + ex.getMessage());\r
         }\r
     }\r
 \r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 2d7bb0901cc036c5e37df32644878c4439f83d37..0704bf44119b1bec734773634e8d9b1f923f1037 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -243,7 +243,7 @@ public class AutoGen {
                        libGenAutogenH();\r
                } catch (Exception e) {\r
                        throw new BuildException(\r
-                                       "Faile to create library AutoGen.c & AutoGen.h!\n"\r
+                                       "Failed to create library AutoGen.c & AutoGen.h!\n"\r
                                                        + e.getMessage());\r
                }\r
        }\r
@@ -672,7 +672,7 @@ public class AutoGen {
                                        libClassList[i]);\r
                        if (includerName == null) {\r
                                throw new AutoGenException("Can not find library class ["\r
-                                               + libClassList[i] + "] declaration in every packages. ");\r
+                                               + libClassList[i] + "] declaration in any SPD package. ");\r
                        }\r
                        for (int j = 0; j < includerName.length; j++) {\r
                                String includeNameStr = includerName[j];\r
@@ -714,7 +714,7 @@ public class AutoGen {
                        if (pkgHeader == null) {\r
                                throw new AutoGenException("Can not find package ["\r
                                                + packageNameList[i]\r
-                                               + "] declaration in every packages. ");\r
+                                               + "] declaration in any SPD package. ");\r
                        } else if (!pkgHeader.equalsIgnoreCase("")) {\r
                                includeStr = CommonDefinition.include + " <" + pkgHeader\r
                                                + ">\r\n";\r
@@ -751,7 +751,7 @@ public class AutoGen {
                case CommonDefinition.ModuleTypePeiCore:\r
                        if (entryPointList == null ||entryPointList.length != 1 ) {\r
                                throw new BuildException(\r
-                                               "Module type = 'PEI_CORE', only have one module entry point!");\r
+                                               "Module type = 'PEI_CORE', can have only one module entry point!");\r
                        } else {\r
                                fileBuffer.append("EFI_STATUS\r\n");\r
                                fileBuffer.append("EFIAPI\r\n");\r
@@ -783,7 +783,7 @@ public class AutoGen {
                        fileBuffer.append("const UINT32 _gUefiDriverRevision = 0;\r\n");\r
                        if (entryPointList == null || entryPointList.length != 1) {\r
                                throw new BuildException(\r
-                                               "Module type = 'DXE_CORE', only have one module entry point!");\r
+                                               "Module type = 'DXE_CORE', can have only one module entry point!");\r
                        } else {\r
 \r
                                fileBuffer.append("VOID\r\n");\r
@@ -1231,7 +1231,7 @@ public class AutoGen {
                                // If can't find Ppi GUID declaration in every package\r
                                //\r
                                throw new AutoGenException("Can not find Ppi GUID ["\r
-                                               + ppiKeyWord + "] declaration in every packages. ");\r
+                                               + ppiKeyWord + "] declaration in any SPD package!");\r
                        }\r
                }\r
        }\r
@@ -1288,7 +1288,7 @@ public class AutoGen {
                                // If can't find protocol GUID declaration in every package\r
                                //\r
                                throw new BuildException("Can not find protocol Guid ["\r
-                                               + protocolKeyWord + "] declaration in every packages. ");\r
+                                               + protocolKeyWord + "] declaration in any SPD package!");\r
                        }\r
                }\r
        }\r
@@ -1331,7 +1331,7 @@ public class AutoGen {
                                // If can't find GUID declaration in every package\r
                                //\r
                                throw new AutoGenException("Can not find Guid [" + guidKeyWord\r
-                                               + "] declaration in every packages. ");\r
+                                               + "] declaration in any SPD package. ");\r
                        }\r
 \r
                }\r
@@ -1499,7 +1499,7 @@ public class AutoGen {
                                fileBuffer.append(" (ImageHandle, SystemTable);\r\n");\r
                                break;\r
             default:\r
-                EdkLog.log(EdkLog.EDK_INFO,"Autogen don't know how to deal with module type -"+ moduleType + " !");\r
+                EdkLog.log(EdkLog.EDK_INFO,"Autogen doesn't know how to deal with module type - " + moduleType + "!");\r
                        }\r
                        fileBuffer.append("  ASSERT_EFI_ERROR (Status);\r\n");\r
                }\r
@@ -1985,7 +1985,7 @@ public class AutoGen {
                     fis.close();\r
                     fos.close();\r
                 }else {\r
-                    throw new AutoGenException("The flashMap.h file don't exist!!");\r
+                    throw new AutoGenException("The file, flashMap.h doesn't exist!");\r
                 }\r
             } catch (Exception e){\r
                 throw new AutoGenException(e.getMessage());\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
index 5ab585c4713fc268d7bc645545ba80e4cc00f9f0..8aad4cc0015ac7dea3540cf0a037ab91ca7da032 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
@@ -85,7 +85,7 @@ public class AutogenLibOrder {
                 if (this.libInstanceMap.containsKey(libraryList[i])) {\r
                     throw new Exception(\r
                             libraryList[i].getName()\r
-                                    + "this library instance is already exist, please check you library instance list!");\r
+                                    + "this library instance already exists, please check the library instance list!");\r
                 } else {\r
                     this.libInstanceMap.put(libraryList[i], classStr);\r
                 }\r
@@ -102,8 +102,8 @@ public class AutogenLibOrder {
                         System.out.println(libClassDeclList[j]\r
                                 + " class is already implement by "\r
                                 + this.libClassMap.get(libClassDeclList[j]));\r
-                        throw new Exception(libClassDeclList\r
-                                + " is already have library instance!");\r
+                        throw new Exception("Library Class: " + libClassDeclList\r
+                                + " already has a library instance!");\r
                     } else {\r
                         this.libClassMap.put(libClassDeclList[j], libraryList[i]);\r
                     }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
index c6bf678e0b34e84d1cda7b8dc3e830d2d381e84b..fe3b46021197fb978aafae7483ad1032c9397530 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
@@ -317,7 +317,7 @@ public class CommonDefinition {
             return guid;\r
         } else {\r
             System.out\r
-                    .println("Check GUID Value, it don't conform to the schema!!!");\r
+                    .println("Check GUID Value, It doesn't conform to the registry format specified in the schema!!!");\r
             return "0";\r
 \r
         }\r
@@ -351,4 +351,4 @@ public class CommonDefinition {
         return desList;\r
     }\r
     \r
-}
\ No newline at end of file
+}\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 23be3307e15294e1a729d4c56891436aa411eabd..1aaf6608f6a6d96fd35abf257b739f3f87067b28 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -130,7 +130,7 @@ public class FpdParserTask extends Task {
         // Remove !!\r
         if ( fpdFile == null) {\r
             if (platformName == null) {\r
-                throw new BuildException("FpdParserTask parameter error. Please specify platform name or FPD file. ");\r
+                throw new BuildException("FpdParserTask parameter error. Please specify either the platform name or FPD file!");\r
             }\r
             platformId = GlobalData.getPlatformByName(platformName);\r
             fpdFile = platformId.getFpdFile();\r
@@ -300,7 +300,7 @@ public class FpdParserTask extends Task {
                 bw.close();\r
                 fw.close();\r
             } catch (Exception e) {\r
-                throw new BuildException("Generate FV file [" + fvFile.getPath() + "] failed. \n" + e.getMessage());\r
+                throw new BuildException("Generation of the FV file [" + fvFile.getPath() + "] failed!\n" + e.getMessage());\r
             }\r
         }\r
     }\r
@@ -327,7 +327,7 @@ public class FpdParserTask extends Task {
             XmlObject doc = XmlObject.Factory.parse(fpdFile);\r
             \r
             if (!doc.validate()) {\r
-                throw new BuildException("Platform Surface Area file [" + fpdFile.getPath() + "] is invalid.");\r
+                throw new BuildException("Platform Surface Area file [" + fpdFile.getPath() + "] format is invalid!");\r
             }\r
             \r
             Map<String, XmlObject> map = new HashMap<String, XmlObject>();\r
@@ -378,7 +378,7 @@ public class FpdParserTask extends Task {
             PlatformPcdPreprocessActionForBuilding ca = new PlatformPcdPreprocessActionForBuilding();\r
             ca.perform(platformId.getFpdFile().getPath(), ActionMessage.NULL_MESSAGE_LEVEL);\r
         } catch (Exception e) {\r
-            throw new BuildException("Load FPD file [" + fpdFile.getPath() + "] error. \n" + e.getMessage());\r
+            throw new BuildException("Parsing of the FPD file [" + fpdFile.getPath() + "] failed!\n" + e.getMessage());\r
         }\r
     }\r
 \r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
index b7d2881d1240134990312b4dd542a3f2f09d84fa..e6a1002da3b711bbd0384b719b07a8e9e07bc680 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
@@ -53,10 +53,10 @@ public class PlatformBuildFileGenerator {
     private Project project;\r
     \r
     private String info = "DO NOT EDIT \n" \r
-        + "File auto-generated by build utility\n" \r
+        + "This file is auto-generated by the build utility\n" \r
         + "\n" \r
         + "Abstract:\n"\r
-        + "Auto-generated ANT build file for building of EFI Modules/Platforms\n";\r
+        + "Auto-generated ANT build file for building EFI Modules and Platforms\n";\r
 \r
     public PlatformBuildFileGenerator(Project project, Map<FpdModuleIdentification, String> outfiles, boolean isUnified){\r
         this.project = project;\r
@@ -164,7 +164,7 @@ public class PlatformBuildFileGenerator {
             xformer.setOutputProperty(OutputKeys.INDENT, "yes");\r
             xformer.transform(source, result);\r
         } catch (Exception ex) {\r
-            throw new BuildException("Generate " + platformName + "_build.xml failed. \n" + ex.getMessage());\r
+            throw new BuildException("Generation of the " + platformName + "_build.xml failed!\n" + ex.getMessage());\r
         }\r
     }\r
     \r
@@ -351,7 +351,7 @@ public class PlatformBuildFileGenerator {
         //\r
         // Deep Clean Target\r
         //\r
-        root.appendChild(document.createComment("Clean All target"));\r
+        root.appendChild(document.createComment("Target: cleanall"));\r
         Element ele = document.createElement("target");\r
         ele.setAttribute("name", "cleanall");\r
 \r
@@ -436,7 +436,7 @@ public class PlatformBuildFileGenerator {
         //\r
         // User Extensions\r
         //\r
-        root.appendChild(document.createComment("Pre Build Processing"));\r
+        root.appendChild(document.createComment("Pre-Build Processing"));\r
         Element ele = document.createElement("target");\r
         ele.setAttribute("name", "prebuild");\r
         \r
@@ -480,7 +480,7 @@ public class PlatformBuildFileGenerator {
         //\r
         // User Extensions\r
         //\r
-        root.appendChild(document.createComment("Post Build Processing"));\r
+        root.appendChild(document.createComment("Post-Build Processing"));\r
         Element ele = document.createElement("target");\r
         ele.setAttribute("name", "postbuild");\r
         \r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index d83114aefb9e9495aa6a0824508fa81e20387a88..1e7568757af2ef77e978d26a8e0c2a0193134334 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -162,7 +162,7 @@ public class GlobalData {
         // CONF dir + tools definition file name\r
         //\r
         File toolsDefFile = new File(workspaceDir + File.separatorChar + toolsDefFilename);\r
-        System.out.println("Using file [" + toolsDefFile.getPath() + "] as tools definition file. ");\r
+        System.out.println("Using tool definiton file [" + toolsDefFile.getPath() + "].");\r
         toolsDef = new ToolChainConfig(toolsDefFile);\r
         \r
         //\r
@@ -175,7 +175,7 @@ public class GlobalData {
             // validate FrameworkDatabaseFile\r
             //\r
             if (! db.validate()) {\r
-                throw new BuildException("Framework Database file [" + dbFile.getPath() + "] is invalid.");\r
+                throw new BuildException("Framework Database file [" + dbFile.getPath() + "] format is invalid!");\r
             }\r
             //\r
             // Get package list\r
@@ -208,7 +208,7 @@ public class GlobalData {
                     // Verify FPD file, if is invalid, throw Exception\r
                     //\r
                     if (! fpdDoc.validate()) {\r
-                        throw new BuildException("Framework Platform Surface Area file [" + fpdFile.getPath() + "] is invalid. ");\r
+                        throw new BuildException("Framework Platform Surface Area file [" + fpdFile.getPath() + "] format is invalid!");\r
                     }\r
                     //\r
                     // We can change Map to XmlObject\r
@@ -225,7 +225,7 @@ public class GlobalData {
                 }\r
             }\r
         } catch (Exception e) {\r
-            throw new BuildException("Parse workspace Database [" + dbFile.getPath() + "] Error.\n" + e.getMessage());\r
+            throw new BuildException("Parse WORKSPACE Database file [" + dbFile.getPath() + "] Error.\n" + e.getMessage());\r
         }\r
     }\r
     \r
@@ -257,7 +257,7 @@ public class GlobalData {
             }\r
         }\r
         if (msaFile == null){\r
-            throw new BuildException("Can't find Module [" + moduleId.getName() + "] in all packages. ");\r
+            throw new BuildException("Can't find Module [" + moduleId.getName() + "] in any SPD package!");\r
         }\r
         else {\r
             return msaFile;\r
@@ -283,7 +283,7 @@ public class GlobalData {
             }\r
         }\r
         if (packageId == null){\r
-            throw new BuildException("Can't find Module [" + moduleId.getName() + "] in all packages. ");\r
+            throw new BuildException("Can't find Module [" + moduleId.getName() + "] in any SPD package!");\r
         }\r
         else {\r
             return packageId;\r
@@ -387,7 +387,7 @@ public class GlobalData {
     \r
     public synchronized static Map<String, XmlObject> getNativeMsa(File msaFile) throws BuildException {\r
         if (! msaFile.exists()) {\r
-            throw new BuildException("Surface Area file [" + msaFile.getPath() + "] can't found.");\r
+            throw new BuildException("Module Surface Area file [" + msaFile.getPath() + "] can't be found!");\r
         }\r
         try {\r
             ModuleSurfaceAreaDocument doc = (ModuleSurfaceAreaDocument)XmlObject.Factory.parse(msaFile);\r
@@ -395,7 +395,7 @@ public class GlobalData {
             // Validate File if they accord with XML Schema\r
             //\r
             if ( ! doc.validate()){\r
-                throw new BuildException("Module Surface Area file [" + msaFile.getPath() + "] is invalid.");\r
+                throw new BuildException("Module Surface Area file [" + msaFile.getPath() + "] format is invalid!");\r
             }\r
             //\r
             // parse MSA file\r
@@ -475,7 +475,7 @@ public class GlobalData {
         // If can't find library class declaration in every package\r
         //\r
         throw new BuildException("Can not find library class [" + name\r
-                + "] declaration in every packages. ");\r
+                + "] declaration in any SPD package!");\r
     }\r
 \r
     /**\r
@@ -581,7 +581,7 @@ public class GlobalData {
                 return platformId;\r
             }\r
         }\r
-        throw new BuildException("Can't find platform [" + name + "] in current workspace database. ");\r
+        throw new BuildException("Can't find platform [" + name + "] in the current WORKSPACE database!");\r
     }\r
     \r
     public synchronized static PlatformIdentification getPlatform(String filename) throws BuildException {\r
@@ -593,7 +593,7 @@ public class GlobalData {
                 return platformId;\r
             }\r
         }\r
-        throw new BuildException("Can't find platform file [" + filename + "] in current workspace database. ");\r
+        throw new BuildException("Can't find platform file [" + filename + "] in the current WORKSPACE database!");\r
     }\r
     \r
     public synchronized static PackageIdentification refreshPackageIdentification(PackageIdentification packageId) throws BuildException {\r
@@ -606,7 +606,7 @@ public class GlobalData {
                 return packageId;\r
             }\r
         }\r
-        throw new BuildException("Can't find package GUID value " + packageId.getGuid() + " under current workspace. ");\r
+        throw new BuildException("Can't find package GUID value " + packageId.getGuid() + " in the current workspace!");\r
     }\r
     \r
     public synchronized static ModuleIdentification refreshModuleIdentification(ModuleIdentification moduleId) throws BuildException {\r
@@ -617,7 +617,7 @@ public class GlobalData {
         moduleId.setPackage(packageId);\r
         Spd spd = spdTable.get(packageId);\r
         if (spd == null) {\r
-            throw new BuildException("Can't find package GUID value " + packageId.getGuid() + " under current workspace. ");\r
+            throw new BuildException("Can't find package GUID value " + packageId.getGuid() + " in the current workspace!");\r
         }\r
         Set<ModuleIdentification> modules = spd.getModules();\r
         Iterator<ModuleIdentification> iter = modules.iterator();\r
@@ -630,7 +630,7 @@ public class GlobalData {
                 return moduleId;\r
             }\r
         }\r
-        throw new BuildException("Can't find module GUID value " + moduleId.getGuid() + " in " + packageId + " under current workspace. ");\r
+        throw new BuildException("Can't find module GUID value " + moduleId.getGuid() + " in package, " + packageId + ", in the current workspace!");\r
     }\r
     \r
     public synchronized static Set<PackageIdentification> getPackageList(){\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java b/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
index ba388a100086a7be64b0ebe037a7daec53ed0c73..4177b50466c043d06b7b726286662583eae75c2c 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
@@ -90,7 +90,7 @@ public class OnDependency extends Task {
                 } else {\r
                     File srcFile = new File(srcFileName);\r
                     if (!srcFile.exists()) {\r
-                        throw new BuildException(srcFileName + " doesn't exist !!!");\r
+                        throw new BuildException("Source File name: " + srcFileName + " doesn't exist!!!");\r
                     }\r
                     srcTimeStamp = srcFile.lastModified();\r
                     timeStampCache.put(srcFileName, new Long(srcTimeStamp));\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java b/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
index 3e09f58fba1864028d1476e45e336094c0dee665..8772385e4b47ae7ed5ed255f6602aea007b94b95 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
@@ -93,7 +93,7 @@ public class Spd {
         // If specified package file not exists\r
         //\r
         if ( ! packageFile.exists()) {\r
-            throw new BuildException("Package file [" + packageFile.getPath() + "] not exists. ");\r
+            throw new BuildException("Package file [" + packageFile.getPath() + "] does not exist!");\r
         }\r
         try {\r
             XmlObject spdDoc = XmlObject.Factory.parse(packageFile);\r
@@ -101,7 +101,7 @@ public class Spd {
             // Verify SPD file, if is invalid, throw Exception\r
             //\r
             if (! spdDoc.validate()) {\r
-                throw new BuildException("Package Surface Area file [" + packageFile.getPath() + "] is invalid. ");\r
+                throw new BuildException("Package Surface Area file [" + packageFile.getPath() + "] format is invalid!");\r
             }\r
             // We can change Map to XmlObject\r
             Map<String, XmlObject> spdDocMap = new HashMap<String, XmlObject>();\r
@@ -127,7 +127,7 @@ public class Spd {
                 moduleId.setPackage(packageId);\r
                 moduleId.setMsaFile(msaFile);\r
                 if (msaInfo.containsKey(moduleId)) {\r
-                    throw new BuildException("Find two modules with the same GUID and Version in " + packageId + ". They are [" + msaInfo.get(moduleId) + "] and [" + msaFile + "] ");\r
+                    throw new BuildException("Found two modules with the same GUID and Version in package " + packageId + ".\nThey are  module [" + msaInfo.get(moduleId) + "] and MSA file [" + msaFile + "]!");\r
                 }\r
                 msaInfo.put(moduleId, msaFile);\r
             }\r
@@ -199,7 +199,7 @@ public class Spd {
         }\r
         catch (Exception e) {\r
             e.setStackTrace(e.getStackTrace());\r
-            throw new BuildException("Parse package description file [" + packageId.getSpdFile() + "] Error.\n"\r
+            throw new BuildException("Parse of the package description file [" + packageId.getSpdFile() + "] failed!\n"\r
                                      + e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/VariableTask.java b/Tools/Source/GenBuild/org/tianocore/build/global/VariableTask.java
index f830e0ac76bbd30e63d5223ac2f533b47e65d253..021b8d5b00628e804eaaf217cbbd6c80b2f9b8e4 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/VariableTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/VariableTask.java
@@ -63,7 +63,7 @@ public class VariableTask extends Task {
     */\r
    public void execute() throws BuildException {\r
        if (name == null || value == null) {\r
-           throw new BuildException("Name or value must not null.");\r
+           throw new BuildException("Name or value cannot be null.");\r
        }\r
        getProject().setProperty(name, value);\r
    }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
index 5928061ff46d8ac50c2fc81f0e1aed9e5af4e890..5c7b29aa17e197f84e072ce147fe9639cea76afe 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
@@ -171,7 +171,7 @@ public class PCDAutoGenAction extends BuildAction {
         }\r
 \r
         ActionMessage.debug(this,\r
-                            "PCD memory database contains " + dbManager.getDBSize() + " PCD tokens");\r
+                            "PCD memory database contains " + dbManager.getDBSize() + " PCD tokens.");\r
 \r
         generateAutogenForModule();\r
     }\r
@@ -228,9 +228,9 @@ public class PCDAutoGenAction extends BuildAction {
                         // All library's PCD should instanted in module's <ModuleSA> who\r
                         // use this library instance. If not, give errors.\r
                         //\r
-                        throw new BuildActionException (String.format("Module %s use library instance %s, the PCD %s " +\r
-                                                                      "is required by this library instance, but can not find " +\r
-                                                                      "it in the %s's <ModuleSA> in FPD file!",\r
+                        throw new BuildActionException (String.format("Module %s using library instance %s; the PCD %s " +\r
+                                                                      "is required by this library instance, but can not be found " +\r
+                                                                      "in the %s's <ModuleSA> in the FPD file!",\r
                                                                       MemoryDatabaseManager.CurrentModuleName,\r
                                                                       moduleName,\r
                                                                       pcdNameArrayInMsa[index],\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
index a42ef927ad8d0cb8a8b2bbd2f95bc5eb6d2a6893..0460efd9ee5f3416d25fc2084887a2c83f4db198 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
@@ -1326,7 +1326,7 @@ public class PcdDatabase {
         case POINTER:\r
             return "UINT8";\r
         default:\r
-            throw new EntityException("Unknown type in getDataTypeCDeclaration");\r
+            throw new EntityException("Unknown DatumType in getDataTypeCDeclaration");\r
         }\r
     }\r
 \r
@@ -1486,7 +1486,7 @@ public class PcdDatabase {
                 retStr = retStr +"\r\n" + str;\r
             }\r
         } catch (Exception ex) {\r
-            throw new EntityException("Fatal error when generating PcdDatabase Common Definitions");\r
+            throw new EntityException("Fatal error when generating PcdDatabase Common Definitions!");\r
         }\r
 \r
         return retStr;\r
@@ -1509,7 +1509,7 @@ public class PcdDatabase {
                 retStr = retStr +"\r\n" + str;\r
             }\r
         } catch (Exception ex) {\r
-            throw new EntityException("Fatal error when generating PcdDatabase Dxe Definitions");\r
+            throw new EntityException("Fatal error when generating PcdDatabase Dxe Definitions!");\r
         }\r
 \r
         return retStr;\r
@@ -1532,7 +1532,7 @@ public class PcdDatabase {
                 retStr = retStr +"\r\n" + str;\r
             }\r
         } catch (Exception ex) {\r
-            throw new EntityException("Fatal error when generating PcdDatabase Pei Definitions");\r
+            throw new EntityException("Fatal error when generating PcdDatabase Pei Definitions!");\r
         }\r
 \r
         return retStr;\r
@@ -1585,7 +1585,7 @@ public class PcdDatabase {
         if ((uuidString.charAt(0) == '0') && ((uuidString.charAt(1) == 'x') || (uuidString.charAt(1) == 'X'))) {\r
             splitStringArray = uuidString.split("," );\r
             if (splitStringArray.length != 11) {\r
-                throw new EntityException ("[FPD file error] Wrong format for UUID string: " + uuidString);\r
+                throw new EntityException ("[FPD file error] Wrong format for GUID string: " + uuidString);\r
             }\r
 \r
             //\r
@@ -1626,4 +1626,4 @@ public class PcdDatabase {
 \r
         return UUID.fromString(uuidString);\r
     }\r
-}
\ No newline at end of file
+}\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java
index 0b2fd0b0109e17b5b8ad9bcf30f0e1eb879fee77..a0a40eb4d1b83673b6b4bb528b194bf2ba7e3cdd 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java
@@ -121,7 +121,7 @@ public class PlatformPcdPreprocessActionForBuilding extends PlatformPcdPreproces
 \r
     **/\r
     public void execute() throws PlatformPcdPreprocessBuildException {\r
-        String errorMessageHeader   = "Fail to initialize Pcd memory database for building. Because:";\r
+        String errorMessageHeader   = "Failed to initialize the Pcd memory database because: ";\r
         String errorsForPreprocess  = null;\r
 \r
         //\r
@@ -170,7 +170,7 @@ public class PlatformPcdPreprocessActionForBuilding extends PlatformPcdPreproces
         try {\r
             tokenSpaceStrRet = GlobalData.getGuidInfoFromCname(guidCName);\r
         } catch ( Exception e ) {\r
-            throw new PlatformPcdPreprocessException ("Failed get Guid CName " + guidCName + "from SPD file!");\r
+            throw new PlatformPcdPreprocessException ("Failed to get Guid CName " + guidCName + " from the SPD file!");\r
         }\r
         return tokenSpaceStrRet;\r
     }\r
@@ -303,8 +303,8 @@ public class PlatformPcdPreprocessActionForBuilding extends PlatformPcdPreproces
 \r
         dynamicPcdBuildDefinitions = fpdDocInstance.getPlatformSurfaceArea().getDynamicPcdBuildDefinitions();\r
         if (dynamicPcdBuildDefinitions == null) {\r
-            exceptionString = String.format("[FPD file error] There are no <PcdDynamicBuildDescriptions> in FPD file but contains Dynamic type "+\r
-                                            "PCD entry %s in module %s!",\r
+            exceptionString = String.format("[FPD file error] There are no <PcdDynamicBuildDescriptions> elements in FPD file but there are Dynamic type "+\r
+                                            "PCD entries %s in module %s!",\r
                                             token.cName,\r
                                             moduleName);\r
             putError(exceptionString);\r
@@ -374,11 +374,11 @@ public class PlatformPcdPreprocessActionForBuilding extends PlatformPcdPreproces
         File file = null;\r
 \r
         if (fpdFilePath == null) {\r
-            throw new PlatformPcdPreprocessBuildException("WorkspacePath and FPDFileName should be blank for CollectPCDAtion!");\r
+            throw new PlatformPcdPreprocessBuildException("WorkspacePath and FPDFileName should be empty for CollectPCDAtion!");\r
         }\r
 \r
         if (fpdFilePath.length() == 0) {\r
-            throw new PlatformPcdPreprocessBuildException("WorkspacePath and FPDFileName should be blank for CollectPCDAtion!");\r
+            throw new PlatformPcdPreprocessBuildException("WorkspacePath and FPDFileName should be empty for CollectPCDAtion!");\r
         }\r
 \r
         file = new File(fpdFilePath);\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
index 0097890648a8dd4e66df4f7d4d35eaa8adf59a8a..66d38f962c8de6e9d4a2a2e081acfd48a0789c96 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
@@ -89,7 +89,7 @@ public class ConfigReader {
                 valueList.add(str.substring(index + 1).trim());\r
             }\r
         } catch (Exception e) {\r
-            throw new EdkException("Process file [" + filename + "] error. \n" + e.getMessage());\r
+            throw new EdkException("ERROR Processing file [" + filename + "].\n" + e.getMessage());\r
         }\r
 \r
         String[][] definitions = new String[2][keyList.size()];\r
@@ -126,7 +126,7 @@ public class ConfigReader {
                 map.put(key, value);\r
             }\r
         } catch (Exception e) {\r
-            throw new EdkException("Process file [" + ConfigFile.getAbsolutePath() + "] error. \n" + e.getMessage());\r
+            throw new EdkException("ERROR Processing file [" + ConfigFile.getAbsolutePath() + "].\n" + e.getMessage());\r
         }\r
 \r
         return map;\r