summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-07 11:46:19 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-07 11:46:19 +0100
commit72a02cce468f3a7712c2af23131626290de10620 (patch)
tree2603001161d676dc9ce394ee77e7c9471631f543
parentd55195311fd0a0eb531d3bbc68087d5f82d3341d (diff)
downloadcpptasks-parallel-72a02cce468f3a7712c2af23131626290de10620.tar.gz
cpptasks-parallel-72a02cce468f3a7712c2af23131626290de10620.tar.bz2
cpptasks-parallel-72a02cce468f3a7712c2af23131626290de10620.tar.xz
cpptasks-parallel-72a02cce468f3a7712c2af23131626290de10620.zip
Removed debug statement; Fixed doc
-rw-r--r--README.txt2
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java2
-rw-r--r--src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java2
3 files changed, 4 insertions, 2 deletions
diff --git a/README.txt b/README.txt
index 6a65766..59601bb 100644
--- a/README.txt
+++ b/README.txt
@@ -5,7 +5,7 @@ Modified version of ant contrib cpptasks, used in the freehep/maven-nar-plugin.
* cpptasks-1.0-beta-5-parallel-1-SNAPSHOT
- merged with cpptasks-1.0b5.tar.gz
-+++ some problems with tests may occur on other platforms than MacOS X.
+- See NAR-103 for tests that have been changed
* cpptasks-1.0-beta-4-parallel-5
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
index f9e4c0b..3497aaf 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
@@ -255,7 +255,9 @@ public final class GccCCompiler extends GccCompatibleCCompiler {
public Linker getLinker(LinkType linkType) {
return GccLinker.getInstance().getLinker(linkType);
}
+ // BEGINFREEHEP
public int getMaximumCommandLength() {
return isWindows() ? 20000 : Integer.MAX_VALUE;
}
+ // ENDFREEHEP
}
diff --git a/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java
index 27ffea0..41a736b 100644
--- a/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java
@@ -235,7 +235,7 @@ public class TestAbstractLdLinker extends TestCase {
Vector endargs = new Vector();
String[] rc = linker.addLibrarySets(task, sets, preargs, midargs,
endargs);
- for (int i=0; i<endargs.size(); i++) System.err.println(endargs.get( i ));
+// for (int i=0; i<endargs.size(); i++) System.err.println(endargs.get( i ));
// NAR-103
// BEGINFREEHEP
if (System.getProperty("os.name").equals("Mac OS X")) {