diff options
| author | Eric Sandall | 2007-09-28 22:50:09 -0700 |
|---|---|---|
| committer | Eric Sandall | 2007-09-28 22:50:09 -0700 |
| commit | 02a6f5183ca6559619773a45ba021d9b4e800b80 (patch) | |
| tree | 6c932ca70a8be8d81fe57087153969014df05a6b /java | |
| parent | 878634b9e59a5f0e3331ef2c81c18fa4388c3fa8 (diff) | |
ant: Ant requires Java, so make sure it can find it
Diffstat (limited to 'java')
| -rwxr-xr-x | java/ant/DETAILS | 10 | ||||
| -rw-r--r-- | java/ant/HISTORY | 4 | ||||
| -rw-r--r-- | java/ant/ant.sh | 16 |
3 files changed, 19 insertions, 11 deletions
diff --git a/java/ant/DETAILS b/java/ant/DETAILS index 27d493b19a..b41ddbea02 100755 --- a/java/ant/DETAILS +++ b/java/ant/DETAILS @@ -5,14 +5,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/apache-$SPELL-$VERSION SOURCE_URL[0]=http://archive.apache.org/dist/ant/source/$SOURCE SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE SOURCE_HASH=sha512:d527c86df32045a1083c141bb5604b26ae94bb77f68e1bcad57fa86aa2c96c3648392597e793845c5753b3013a76259b18e433e686a0ac34612fba56761fe268 - WEB_SITE=http://ant.apache.org/ - ENTERED=20030120 - UPDATED=20040127 + PATCHLEVEL=1 LICENSE[0]=APACHE + WEB_SITE=http://ant.apache.org/ KEYWORDS="java" + ENTERED=20030120 SHORT="Advanced build system using Java" cat << EOF -Ant is a Java-based build tool. In theory, it is kind of like Make, without -Make's wrinkles and with the full portability of pure Java code.(quote from +Ant is a Java-based build tool. In theory, it is kind of like Make, without +Make's wrinkles and with the full portability of pure Java code.(quote from the website) EOF diff --git a/java/ant/HISTORY b/java/ant/HISTORY index 73d11c48a2..8bc3ca8397 100644 --- a/java/ant/HISTORY +++ b/java/ant/HISTORY @@ -1,3 +1,7 @@ +2007-09-28 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Incremented PATCHLEVEL=1 to install update ant.sh + * ant.sh: Ant requires Java to run, so make sure JAVA_HOME is set if not + 2007-03-02 Eric Sandall <sandalle@sourcemage.org> * CONFIGURE: Removed query, now done with an optional_depends * DEPENDS: Properly optionally depend on antlr diff --git a/java/ant/ant.sh b/java/ant/ant.sh index 0173d286dd..6362a9fcdb 100644 --- a/java/ant/ant.sh +++ b/java/ant/ant.sh @@ -1,9 +1,13 @@ -#!/bin/bash -# First check if this variable is already set -# then if not set, check it (maybe), then set it +#!/bin/bash +# First check if this variable is already set +# then if not set, check it (maybe), then set it + +if [ -z "$ANT_HOME" ] ; then + if [ -z "$JAVA_HOME" ] ; then + source /etc/profile.d/java.sh + fi + ANT_HOME=/opt/ant +fi -if [ -z "$ANT_HOME" ] ; then - ANT_HOME=/opt/ant -fi export ANT_HOME export PATH=$PATH:$ANT_HOME/bin |