You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by um...@apache.org on 2002/07/09 17:00:05 UTC
cvs commit: jakarta-ant/src/script ant
umagesh 2002/07/09 08:00:05
Modified: src/script Tag: ANT_15_BRANCH ant
Log:
With "rpm mode", ant script won't pull in antlrall.jar
PR: 9428
Submitted by: Henri Gomez <nr...@betaversion.org>
Revision Changes Path
No revision
No revision
1.19.2.3 +21 -15 jakarta-ant/src/script/ant
Index: ant
===================================================================
RCS file: /home/cvs/jakarta-ant/src/script/ant,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -r1.19.2.2 -r1.19.2.3
--- ant 31 May 2002 20:41:48 -0000 1.19.2.2
+++ ant 9 Jul 2002 15:00:04 -0000 1.19.2.3
@@ -69,6 +69,9 @@
cd $saveddir
fi
+# set ANT_LIB location
+ANT_LIB=${ANT_HOME}/lib
+
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$ANT_HOME" ] &&
@@ -113,22 +116,25 @@
LOCALCLASSPATH="$JAVALIBDIR/$i.jar":"$LOCALCLASSPATH"
fi
done
-else
- # add in the dependency .jar files in non-RPM mode (the default)
- DIRLIBS="${ANT_HOME}"/lib
- for i in "${DIRLIBS}"/*.jar
- do
- # if the directory is empty, then it will return the input string
- # this is stupid, so case for it
- if [ "$i" != "${DIRLIBS}/*.jar" ] ; then
- if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH=$i
- else
- LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
- fi
- fi
- done
+
+# in rpm mode ant/lib is in /usr/share/java/ant
+ANT_LIB=${JAVALIBDIR}/ant
+
fi
+
+# add in the dependency .jar files in non-RPM mode (the default)
+for i in "${ANT_LIB}"/*.jar
+do
+ # if the directory is empty, then it will return the input string
+ # this is stupid, so case for it
+ if [ "$i" != "${ANT_LIB}/*.jar" ] ; then
+ if [ -z "$LOCALCLASSPATH" ] ; then
+ LOCALCLASSPATH=$i
+ else
+ LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
+ fi
+ fi
+done
if [ -n "$JAVA_HOME" ] ; then
if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>