summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-09 16:23:45 +0200
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-09 16:23:45 +0200
commitef6f25ba42792d2d811fd6826c0dd528ad77b1e9 (patch)
tree230ba16bb40cdfaae36b2b4456a51edc0654bc02
parent11fa61ff2d5e8435f6c62a4dab715542750e8271 (diff)
downloadcpptasks-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
-rw-r--r--PATCHES6
-rw-r--r--src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java4
-rw-r--r--src/net/sf/antcontrib/cpptasks/types/LibrarySet.java2
3 files changed, 8 insertions, 4 deletions
diff --git a/PATCHES b/PATCHES
index 700ca8a..d722ce6 100644
--- a/PATCHES
+++ b/PATCHES
@@ -1,5 +1,9 @@
*** ALL Changes marked with FREEHEP or BEGINFREEHEP-ENDFREEHEP.
+* cpptasks-1.0-beta-4-parallel-5-SNAPSHOT
+
+- [src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker] use absolute paths for all paths to overcome windows file length limit.
+
* cpptasks-1.0-beta-4-parallel-4
- Added fake <distributionManagement> section to pom to avoid MDEPLOY-50. One can now deploy
@@ -30,7 +34,7 @@
- [src/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java] added missing code for -fno-exceptions
- [src/net/sf/antcontrib/cpptasks/CCTask.java] added log statement to identify linker and compiler
- [src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java] g++ linking now includes option -fexceptions
-- [src/net/sf/antcontrib/cpptasks/CommandLineLinker] use absolute paths for filenames if they are shorter than relative paths to overcome windows file length limit.
+- [src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker] use absolute paths for filenames if they are shorter than relative paths to overcome windows file length limit.
- [src/net/sf/antcontrib/cpptasks/CCTask.java] added thread to keep progress
** Parallel running change
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]);
}
}