ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: ant/src/script ant
Date Tue, 15 Mar 2005 20:52:27 GMT
jkf         2005/03/15 12:52:27

  Modified:    src/script ant
  Log:
  PR: 31245
  cygwin part to handle both unix and windows style paths correctly
  
  Revision  Changes    Path
  1.52      +8 -2      ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/ant/src/script/ant,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- ant	15 Mar 2005 15:29:47 -0000	1.51
  +++ ant	15 Mar 2005 20:52:27 -0000	1.52
  @@ -214,6 +214,10 @@
   fi
   
   # For Cygwin, switch paths to appropriate format before running java
  +# For PATHs convert to unix format first, then to windows format to ensure
  +# both formats are supported. Probably this will fail on directories with ;
  +# in the name in the path. Let's assume that paths containing ; are more
  +# rare than windows style paths on cygwin.
   if $cygwin; then
     if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
       format=mixed
  @@ -223,9 +227,11 @@
     ANT_HOME=`cygpath --$format "$ANT_HOME"`
     ANT_LIB=`cygpath --$format "$ANT_LIB"`
     JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
  -  LOCALCLASSPATH=`cygpath --path --$format "$LOCALCLASSPATH"`
  +  LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
  +  LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
     if [ -n "$CLASSPATH" ] ; then
  -    CLASSPATH=`cygpath --path --$format "$CLASSPATH"`
  +    CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
  +    CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
     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