summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2002-10-14 18:21:21 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2002-10-14 18:21:21 +0000
commitc8cc794fdf70e8c58c961103076127ac4d3f6579 (patch)
treeff85b31283d9f280429fa867400af3da74ae590e /dev-java
parentFix for #8581. (diff)
downloadgentoo-2-c8cc794fdf70e8c58c961103076127ac4d3f6579.tar.gz
gentoo-2-c8cc794fdf70e8c58c961103076127ac4d3f6579.tar.bz2
gentoo-2-c8cc794fdf70e8c58c961103076127ac4d3f6579.zip
Fixes #7732.
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant/ChangeLog6
-rw-r--r--dev-java/ant/files/1.5/ant18
2 files changed, 15 insertions, 9 deletions
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 0209d91cc3f3..d82735908241 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,11 +1,13 @@
# ChangeLog for dev-java/ant
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.8 2002/09/08 15:26:27 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.9 2002/10/14 18:21:21 karltk Exp $
*ant-1.5 (26 Jul 2002)
- 26 Jul 2002; William McArthur <sandymac@gentoo.org> ant-1.5.ebuild files/gent$
+ 14 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant :
+ Fixed bugs with script as reported in #7732. Marked for testing.
+ 26 Jul 2002; William McArthur <sandymac@gentoo.org> ant-1.5.ebuild files/1.5/ant files/digest-ant-1.5 :
Upgraded to Ant 1.5, rewrote the Gentoo specific ant script to take
avantage of java-config. It also looked like the Gentoo ant-1.4.1
script was based an older version of ant.
diff --git a/dev-java/ant/files/1.5/ant b/dev-java/ant/files/1.5/ant
index 74d1fcf8b557..b83ea6b4e6eb 100644
--- a/dev-java/ant/files/1.5/ant
+++ b/dev-java/ant/files/1.5/ant
@@ -5,14 +5,18 @@
# Edited for Gentoo Linux
if [ -f $HOME/.gentoo/java-env ] ; then
- envfile=$HOME/.gentoo/java-env
-elif [ -f /etc/env.d/20java ] ; then
- envfile=/etc/env.d/20java
+ source $HOME/.gentoo/java-env
else
- echo "!!! /etc/env.d/20java not found, please configure your system VM with java-config"
+ JAVA_HOME=`java-config --jdk-home`
+ if [ -z $JAVA_HOME ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ CLASSPATH=`java-config --classpath`
fi
-JAVA_HOME=`java-config --jdk-home`
+if [ -z $JAVA_HOME ] ; then
+ echo "Error: No JDK/JRE found!"
+ exit 1
+fi
# load system-wide ant configuration
if [ -f "/etc/ant.conf" ] ; then
@@ -33,7 +37,7 @@ ANT_HOME=/usr/share/ant
# set ANT_LIB location
ANT_LIB=${ANT_HOME}/lib
-JAVACMD=`java-config --java`
+JAVACMD="${JAVA_HOME}/java"
if [ ! -x "$JAVACMD" ] ; then
echo "Error: We cannot execute $JAVACMD "
@@ -46,7 +50,7 @@ if [ -n "$CLASSPATH" ] ; then
fi
# add in the dependency .jar files
-LOCALCLASSPATH=`java-config --classpath=ant`
+LOCALCLASSPATH=`${LOCALCLASSPATH}:java-config --classpath=ant`
if [ -n "$JAVA_HOME" ] ; then
if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then