ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant/src/script ant
Date Thu, 06 May 2004 19:43:20 GMT
mbenson     2004/05/06 12:43:20

  Modified:    src/script ant
  Log:
  Make sure CLASSPATH is set before attempting to change it;
  make sure --mixed option is available to cygpath before using it.
  
  Revision  Changes    Path
  1.49      +4 -2      ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/ant/src/script/ant,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- ant	6 May 2004 16:42:18 -0000	1.48
  +++ ant	6 May 2004 19:43:19 -0000	1.49
  @@ -224,7 +224,7 @@
   
   # For Cygwin, switch paths to appropriate format before running java
   if $cygwin; then
  -  if [ "$OS" = "Windows_NT" ] ; then
  +  if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
       format=mixed
     else
       format=windows
  @@ -233,7 +233,9 @@
     ANT_LIB=`cygpath --$format "$ANT_LIB"`
     JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
     LOCALCLASSPATH=`cygpath --path --$format "$LOCALCLASSPATH"`
  -  CLASSPATH=`cygpath --path --$format "$OCALCLASSPATH"`
  +  if [ -n "$CLASSPATH" ] ; then
  +    CLASSPATH=`cygpath --path --$format "$CLASSPATH"`
  +  fi
     CYGHOME=`cygpath --$format "$HOME"`
   fi
   
  
  
  

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


Mime
View raw message