Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X 934b29d03 -> 8e39bfbc1


GROOVY-8295: Groovyc ant task can overflow Windows command line if classpath is 
large (remove duplicated parameter)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8e39bfbc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8e39bfbc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8e39bfbc

Branch: refs/heads/GROOVY_2_4_X
Commit: 8e39bfbc1cab706e9aebd457e0ab8feee78ce9c3
Parents: 934b29d
Author: paulk <pa...@asert.com.au>
Authored: Wed Dec 13 16:16:44 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Feb 23 14:45:00 2018 +1000

----------------------------------------------------------------------
 .../src/main/java/org/codehaus/groovy/ant/Groovyc.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/8e39bfbc/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
----------------------------------------------------------------------
diff --git 
a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java 
b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
index 3a2ec3b..e3766ac 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
@@ -1059,8 +1059,10 @@ public class Groovyc extends MatchingTask {
      * @param classpath
      */
     private void doNormalCommandLineList(List<String> commandLineList, 
List<String> jointOptions, Path classpath) {
-        commandLineList.add("--classpath");
-        commandLineList.add(getClasspathRelative(classpath));
+        if (!fork) {
+            commandLineList.add("--classpath");
+            commandLineList.add(classpath.toString());
+        }
         if (jointCompilation) {
             commandLineList.add("-j");
             commandLineList.addAll(jointOptions);

Reply via email to