incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1154520 - /incubator/easyant/core/trunk/bin/easyant
Date Sat, 06 Aug 2011 13:57:47 GMT
Author: hibou
Date: Sat Aug  6 13:57:47 2011
New Revision: 1154520

URL: http://svn.apache.org/viewvc?rev=1154520&view=rev
Log:
IP cleanup: revert of easyant svn commit r519

Modified:
    incubator/easyant/core/trunk/bin/easyant

Modified: incubator/easyant/core/trunk/bin/easyant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/bin/easyant?rev=1154520&r1=1154519&r2=1154520&view=diff
==============================================================================
--- incubator/easyant/core/trunk/bin/easyant (original)
+++ incubator/easyant/core/trunk/bin/easyant Sat Aug  6 13:57:47 2011
@@ -281,6 +281,11 @@ if $rpm_mode && [ -x /usr/bin/build-clas
     fi
   fi
 
+  # Explicitly add javac path to classpath, assume JAVA_HOME set
+  # properly in rpm mode
+  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
+    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
+  fi
   if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
     LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
   fi
@@ -313,11 +318,6 @@ else
   fi
 fi
 
-# Explicitly add javac path to classpath
-if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
-  LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
-fi
-
 if [ -n "$JAVA_HOME" ] ; then
   # OSX hack to make Ant work with jikes
   if $darwin ; then



Mime
View raw message