Installer updated to no longer add -Xbootclasspath.

This commit is contained in:
Reinier Zwitserloot committed 2014-10-28 22:20:27 +01:00
1 parent 5407d0d253
commit 6959fa42a0
4 files changed
+4 -9

No files matched your search

+1 -1
View File
@@ -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";
@@ -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 {
@@ -820,9 +820,8 @@ public class InstallerGUI {
private static final String HOW_I_WORK_EXPLANATION =
"<html><h2>Eclipse</h2><ol>" +
"<li>First, I copy myself (lombok.jar) to your Eclipse install directory.</li>" +
"<li>Then, I edit the <i>eclipse.ini</i> file to add the following two entries:<br>" +
"<pre>-Xbootclasspath/a:lombok.jar<br>" +
"-javaagent:lombok.jar</pre></li></ol>" +
"<li>Then, I edit the <i>eclipse.ini</i> file to add the following entry:<br>" +
"<pre>-javaagent:lombok.jar</pre></li></ol>" +
"On Mac OS X, eclipse.ini is hidden in<br>" +
"<code>Eclipse.app/Contents/MacOS</code> so that's where I place the jar files.</html>";
@@ -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:<br>" +
"<code>-vmargs -Xbootclasspath/a:lombok.jar -javaagent:lombok.jar</code><br>" +
"as parameter as well.";
"<code>-vmargs -javaagent:lombok.jar</code><br>as parameter as well.";
}
@Override public URL getIdeIcon() {