Fixed grammar in messages.

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
index 2d97d7b620fd55d5b7bfc9f5b358c1ae7d0993c4..bb7e3230ec6376307497c47fa5882c0329f934ee 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
@@ -121,7 +121,7 @@ public class CreateMtFileTask extends Task implements EfiDefine {
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
+                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("CreateMtFile failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
index 55e7fa74cf884df08909546774f146f508012961..ef06e134bfdb3e787efa0fc900c6541dc473e462 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
@@ -119,7 +119,7 @@ public class EfiCompressTask extends Task implements EfiDefine {
                 // command execution fail\r
                 //\r
                 EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("Strip failed!");\r
+                throw new BuildException("EfiCompress failed!");\r
 \r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
index 4af491950da579885d31f119979b08e7d741bf99..24cb3df266208d843669be6b5cf4c40cc8d8540f 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
@@ -52,7 +52,7 @@ public class FfsHeader {
         **/     \r
         public void bufferToStruct (byte[] dataBuffer){\r
             if (dataBuffer.length != 16) {\r
-                throw new BuildException ("Buffer is not fitting GUID type!");\r
+                throw new BuildException ("Buffer is not sized [" + dataBuffer.length + "] for data type, GUID!");\r
             }\r
 \r
             data1 = (int)(dataBuffer[3]& 0xff);\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java
index 982fd65096e6bed40b21366685bde0e55ac633ba..cc48b71dabd6f09a96e6f2d64d801eca807bef71 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java
@@ -46,7 +46,7 @@ public class  FileParser {
         String str;\r
         \r
         if (!file.exists()) {\r
-            throw new BuildException("The file" + file + "is not exist");           \r
+            throw new BuildException("The file, " + file + " does not exist!");           \r
         } \r
         try {\r
             fileReader = new FileReader(file);\r
@@ -69,4 +69,4 @@ public class  FileParser {
         }\r
     }\r
     \r
-}
\ No newline at end of file
+}\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
index 1021f1afe68f1c68e7a941d066171fce34bc4b0f..6612a0330d2b5d72b510c167d02eca9f62f38030 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
@@ -102,13 +102,13 @@ public class FwImageTask extends Task implements EfiDefine{
             log(this.peImageName);\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
-                log("fwimage succeeded!", Project.MSG_VERBOSE);\r
+                log("FwImage succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
                 log("ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("fwimage failed!");\r
+                throw new BuildException("FwImage failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
index cf02466ab0c58d8f51fdf9a20f7f46b02604625f..6754beb6218ccc9d9a840fc3e9e5246475df5d17 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
@@ -96,12 +96,14 @@ public class GenCRC32SectionTask extends Task implements EfiDefine{
                 //\r
                 //  command execution success \r
                 //\r
-                log("gencrc32section succeeded!", Project.MSG_VERBOSE);\r
+                log("GenCRC32Section succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 // \r
                 // command execution fail\r
                 //\r
                 log("ERROR = " + Integer.toHexString(revl));\r
+// LAH Added This Line\r
+                throw new BuildException("GenCRC32Section failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
index 2c46f09d659d7a449a91775043a48d9843c00bba..117ef393f5309b0daa96cde838c23cdcbc163c1c 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
@@ -142,7 +142,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
         //  Check does the BaseName, Guid, FileType set value.\r
         //\r
         if (this.baseName.equals("")) {\r
-            throw new BuildException ("Must set BaseName!\n");\r
+            throw new BuildException ("Must set OutputFileBasename!\n");\r
         }\r
 \r
         if (this.ffsFileGuid.equals("")) {\r
@@ -296,7 +296,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
                 if (fileSize == ffsHeader.getSize()) {\r
                     throw new BuildException (\r
                                              "FFS_ATTRIB_TAIL_PRESENT=TRUE is " +\r
-                                             "invalid for 0-length files"\r
+                                             "invalid for zero length files"\r
                                              );            \r
                 }\r
                 fileSize = fileSize + 2;\r
@@ -503,7 +503,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
     public void setFfsAttribDataAlignment(String ffsAligment) {\r
         this.ffsAttribDataAlignment = stringToInt(ffsAligment.replaceAll(" ", "").toLowerCase());\r
         if (this.ffsAttribDataAlignment < 0 || this.ffsAttribDataAlignment > 7) {\r
-            throw new BuildException ("FFS_ATTRIB_DATA_ALIGMENT must be 0-7");\r
+            throw new BuildException ("FFS_ATTRIB_DATA_ALIGMENT must be an integer value from 0 through 7, inclusive");\r
         } else {\r
             attributes |= (((byte)this.ffsAttribDataAlignment) << 3);\r
         }\r
@@ -664,13 +664,13 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
 \r
         byte[] buffer = new byte[16];\r
         if (GuidStr.length()!=36) {\r
-            throw new BuildException ("Guid length is not correct!");\r
+            throw new BuildException ("The GUID length [" + GuidStr.length() + "] is not correct!");\r
         }\r
 \r
 \r
         SplitStr = GuidStr.split("-");\r
         if (SplitStr.length != 5) {\r
-            throw new BuildException ("Guid type is not correct!");\r
+            throw new BuildException ("The GUID format is not correct!");\r
         }\r
 \r
 \r
@@ -974,7 +974,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
         try {\r
             value = Integer.parseInt(intStringNoPrefix, radix);\r
         } catch (NumberFormatException e) {\r
-            log("Incorrect format of int (" + intString + "). -1 is assumed");\r
+            log("Incorrect format of int [" + intString + "]. -1 is assumed");\r
             return -1;\r
         }\r
 \r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
index 25328a12d87f7bd31bf0e5d06fb7909cfa18c36f..a631d93de506bda10c736768620f947306314dbd 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
@@ -97,13 +97,13 @@ public class GenSectionTask extends Task implements EfiDefine {
             log(Commandline.toString(cmdline.getCommandline()), Project.MSG_VERBOSE);\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
-                log("gensection succeeded!", Project.MSG_VERBOSE);\r
+                log("GenSection succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
                 log("ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("gensection failed!");\r
+                throw new BuildException("GenSection failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
index 5c049773b29e0e161cb8319e4100f86424aa4d64..231a37161b424af474a955bd4cae3143bdf8a347 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
@@ -187,7 +187,7 @@ public class MakeDeps extends Task {
 \r
         // change the old DEP file format (makefile compatible) to just file list\r
         if (!cleanup()) {\r
-            throw new BuildException(depsFile + " was not generated");\r
+            throw new BuildException(depsFile + " was not generated!");\r
         }\r
     }\r
 \r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
index 82f161a97e83762204a6d87a0af3c453f63c8656..7e67fdabc865d25ced839ce05c9b8bbd0b93c320 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
@@ -71,7 +71,7 @@ public class ModifyInfTask extends Task implements EfiDefine {
         //\r
         // set Logger\r
         //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "modifytask");\r
+        FrameworkLogger logger = new FrameworkLogger(project, "modifyinftask");\r
         EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
         EdkLog.setLogger(logger);\r
         //\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
index b4e153d480ffd9f1a60df741fd7c7da830d1af83..b603a3eb80a92b84af3af0e0475796d4d78f395d 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
@@ -67,7 +67,7 @@ public class SectFile implements Section {
         /// check if file exist.\r
         ///     \r
         if (! sectFile.exists()) {\r
-            throw new BuildException("The file  " + this.fileName + "  is not exist!\n");     \r
+            throw new BuildException("The file  " + this.fileName + "  does not exist!\n");     \r
         }\r
 \r
 \r
@@ -110,7 +110,7 @@ public class SectFile implements Section {
 \r
         } catch (Exception e) {\r
             System.out.print(e.getMessage());\r
-            throw new BuildException("section file2Buffer failed!\n");            \r
+            throw new BuildException("SectFile, toBuffer failed!\n");            \r
         }\r
     }\r
-}
\ No newline at end of file
+}\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
index b2fad5cbb6430686abc9f960abfe4a56904800b5..8dbb94b46ec7f03324a0e057d22930361c49496f 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
@@ -105,13 +105,13 @@ public class SplitfileTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "splitfile succeeded!");\r
+                EdkLog.log(EdkLog.EDK_VERBOSE, "SplitFile succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
                 EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("splitfile failed!");\r
+                throw new BuildException("SplitFile failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
index ed8ef2dc8c17d80cc566e51b9a2d3b09f6398d20..6f9fc73d3d2b97aef45ad7aad3e360d53ed3406f 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
@@ -153,13 +153,13 @@ public class StrGatherTask extends Task implements EfiDefine {
             log(this.commandType.substring(2));\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
-                log("strgather succeeded!", Project.MSG_VERBOSE);\r
+                log("StrGather succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 ///\r
                 /// command execution fail\r
                 ///\r
                 log("ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("strgather failed!");\r
+                throw new BuildException("StrGather failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
index 0f775a5c20beb4074577151e509442837f79d6bf..d6e9bedf06e2f4b0182ecc0a20ace3f655f6c26d 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
@@ -62,7 +62,7 @@ public class StripTask extends Task implements EfiDefine {
         //\r
         // set Logger\r
         //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "edkStrip");\r
+        FrameworkLogger logger = new FrameworkLogger(project, "strip");\r
         EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
         EdkLog.setLogger(logger);\r
         //\r
@@ -72,7 +72,7 @@ public class StripTask extends Task implements EfiDefine {
         String command;\r
         String argument;\r
         if (path == null) {\r
-            command = "strip";\r
+            command = "Strip";\r
         } else {\r
             command = path + File.separatorChar + "Strip";\r
         }\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
index c784a50107e6ee3088bc3b80eff3870edb423755..67e0a865a675abaebd1c8c751e52594124ee61c3 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
@@ -49,7 +49,7 @@ public class Tool implements EfiDefine, Section {
         try {\r
             executeTool ();\r
         } catch (Exception e) {\r
-            throw new BuildException("Call tools failed!\n");\r
+            throw new BuildException("Call to executeTool failed!\n");\r
         }\r
 \r
         ///\r
@@ -58,7 +58,7 @@ public class Tool implements EfiDefine, Section {
         OutputFile = new File (this.outPutFileName);\r
         long fileLen = OutputFile.length();\r
         if (!OutputFile.exists()) {\r
-            throw new BuildException("The file " + outPutFileName + " is not exist!\n");\r
+            throw new BuildException("The file " + outPutFileName + " does not exist!\n");\r
         }\r
 \r
         ///\r
@@ -91,7 +91,7 @@ public class Tool implements EfiDefine, Section {
 \r
         } catch (Exception e) {\r
             System.out.print(e.getMessage());\r
-            throw new BuildException("Call tool2buffer failed!\n");\r
+            throw new BuildException("Tool call, toBuffer failed!\n");\r
         }\r
     }\r
 \r
@@ -137,7 +137,7 @@ public class Tool implements EfiDefine, Section {
             crcProcess.waitFor();\r
         } catch (Exception e) {\r
             System.out.print (e.getMessage());\r
-            throw new BuildException("Execute tools fails!\n");\r
+            throw new BuildException("Execution of externalTool task failed!\n");\r
         }\r
     }\r
 \r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
index 8d3a22dd17009547f8e56efe6671f008a50d873e..052c24e1fce1aa1ae5c25cc76a5bde5c51b5730a 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
@@ -210,13 +210,13 @@ public class VfrCompilerTask extends Task implements EfiDefine {
             log(vfrFileName);\r
             int returnVal = runner.execute();\r
             if (EFI_SUCCESS == returnVal) {\r
-                log("VfrCompiler succeeded!", Project.MSG_VERBOSE);\r
+                log("VfrCompile succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 log("ERROR = " + Integer.toHexString(returnVal));\r
-                throw new BuildException("VfrCompiler failed!");\r
+                throw new BuildException("VfrCompile failed!");\r
             }\r
         } catch (IOException e) {\r
             throw new BuildException(e.getMessage());\r
         }\r
     }\r
-}
\ No newline at end of file
+}\r