From 483af893cd4306a3770c12e8689fb17e0d8add1a Mon Sep 17 00:00:00 2001 From: Paul King Date: Thu, 13 Sep 2018 19:27:24 +1000 Subject: [PATCH] GROOVY-8775: Bug joint compilation in ant task groovyc: package does not exist --- .../org/codehaus/groovy/tools/javac/JavacJavaCompiler.java | 3 +++ .../src/main/java/org/codehaus/groovy/ant/Groovyc.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java b/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java index e50da83af7d..ac306362468 100644 --- a/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java +++ b/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java @@ -127,6 +127,9 @@ private String[] makeParameters(List files, GroovyClassLoader parentClas if (namedValues != null) { for (int i = 0; i < namedValues.length; i += 2) { String name = namedValues[i]; + if (name.equals("classpathOverride")) { + name = "classpath"; + } if (name.equals("classpath")) hadClasspath = true; paras.add('-' + name); paras.add(namedValues[i + 1]); 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 3613b5ed351..b56a0c9ab11 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 @@ -961,9 +961,10 @@ private List extractJointOptions(Path classpath) { // false is default, so something to do only in true case if ("on".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value) || "yes".equalsIgnoreCase(value)) jointOptions.add("-F" + key); - } else if (key.contains("classpath")) { + } else if (key.contains("classpath") && !key.contains("classpathOverride")) { classpath.add(javac.getClasspath()); } else if ((key.contains("depend")) + || (key.contains("classpathOverride")) || (key.contains("extdirs")) || (key.contains("encoding")) || (key.contains("source"))