This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: [PATCH] rename jar, rmic and rmiregistry
- From: Thomas Fitzsimmons <fitzsim at redhat dot com>
- To: libgcj patches <java-patches at gcc dot gnu dot org>
- Cc: gcc-patches at gcc dot gnu dot org
- Date: Fri, 23 Jul 2004 19:10:52 -0400
- Subject: Re: [PATCH] rename jar, rmic and rmiregistry
- References: <1090009929.6210.509.camel@tortoise.toronto.redhat.com>
On Fri, 2004-07-16 at 16:32, Thomas Fitzsimmons wrote:
> Hi,
>
> This patch renames the jar, rmic and rmiregistry tools to gjar, grmic
> and grmiregistry. This prevents naming conflicts with other
> implementations of the same tools. In particular, these names are
> problematic for the jpackage.org packaging conventions which install
> symlinks in /usr/bin that point to the preferred versions of these
> tools.
>
> OK for mainline?
>
Hi,
People objected to renaming fastjar gjar, so instead I changed the jar
binary's name to fastjar.
OK for mainline?
Tom
fastjar/ChangeLog:
2004-07-23 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am: Rename jar binary to fastjar.
* Makefile.in: Regenerate.
* fastjar.texi: Rename references to jar binary with fastjar.
gcc/java/ChangeLog:
2004-07-23 Thomas Fitzsimmons <fitzsim@redhat.com>
* Make-lang.in: Replace rmic and rmiregistry references with
grmic and grmiregistry.
* gcj.texi: Likewise.
libjava/ChangeLog:
2004-07-23 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am: Replace jar, rmic and rmiregistry references with
gjar, grmic and grmiregistry.
* configure.in: Likewise.
* Makefile.in: Regenerate.
* configure: Likewise.
* gcj/Makefile.in: Likewise.
* include/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
Index: fastjar/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/fastjar/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- fastjar/Makefile.am 7 Jul 2004 08:43:10 -0000 1.18
+++ fastjar/Makefile.am 23 Jul 2004 22:58:14 -0000
@@ -45,12 +45,12 @@
LIBIBERTY = ../libiberty/libiberty.a
-bin_PROGRAMS = jar grepjar
-jar_SOURCES = jartool.c dostime.c compress.c pushback.c shift.c jartool.h \
+bin_PROGRAMS = fastjar grepjar
+fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c shift.c jartool.h \
zipfile.h dostime.h compress.h pushback.h shift.h
-jar_LDADD = $(ZLIBS) $(LIBIBERTY)
-jar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
-jar_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_SHIFT_DOWN
+fastjar_LDADD = $(ZLIBS) $(LIBIBERTY)
+fastjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
+fastjar_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_SHIFT_DOWN
grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h \
zipfile.h dostime.h compress.h pushback.h
@@ -65,7 +65,7 @@
fastjar_TEXINFOS = \
../gcc/doc/include/gcc-common.texi \
../gcc/doc/include/gpl.texi
-man_MANS = jar.1 grepjar.1
+man_MANS = fastjar.1 grepjar.1
EXTRA_DIST = $(man_MANS)
TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
@@ -76,10 +76,10 @@
mv -f $(@).T$$$$ $@) || \
(rm -f $(@).T$$$$ && exit 1)
-.INTERMEDIATE: jar.pod grepjar.pod
+.INTERMEDIATE: fastjar.pod grepjar.pod
-jar.pod: $(srcdir)/fastjar.texi
- -$(TEXI2POD) -D jar $< > $@
+fastjar.pod: $(srcdir)/fastjar.texi
+ -$(TEXI2POD) -D fastjar $< > $@
grepjar.pod: $(srcdir)/fastjar.texi
-$(TEXI2POD) -D grepjar $< > $@
@@ -97,13 +97,13 @@
all-local: $(STAMP_GENINSRC)
-stamp-geninsrc: jar.1 grepjar.1 fastjar.info
- -cp -p $(top_builddir)/jar.1 $(srcdir)/jar.1
+stamp-geninsrc: fastjar.1 grepjar.1 fastjar.info
+ -cp -p $(top_builddir)/fastjar.1 $(srcdir)/fastjar.1
-cp -p $(top_builddir)/grepjar.1 $(srcdir)/grepjar.1
-cp -p $(top_builddir)/fastjar.info $(srcdir)/fastjar.info
touch $@
CLEANFILES = stamp-geninsrc
-MAINTAINERCLEANFILES = $(srcdir)/jar.1 \
+MAINTAINERCLEANFILES = $(srcdir)/fastjar.1 \
$(srcdir)/grepjar.1 \
$(srcdir)/fastjar.info
Index: fastjar/fastjar.texi
===================================================================
RCS file: /cvs/gcc/gcc/fastjar/fastjar.texi,v
retrieving revision 1.7
diff -u -r1.7 fastjar.texi
--- fastjar/fastjar.texi 6 Jul 2004 21:40:08 -0000 1.7
+++ fastjar/fastjar.texi 23 Jul 2004 22:58:15 -0000
@@ -24,7 +24,7 @@
@dircategory Individual utilities
@direntry
-* jar: (fastjar)Invoking jar.
+* fastjar: (fastjar)Invoking fastjar.
An archive tool for Java archives
* grepjar: (fastjar)Invoking grepjar.
Search files in a jar file for a pattern
@@ -74,20 +74,20 @@
@node Top
@top Introduction
-This manual describes how to use @command{jar} and @command{grepjar}.
+This manual describes how to use @command{fastjar} and @command{grepjar}.
@menu
-* Invoking jar:: Options supported by @command{jar}
+* Invoking fastjar:: Options supported by @command{fastjar}
* Invoking grepjar:: Options supported by @command{grepjar}
* Copying:: The GNU General Public License
@end menu
-@node Invoking jar
-@chapter Invoking jar
+@node Invoking fastjar
+@chapter Invoking fastjar
-@c man title jar archive tool for Java archives
+@c man title fastjar archive tool for Java archives
-@c man begin DESCRIPTION jar
+@c man begin DESCRIPTION fastjar
@code{fastjar} is an implementation of Sun's jar utility that comes with
the JDK, written entirely in C, and runs in a fraction of the time while
@@ -100,16 +100,16 @@
@c man end
@ignore
-@c man begin SYNOPSIS jar
-jar @option{-ctxu} [@option{OPTIONS}] [@var{jar-file}] [@var{manifest-file}] [@option{-C} @var{dir}] @var{files}@dots{}
+@c man begin SYNOPSIS fastjar
+fastjar @option{-ctxu} [@option{OPTIONS}] [@var{jar-file}] [@var{manifest-file}] [@option{-C} @var{dir}] @var{files}@dots{}
@c man end
-@c man begin SEEALSO jar
+@c man begin SEEALSO fastjar
gcj(1), gij(1), grepjar(1)
and the Info entry for @file{gcj}.
@c man end
@end ignore
-@c man begin OPTIONS jar
+@c man begin OPTIONS fastjar
Exactly one of the following actions must be specified:
@@ -189,7 +189,7 @@
grepjar [@option{-bcinsw}] @option{-e} @var{PATTERN} | @var{PATTERN} @var{files}@dots{}
@c man end
@c man begin SEEALSO grepjar
-jar(1), gcj(1), gij(1), gfdl(7) and the Info entry for @file{gcj}.
+fastjar(1), gcj(1), gij(1), gfdl(7) and the Info entry for @file{gcj}.
@c man end
@end ignore
Index: gcc/java/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
retrieving revision 1.139
diff -u -r1.139 Make-lang.in
--- gcc/java/Make-lang.in 24 May 2004 10:50:44 -0000 1.139
+++ gcc/java/Make-lang.in 23 Jul 2004 22:58:17 -0000
@@ -167,7 +167,7 @@
dvi:: doc/gcj.dvi
JAVA_MANFILES = doc/gcj.1 doc/gcjh.1 doc/jv-scan.1 doc/jcf-dump.1 doc/gij.1 \
- doc/jv-convert.1 doc/rmic.1 doc/rmiregistry.1
+ doc/jv-convert.1 doc/grmic.1 doc/grmiregistry.1
java.man: $(JAVA_MANFILES)
@@ -247,8 +247,8 @@
-rm -f $(docobjdir)/jv-scan.1 $(docobjdir)/jcf-dump.1
-rm -f $(docobjdir)/gij.1
-rm -f $(docobjdir)/jv-convert.1
- -rm -f $(docobjdir)/rmic.1
- -rm -f $(docobjdir)/rmiregistry.1
+ -rm -f $(docobjdir)/grmic.1
+ -rm -f $(docobjdir)/grmiregistry.1
#
# Stage hooks:
# The main makefile has already created stage?/java.
@@ -378,7 +378,7 @@
$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
.INTERMEDIATE: gcj.pod gcjh.pod jv-scan.pod jcf-dump.pod gij.pod \
- jv-convert.pod rmic.pod rmiregistry.pod
+ jv-convert.pod grmic.pod grmiregistry.pod
gcj.pod: java/gcj.texi
-$(TEXI2POD) -D gcj < $< > $@
@@ -392,18 +392,18 @@
-$(TEXI2POD) -D gij < $< > $@
jv-convert.pod: java/gcj.texi
-$(TEXI2POD) -D jv-convert < $< > $@
-rmic.pod: java/gcj.texi
- -$(TEXI2POD) -D rmic < $< > $@
-rmiregistry.pod: java/gcj.texi
- -$(TEXI2POD) -D rmiregistry < $< > $@
+grmic.pod: java/gcj.texi
+ -$(TEXI2POD) -D grmic < $< > $@
+grmiregistry.pod: java/gcj.texi
+ -$(TEXI2POD) -D grmiregistry < $< > $@
# Install the man pages.
java.install-man: installdirs \
$(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext) \
$(JAVA_TARGET_INDEPENDENT_BIN_TOOLS:%=doc/%.1) \
- doc/gij.1 doc/jv-convert.1 doc/rmic.1 doc/rmiregistry.1
+ doc/gij.1 doc/jv-convert.1 doc/grmic.1 doc/grmiregistry.1
for tool in $(JAVA_TARGET_INDEPENDENT_BIN_TOOLS) \
- gij jv-convert rmic rmiregistry ; do \
+ gij jv-convert grmic grmiregistry ; do \
tool_transformed_name=`echo $$tool|sed '$(program_transform_name)'`; \
man_name=$(DESTDIR)$(man1dir)/$${tool_transformed_name}$(man1ext); \
rm -f $$man_name ; \
Index: gcc/java/gcj.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/gcj.texi,v
retrieving revision 1.64
diff -u -r1.64 gcj.texi
--- gcc/java/gcj.texi 8 Jul 2004 01:04:12 -0000 1.64
+++ gcc/java/gcj.texi 23 Jul 2004 22:58:19 -0000
@@ -66,9 +66,9 @@
* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode
* jv-convert: (gcj)Invoking jv-convert.
Convert file from one encoding to another
-* rmic: (gcj)Invoking rmic.
+* grmic: (gcj)Invoking grmic.
Generate stubs for Remote Method Invocation.
-* rmiregistry: (gcj)Invoking rmiregistry.
+* grmiregistry: (gcj)Invoking grmiregistry.
The remote object registry.
@end direntry
@end format
@@ -113,8 +113,8 @@
* Invoking jcf-dump:: Print information about class files
* Invoking gij:: Interpreting Java bytecodes
* Invoking jv-convert:: Converting from one encoding to another
-* Invoking rmic:: Generate stubs for Remote Method Invocation.
-* Invoking rmiregistry:: The remote object registry.
+* Invoking grmic:: Generate stubs for Remote Method Invocation.
+* Invoking grmiregistry:: The remote object registry.
* About CNI:: Description of the Compiled Native Interface
* System properties:: Modifying runtime behavior of the libgcj library
* Resources:: Where to look for more information
@@ -1019,13 +1019,13 @@
@c man end
-@node Invoking rmic
-@chapter Invoking rmic
+@node Invoking grmic
+@chapter Invoking grmic
-@c man title rmic Generate stubs for Remote Method Invocation
+@c man title grmic Generate stubs for Remote Method Invocation
-@c man begin SYNOPSIS rmic
-@command{rmic} [@option{OPTION}] @dots{} @var{class} @dots{}
+@c man begin SYNOPSIS grmic
+@command{grmic} [@option{OPTION}] @dots{} @var{class} @dots{}
@ignore
[@option{-keep}]
[@option{-keepgenerated}]
@@ -1040,16 +1040,16 @@
@end ignore
@c man end
-@c man begin DESCRIPTION rmic
+@c man begin DESCRIPTION grmic
-@command{rmic} is a utility included with @code{libgcj} which generates
+@command{grmic} is a utility included with @code{libgcj} which generates
stubs for remote objects.
@c FIXME: Add real information here.
@c This really isn't much more than the --help output.
Note that this program isn't yet fully compatible with the JDK
-@command{rmic}. Some options, such as @option{-classpath}, are
+@command{grmic}. Some options, such as @option{-classpath}, are
recognized but currently ignored. We have left these options
undocumented for now.
@@ -1058,31 +1058,31 @@
@c man end
-@c man begin OPTIONS rmic
+@c man begin OPTIONS grmic
@table @gcctabopt
@item -keep
@itemx -keepgenerated
-By default, @command{rmic} deletes intermediate files. Either of these
+By default, @command{grmic} deletes intermediate files. Either of these
options causes it not to delete such files.
@item -v1.1
-Cause @command{rmic} to create stubs and skeletons for the 1.1
+Cause @command{grmic} to create stubs and skeletons for the 1.1
protocol version.
@item -vcompat
-Cause @command{rmic} to create stubs and skeletons compatible with both
+Cause @command{grmic} to create stubs and skeletons compatible with both
the 1.1 and 1.2 protocol versions. This is the default.
@item -v1.2
-Cause @command{rmic} to create stubs and skeletons for the 1.2
+Cause @command{grmic} to create stubs and skeletons for the 1.2
protocol version.
@item -nocompile
Don't compile the generated files.
@item -verbose
-Print information about what @command{rmic} is doing.
+Print information about what @command{grmic} is doing.
@item -d @var{directory}
Put output files in @var{directory}. By default the files are put in
@@ -1098,22 +1098,22 @@
@c man end
-@node Invoking rmiregistry
-@chapter Invoking rmiregistry
+@node Invoking grmiregistry
+@chapter Invoking grmiregistry
-@c man title rmiregistry Remote object registry
+@c man title grmiregistry Remote object registry
-@c man begin SYNOPSIS rmiregistry
-@command{rmic} [@option{OPTION}] @dots{} [@var{port}]
+@c man begin SYNOPSIS grmiregistry
+@command{grmic} [@option{OPTION}] @dots{} [@var{port}]
@ignore
[@option{--help}]
[@option{--version}]
@end ignore
@c man end
-@c man begin DESCRIPTION rmiregistry
+@c man begin DESCRIPTION grmiregistry
-@command{rmiregistry} starts a remote object registry on the current
+@command{grmiregistry} starts a remote object registry on the current
host. If no port number is specified, then port 1099 is used.
@c FIXME: Add real information here.
@@ -1121,7 +1121,7 @@
@c man end
-@c man begin OPTIONS rmiregistry
+@c man begin OPTIONS grmiregistry
@table @gcctabopt
@item --help
Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.394
diff -u -r1.394 Makefile.am
--- libjava/Makefile.am 23 Jul 2004 01:21:38 -0000 1.394
+++ libjava/Makefile.am 23 Jul 2004 22:58:24 -0000
@@ -60,7 +60,7 @@
## For now, only on native systems. FIXME.
if NATIVE
-bin_PROGRAMS = jv-convert gij rmic rmiregistry
+bin_PROGRAMS = jv-convert gij grmic grmiregistry
endif
bin_SCRIPTS = addr2name.awk
@@ -777,29 +777,29 @@
## linking this program.
gij_DEPENDENCIES = libgcj.la libgcj.spec
-rmic_SOURCES =
+grmic_SOURCES =
## This is a dummy definition.
-EXTRA_rmic_SOURCES = $(rmi_java_source_files)
-rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \
+EXTRA_grmic_SOURCES = $(rmi_java_source_files)
+grmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-rmic_LINK = $(GCJLINK)
+grmic_LINK = $(GCJLINK)
## See jv_convert_LDADD.
-rmic_LDADD = -L$(here)/.libs libgcj.la
+grmic_LDADD = -L$(here)/.libs libgcj.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
-rmic_DEPENDENCIES = libgcj.la libgcj.spec
+grmic_DEPENDENCIES = libgcj.la libgcj.spec
-rmiregistry_SOURCES =
+grmiregistry_SOURCES =
## This is a dummy definition.
-EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files)
-rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
+EXTRA_grmiregistry_SOURCES = $(rmi_java_source_files)
+grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-rmiregistry_LINK = $(GCJLINK)
+grmiregistry_LINK = $(GCJLINK)
## See jv_convert_LDADD.
-rmiregistry_LDADD = -L$(here)/.libs libgcj.la
+grmiregistry_LDADD = -L$(here)/.libs libgcj.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
-rmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
+grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
# The Unicode consortium does not permit re-distributing the file JIS0201.TXT.
# You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/.
Index: libjava/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.195
diff -u -r1.195 configure.in
--- libjava/configure.in 18 Jul 2004 09:56:32 -0000 1.195
+++ libjava/configure.in 23 Jul 2004 22:58:26 -0000
@@ -1092,7 +1092,7 @@
built)
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
- ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
+ ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
;;
cross)
if test "x${with_newlib}" = "xyes"; then
@@ -1109,7 +1109,7 @@
GCJ="gcj -B`${PWDCMD-pwd}`/"
## In this case, gcj is found outside the build tree. However, zip is
## found in the build tree.
- ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
+ ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
GCJH=gcjh
;;
esac