ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/script ant
Date Wed, 11 Feb 2004 08:29:38 GMT
antoine     2004/02/11 00:29:38

  Modified:    src/script ant
  Log:
  changes following tests under cygwin
  adding a second backslash to variables terminated with a backslash to ensure
  also prevent problem with evaluation of test expressions where -f is compared to something
else
  this error message was happening
  + [ -f = --h -o -f = --help ]
  [: --h: unknown operand
  + [ -f = -h -o -f = -help ]
  [: -h: unknown operand
  
  Revision  Changes    Path
  1.45      +25 -3     ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/ant/src/script/ant,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- ant	9 Feb 2004 21:05:40 -0000	1.44
  +++ ant	11 Feb 2004 08:29:38 -0000	1.45
  @@ -27,11 +27,11 @@
       use_jikes_default=true
     elif [ "$arg" = "--execdebug" ] ; then
       ant_exec_debug=true
  -  elif [ "$arg" = "--h" -o "$arg" = "--help" ] ; then
  +  elif [ my"$arg" = my"--h"  -o my"$arg" = my"--help"  ] ; then
       show_help=true
       ant_exec_args="$ant_exec_args -h"
     else
  -    if [ "$arg" = "-h" -o "$arg" = "-help" ] ; then
  +    if [  my"$arg" = my"-h"  -o  my"$arg" = my"-help" ] ; then
         show_help=true
       fi
       ant_exec_args="$ant_exec_args \"$arg\""
  @@ -243,7 +243,29 @@
     echo '                         launch script'
     echo '  '
   fi
  -
  +# add a second backslash to variables terminated by a backslash under cygwin
  +if $cygwin; then
  +  case "$CYGHOME" in
  +    *\\ )
  +    CYGHOME="$CYGHOME\\"
  +    ;;
  +  esac
  +  case "$JIKESPATH" in
  +    *\\ )
  +    JIKESPATH="$JIKESPATH\\"
  +    ;;
  +  esac
  +  case "$LOCALCLASSPATH" in
  +    *\\ )
  +    LOCALCLASSPATH="LOCALCLASSPATH\\"
  +    ;;
  +  esac
  +  case "$CLASSPATH" in
  +    *\\ )
  +    CLASSPATH="$CLASSPATH\\"
  +    ;;
  +  esac
  +fi
   # Execute ant using eval/exec to preserve spaces in paths,
   # java options, and ant args
   ant_sys_opts=
  
  
  

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


Mime
View raw message