aboutsummaryrefslogtreecommitdiff
path: root/src/support/lombok/eclipseCreate/CreateEclipseDebugTarget.java
diff options
context:
space:
mode:
authorReinier Zwitserloot <r.zwitserloot@projectlombok.org>2020-09-18 01:00:24 +0200
committerReinier Zwitserloot <r.zwitserloot@projectlombok.org>2020-09-18 01:00:24 +0200
commit9d45a506b1026bdf9a3c76f97c9d4ec52dc92345 (patch)
treead5408db130af437f609ee70a0794dca6441df6e /src/support/lombok/eclipseCreate/CreateEclipseDebugTarget.java
parent007c4e7cb2d64afedcd942ab788bc1b15191a309 (diff)
downloadlombok-9d45a506b1026bdf9a3c76f97c9d4ec52dc92345.tar.gz
lombok-9d45a506b1026bdf9a3c76f97c9d4ec52dc92345.tar.bz2
lombok-9d45a506b1026bdf9a3c76f97c9d4ec52dc92345.zip
[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 :)
Diffstat (limited to 'src/support/lombok/eclipseCreate/CreateEclipseDebugTarget.java')
-rw-r--r--src/support/lombok/eclipseCreate/CreateEclipseDebugTarget.java8
1 files changed, 5 insertions, 3 deletions
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<listEntry value=\"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/lombok/bin&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;\"/>\n");
+ launchContent.append("\t\t<listEntry value=\"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/lombok/bin/main&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;\"/>\n");
for (Map.Entry<String, String> 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<listAttribute key=\"org.eclipse.jdt.launching.MODULEPATH\"/>\n");
launchContent.append("\t<stringAttribute key=\"org.eclipse.jdt.launching.PROJECT_ATTR\" value=\"lombok\"/>\n");
if (getArgBoolean("shadowLoaderBased")) {
- launchContent.append("<stringAttribute key=\"org.eclipse.jdt.launching.VM_ARGUMENTS\" value=\"-javaagent:dist/lombok.jar -Dshadow.override.lombok=${project_loc:lombok}/bin");
+ launchContent.append("<stringAttribute key=\"org.eclipse.jdt.launching.VM_ARGUMENTS\" value=\"-javaagent:dist/lombok.jar -Dshadow.override.lombok=${project_loc:lombok}/bin/main");
for (Map.Entry<String, String> entry : args.entrySet()) {
if (!entry.getKey().startsWith("conf.")) continue;
launchContent.append(File.pathSeparator).append(entry.getValue());