ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/script ant
Date Fri, 27 Feb 2004 15:40:34 GMT
bodewig     2004/02/27 07:40:34

  Modified:    src/script ant
  Log:
  More tweaks to the RPM specific section, submitted by Randy Watler
  
  Revision  Changes    Path
  1.46      +8 -6      ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/ant/src/script/ant,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- ant	11 Feb 2004 08:29:38 -0000	1.45
  +++ ant	27 Feb 2004 15:40:34 -0000	1.46
  @@ -182,12 +182,14 @@
     #
     # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
     # with ant-found jars first and user CLASSPATH after
  -  if [ -n "$CLASSPATH" -a -n "$CLASSPATH_OVERRIDE" ] ; then
  -     # prepend local class path with class path override
  -     if [ -z "$LOCALCLASSPATH" ] ; then 
  -       LOCALCLASSPATH="$CLASSPATH"
  -     else
  -       LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
  +  if [ -n "$CLASSPATH" ] ; then
  +    # merge local and specified classpath 
  +    if [ -z "$LOCALCLASSPATH" ] ; then 
  +      LOCALCLASSPATH="$CLASSPATH"
  +    elif [ -n "$CLASSPATH_OVERRIDE" ] ; then
  +      LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
  +    else
  +      LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
       fi
   
       # remove class path from launcher -lib option
  
  
  

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


Mime
View raw message