+2001-10-12 Tom Tromey <tromey@redhat.com>
+
+ * 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 <tromey@redhat.com>
* configure: Rebuilt.
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 \
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 \
.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 \
--- /dev/null
+/*
+ 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;
+ }
+}
--- /dev/null
+/*
+ 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
+ * <code>getInstance()</code> 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_";
+}
--- /dev/null
+/*
+ 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);
+ }
+ }
+}
/*
- 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.
import java.util.Arrays;
import java.lang.Comparable;
import gnu.java.rmi.server.RMIHashes;
-// import kaffe.tools.compiler.Compiler;
public class RMIC {
}
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) {
OSDN Git Service
