This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

rename fastjar binary


There was some discussion whether the fastjar binary should be renamed
to plain 'jar'.   To me the answer is clearly "yes", and here is a
patch to do it.

The question for Mark is whether we should also make this change in the
gcc-3 branch.  I think so, on the grounds that this changes the user
functionality (and Makefiles) in a positive direction, and that this
is low-risk (if something breaks we'll find out very quickly).

This is the patch.

        * Makefile.am (bin_PROGRAMS):  Renamed from "fastjar" to "jar".

Index: fastjar/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/fastjar/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am	2001/01/22 17:32:28	1.3
+++ Makefile.am	2001/05/14 23:40:52
@@ -40,11 +40,11 @@
 
 INCLUDES = -I. -I$(top_srcdir) $(ZINCS)
 
-bin_PROGRAMS = fastjar
+bin_PROGRAMS = jar
 EXTRA_PROGRAMS = grepjar
-fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
-fastjar_LDADD = $(ZLIBS)
-fastjar_DEPENDENCIES = $(ZDEPS)
+jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
+jar_LDADD = $(ZLIBS)
+jar_DEPENDENCIES = $(ZDEPS)
 grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
 grepjar_LDADD = $(ZLIBS)
 grepjar_DEPENDENCIES = $(ZDEPS)

        * Makefile.am (ZIP):  The "fastjar" binary is now plain "jar".

Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.129.2.8
diff -u -r1.129.2.8 Makefile.am
--- Makefile.am	2001/05/13 07:10:23	1.129.2.8
+++ Makefile.am	2001/05/14 23:40:54
@@ -57,9 +57,9 @@
 if NULL_TARGET
 ## In this case, gcj is found outside the build tree.  However, zip is
 ## found in the build tree.
-ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
+ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
 else
-ZIP = fastjar
+ZIP = jar
 endif
 GCJH = gcjh
 else # CANADIAN
@@ -68,7 +68,7 @@
 ## definition of GCJ won't work; instead we resort to this ugly
 ## definition that gives us absolute paths.
 GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
-ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
+ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
 endif # CANADIAN
 
 ## The compiler with whatever flags we want for both -c and -C

-- 
	--Per Bothner
per@bothner.com   http://www.bothner.com/per/


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]