diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-09 16:23:45 +0200 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-09 16:23:45 +0200 |
| commit | ef6f25ba42792d2d811fd6826c0dd528ad77b1e9 (patch) | |
| tree | 230ba16bb40cdfaae36b2b4456a51edc0654bc02 /src | |
| parent | 11fa61ff2d5e8435f6c62a4dab715542750e8271 (diff) | |
| download | cpptasks-parallel-ef6f25ba42792d2d811fd6826c0dd528ad77b1e9.tar.gz cpptasks-parallel-ef6f25ba42792d2d811fd6826c0dd528ad77b1e9.tar.bz2 cpptasks-parallel-ef6f25ba42792d2d811fd6826c0dd528ad77b1e9.tar.xz cpptasks-parallel-ef6f25ba42792d2d811fd6826c0dd528ad77b1e9.zip | |
Always use absolute path for linker libraries for windows; Removed debug statements
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java | 4 | ||||
| -rw-r--r-- | src/net/sf/antcontrib/cpptasks/types/LibrarySet.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java index dcff759..aeed2bb 100644 --- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java +++ b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java @@ -337,7 +337,9 @@ public abstract class CommandLineLinker extends AbstractLinker String relativePath = CUtil.getRelativePath(outputDir, new File(sourceFile)); // FREEHEP, return the shortest - return quoteFilename(buf, sourceFile.length() > relativePath.length() ? relativePath : sourceFile); +// return quoteFilename(buf, sourceFile.length() > relativePath.length() ? relativePath : sourceFile); +// FREEHEP trying with always absolute paths... + return quoteFilename(buf, sourceFile); } /** diff --git a/src/net/sf/antcontrib/cpptasks/types/LibrarySet.java b/src/net/sf/antcontrib/cpptasks/types/LibrarySet.java index 3b747df..acac911 100644 --- a/src/net/sf/antcontrib/cpptasks/types/LibrarySet.java +++ b/src/net/sf/antcontrib/cpptasks/types/LibrarySet.java @@ -309,11 +309,9 @@ public class LibrarySet extends DataType { } else { DirectoryScanner scanner = localSet.getDirectoryScanner(project); File basedir = scanner.getBasedir(); - System.err.println("CPP BaseDir: "+basedir); String[] files = scanner.getIncludedFiles(); matches += files.length; for (int k = 0; k < files.length; k++) { - System.err.println("CPP File: "+files[k]); visitor.visit(basedir, files[k]); } } |