ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r448058 - in /ant/core/trunk: WHATSNEW src/script/ant
Date Wed, 20 Sep 2006 04:35:06 GMT
Author: bodewig
Date: Tue Sep 19 21:35:05 2006
New Revision: 448058

URL: http://svn.apache.org/viewvc?view=rev&rev=448058
Log:
Yet another uncommon file system layout on AIX, submitted by Henri Gomez

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/script/ant

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=448058&r1=448057&r2=448058
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Sep 19 21:35:05 2006
@@ -17,6 +17,9 @@
 
 * nested fileset in <cab> 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:
 --------------
 

Modified: ant/core/trunk/src/script/ant
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/script/ant?view=diff&rev=448058&r1=448057&r2=448058
==============================================================================
--- ant/core/trunk/src/script/ant (original)
+++ ant/core/trunk/src/script/ant Tue Sep 19 21:35:05 2006
@@ -129,9 +129,11 @@
 
 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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message