svn commit: r423646 - /incubator/harmony/enhanced/drlvm/trunk/build/build.sh

[ge...@apache.org]

Author: geirm
Date: Wed Jul 19 15:49:27 2006
New Revision: 423646

URL: http://svn.apache.org/viewvc?rev=423646&view=rev
Log:
put this back... testing seems to need it

Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/build.sh

Modified: incubator/harmony/enhanced/drlvm/trunk/build/build.sh
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/build.sh?rev=423646&r1=423645&r2=423646&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/build.sh (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/build.sh Wed Jul 19 15:49:27 2006
@@ -50,7 +50,13 @@
 # Check external resources / software installation
 # ================================================
 
-if [ ! -x $ANT_HOME/bin/ant ]; then
+if [ ! -x $JAVA_HOME/bin/java ] && [ ! -x $JAVA_HOME/bin/ij ]; then
+    echo "* Neigher $JAVA_HOME/bin/java nor $JAVA_HOME/bin/ij found."
+    echo "* Make sure you have J2SDK or DRLVM installed on your computer and that"
+    echo "* JAVA_HOME environment variable points out to its installation dir, e.g."
+    echo "* export JAVA_HOME=/usr/local/jdk_1.4.2"
+    ERROR
+elif [ ! -x $ANT_HOME/bin/ant ]; then
     echo "* File $ANT_HOME/bin/ant not found."
     echo "* Make sure you have Ant 1.6.5 or above installed from"
     echo "* http://ant.apache.org/bindownload.cgi and that ANT_HOME environment"