jdk-sandbox: comparison langtools/src/share/classes/com/sun/tools/javah/JavahTask.java

equal deleted inserted replaced

-:81a6a7c1bef1
+:b6fea484cbb2
 import java.util.ResourceBundle;
 import java.util.Set;
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Messager;
+import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.StandardLocation;
 import javax.tools.ToolProvider;
+import static javax.tools.Diagnostic.Kind.*;
+import com.sun.tools.javac.code.Symbol.CompletionFailure;
 /**
 * Javah generates support files for native methods.
 * Parse commandline options & Invokes javadoc to execute those commands.
 *
 void process(JavahTask task, String opt, String arg) {
 task.llni = true;
 task.doubleAlign = true;
 }
 },
+new HiddenOption(false) {
+boolean matches(String opt) {
+return opt.startsWith("-XD");
+}
+void process(JavahTask task, String opt, String arg) {
+task.javac_extras.add(opt);
+}
+},
 };
 JavahTask() {
 }
 diagnosticListener.report(createDiagnostic(e.key, e.args));
 return 1;
 } catch (InternalError e) {
 diagnosticListener.report(createDiagnostic("err.internal.error", e.getMessage()));
 return 1;
+} catch (Util.Exit e) {
+return e.exitValue;
 } finally {
 log.flush();
 }
 }
 if (fileManager instanceof JavahFileManager)
 ((JavahFileManager) fileManager).setIgnoreSymbolFile(true);
 JavaCompiler c = ToolProvider.getSystemJavaCompiler();
-List<String> opts = Arrays.asList("-proc:only");
+List<String> opts = new ArrayList<String>();
+opts.add("-proc:only");
+opts.addAll(javac_extras);
 CompilationTask t = c.getTask(log, fileManager, diagnosticListener, opts, internalize(classes), null);
 JavahProcessor p = new JavahProcessor(g);
 t.setProcessors(Collections.singleton(p));
 boolean ok = t.call();
 boolean jni;
 boolean llni;
 boolean doubleAlign;
 boolean force;
 boolean old;
+Set<String> javac_extras = new LinkedHashSet<String>();
 PrintWriter log;
 JavaFileManager fileManager;
 DiagnosticListener<? super JavaFileObject> diagnosticListener;
 Locale task_locale;
 Map<Locale, ResourceBundle> bundles;
 private static final String progname = "javah";
 @SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_7)
 class JavahProcessor extends AbstractProcessor {
+private Messager messager;
 JavahProcessor(Gen g) {
 this.g = g;
 }
+@Override
+public SourceVersion getSupportedSourceVersion() {
+// since this is co-bundled with javac, we can assume it supports
+// the latest source version
+return SourceVersion.latest();
+}
+@Override
+public void init(ProcessingEnvironment pEnv) {
+super.init(pEnv);
+messager  = processingEnv.getMessager();
+}
 public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-Messager messager  = processingEnv.getMessager();
+try {
 Set<TypeElement> classes = getAllClasses(ElementFilter.typesIn(roundEnv.getRootElements()));
 if (classes.size() > 0) {
 checkMethodParameters(classes);
 g.setProcessingEnvironment(processingEnv);
 g.setClasses(classes);
-try {
 g.run();
-} catch (ClassNotFoundException cnfe) {
-messager.printMessage(Diagnostic.Kind.ERROR, getMessage("class.not.found", cnfe.getMessage()));
-} catch (IOException ioe) {
-messager.printMessage(Diagnostic.Kind.ERROR, getMessage("io.exception", ioe.getMessage()));
-} catch (Util.Exit e) {
-exit = e;
 }
-}
+} catch (CompletionFailure cf) {
+messager.printMessage(ERROR, getMessage("class.not.found", cf.sym.getQualifiedName().toString()));
+} catch (ClassNotFoundException cnfe) {
+messager.printMessage(ERROR, getMessage("class.not.found", cnfe.getMessage()));
+} catch (IOException ioe) {
+messager.printMessage(ERROR, getMessage("io.exception", ioe.getMessage()));
+} catch (Util.Exit e) {
+exit = e;
+}
 return true;
 }
 private Set<TypeElement> getAllClasses(Set<? extends TypeElement> classes) {
 Set<TypeElement> allClasses = new LinkedHashSet<TypeElement>();

changeset 6930	b6fea484cbb2
parent 6925	2196feb18c96
child 7078	17f1f2bdcb46