From 630e898f2013b4400657889adbb97940e015538d Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 20 Sep 2006 04:35:05 +0000 Subject: [PATCH] Yet another uncommon file system layout on AIX, submitted by Henri Gomez git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@448058 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ src/script/ant | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index efd58740a..2f0fced30 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -17,6 +17,9 @@ Fixed bugs: * nested fileset in did not work. Bugzilla report 39439. +* the ant wrapper script should now correctly locate the java + executable in more recent IBM JDKs for AIX as well. + Other changes: -------------- diff --git a/src/script/ant b/src/script/ant index a97c5c97b..bad19c05d 100644 --- a/src/script/ant +++ b/src/script/ant @@ -129,9 +129,11 @@ ANT_LIB="${ANT_HOME}/lib" if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then + # IBM's JDK on AIX uses strange locations for the executables if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" + elif [ -x "$JAVA_HOME/jre/bin/java" ] ; then + JAVACMD="$JAVA_HOME/jre/bin/java" else JAVACMD="$JAVA_HOME/bin/java" fi