diff options
| author |   Dylan Carlson <absinthe@gentoo.org> | 2004-02-29 01:14:26 +0000 |
|---|---|---|
| committer | Dylan Carlson <absinthe@gentoo.org> | 2004-02-29 01:14:26 +0000 |
| commit | 47c1d7ce5444ba98f1e93d66dbb4350431a1f458 (patch) | |
| tree | ea5c9e33e4bff50963350dadfae9238b4d66613e /dev-java | |
| parent | version bump. workaround missing .so extensions with libtool version (#42955)... (diff) | |
| download | gentoo-2-47c1d7ce5444ba98f1e93d66dbb4350431a1f458.tar.gz gentoo-2-47c1d7ce5444ba98f1e93d66dbb4350431a1f458.tar.bz2 gentoo-2-47c1d7ce5444ba98f1e93d66dbb4350431a1f458.zip | |
Fix to close bug #43222.
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jswat/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/jswat/files/2.21/jswat2 | 43 | ||||
| -rw-r--r-- | dev-java/jswat/jswat-2.21.ebuild | 6 |
3 files changed, 53 insertions, 4 deletions
diff --git a/dev-java/jswat/ChangeLog b/dev-java/jswat/ChangeLog index 3be43e308f99..eb5e4c460f43 100644 --- a/dev-java/jswat/ChangeLog +++ b/dev-java/jswat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/jswat # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.8 2004/02/25 08:08:07 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.9 2004/02/29 01:14:26 absinthe Exp $ + +*jswat-2.21 (28 Feb 2004) + + 28 Feb 2004; Dylan Carlson <absinthe@gentoo.org> jswat-2.21.ebuild, + files/2.21/jswat2: + Fix to close bug #43222. 25 Feb 2004; Dylan Carlson <absinthe@gentoo.org> : Version bump. diff --git a/dev-java/jswat/files/2.21/jswat2 b/dev-java/jswat/files/2.21/jswat2 new file mode 100644 index 000000000000..6b877058cf3e --- /dev/null +++ b/dev-java/jswat/files/2.21/jswat2 @@ -0,0 +1,43 @@ +#!/bin/sh +# jswat Launch Script +# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/files/2.21/jswat2,v 1.1 2004/02/29 01:14:26 absinthe Exp $ + +JSWAT_VER="2.21" + +JAVA_HOME=`/usr/bin/java-config --jdk-home` +if [ -z "${JAVA_HOME}" ] ; then + JAVA_HOME=`/usr/bin/java-config --jre-home` +fi +CLASSPATH="${JAVA_HOME}/lib/tools.jar:`/usr/bin/java-config --classpath=jswat-${JSWAT_VER}`:${CLASSPATH}" + +if [ ! -f ${JAVA_HOME}/bin/java ] ; then + echo " " + echo "I tried using the following Java Runtime:" + echo "${JAVA_HOME}/bin/java" + echo " " + echo "Java Runtime missing. Please run java-config(1) and ensure" + echo "your environment is configured properly." + exit 1 +else + echo " " + echo "Using Java Runtime:" + echo "${JAVA_HOME}/bin/java" + echo " " + echo "Using CLASSPATH:" + echo "${CLASSPATH}" + echo " " +fi + +# Make sure we're using 1.4 JDK + +if [ -z `echo ${JAVA_HOME} | grep "1.4"` ] ; then + echo "!!! JDK 1.4 is required for this version of " + echo "!!! jswat (${JSWAT_VER}). " + echo "!!! " + echo "!!! Please run java-config(1) and configure " + echo "!!! your system to use a 1.4 or later JDK. " + echo " " + exit 1 +fi + +${JAVA_HOME}/bin/java com.bluemarsh.jswat.Main $@ diff --git a/dev-java/jswat/jswat-2.21.ebuild b/dev-java/jswat/jswat-2.21.ebuild index cc2c98f553d9..39c16ee67c90 100644 --- a/dev-java/jswat/jswat-2.21.ebuild +++ b/dev-java/jswat/jswat-2.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.21.ebuild,v 1.1 2004/02/25 08:08:08 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.21.ebuild,v 1.2 2004/02/29 01:14:26 absinthe Exp $ inherit java-pkg @@ -37,12 +37,12 @@ src_compile() { src_install () { # install jswat classes java-pkg_dojar \ - build/dist/${P}/*.jar \ + build/dist/*/*.jar \ classes/ext/parser.jar \ classes/ext/jclasslib.jar # prepare and install jswat script - dobin ${FILESDIR}/jswat2 + dobin ${FILESDIR}/${PV}/jswat2 # install documents dodoc AUTHORS.txt BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt |