diff options
author | carnold <[email protected]> | 2008-04-02 22:14:50 +0000 |
---|---|---|
committer | carnold <[email protected]> | 2008-04-02 22:14:50 +0000 |
commit | 283e0b34eaf0fdca02214b152cf50d1b69a1936a (patch) | |
tree | 7cc6b7a51ce4b99a2e1c9b1f5bdbd783b6bd512e /src/main/java/net/sf/antcontrib/cpptasks/gcc | |
parent | 7919095f38d9536f02f1a9505d8fa55b69bd9c02 (diff) |
Javadoc fixes
git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/cpptasks/trunk@159 32d7a393-a5a9-423c-abd3-5d954feb1f2f
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/gcc')
4 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java index 940d8bc..75ddcc7 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java @@ -101,12 +101,12 @@ public abstract class AbstractLdLinker extends CommandLineLinker { LibrarySet set = libsets[i]; File libdir = set.getDir(null); String[] libs = set.getLibs(); - if (libdir != null) {
- String relPath = libdir.getAbsolutePath();
- File outputFile = task.getOutfile();
- if (outputFile != null && outputFile.getParentFile() != null) {
- relPath = CUtil.getRelativePath(
- outputFile.getParentFile().getAbsolutePath(), libdir);
+ if (libdir != null) { + String relPath = libdir.getAbsolutePath(); + File outputFile = task.getOutfile(); + if (outputFile != null && outputFile.getParentFile() != null) { + relPath = CUtil.getRelativePath( + outputFile.getParentFile().getAbsolutePath(), libdir); } if (set.getType() != null && "framework".equals(set.getType().getValue()) && @@ -272,8 +272,8 @@ public abstract class AbstractLdLinker extends CommandLineLinker { * linker output file * @param sourceFiles * linker input files (.obj, .o, .res) - * @param args - * linker arguments + * @param config + * linker configuration * @return arguments for runTask */ public String[] prepareArguments(CCTask task, String outputDir, diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java index 058ef12..988848d 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java @@ -117,7 +117,7 @@ public class GccProcessor { * -dumpversion. Attempts to use gcc -dumpspecs to provide this information * resulted in stalling on the Execute.run * - * @returns contents of the specs file + * @return contents of the specs file */ public static String[] getSpecs() { if (specs == null) { diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java index 8e35995..728cd47 100755 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java @@ -106,7 +106,7 @@ public class GccProcessor { * -dumpversion. Attempts to use gcc -dumpspecs to provide this information * resulted in stalling on the Execute.run * - * @returns contents of the specs file + * @return contents of the specs file */ public static String[] getSpecs() { if (specs == null) { diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java index 8a7a26e..bbcd13d 100755 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java @@ -121,7 +121,7 @@ public class GccProcessor { * -dumpversion. Attempts to use gcc -dumpspecs to provide this information * resulted in stalling on the Execute.run * - * @returns contents of the specs file + * @return contents of the specs file */ public static String[] getSpecs() { if (specs == null) { |