1) Applied ToolArg and FileArg class to represent tool arguments

[mirror_edk2.git] / Tools / Source / FrameworkTasks / org / tianocore / framework / tasks / Tool.java

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
index e67e15d7867fb21ebc872fe5e3d09242733c982c..0ef2a6ea7c22941d7bbb7709e49a7cd2ccc443bd 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 to executeTool failed!\n");\r
+            throw new BuildException("Call to executeTool failed!\n" + e.getMessage());\r
         }\r
 \r
         ///\r
@@ -83,7 +83,7 @@ public class Tool implements EfiDefine, Section {
                 buffer.writeByte(0);\r
             }\r
         } catch (Exception e) {\r
-            System.out.print(e.getMessage());\r
+            EdkLog.log(e.getMessage());\r
             throw new BuildException("Tool call, toBuffer failed!\n");\r
         } finally {\r
             try {\r
@@ -94,7 +94,7 @@ public class Tool implements EfiDefine, Section {
                     fs.close();\r
                 }\r
             } catch (Exception e) {\r
-                System.out.println("WARNING: Cannot close " + outputFile.getPath());\r
+                EdkLog.log("WARNING: Cannot close " + outputFile.getPath());\r
             }\r
         }\r
     }\r
@@ -129,7 +129,7 @@ public class Tool implements EfiDefine, Section {
                     sect.toBuffer(Do);\r
                 }\r
                 catch (BuildException e) {\r
-                    System.out.print(e.getMessage());\r
+                    EdkLog.log(e.getMessage());\r
                     throw new BuildException ("GenSection failed at Tool!");\r
                 }  \r
                 Do.close();\r
@@ -150,7 +150,7 @@ public class Tool implements EfiDefine, Section {
             Process process = Runtime.getRuntime().exec(command + " " + argument);\r
             process.waitFor();\r
         } catch (Exception e) {\r
-            System.out.print (e.getMessage());\r
+            EdkLog.log(e.getMessage());\r
             throw new BuildException("Execution of externalTool task failed!\n");\r
         }\r
     }\r