sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cleanall can't clean all genereated files. Now .i files generated by VfrCompile move to module out put dir and Platform_build.xml will be removed in cleanall. Also adjust some code format.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1321 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
wuyizhong
2006-08-18 08:06:02 +00:00
parent 4b5f554990
commit caa44816dd
7 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
View File

@@ -25,9 +25,6 @@ import org.apache.tools.ant.taskdefs.Execute;
import org.apache.tools.ant.taskdefs.LogStreamHandler;
import org.apache.tools.ant.types.Commandline;
import org.tianocore.common.logger.EdkLog;
/**
FwImageTask class.

3
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
View File

@@ -25,8 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -47,7 +45,6 @@ public class MakeDeps extends Task {
// private members, use set/get to access them
//
private static final String cmdName = "MakeDeps";
private static final String target = "dummy";
private String includePath = null;
private String depsFile = null;
private String subDir = null;

9
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
View File

@@ -38,6 +38,7 @@ import org.apache.tools.ant.types.Commandline;
public class VfrCompilerTask extends Task implements EfiDefine {
private String createListFile = "";
private String outPutDir = "";
private File outPutFile;
private String createIfrBinFile = "";
private String processerArg ="";
private String vfrFile = "";
@@ -79,6 +80,9 @@ public class VfrCompilerTask extends Task implements EfiDefine {
@param outPutDir The directory name for ouput file
**/
public void setOutPutDir(String outPutDir) {
if (outPutDir != null) {
outPutFile = new File(outPutDir);
}
this.outPutDir = " -od " + outPutDir;
}
@@ -204,7 +208,12 @@ public class VfrCompilerTask extends Task implements EfiDefine {
Execute runner = new Execute(streamHandler,null);
runner.setAntRun(project);
runner.setCommandline(commandLine.getCommandline());
if (outPutFile != null && outPutFile.exists()) {
runner.setWorkingDirectory(outPutFile);
}
log(Commandline.toString(commandLine.getCommandline()), Project.MSG_VERBOSE);
log(vfrFileName);