From 9d45a506b1026bdf9a3c76f97c9d4ec52dc92345 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 18 Sep 2020 01:00:24 +0200 Subject: [build] eclipse test target for Javac8 fixed javac8 has a bizarre dependency situation: we need the stubs in src/stubs there to compile, but if they are there at runtime during a test run of javac8, they take precedence over the JDK's javac (because we include this as a separate cp entry, and thus it is not a bootclasspath item), and messes everything up. The fix is to tell eclipse to compile various src/X folders to different 'bin' targets, which required an update to ivyplusplus as well. also it was just broken in general, fixed that too :) --- src/support/lombok/eclipseCreate/CreateEclipseDebugTarget.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/support/lombok/eclipseCreate/CreateEclipseDebugTarget.java b/src/support/lombok/eclipseCreate/CreateEclipseDebugTarget.java index e5e48c49..f54a5988 100644 --- a/src/support/lombok/eclipseCreate/CreateEclipseDebugTarget.java +++ b/src/support/lombok/eclipseCreate/CreateEclipseDebugTarget.java @@ -95,10 +95,12 @@ public class CreateEclipseDebugTarget { String bootpath = getBootPath(); - launchContent.append("\t\t\n"); + launchContent.append("\t\t\n"); for (Map.Entry entry : args.entrySet()) { if (!entry.getKey().startsWith("conf.")) continue; - String[] files = entry.getValue().split(Pattern.quote(File.pathSeparator)); + String v = entry.getValue(); + if (v.equals("NONE")) continue; + String[] files = v.split(Pattern.quote(File.pathSeparator)); for (String file : files) { String n; try { @@ -128,7 +130,7 @@ public class CreateEclipseDebugTarget { launchContent.append("\t\n"); launchContent.append("\t\n"); if (getArgBoolean("shadowLoaderBased")) { - launchContent.append(" entry : args.entrySet()) { if (!entry.getKey().startsWith("conf.")) continue; launchContent.append(File.pathSeparator).append(entry.getValue()); -- cgit