From 6959fa42a0830b848bae2205977409ed17f12990 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 28 Oct 2014 22:20:27 +0100 Subject: Installer updated to no longer add -Xbootclasspath. --- src/core/lombok/core/Version.java | 2 +- src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java | 1 - src/installer/lombok/installer/InstallerGUI.java | 5 ++--- src/installer/lombok/installer/eclipse/EclipseLocation.java | 5 +---- 4 files changed, 4 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java index 9f810525..02bc1af0 100644 --- a/src/core/lombok/core/Version.java +++ b/src/core/lombok/core/Version.java @@ -30,7 +30,7 @@ public class Version { // ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries). // Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example. // Official builds always end in an even number. (Since 0.10.2). - private static final String VERSION = "1.14.9"; + private static final String VERSION = "1.14.9.shadow"; private static final String RELEASE_NAME = "Edgy Guinea Pig"; // private static final String RELEASE_NAME = "Branching Cobra"; diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java index eb633406..c9b8ca85 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java @@ -26,7 +26,6 @@ public class EclipseLoaderPatcher { ClassLoader shadowLoader = (ClassLoader) shadowLoaderField.get(original); if (shadowLoader == null) { String jarLoc = (String) original.getClass().getDeclaredField("lombok$location").get(null); - System.out.println(jarLoc); JarFile jf = new JarFile(jarLoc); InputStream in = null; try { diff --git a/src/installer/lombok/installer/InstallerGUI.java b/src/installer/lombok/installer/InstallerGUI.java index 5717948a..41832e5d 100644 --- a/src/installer/lombok/installer/InstallerGUI.java +++ b/src/installer/lombok/installer/InstallerGUI.java @@ -820,9 +820,8 @@ public class InstallerGUI { private static final String HOW_I_WORK_EXPLANATION = "

Eclipse

    " + "
  1. First, I copy myself (lombok.jar) to your Eclipse install directory.
    2. " + - "
  2. Then, I edit the eclipse.ini file to add the following two entries:
    " + - "
    -Xbootclasspath/a:lombok.jar
    " +
-		"-javaagent:lombok.jar
" + + "
  • Then, I edit the eclipse.ini file to add the following entry:
    " + + "
    -javaagent:lombok.jar
    • " + "On Mac OS X, eclipse.ini is hidden in
    " + "Eclipse.app/Contents/MacOS so that's where I place the jar files."; diff --git a/src/installer/lombok/installer/eclipse/EclipseLocation.java b/src/installer/lombok/installer/eclipse/EclipseLocation.java index e347cd98..0fe60c05 100644 --- a/src/installer/lombok/installer/eclipse/EclipseLocation.java +++ b/src/installer/lombok/installer/eclipse/EclipseLocation.java @@ -337,8 +337,6 @@ public class EclipseLocation extends IdeLocation { newContents.append(String.format( "-javaagent:%s", escapePath(fullPathToLombok + "lombok.jar"))).append(OS_NEWLINE); - newContents.append(String.format( - "-Xbootclasspath/a:%s", escapePath(fullPathToLombok + "lombok.jar"))).append(OS_NEWLINE); FileOutputStream fos = new FileOutputStream(eclipseIniPath); try { @@ -360,8 +358,7 @@ public class EclipseLocation extends IdeLocation { } return "If you start " + getTypeName() + " with a custom -vm parameter, you'll need to add:
    " + - "-vmargs -Xbootclasspath/a:lombok.jar -javaagent:lombok.jar
    " + - "as parameter as well."; + "-vmargs -javaagent:lombok.jar
    as parameter as well."; } @Override public URL getIdeIcon() { -- cgit