1. Remove some unuseful import in Framework's EfiRomTask.java, FlashMapTask.java...

2. For "BASE" type , the definition of variable "gEfiCallerIdGuid" in Autogen.c is as type of "GUID" instead of "EFI_GUID".

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java
index caa77477adfc16f6e0286081746a0acb2563a93a..acfb2ba5720815c8a321da934d184943783a42b2 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java
@@ -17,11 +17,7 @@
 package org.tianocore.framework.tasks;\r
 \r
 import java.io.File;\r
 package org.tianocore.framework.tasks;\r
 \r
 import java.io.File;\r

-import java.io.InputStreamReader;\r
-import java.util.ArrayList;\r
-import java.util.Iterator;\r

 import java.util.LinkedList;\r
 import java.util.LinkedList;\r

-import java.util.List;\r

 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Project;\r
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Project;\r


@@ -31,8 +27,6 @@ import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.taskdefs.LogStreamHandler;\r
 import org.apache.tools.ant.types.Commandline;\r
 \r
 import org.apache.tools.ant.taskdefs.LogStreamHandler;\r
 import org.apache.tools.ant.types.Commandline;\r
 \r

-import com.sun.org.apache.bcel.internal.generic.NEW;\r
-\r

 /**\r
   SecFixupTask class.\r
  \r
 /**\r
   SecFixupTask class.\r
  \r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
index c6f5099afa6cf927e13948bf282f3f32dad7104c..9a3c61e6c879c5765b8530af61f3f83388dafcbb 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
@@ -629,7 +629,6 @@ public class FlashMapTask extends Task implements EfiDefine {
     private boolean isUptodate() {\r
         long srcTimeStamp = 0;\r
         String srcName = "";\r
     private boolean isUptodate() {\r
         long srcTimeStamp = 0;\r
         String srcName = "";\r

-        long dstTimeStamp = 0;\r

         String dstName = "";\r
         long timeStamp = 0;\r
 \r
         String dstName = "";\r
         long timeStamp = 0;\r
 \r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
index d37156dd7095826677ac94740e89ce435f9ee54e..0f25032f7f0bb624837455a9beb2f8611e0831ba 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
@@ -23,13 +23,10 @@ import org.apache.tools.ant.taskdefs.LogStreamHandler;
 import org.apache.tools.ant.types.Commandline;\r
 \r
 import java.io.File;\r
 import org.apache.tools.ant.types.Commandline;\r
 \r
 import java.io.File;\r

-import java.io.InputStreamReader;\r
-import java.lang.ProcessBuilder;\r

 import java.util.LinkedList;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 import java.util.List;\r
 import java.util.LinkedList;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 import java.util.List;\r

-import java.util.StringTokenizer;\r

 import java.util.Iterator;\r
 import java.io.BufferedReader;\r
 import java.io.FileReader;\r
 import java.util.Iterator;\r
 import java.io.BufferedReader;\r
 import java.io.FileReader;\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
index 4cd7a96cdbd76fc71dd2e0ea72cf5e2dcebf8418..e329c0e3eb06d6cfe21edd5cc85c6f87f798eb81 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
@@ -364,7 +364,7 @@ public class GenSectionTask extends Task implements EfiDefine, Section, FfsTypes
                     }\r
                 }\r
             } catch (Exception e) {\r
                     }\r
                 }\r
             } catch (Exception e) {\r

-                throw new BuildException("compress.toBuffer failed!\n");\r
+                throw new BuildException("GenSection<SectionType=EFI_SECTION_COMPRESSION> to Buffer  failed!\n");\r

             } \r
         } else {\r
             Section sect;\r
             } \r
         } else {\r
             Section sect;\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
index 1486bd384edcdf12d5add2464f5ec9f2228bdd01..8f5664f01dcee3055c7e6073bbeca4bc3d27bc25 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
@@ -18,8 +18,6 @@ import java.io.File;
 import java.io.FileReader;\r
 import java.io.IOException;\r
 import java.io.LineNumberReader;\r
 import java.io.FileReader;\r
 import java.io.IOException;\r
 import java.io.LineNumberReader;\r

-import java.util.ArrayList;\r
-import java.util.Iterator;\r

 import java.util.List;\r
 \r
 import org.apache.tools.ant.BuildException;\r
 import java.util.List;\r
 \r
 import org.apache.tools.ant.BuildException;\r


@@ -28,7 +26,6 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Execute;\r
 import org.apache.tools.ant.taskdefs.LogStreamHandler;\r
 import org.apache.tools.ant.types.Commandline;\r
 import org.apache.tools.ant.taskdefs.Execute;\r
 import org.apache.tools.ant.taskdefs.LogStreamHandler;\r
 import org.apache.tools.ant.types.Commandline;\r

-import org.apache.tools.ant.types.Path;\r

 \r
 import org.tianocore.common.logger.EdkLog;\r
 import org.tianocore.common.cache.FileTimeStamp;\r
 \r
 import org.tianocore.common.logger.EdkLog;\r
 import org.tianocore.common.cache.FileTimeStamp;\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index d0d04b3afaea1ccdcfd884602b68d8c3563a64bf..0d757b923b1c4b769096326b074db54482fdbf83 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -452,9 +452,14 @@ public class AutoGen {
         // Write Guid to autogen.c\r
         //\r
         String guid = CommonDefinition.formatGuidName(saq.getModuleGuid());\r
         // Write Guid to autogen.c\r
         //\r
         String guid = CommonDefinition.formatGuidName(saq.getModuleGuid());\r

-\r
-        fileBuffer\r
-        .append("GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiCallerIdGuid = {");\r
+        if (this.moduleId.getModuleType().equalsIgnoreCase(EdkDefinitions.MODULE_TYPE_BASE)) {\r
+                       fileBuffer\r
+            .append("GLOBAL_REMOVE_IF_UNREFERENCED GUID gEfiCallerIdGuid = {");\r
+               } else {\r
+                       fileBuffer\r
+            .append("GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiCallerIdGuid = {");\r
+               }\r
+        \r

         if (guid == null) {\r
             throw new AutoGenException("Guid value must set!\n");\r
         }\r
         if (guid == null) {\r
             throw new AutoGenException("Guid value must set!\n");\r
         }\r