some bugfixes for JDK9 support involving the Options system of javac.

src/core/lombok/javac/Javac9BasedLombokOptions.java

@@ -39,6 +39,7 @@ public class Javac9BasedLombokOptions extends LombokOptions {
 	}
 	
 	@Override public void putJavacOption(String optionName, String value) {
+		if (optionName.equals("CLASSPATH")) optionName = "CLASS_PATH";
 		if (optionName.equals("SOURCEPATH")) optionName = "SOURCE_PATH";
 		if (optionName.equals("BOOTCLASSPATH")) optionName = "BOOT_CLASS_PATH";
 		String optionText = Option.valueOf(optionName).primaryName;

src/delombok/lombok/delombok/LombokOptionsFactory.java

@@ -50,7 +50,7 @@ public class LombokOptionsFactory {
 			}
 		};
 		
-		abstract LombokOptions createAndRegisterOptions(Context context); 
+		abstract LombokOptions createAndRegisterOptions(Context context);
 	}
 	
 	public static LombokOptions getDelombokOptions(Context context) {

src/stubs/com/sun/tools/javac/util/Options.java

@@ -0,0 +1,20 @@
+package com.sun.tools.javac.util;
+
+import java.util.Set;
+
+import com.sun.tools.javac.main.Option;
+import com.sun.tools.javac.main.OptionName;
+import com.sun.tools.javac.main.JavacOption;
+
+public class Options {
+	public Options(Context context) {}
+	public static final Context.Key<Options> optionsKey = new Context.Key<Options>();
+	public static Options instance(Context context) { return null; }
+	public String get(String key) { return null; }
+	public String get(Option opt) { return null; }
+	public String get(OptionName name) { return null; }
+	public String get(JavacOption.Option opt) { return null; }
+	public void putAll(Options o) {}
+	public void put(String key, String value) {}
+	public Set<String> keySet() { return null; }
+}

src/stubsstubs/com/sun/tools/javac/main/JavacOption.java

@@ -0,0 +1,5 @@
+package com.sun.tools.javac.main;
+
+public class JavacOption {
+	public static class Option {}
+}

src/stubsstubs/com/sun/tools/javac/main/Option.java

@@ -0,0 +1,3 @@
+package com.sun.tools.javac.main;
+
+public class Option {}

src/stubsstubs/com/sun/tools/javac/main/OptionName.java

@@ -0,0 +1,3 @@
+package com.sun.tools.javac.main;
+
+public class OptionName {}

src/stubsstubs/com/sun/tools/javac/util/Context.java

@@ -1,3 +1,5 @@
 package com.sun.tools.javac.util;
 
-public class Context {}
+public class Context {
+	public static class Key<T> {}
+}