import net.sf.antcontrib.cpptasks.types.IncludePath;\r
import net.sf.antcontrib.cpptasks.types.LibrarySet;\r
\r
-public class UserDefineDef extends ProcessorDef{\r
- \r
- public UserDefineDef () {}\r
- \r
+/**\r
+ * A userdefinedef definition. userdefine elements may be placed either as\r
+ * children of a cc element or the project element. A userdefine element with an\r
+ * id attribute may be referenced by userdefine elements with refid or extends\r
+ * attributes.\r
+ * \r
+ */\r
+public class UserDefineDef extends ProcessorDef {\r
+\r
+ public UserDefineDef () {\r
+ }\r
+\r
private String type = "CC";\r
- \r
+\r
private String family = "MSFT";\r
- \r
+\r
private String cmd;\r
- \r
- private String includepathDelimiter;\r
- \r
+\r
+ private String includePathDelimiter;\r
+\r
private String outputDelimiter;\r
- \r
+\r
private File workdir;\r
- \r
- private Vector includePaths= new Vector();\r
- \r
+\r
+ private Vector includePaths = new Vector();\r
+\r
private String outputFile;\r
- \r
- private Vector _libset = new Vector();\r
- \r
+\r
+ private Vector allLibraries = new Vector();\r
+\r
public void addLibset(LibrarySet libset) {\r
if (isReference()) {\r
throw noChildrenAllowed();\r
if (libset == null) {\r
throw new NullPointerException("libset");\r
}\r
- \r
- _libset.add(libset);\r
+\r
+ allLibraries.add(libset);\r
}\r
- \r
+\r
public void execute() throws org.apache.tools.ant.BuildException {\r
throw new org.apache.tools.ant.BuildException(\r
"Not an actual task, but looks like one for documentation purposes");\r
}\r
\r
-\r
public void addConfiguredArgument(UserDefineArgument arg) {\r
if (isReference()) {\r
throw noChildrenAllowed();\r
}\r
addConfiguredProcessorArg(arg);\r
}\r
- \r
+\r
/**\r
* Creates an include path.\r
*/\r
public IncludePath createIncludePath() {\r
Project p = getProject();\r
- if (p == null) {\r
- throw new java.lang.IllegalStateException("project must be set");\r
- }\r
if (isReference()) {\r
throw noChildrenAllowed();\r
}\r
includePaths.addElement(path);\r
return path;\r
}\r
- \r
- \r
+\r
/**\r
* Add a <includepath> if specify the file attribute\r
* \r
+ * @param activePath\r
+ * Active Path Vector\r
+ * @param file\r
+ * File with multiple path\r
* @throws BuildException\r
* if the specify file not exist\r
*/\r
fileReader = new FileReader(file);\r
in = new BufferedReader(fileReader);\r
while ((str = in.readLine()) != null) {\r
- if (str.trim() == "") {\r
+ if (str.trim().endsWith("")) {\r
continue;\r
}\r
str = getProject().replaceProperties(str);\r
throw new BuildException(e.getMessage());\r
}\r
}\r
- \r
+\r
/**\r
* Returns the specific include path.\r
+ * \r
+ * @return All active include paths\r
*/\r
public String[] getActiveIncludePaths() {\r
if (isReference()) {\r
}\r
return getActivePaths(includePaths);\r
}\r
- \r
+\r
private String[] getActivePaths(Vector paths) {\r
Project p = getProject();\r
- if (p == null) {\r
- throw new java.lang.IllegalStateException("project not set");\r
- }\r
Vector activePaths = new Vector(paths.size());\r
- for (int i = 0; i < paths.size(); i++) {\r
+ int length = paths.size();\r
+ for (int i = 0; i < length; i++) {\r
ConditionalPath path = (ConditionalPath) paths.elementAt(i);\r
if (path.isActive(p)) {\r
if (path.getFile() == null) {\r
activePaths.copyInto(pathNames);\r
return pathNames;\r
}\r
- \r
- public String getIncludepathDelimiter() {\r
+\r
+ /**\r
+ * Get include path delimiter.\r
+ * \r
+ * @return Include Path Delimiter\r
+ */\r
+ public String getIncludePathDelimiter() {\r
if (isReference()) {\r
return ((UserDefineDef) getCheckedRef(UserDefineDef.class,\r
- "UserDefineDef")).getIncludepathDelimiter();\r
+ "UserDefineDef")).getIncludePathDelimiter();\r
}\r
- return includepathDelimiter;\r
+ return includePathDelimiter;\r
}\r
\r
- public void setIncludepathDelimiter(String includepathDelimiter) {\r
+ /**\r
+ * Set include path delimiter.\r
+ * \r
+ * @param includePathDelimiter\r
+ * include path delimiter\r
+ */\r
+ public void setIncludePathDelimiter(String includePathDelimiter) {\r
if (isReference()) {\r
throw tooManyAttributes();\r
}\r
- this.includepathDelimiter = includepathDelimiter;\r
+ this.includePathDelimiter = includePathDelimiter;\r
}\r
\r
+ /**\r
+ * Get type.\r
+ * \r
+ * @return type\r
+ */\r
public String getType() {\r
if (isReference()) {\r
return ((UserDefineDef) getCheckedRef(UserDefineDef.class,\r
return type;\r
}\r
\r
+ /**\r
+ * Set type.\r
+ * \r
+ * @param type\r
+ * Type\r
+ */\r
public void setType(String type) {\r
if (isReference()) {\r
throw tooManyAttributes();\r
this.workdir = workdir;\r
}\r
\r
- public String[] get_libset() {\r
+ public String[] getLibset() {\r
Set libs = new LinkedHashSet();\r
- Iterator iter = _libset.iterator();\r
+ Iterator iter = allLibraries.iterator();\r
while (iter.hasNext()) {\r
- LibrarySet librarySet = (LibrarySet)iter.next();\r
+ LibrarySet librarySet = (LibrarySet) iter.next();\r
File basedir = librarySet.getDir(getProject());\r
String[] libStrArray = librarySet.getLibs();\r
- for (int i = 0 ; i < libStrArray.length; i ++) {\r
+ for (int i = 0; i < libStrArray.length; i++) {\r
if (basedir != null) {\r
File libFile = new File(libStrArray[i]);\r
if (libFile.isAbsolute()) {\r
libs.add(libFile.getPath());\r
+ } else {\r
+ libs.add(basedir.getPath() + File.separatorChar\r
+ + libFile.getPath());\r
}\r
- else {\r
- libs.add(basedir.getPath() + File.separatorChar + libFile.getPath());\r
- }\r
- }\r
- else {\r
+ } else {\r
libs.add(libStrArray[i]);\r
}\r
}\r
}\r
- return (String[])libs.toArray(new String[libs.size()]);\r
+ return (String[]) libs.toArray(new String[libs.size()]);\r
}\r
\r
public String getOutputDelimiter() {\r