diff options
author | tv <tv@pkgsrc.org> | 2004-08-11 14:45:31 +0000 |
---|---|---|
committer | tv <tv@pkgsrc.org> | 2004-08-11 14:45:31 +0000 |
commit | 22c0b82ae5700e3da194d97b9b138413f0dfaad6 (patch) | |
tree | 4748d00e79e12a6a16666fddbd056e26e28275f9 /lang | |
parent | fba34fd12fc5f6f8240cf3d46bb2544ed087774a (diff) | |
download | pkgsrc-22c0b82ae5700e3da194d97b9b138413f0dfaad6.tar.gz |
1.1: Add more wrappers (jdb, rmic, rmiregistry, ...).
Also add ability to specify a full command line (foo_CMD) so that tools
such as fastjar and jikes may be used as jar and javac, respectively.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/java-wrapper/Makefile | 10 | ||||
-rw-r--r-- | lang/java-wrapper/PLIST | 14 | ||||
-rw-r--r-- | lang/java-wrapper/files/java-wrapper.conf | 36 | ||||
-rw-r--r-- | lang/java-wrapper/files/java-wrapper.sh | 17 |
4 files changed, 58 insertions, 19 deletions
diff --git a/lang/java-wrapper/Makefile b/lang/java-wrapper/Makefile index 8a1c1ce647a..4593b12e417 100644 --- a/lang/java-wrapper/Makefile +++ b/lang/java-wrapper/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/06/04 16:35:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/08/11 14:45:31 tv Exp $ # -DISTNAME= java-wrapper-1.0 +DISTNAME= java-wrapper-1.1 CATEGORIES= lang MASTER_SITES= # empty DISTFILES= # empty @@ -40,8 +40,12 @@ do-extract: do-build: @${DO_NADA} +# Not all implemetations supply all of the following programs, but these +# comprise the majority of useful tools available with most JVMs: do-install: -.for f in appletviewer jar java javac javadoc javah javap +.for f in appletviewer extcheck idlj jar jarsigner java javac javadoc \ + javah javakey javap jdb keytool policytool rmic rmid \ + rmiregistry serialver tnameserv ${INSTALL_SCRIPT} ${WRKSRC}/java-wrapper.sh ${PREFIX}/bin/${f} .endfor .undef f diff --git a/lang/java-wrapper/PLIST b/lang/java-wrapper/PLIST index f3a9b5e526c..e5b61581c47 100644 --- a/lang/java-wrapper/PLIST +++ b/lang/java-wrapper/PLIST @@ -1,11 +1,23 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/04 16:35:07 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/08/11 14:45:31 tv Exp $ bin/appletviewer +bin/extcheck +bin/idlj bin/jar +bin/jarsigner bin/java bin/javac bin/javadoc bin/javah +bin/javakey bin/javap +bin/jdb +bin/keytool +bin/policytool +bin/rmic +bin/rmid +bin/rmiregistry +bin/serialver +bin/tnameserv man/man1/java-wrapper.1 share/examples/java-wrapper/java-wrapper.conf @dirrm share/examples/java-wrapper diff --git a/lang/java-wrapper/files/java-wrapper.conf b/lang/java-wrapper/files/java-wrapper.conf index 027d4fa8d82..8d9c51c35f9 100644 --- a/lang/java-wrapper/files/java-wrapper.conf +++ b/lang/java-wrapper/files/java-wrapper.conf @@ -1,4 +1,4 @@ -# $NetBSD: java-wrapper.conf,v 1.1.1.1 2004/06/04 16:35:07 jmmv Exp $ +# $NetBSD: java-wrapper.conf,v 1.2 2004/08/11 14:45:31 tv Exp $ # # @PKG_SYSCONFDIR@/java-wrapper.conf # @@ -7,13 +7,33 @@ # # Default Java implementation to use. I.e., 'sun14', 'wonka', etc. +# This should be set to something, else most of these programs will not run! +# DEFAULT= # Override the above setting on a command basis. -APPLETVIEWER= -JAR= -JAVA= -JAVAC= -JAVADOC= -JAVAH= -JAVAP= +# +#APPLETVIEWER= +#EXTCHECK= +#IDLJ= +#JAR= +#JARSIGNER= +#JAVA= +#JAVAC= +#JAVADOC= +#JAVAH= +#JAVAKEY= +#JAVAP= +#JDB= +#KEYTOOL= +#POLICYTOOL= +#RMIC= +#RMID= +#RMIREGISTRY= +#SERIALVER= +#TNAMESERV= + +# Or, override the command line explicitly for a given command. +# +#JAR_CMD=${PREFIX}/bin/fastjar +#JAVAC_CMD="${PREFIX}/bin/jikes -Xstdout -bootclasspath $(echo ${PREFIX}/java/jdk-1.3.1/jre/lib/*.jar | tr ' ' ':')" diff --git a/lang/java-wrapper/files/java-wrapper.sh b/lang/java-wrapper/files/java-wrapper.sh index 7476ac7f048..99819abefdc 100644 --- a/lang/java-wrapper/files/java-wrapper.sh +++ b/lang/java-wrapper/files/java-wrapper.sh @@ -1,6 +1,6 @@ #! @SH@ # -# $NetBSD: java-wrapper.sh,v 1.1.1.1 2004/06/04 16:35:07 jmmv Exp $ +# $NetBSD: java-wrapper.sh,v 1.2 2004/08/11 14:45:31 tv Exp $ # # java-wrapper - Runs different Java implementations transparently. # Copyright (c) 2004 Julio M. Merino Vidal <jmmv@NetBSD.org> @@ -52,16 +52,19 @@ else fi varname=$(echo ${progname} | ${TR} a-z A-Z) +eval cmd=\"\$${varname}_CMD\" eval impl=\"\$${varname}\" -if [ -z "${impl}" -a -z "${DEFAULT}" ]; then - err "no mapping defined (${varname} and DEFAULT are empty)." +if [ -z "${cmd}" -a -z "${impl}" -a -z "${DEFAULT}" ]; then + err "no mapping defined (${varname}_CMD, ${varname}, and DEFAULT are empty)." fi -bin=${PREFIX}/bin/${impl:-${DEFAULT}}-${progname} +if [ -z "${cmd}" ]; then + cmd=${PREFIX}/bin/${impl:-${DEFAULT}}-${progname} -if [ ! -f ${bin} ]; then - err "cannot locate ${bin} (incorrect mapping or missing package)." + if [ ! -f ${cmd} ]; then + err "cannot locate ${cmd} (incorrect mapping or missing package)." + fi fi -${bin} "$@" +exec ${cmd} "$@" |