From ef05818b76a645f094e89f0804611d19c677f03f Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Fri, 23 Jul 2004 23:34:17 +0000 Subject: [PATCH] Makefile.am: Rename jar binary to fastjar. 2004-07-23 Thomas Fitzsimmons * Makefile.am: Rename jar binary to fastjar. * Makefile.in: Regenerate. * fastjar.texi: Rename references to jar binary with fastjar. 2004-07-23 Thomas Fitzsimmons * Make-lang.in: Replace rmic and rmiregistry references with grmic and grmiregistry. * gcj.texi: Likewise. 2004-07-23 Thomas Fitzsimmons * 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. From-SVN: r85101 --- fastjar/ChangeLog | 6 +++ fastjar/Makefile.am | 24 +++++----- fastjar/Makefile.in | 88 +++++++++++++++++------------------ fastjar/fastjar.texi | 24 +++++----- gcc/java/ChangeLog | 6 +++ gcc/java/Make-lang.in | 20 ++++---- gcc/java/gcj.texi | 52 ++++++++++----------- libjava/ChangeLog | 11 +++++ libjava/Makefile.am | 26 +++++------ libjava/Makefile.in | 48 +++++++++---------- libjava/configure | 8 ++-- libjava/configure.in | 4 +- libjava/gcj/Makefile.in | 2 +- libjava/include/Makefile.in | 2 +- libjava/testsuite/Makefile.in | 2 +- 15 files changed, 173 insertions(+), 150 deletions(-) diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index d3ee407ac1b..7b354255e2e 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,9 @@ +2004-07-23 Thomas Fitzsimmons + + * Makefile.am: Rename jar binary to fastjar. + * Makefile.in: Regenerate. + * fastjar.texi: Rename references to jar binary with fastjar. + 2004-07-19 Bryce McKinlay * jartool.c (main): Ensure that only one of ftruncate and _chsize diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am index eeff9a1af9d..901e8995d8a 100644 --- a/fastjar/Makefile.am +++ b/fastjar/Makefile.am @@ -45,12 +45,12 @@ AM_CPPFLAGS = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include 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 @@ info_TEXINFOS = fastjar.texi 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 @@ POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" 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 @@ endif 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 diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index bcbb3c7ef28..2bef6898446 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -16,7 +16,7 @@ # Process this with automake to create Makefile.in -SOURCES = $(grepjar_SOURCES) $(jar_SOURCES) +SOURCES = $(fastjar_SOURCES) $(grepjar_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -38,7 +38,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -bin_PROGRAMS = jar$(EXEEXT) grepjar$(EXEEXT) +bin_PROGRAMS = fastjar$(EXEEXT) grepjar$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(fastjar_TEXINFOS) \ $(srcdir)/../compile $(srcdir)/../install-sh \ @@ -59,15 +59,15 @@ CONFIG_CLEAN_FILES = install-defs.sh am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) +am_fastjar_OBJECTS = fastjar-jartool.$(OBJEXT) \ + fastjar-dostime.$(OBJEXT) fastjar-compress.$(OBJEXT) \ + fastjar-pushback.$(OBJEXT) fastjar-shift.$(OBJEXT) +fastjar_OBJECTS = $(am_fastjar_OBJECTS) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = ../libiberty/libiberty.a am_grepjar_OBJECTS = jargrep.$(OBJEXT) dostime.$(OBJEXT) \ compress.$(OBJEXT) pushback.$(OBJEXT) grepjar_OBJECTS = $(am_grepjar_OBJECTS) -am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = ../libiberty/libiberty.a -am_jar_OBJECTS = jar-jartool.$(OBJEXT) jar-dostime.$(OBJEXT) \ - jar-compress.$(OBJEXT) jar-pushback.$(OBJEXT) \ - jar-shift.$(OBJEXT) -jar_OBJECTS = $(am_jar_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = am__depfiles_maybe = @@ -75,8 +75,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(grepjar_SOURCES) $(jar_SOURCES) -DIST_SOURCES = $(grepjar_SOURCES) $(jar_SOURCES) +SOURCES = $(fastjar_SOURCES) $(grepjar_SOURCES) +DIST_SOURCES = $(fastjar_SOURCES) $(grepjar_SOURCES) INFO_DEPS = $(srcdir)/fastjar.info am__TEXINFO_TEX_DIR = $(srcdir)/../gcc/doc/include DVIS = fastjar.dvi @@ -229,12 +229,12 @@ AM_MAKEFLAGS = \ AM_CPPFLAGS = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include LIBIBERTY = ../libiberty/libiberty.a -jar_SOURCES = jartool.c dostime.c compress.c pushback.c shift.c jartool.h \ +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 @@ -248,7 +248,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 POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" @@ -260,7 +260,7 @@ POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" # --enable-generated-files-in-srcdir in the configure script. @GENINSRC_TRUE@STAMP_GENINSRC = stamp-geninsrc CLEANFILES = stamp-geninsrc -MAINTAINERCLEANFILES = $(srcdir)/jar.1 \ +MAINTAINERCLEANFILES = $(srcdir)/fastjar.1 \ $(srcdir)/grepjar.1 \ $(srcdir)/fastjar.info @@ -344,12 +344,12 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +fastjar$(EXEEXT): $(fastjar_OBJECTS) $(fastjar_DEPENDENCIES) + @rm -f fastjar$(EXEEXT) + $(LINK) $(fastjar_LDFLAGS) $(fastjar_OBJECTS) $(fastjar_LDADD) $(LIBS) grepjar$(EXEEXT): $(grepjar_OBJECTS) $(grepjar_DEPENDENCIES) @rm -f grepjar$(EXEEXT) $(LINK) $(grepjar_LDFLAGS) $(grepjar_OBJECTS) $(grepjar_LDADD) $(LIBS) -jar$(EXEEXT): $(jar_OBJECTS) $(jar_DEPENDENCIES) - @rm -f jar$(EXEEXT) - $(LINK) $(jar_LDFLAGS) $(jar_OBJECTS) $(jar_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -363,35 +363,35 @@ distclean-compile: .c.obj: $(COMPILE) -c `$(CYGPATH_W) '$<'` -jar-jartool.o: jartool.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-jartool.o `test -f 'jartool.c' || echo '$(srcdir)/'`jartool.c +fastjar-jartool.o: jartool.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-jartool.o `test -f 'jartool.c' || echo '$(srcdir)/'`jartool.c -jar-jartool.obj: jartool.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-jartool.obj `if test -f 'jartool.c'; then $(CYGPATH_W) 'jartool.c'; else $(CYGPATH_W) '$(srcdir)/jartool.c'; fi` +fastjar-jartool.obj: jartool.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-jartool.obj `if test -f 'jartool.c'; then $(CYGPATH_W) 'jartool.c'; else $(CYGPATH_W) '$(srcdir)/jartool.c'; fi` -jar-dostime.o: dostime.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-dostime.o `test -f 'dostime.c' || echo '$(srcdir)/'`dostime.c +fastjar-dostime.o: dostime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-dostime.o `test -f 'dostime.c' || echo '$(srcdir)/'`dostime.c -jar-dostime.obj: dostime.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-dostime.obj `if test -f 'dostime.c'; then $(CYGPATH_W) 'dostime.c'; else $(CYGPATH_W) '$(srcdir)/dostime.c'; fi` +fastjar-dostime.obj: dostime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-dostime.obj `if test -f 'dostime.c'; then $(CYGPATH_W) 'dostime.c'; else $(CYGPATH_W) '$(srcdir)/dostime.c'; fi` -jar-compress.o: compress.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-compress.o `test -f 'compress.c' || echo '$(srcdir)/'`compress.c +fastjar-compress.o: compress.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-compress.o `test -f 'compress.c' || echo '$(srcdir)/'`compress.c -jar-compress.obj: compress.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-compress.obj `if test -f 'compress.c'; then $(CYGPATH_W) 'compress.c'; else $(CYGPATH_W) '$(srcdir)/compress.c'; fi` +fastjar-compress.obj: compress.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-compress.obj `if test -f 'compress.c'; then $(CYGPATH_W) 'compress.c'; else $(CYGPATH_W) '$(srcdir)/compress.c'; fi` -jar-pushback.o: pushback.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-pushback.o `test -f 'pushback.c' || echo '$(srcdir)/'`pushback.c +fastjar-pushback.o: pushback.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-pushback.o `test -f 'pushback.c' || echo '$(srcdir)/'`pushback.c -jar-pushback.obj: pushback.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-pushback.obj `if test -f 'pushback.c'; then $(CYGPATH_W) 'pushback.c'; else $(CYGPATH_W) '$(srcdir)/pushback.c'; fi` +fastjar-pushback.obj: pushback.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-pushback.obj `if test -f 'pushback.c'; then $(CYGPATH_W) 'pushback.c'; else $(CYGPATH_W) '$(srcdir)/pushback.c'; fi` -jar-shift.o: shift.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-shift.o `test -f 'shift.c' || echo '$(srcdir)/'`shift.c +fastjar-shift.o: shift.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-shift.o `test -f 'shift.c' || echo '$(srcdir)/'`shift.c -jar-shift.obj: shift.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-shift.obj `if test -f 'shift.c'; then $(CYGPATH_W) 'shift.c'; else $(CYGPATH_W) '$(srcdir)/shift.c'; fi` +fastjar-shift.obj: shift.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-shift.obj `if test -f 'shift.c'; then $(CYGPATH_W) 'shift.c'; else $(CYGPATH_W) '$(srcdir)/shift.c'; fi` .texi.info: restore=: && \ @@ -854,18 +854,18 @@ uninstall-man: uninstall-man1 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 $< > $@ 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 $@ diff --git a/fastjar/fastjar.texi b/fastjar/fastjar.texi index e07b37a8ce4..5fb856c46e0 100644 --- a/fastjar/fastjar.texi +++ b/fastjar/fastjar.texi @@ -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 @@ section entitled ``GNU General Public License''. @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 @@ the same order the @option{-m} and @option{-f} flags are specified. @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 @@ a pattern. 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 diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index bcc6848ee0e..f3daf2981ce 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2004-07-23 Thomas Fitzsimmons + + * Make-lang.in: Replace rmic and rmiregistry references with + grmic and grmiregistry. + * gcj.texi: Likewise. + 2004-07-20 Andrew Haley PR java/16431. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 84b3d568ec6..2944383eeb3 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -167,7 +167,7 @@ java.srcinfo: doc/gcj.info 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 @@ java.maintainer-clean: -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 @@ doc/gcj.dvi: java/gcj.texi $(docdir)/include/fdl.texi \ $(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 @@ gij.pod: java/gcj.texi -$(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 ; \ diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi index 6c831765c08..e8da2ccbf27 100644 --- a/gcc/java/gcj.texi +++ b/gcc/java/gcj.texi @@ -66,9 +66,9 @@ man page gfdl(7). * 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 @@ files and object files, and it can read both Java source code and * 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 @@ Print version information, then exit. @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 @@ Print version information, then exit. @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 @@ instance, @option{--help} is accepted. @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 @@ Print version information, then exit. @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 @@ host. If no port number is specified, then port 1099 is used. @c man end -@c man begin OPTIONS rmiregistry +@c man begin OPTIONS grmiregistry @table @gcctabopt @item --help diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9b467ae0b87..a1280c74b15 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +2004-07-23 Thomas Fitzsimmons + + * 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. + 2004-07-23 Bryce McKinlay * gnu/java/net/protocol/http/Connection.java: Use GetPropertyAction diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 005c8bf9e93..fb0db4603d8 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -60,7 +60,7 @@ propdir = $(libdir) ## 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 @@ gij_LDADD = -L$(here)/.libs libgcj.la ## 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/. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 9cf6bacb72b..13f20632cdd 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -193,7 +193,7 @@ jar_DATA = libgcj-@gcc_version@.jar secdir = $(libdir)/security propdir = $(libdir) -@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry +@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij grmic grmiregistry bin_SCRIPTS = addr2name.awk @@ -536,23 +536,23 @@ gij_LINK = $(GCJLINK) gij_LDADD = -L$(here)/.libs libgcj.la gij_DEPENDENCIES = libgcj.la libgcj.spec -rmic_SOURCES = -EXTRA_rmic_SOURCES = $(rmi_java_source_files) -rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ +grmic_SOURCES = +EXTRA_grmic_SOURCES = $(rmi_java_source_files) +grmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rmic_LINK = $(GCJLINK) -rmic_LDADD = -L$(here)/.libs libgcj.la -rmic_DEPENDENCIES = libgcj.la libgcj.spec +grmic_LINK = $(GCJLINK) +grmic_LDADD = -L$(here)/.libs libgcj.la +grmic_DEPENDENCIES = libgcj.la libgcj.spec -rmiregistry_SOURCES = -EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files) -rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ +grmiregistry_SOURCES = +EXTRA_grmiregistry_SOURCES = $(rmi_java_source_files) +grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rmiregistry_LINK = $(GCJLINK) -rmiregistry_LDADD = -L$(here)/.libs libgcj.la -rmiregistry_DEPENDENCIES = libgcj.la libgcj.spec +grmiregistry_LINK = $(GCJLINK) +grmiregistry_LDADD = -L$(here)/.libs libgcj.la +grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec gen_from_JIS_SOURCES = EXTRA_gen_from_JIS_SOURCES = $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c \ @@ -3059,15 +3059,15 @@ gnu/gcj/xlib/natXConfigureEvent.lo gnu/gcj/xlib/natXException.lo \ gnu/gcj/xlib/natXExposeEvent.lo gnu/gcj/xlib/natXImage.lo \ gnu/gcj/xlib/natXUnmapEvent.lo @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \ -@NATIVE_TRUE@rmic$(EXEEXT) rmiregistry$(EXEEXT) +@NATIVE_TRUE@grmic$(EXEEXT) grmiregistry$(EXEEXT) @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \ @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) jv_convert_OBJECTS = gij_OBJECTS = gij.$(OBJEXT) -rmic_OBJECTS = -rmiregistry_OBJECTS = +grmic_OBJECTS = +grmiregistry_OBJECTS = gen_from_JIS_OBJECTS = gen_from_JIS_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) @@ -4902,8 +4902,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/org/xml/sax/helpers/XMLReaderFactory.P .deps/posix-threads.P \ .deps/posix.P .deps/prims.P .deps/resolve.P .deps/verify.P \ .deps/win32-threads.P .deps/win32.P -SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgij_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_gnu_awt_xlib_la_SOURCES) $(EXTRA_lib_gnu_awt_xlib_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) -OBJECTS = $(libgcj_la_OBJECTS) $(libgij_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_awt_xlib_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS) +SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgij_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_gnu_awt_xlib_la_SOURCES) $(EXTRA_lib_gnu_awt_xlib_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(EXTRA_grmic_SOURCES) $(grmiregistry_SOURCES) $(EXTRA_grmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) +OBJECTS = $(libgcj_la_OBJECTS) $(libgij_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_awt_xlib_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(grmic_OBJECTS) $(grmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS) all: all-redirect .SUFFIXES: @@ -5047,13 +5047,13 @@ gij$(EXEEXT): $(gij_OBJECTS) $(gij_DEPENDENCIES) @rm -f gij$(EXEEXT) $(gij_LINK) $(gij_LDFLAGS) $(gij_OBJECTS) $(gij_LDADD) $(LIBS) -rmic$(EXEEXT): $(rmic_OBJECTS) $(rmic_DEPENDENCIES) - @rm -f rmic$(EXEEXT) - $(rmic_LINK) $(rmic_LDFLAGS) $(rmic_OBJECTS) $(rmic_LDADD) $(LIBS) +grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) + @rm -f grmic$(EXEEXT) + $(grmic_LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS) -rmiregistry$(EXEEXT): $(rmiregistry_OBJECTS) $(rmiregistry_DEPENDENCIES) - @rm -f rmiregistry$(EXEEXT) - $(rmiregistry_LINK) $(rmiregistry_LDFLAGS) $(rmiregistry_OBJECTS) $(rmiregistry_LDADD) $(LIBS) +grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grmiregistry_DEPENDENCIES) + @rm -f grmiregistry$(EXEEXT) + $(grmiregistry_LINK) $(grmiregistry_LDFLAGS) $(grmiregistry_OBJECTS) $(grmiregistry_LDADD) $(LIBS) gen-from-JIS$(EXEEXT): $(gen_from_JIS_OBJECTS) $(gen_from_JIS_DEPENDENCIES) @rm -f gen-from-JIS$(EXEEXT) diff --git a/libjava/configure b/libjava/configure index 50339f82577..0795cf1b50e 100755 --- a/libjava/configure +++ b/libjava/configure @@ -1664,7 +1664,7 @@ else if { (eval echo configure:1665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.$ac_ext | *.c | *.o | *.obj) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -7186,7 +7186,7 @@ case "${which_gcj}" in 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 @@ -7203,7 +7203,7 @@ case "${which_gcj}" in 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 @@ -9272,7 +9272,7 @@ if test "$no_recursion" != yes; then fi fi - cd "$ac_popdir" + cd $ac_popdir done fi diff --git a/libjava/configure.in b/libjava/configure.in index a1bcd64fd1f..47773fefc82 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -1092,7 +1092,7 @@ case "${which_gcj}" in 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 @@ case "${which_gcj}" in 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 diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index 9402129e0fa..2d39365b349 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -178,7 +178,7 @@ DIST_COMMON = ./stamp-h2.in Makefile.am Makefile.in libgcj-config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index d00ce1d3b4d..6c0f2a0aabe 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -174,7 +174,7 @@ DIST_COMMON = ./stamp-h1.in Makefile.am Makefile.in config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 83a4b77c5c0..1a0f6cf50ba 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -183,7 +183,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -- 2.30.2