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

Adjust code format and remove unused code.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1181 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
wuyizhong
2006-08-03 04:34:39 +00:00
parent a390c35d8a
commit e6225e3c73
5 changed files with 212 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java
View File

@ -32,23 +32,25 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
/**
*
*/
public class CommandLineUserDefine {
String includePathDelimiter = null;
String outputDelimiter = null;
public void command(CCTask cctask, UserDefineDef userdefine){
public void command(CCTask cctask, UserDefineDef userdefine) {
boolean isGccCommand = userdefine.getFamily().equalsIgnoreCase("GCC");
File workdir;
Project project = cctask.getProject();
if(userdefine.getWorkdir() == null) {
if (userdefine.getWorkdir() == null) {
workdir = new File(".");
}
else {
} else {
workdir = userdefine.getWorkdir();
}
}
//
// generate cmdline= command + args + includepath + endargs + outfile
//
@ -57,15 +59,7 @@ public class CommandLineUserDefine {
Vector endargs = new Vector();
Vector endargsWithoutSpace = new Vector();
Vector includePath = new Vector();
//
// Generate cmdline = command +
// general args +
// outputflag + outputfile
// includpath +
// endargs +
//
//
// get Args.
//
@ -77,168 +71,155 @@ public class CommandLineUserDefine {
endargs.addElement(argument[j].getValue());
}
}
//
// get include path.
//
String[] incPath = userdefine.getActiveIncludePaths();
for (int j = 0; j < incPath.length; j++) {
if(incPath[j].indexOf(' ') >= 0) {
includePath.addElement( includePathDelimiter + incPath[j]);
//includePath.addElement( includePathDelimiter + "\"" + incPath[j] + "\"");
}
else {
includePath.addElement( includePathDelimiter + incPath[j]);
}
includePath.addElement(includePathDelimiter + incPath[j]);
}
//
// Remove space in args and endargs.
//
for ( int i=0; i < args.size(); i++) {
String str = (String)args.get(i);
for (int i = 0; i < args.size(); i++) {
String str = (String) args.get(i);
StringTokenizer st = new StringTokenizer(str, " \t");
while(st.hasMoreTokens()) {
while (st.hasMoreTokens()) {
argsWithoutSpace.addElement(st.nextToken());
}
}
for ( int i=0; i < endargs.size(); i++) {
String str = (String)endargs.get(i);
for (int i = 0; i < endargs.size(); i++) {
String str = (String) endargs.get(i);
StringTokenizer st = new StringTokenizer(str, " \t");
while(st.hasMoreTokens()) {
while (st.hasMoreTokens()) {
endargsWithoutSpace.addElement(st.nextToken());
}
}
int cmdLen = 0;
//
// command + args + endargs + includepath + sourcefile
//
cmdLen = 1 + argsWithoutSpace.size() + endargsWithoutSpace.size() + includePath.size() + 1;
String[] libSet = userdefine.get_libset();
if (libSet != null && libSet.length > 0){
cmdLen = 1 + argsWithoutSpace.size() + endargsWithoutSpace.size()
+ includePath.size() + 1;
String[] libSet = userdefine.getLibset();
if (libSet != null && libSet.length > 0) {
cmdLen = cmdLen + libSet.length;
if (isGccCommand) {
cmdLen += 2; // we need -( and -) to group libs for GCC
cmdLen += 2; // we need -( and -) to group libs for GCC
}
}
//
// In gcc the "cr" flag should follow space then add outputfile name, otherwise
// it will pop error.
// In gcc the "cr" flag should follow space then add outputfile name,
// otherwise
// it will pop error.
// TBD
if (outputDelimiter != null && userdefine.getOutputFile() != null && outputDelimiter.trim().length() > 0){
if (outputDelimiter.trim().equalsIgnoreCase("-cr")){
if (outputDelimiter != null && userdefine.getOutputFile() != null
&& outputDelimiter.trim().length() > 0) {
if (outputDelimiter.trim().equalsIgnoreCase("-cr")) {
cmdLen = cmdLen + 2;
}else {
} else {
cmdLen++;
}
}
//
// for every source file
// if file is header file, just skip it (add later)
// for every source file
// if file is header file, just skip it (add later)
//
Vector srcSets = userdefine.getSrcSets();
// System.out.println("##" + userdefine.getSrcSets());
//
// if have source file append source file in command land.
// if have source file append source file in command line.
//
Set allSrcFiles = new LinkedHashSet();
for (int i = 0; i < srcSets.size(); i++) {
ConditionalFileSet srcSet = (ConditionalFileSet) srcSets
.elementAt(i);
.elementAt(i);
if (srcSet.isActive()) {
//
// Find matching source files
//
DirectoryScanner scanner = srcSet.getDirectoryScanner(project);
//
// Check each source file - see if it needs compilation
//
String[] fileNames = scanner.getIncludedFiles();
for (int j = 0; j < fileNames.length; j++){
// execute the command
for (int j = 0; j < fileNames.length; j++) {
allSrcFiles.add(scanner.getBasedir() + "/" + fileNames[j]);
if (isGccCommand) {
System.out.println("[" + userdefine.getType() + "] " + fileNames[j]);
System.out.println("[" + userdefine.getType() + "] "
+ fileNames[j]);
}
}
}
}
String[] fileNames = (String[])allSrcFiles.toArray(new String[allSrcFiles.size()]);
String[] fileNames = (String[]) allSrcFiles
.toArray(new String[allSrcFiles.size()]);
String[] cmd = new String[cmdLen - 1 + fileNames.length];
int index = 0;
cmd[index++] = userdefine.getCmd();
Iterator iter = argsWithoutSpace.iterator();
while (iter.hasNext()) {
cmd[index++] = project.replaceProperties((String)iter.next());
cmd[index++] = project.replaceProperties((String) iter.next());
}
iter = endargsWithoutSpace.iterator();
while (iter.hasNext()) {
cmd[index++] = project.replaceProperties((String)iter.next());
cmd[index++] = project.replaceProperties((String) iter.next());
}
//
// Add outputFileFlag and output file to cmd
//
if (outputDelimiter != null && userdefine.getOutputFile() != null && outputDelimiter.length()> 0){
if (outputDelimiter.trim().equalsIgnoreCase("-cr")){
if (outputDelimiter != null && userdefine.getOutputFile() != null
&& outputDelimiter.length() > 0) {
if (outputDelimiter.trim().equalsIgnoreCase("-cr")) {
cmd[index++] = outputDelimiter;
cmd[index++] = userdefine.getOutputFile();
}else {
cmd[index++] = outputDelimiter + userdefine.getOutputFile();
} else {
cmd[index++] = outputDelimiter + userdefine.getOutputFile();
}
}
iter = includePath.iterator();
while (iter.hasNext()) {
cmd[index++] = (String)iter.next();
cmd[index++] = (String) iter.next();
}
if (libSet != null && libSet.length > 0){
if (libSet != null && libSet.length > 0) {
if (isGccCommand) {
cmd[index++] = "-(";
}
for (int k = 0; k < libSet.length ; k++){
for (int k = 0; k < libSet.length; k++) {
cmd[index++] = libSet[k];
}
if (isGccCommand) {
cmd[index++] = "-)";
}
}
for (int j = 0; j < fileNames.length; j++){
// execute the command
for (int j = 0; j < fileNames.length; j++) {
cmd[index++] = fileNames[j];
}
int retval = runCommand(cctask, workdir, cmd);
// if with monitor, add more code
if (retval != 0) {
throw new BuildException(userdefine.getCmd()
+ " failed with return code " + retval,
cctask.getLocation());
throw new BuildException(userdefine.getCmd()
+ " failed with return code " + retval, cctask
.getLocation());
}
}
protected int runCommand(CCTask task, File workingDir, String[] cmdline)
throws BuildException {
return CUtil.runCommand(task, workingDir, cmdline, false, null);
}
protected String getInputFileArgument(File outputDir, String filename,
int index) {
//
// if there is an embedded space,
// must enclose in quotes
if (filename.indexOf(' ') >= 0) {
StringBuffer buf = new StringBuffer("\"");
buf.append(filename);
buf.append("\"");
return buf.toString();
}
return filename;
}
}