tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-04-08 17:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
qouyang 2006-09-29 10:00:39 +00:00
parent 190293ab4e
commit 2f4035206e
6 changed files with 9 additions and 17 deletions
Tools/Source
FrameworkTasks/org/tianocore/framework/tasks
EfiRomTask.javaFlashMapTask.javaGenFvImageTask.javaGenSectionTask.javaMakeDeps.java
GenBuild/org/tianocore/build/autogen
AutoGen.java

6
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.

1
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;

3
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;

2
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;

3
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;

11
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");
}