From 14d19d6dc1f03f3fedd77a7a881802066d6106e3 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 12 Oct 2001 22:04:07 +0000 Subject: [PATCH] * Makefile.in: Rebuilt. * Makefile.am (rmi_java_source_files): Added new files. * gnu/java/rmi/rmic/RMIC.java (compile): Uncommented; fixed to use new Compiler class. * gnu/java/rmi/rmic/Makefile.am (EXTRA_DIST): Updated. * gnu/java/rmi/rmic/Compile_gcj.java: New file. * gnu/java/rmi/rmic/CompilerProcess.java: New file. * gnu/java/rmi/rmic/Compiler.java: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46235 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 11 ++++ libjava/Makefile.am | 3 ++ libjava/Makefile.in | 6 +++ libjava/gnu/java/rmi/rmic/Compile_gcj.java | 50 +++++++++++++++++ libjava/gnu/java/rmi/rmic/Compiler.java | 75 ++++++++++++++++++++++++++ libjava/gnu/java/rmi/rmic/CompilerProcess.java | 61 +++++++++++++++++++++ libjava/gnu/java/rmi/rmic/RMIC.java | 19 +++---- 7 files changed, 213 insertions(+), 12 deletions(-) create mode 100644 libjava/gnu/java/rmi/rmic/Compile_gcj.java create mode 100644 libjava/gnu/java/rmi/rmic/Compiler.java create mode 100644 libjava/gnu/java/rmi/rmic/CompilerProcess.java diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 672689e..489f13d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +2001-10-12 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (rmi_java_source_files): Added new files. + * gnu/java/rmi/rmic/RMIC.java (compile): Uncommented; fixed to use + new Compiler class. + * gnu/java/rmi/rmic/Makefile.am (EXTRA_DIST): Updated. + * gnu/java/rmi/rmic/Compile_gcj.java: New file. + * gnu/java/rmi/rmic/CompilerProcess.java: New file. + * gnu/java/rmi/rmic/Compiler.java: New file. + 2001-10-11 Tom Tromey * configure: Rebuilt. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 3b55412..6bfb6d9 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -883,6 +883,9 @@ gnu/java/rmi/dgc/DGCImpl_Stub.java \ gnu/java/rmi/registry/RegistryImpl.java \ gnu/java/rmi/registry/RegistryImpl_Skel.java \ gnu/java/rmi/registry/RegistryImpl_Stub.java \ +gnu/java/rmi/rmic/Compile_gcj.java \ +gnu/java/rmi/rmic/Compiler.java \ +gnu/java/rmi/rmic/CompilerProcess.java \ gnu/java/rmi/rmic/RMIC.java \ gnu/java/rmi/rmic/TabbedWriter.java \ gnu/java/rmi/server/ProtocolConstants.java \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 5204ced..fe48046 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -632,6 +632,9 @@ gnu/java/rmi/dgc/DGCImpl_Stub.java \ gnu/java/rmi/registry/RegistryImpl.java \ gnu/java/rmi/registry/RegistryImpl_Skel.java \ gnu/java/rmi/registry/RegistryImpl_Stub.java \ +gnu/java/rmi/rmic/Compile_gcj.java \ +gnu/java/rmi/rmic/Compiler.java \ +gnu/java/rmi/rmic/CompilerProcess.java \ gnu/java/rmi/rmic/RMIC.java \ gnu/java/rmi/rmic/TabbedWriter.java \ gnu/java/rmi/server/ProtocolConstants.java \ @@ -1580,6 +1583,9 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/rmi/registry/RegistryImpl.P \ .deps/gnu/java/rmi/registry/RegistryImpl_Skel.P \ .deps/gnu/java/rmi/registry/RegistryImpl_Stub.P \ +.deps/gnu/java/rmi/rmic/Compile_gcj.P \ +.deps/gnu/java/rmi/rmic/Compiler.P \ +.deps/gnu/java/rmi/rmic/CompilerProcess.P \ .deps/gnu/java/rmi/rmic/RMIC.P .deps/gnu/java/rmi/rmic/TabbedWriter.P \ .deps/gnu/java/rmi/server/ProtocolConstants.P \ .deps/gnu/java/rmi/server/RMIDefaultSocketFactory.P \ diff --git a/libjava/gnu/java/rmi/rmic/Compile_gcj.java b/libjava/gnu/java/rmi/rmic/Compile_gcj.java new file mode 100644 index 0000000..4a5f8e4 --- /dev/null +++ b/libjava/gnu/java/rmi/rmic/Compile_gcj.java @@ -0,0 +1,50 @@ +/* + Copyright (c) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. + */ + +package gnu.java.rmi.rmic; + +/** Subclass of Compiler that can be used to invoke gcj. */ +public class Compile_gcj extends CompilerProcess +{ + public String[] computeArguments (String filename) + { + int len = 3 + (dest == null ? 0 : 2); + String[] result = new String[len]; + int i = 0; + + result[i++] = "gcj"; + result[i++] = "-C"; + if (dest != null) + { + result[i++] = "-d"; + result[i++] = dest; + } + result[i++] = filename; + + return result; + } +} diff --git a/libjava/gnu/java/rmi/rmic/Compiler.java b/libjava/gnu/java/rmi/rmic/Compiler.java new file mode 100644 index 0000000..ab58e63 --- /dev/null +++ b/libjava/gnu/java/rmi/rmic/Compiler.java @@ -0,0 +1,75 @@ +/* + Copyright (c) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. + */ + +package gnu.java.rmi.rmic; + +/** A Compiler object can be used to compile a .java file into a + * .class file. This is an abstract class; the + * getInstance() method is used to obtain the actual + * compiler object. */ +public abstract class Compiler +{ + // Can't directly instantiate. + protected Compiler () + { + } + + /** Create a new compiler instance. */ + public static Compiler getInstance () + { + return getInstance (System.getProperty ("classpath.compiler", "gcj")); + } + + /** Create a new compiler instance given the name of the compiler. */ + public static Compiler getInstance (String name) + { + try + { + Class k = Class.forName (classPrefix + name); + return (Compiler) k.newInstance (); + } + catch (Throwable _) + { + } + return null; + } + + /** Set the directory where output files will be put. */ + public void setDestination (String dest) + { + this.dest = dest; + } + + /** Compile the given file. Throws exception on error. */ + public abstract void compile (String name) throws Exception; + + /** The destination directory, or null if none set. */ + protected String dest; + + /** Class prefix used when trying to find instance. */ + private static final String classPrefix = "gnu.java.rmi.rmic.Compile_"; +} diff --git a/libjava/gnu/java/rmi/rmic/CompilerProcess.java b/libjava/gnu/java/rmi/rmic/CompilerProcess.java new file mode 100644 index 0000000..576ea69 --- /dev/null +++ b/libjava/gnu/java/rmi/rmic/CompilerProcess.java @@ -0,0 +1,61 @@ +/* + Copyright (c) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. + */ + +package gnu.java.rmi.rmic; + +/** Subclass of Compiler that can be subclassed to invoke a process to + * do its work. */ +public abstract class CompilerProcess extends Compiler +{ + /** This is used to compute the command line for the process. */ + public abstract String[] computeArguments (String filename); + + public void compile (String name) throws Exception + { + String[] args = computeArguments (name); + Process p = Runtime.getRuntime ().exec (args); + // FIXME: probably should collect compiler output here and then + // put it into the exception message. + int result; + while (true) + { + try + { + result = p.waitFor (); + break; + } + catch (InterruptedException _) + { + } + } + if (result != 0) + { + // FIXME: wrong exception class. + throw new Exception ("compiler exited with status: " + result); + } + } +} diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java index 84681e2..591d522 100644 --- a/libjava/gnu/java/rmi/rmic/RMIC.java +++ b/libjava/gnu/java/rmi/rmic/RMIC.java @@ -1,5 +1,5 @@ /* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,7 +38,6 @@ import java.util.Iterator; import java.util.Arrays; import java.lang.Comparable; import gnu.java.rmi.server.RMIHashes; -// import kaffe.tools.compiler.Compiler; public class RMIC { @@ -839,16 +838,12 @@ private void generateSkel() throws IOException { } private void compile(String name) throws Exception { - throw new Error ("Not implemented"); -// Compiler comp = Compiler.getInstance(); -// if (verbose) { -// System.out.println("[Compiling class " + name + "]"); -// } -// comp.setDestination(destination); -// boolean result = comp.compile(name); -// if (result == false) { -// throw comp.getException(); -// } + Compiler comp = Compiler.getInstance(); + if (verbose) { + System.out.println("[Compiling class " + name + "]"); + } + comp.setDestination(destination); + comp.compile(name); } private static String getPrettyName(Class cls) { -- 2.7.4