// }\r
// project.log(logLine.toString(), Project.MSG_VERBOSE);\r
\r
- int retval = 0;\r
+ Environment newEnv = new Environment();\r
\r
- if (userdefine.getDpath() == null || userdefine.getDpath().trim().length() == 0) {\r
- retval = runCommand(cctask, workdir, cmd, null);\r
- } else {\r
- String existPath = System.getenv(getPathName());\r
- Environment newEnv = new Environment();\r
+ if (userdefine.getDpath() != null && userdefine.getDpath().trim().length() != 0) {\r
+ String existPath = System.getenv(getPathName("PATH"));\r
+ \r
Variable var = new Variable();\r
- var.setKey(getPathName());\r
+ var.setKey(getPathName("PATH"));\r
var.setPath(new Path(project, userdefine.getDpath() + ";" + existPath));\r
newEnv.addVariable(var);\r
- retval = runCommand(cctask, workdir, cmd, newEnv);\r
}\r
\r
+ if (userdefine.getLibpath() != null && userdefine.getLibpath().trim().length() != 0) {\r
+ String existPath = System.getenv(getPathName("LIB"));\r
+ \r
+ Variable var = new Variable();\r
+ var.setKey(getPathName("LIB"));\r
+ var.setPath(new Path(project, userdefine.getLibpath() + ";" + existPath));\r
+ newEnv.addVariable(var);\r
+ }\r
+ \r
+ if (userdefine.getInclude() != null && userdefine.getInclude().trim().length() != 0) {\r
+ String existPath = System.getenv(getPathName("INCLUDE"));\r
+ \r
+ Variable var = new Variable();\r
+ var.setKey(getPathName("INCLUDE"));\r
+ var.setPath(new Path(project, userdefine.getInclude() + ";" + existPath));\r
+ newEnv.addVariable(var);\r
+ }\r
+ \r
+ int retval = runCommand(cctask, workdir, cmd, newEnv);\r
\r
if (retval != 0) {\r
throw new BuildException(userdefine.getCmd()\r
}\r
}\r
\r
- private String getPathName() {\r
+ private String getPathName(String variableName) {\r
if (pathName != null) {\r
return pathName;\r
}\r
Iterator iter = allEnv.keySet().iterator();\r
while (iter.hasNext()) {\r
String key = (String)iter.next();\r
- if(key.equalsIgnoreCase("PATH")) {\r
+ if(key.equalsIgnoreCase(variableName)) {\r
pathName = key;\r
break ;\r
}\r
private Vector allLibraries = new Vector();\r
\r
private String dpath = null;\r
+ \r
+ private String libpath = null;\r
+ \r
+ private String include = null;\r
\r
public void addLibset(LibrarySet libset) {\r
if (isReference()) {\r
this.dpath = dpath;\r
}\r
\r
+ public String getLibpath() {\r
+ return libpath;\r
+ }\r
+\r
+ public void setLibpath(String libpath) {\r
+ this.libpath = libpath;\r
+ }\r
+\r
+ public String getInclude() {\r
+ return include;\r
+ }\r
+\r
+ public void setInclude(String include) {\r
+ this.include = include;\r
+ }\r
+\r
}\r