Skip to content

GROOVY-8775: Bug joint compilation in ant task groovyc: classpath not set #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
paulk-asert wants to merge 1 commit into from
+5 −1
Closed

GROOVY-8775: Bug joint compilation in ant task groovyc: classpath not set #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ private String[] makeParameters(List<String> 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]);
Expand Down
3 changes: 2 additions & 1 deletion subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,9 +961,10 @@ private List<String> 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"))
Expand Down