Fixed the FfsAlignment issue

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
index ceff3205fe8147be0a392989571698cb4d11fcf0..1500fdff6657ee0783f30f2af55683ac3699e797 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
@@ -169,17 +169,16 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
 \r
         }\r
 \r
-        ffsFile = new File (outputPath + this.ffsFileGuid + '-' + this.baseName + ffsSuffix);  \r
-        System.out.print("General Ffs file: file name is:\n");\r
-        System.out.print(outputPath + this.ffsFileGuid + '-' + this.baseName + ffsSuffix);\r
-        System.out.print("\n");\r
-        \r
+        String ffsFilePath = outputPath + this.ffsFileGuid + '-' + this.baseName + ffsSuffix;\r
+        ffsFile = new File (ffsFilePath);  \r
         //\r
         // Create ffs ORG file. fileName = FfsFileGuid + BaseName + ffsSuffix +\r
         // ".org".\r
         //\r
-        ffsOrgFile = new File(outputPath + this.ffsFileGuid + '-' + this.baseName + ffsSuffix + ".org");\r
+        ffsOrgFile = new File(ffsFilePath + ".org");\r
            \r
+        log(ffsFile.getName());\r
+        log(ffsOrgFile.getName());\r
         try {\r
             //\r
             //  Create file output stream -- dataBuffer.\r
@@ -428,8 +427,8 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
             //\r
             ffsBuffer.close();\r
             orgFfsBuffer.close();\r
-            System.out.print ("Successful create ffs file!\n");\r
         } catch (Exception e) {\r
+            log("genffsfile failed!");\r
             throw new BuildException (e.getMessage());\r
         }\r
     }   \r
@@ -491,7 +490,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
       This function is to get the ffsAligment\r
       @return  The value of ffsAligment.\r
     **/\r
-    public int getFfsAligment() {\r
+    public int getFfsAlignment() {\r
         return this.ffsAlignment;\r
     }\r
 \r
@@ -501,7 +500,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
       This function is to set ffsAligment \r
       @param  ffsAligment     The value of ffsAligment.\r
     **/\r
-    public void setFfsAligment(int ffsAligment) {\r
+    public void setFfsAlignment(int ffsAligment) {\r
         this.ffsAlignment = ffsAligment;\r
         if (this.ffsAlignment > 7) {\r
             throw new BuildException ("FFS_ALIGMENT Scope is 0-7");\r