This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: don't install scripts/jar
- From: Tom Tromey <tromey at redhat dot com>
- To: GCJ-patches <java-patches at gcc dot gnu dot org>
- Cc: Gerald Pfeifer <gerald at pfeifer dot com>
- Date: 29 Jan 2007 09:32:46 -0700
- Subject: Patch: FYI: don't install scripts/jar
- References: <Pine.LNX.4.64.0701212256270.10489@acrux.dbai.tuwien.ac.at> <m3y7nwrtdh.fsf@localhost.localdomain> <Pine.LNX.4.64.0701280125270.10489@acrux.dbai.tuwien.ac.at>
- Reply-to: tromey at redhat dot com
>>>>> "Gerald" == Gerald Pfeifer <gerald@pfeifer.com> writes:
Gerald> No objection from my side! My problem here was that we *sometimes*
Gerald> install the jar script, and sometimes we don't. Never installing it
Gerald> would also work for me. ;-)
I don't think there's a reason to install it now that we have gjar.
This patch removes the install logic. We still keep the script around
as it may be useful for building libjava.
Also I changed the logic so we prefer a jar found by AC_CHECK_PROGS.
This is likely to be a native jar and thus faster than our script.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* configure, Makefile.in: Rebuilt.
* Makefile.am (bin_SCRIPTS): Never install scripts/jar.
* configure.ac (BASH_JAR): Removed conditional.
(JAR): Prefer the jar found by AC_CHECK_PROGS.
Index: configure.ac
===================================================================
--- configure.ac (revision 121297)
+++ configure.ac (working copy)
@@ -117,14 +117,14 @@
AC_CHECK_PROGS([JAR], [jar fastjar gjar], no)
AC_PATH_PROG([ZIP], [zip], no)
AC_PATH_PROG([UNZIP], [unzip], unzip)
-AM_CONDITIONAL(BASH_JAR, test "$JAR" = no)
-if test "$ZIP" = no; then
- if test "$JAR" = no; then
+# Prefer the jar we found, but fall back to our jar script.
+if test "$JAR" = no; then
+ if test "$ZIP" = no; then
AC_MSG_ERROR([cannot find neither zip nor jar, cannot continue])
+ else
+ # InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
+ JAR=`pwd`/scripts/jar
fi
-else
- # InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
- JAR=`pwd`/scripts/jar
fi
AC_PROG_INSTALL
Index: Makefile.am
===================================================================
--- Makefile.am (revision 121299)
+++ Makefile.am (working copy)
@@ -95,10 +95,6 @@
## Compilers and compilation flags.
##
-if BASH_JAR
-bin_SCRIPTS += scripts/jar
-endif
-
## The compiler with whatever flags we want for both -c and -C
## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated