Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 53078 invoked from network); 6 May 2004 19:43:51 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 6 May 2004 19:43:51 -0000 Received: (qmail 1282 invoked by uid 500); 6 May 2004 19:43:13 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 1227 invoked by uid 500); 6 May 2004 19:43:13 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 1187 invoked by uid 500); 6 May 2004 19:43:12 -0000 Received: (qmail 1155 invoked from network); 6 May 2004 19:43:12 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 6 May 2004 19:43:12 -0000 Received: (qmail 52797 invoked by uid 1818); 6 May 2004 19:43:20 -0000 Date: 6 May 2004 19:43:20 -0000 Message-ID: <20040506194320.52796.qmail@minotaur.apache.org> From: mbenson@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/script ant X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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