diff options
| author | qouyang <qouyang@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-29 10:00:39 +0000 |
|---|---|---|
| committer | qouyang <qouyang@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-29 10:00:39 +0000 |
| commit | 2f4035206ec94f900ec5b2dfd852e62fa48da0eb (patch) | |
| tree | 09dfa043e86b9d84c5eb29f1d78e0b7377b8e53a /Tools | |
| parent | 190293ab4ef0ce3a66de1fdadd51d123cd5bc1bd (diff) | |
| download | edk2-2f4035206ec94f900ec5b2dfd852e62fa48da0eb.tar.gz edk2-2f4035206ec94f900ec5b2dfd852e62fa48da0eb.tar.bz2 edk2-2f4035206ec94f900ec5b2dfd852e62fa48da0eb.zip | |
1. Remove some unuseful import in Framework's EfiRomTask.java, FlashMapTask.java, GenFvImageTask.java, GenSectionTask.java, MakeDeps.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
Diffstat (limited to 'Tools')
6 files changed, 9 insertions, 17 deletions
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java index caa77477ad..acfb2ba572 100644 --- 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;
import java.io.File;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedList;
-import java.util.List;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -31,8 +27,6 @@ import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.taskdefs.LogStreamHandler;
import org.apache.tools.ant.types.Commandline;
-import com.sun.org.apache.bcel.internal.generic.NEW;
-
/**
SecFixupTask class.
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java index c6f5099afa..9a3c61e6c8 100644 --- 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() {
long srcTimeStamp = 0;
String srcName = "";
- long dstTimeStamp = 0;
String dstName = "";
long timeStamp = 0;
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java index d37156dd70..0f25032f7f 100644 --- 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;
import java.io.File;
-import java.io.InputStreamReader;
-import java.lang.ProcessBuilder;
import java.util.LinkedList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.List;
-import java.util.StringTokenizer;
import java.util.Iterator;
import java.io.BufferedReader;
import java.io.FileReader;
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java index 4cd7a96cdb..e329c0e3eb 100644 --- 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 }
}
} catch (Exception e) {
- throw new BuildException("compress.toBuffer failed!\n");
+ throw new BuildException("GenSection<SectionType=EFI_SECTION_COMPRESSION> to Buffer failed!\n");
}
} else {
Section sect;
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java index 1486bd384e..8f5664f01d 100644 --- 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;
import java.io.IOException;
import java.io.LineNumberReader;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.tools.ant.BuildException;
@@ -28,7 +26,6 @@ import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Execute;
import org.apache.tools.ant.taskdefs.LogStreamHandler;
import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
import org.tianocore.common.logger.EdkLog;
import org.tianocore.common.cache.FileTimeStamp;
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java index d0d04b3afa..0d757b923b 100644 --- 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
//
String guid = CommonDefinition.formatGuidName(saq.getModuleGuid());
-
- fileBuffer
- .append("GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiCallerIdGuid = {");
+ if (this.moduleId.getModuleType().equalsIgnoreCase(EdkDefinitions.MODULE_TYPE_BASE)) {
+ fileBuffer
+ .append("GLOBAL_REMOVE_IF_UNREFERENCED GUID gEfiCallerIdGuid = {");
+ } else {
+ fileBuffer
+ .append("GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiCallerIdGuid = {");
+ }
+
if (guid == null) {
throw new AutoGenException("Guid value must set!\n");
}
|