Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 45665 invoked from network); 6 May 2004 16:42:21 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 6 May 2004 16:42:21 -0000 Received: (qmail 25214 invoked by uid 500); 6 May 2004 16:42:15 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 25173 invoked by uid 500); 6 May 2004 16:42:14 -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 25157 invoked by uid 500); 6 May 2004 16:42:14 -0000 Received: (qmail 25154 invoked from network); 6 May 2004 16:42:14 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 6 May 2004 16:42:14 -0000 Received: (qmail 45623 invoked by uid 1818); 6 May 2004 16:42:18 -0000 Date: 6 May 2004 16:42:18 -0000 Message-ID: <20040506164218.45622.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 09:42:18 Modified: src/script ant Log: Cygwin/UNC ANT_HOME compatibility using mixed paths on NT-family systems. Revision Changes Path 1.48 +17 -6 ant/src/script/ant Index: ant =================================================================== RCS file: /home/cvs/ant/src/script/ant,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ant 2 Mar 2004 21:57:42 -0000 1.47 +++ ant 6 May 2004 16:42:18 -0000 1.48 @@ -222,13 +222,19 @@ ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes" fi -# For Cygwin, switch paths to Windows format before running java +# For Cygwin, switch paths to appropriate format before running java if $cygwin; then - ANT_HOME=`cygpath --windows "$ANT_HOME"` - ANT_LIB=`cygpath --windows "$ANT_LIB"` - JAVA_HOME=`cygpath --windows "$JAVA_HOME"` - LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"` - CYGHOME=`cygpath --windows "$HOME"` + if [ "$OS" = "Windows_NT" ] ; then + format=mixed + else + format=windows + fi + ANT_HOME=`cygpath --$format "$ANT_HOME"` + ANT_LIB=`cygpath --$format "$ANT_LIB"` + JAVA_HOME=`cygpath --$format "$JAVA_HOME"` + LOCALCLASSPATH=`cygpath --path --$format "$LOCALCLASSPATH"` + CLASSPATH=`cygpath --path --$format "$OCALCLASSPATH"` + CYGHOME=`cygpath --$format "$HOME"` fi # Show script help if requested @@ -247,6 +253,11 @@ fi # add a second backslash to variables terminated by a backslash under cygwin if $cygwin; then + case "$ANT_HOME" in + *\\ ) + ANT_HOME="$ANT_HOME\\" + ;; + esac case "$CYGHOME" in *\\ ) CYGHOME="$CYGHOME\\" --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org