Looking at the script again, I realized that my first patch was a bit sloppy
in a way nobody complained about: here's another patch to deal with the
possibility that ANT_HOME and/or JAVA_HOME may not be set which the rest of
the script allows. Thanks.

-Peter

-----Original Message-----
From: Peter Donald [mailto:[EMAIL PROTECTED]
Sent: Saturday, December 02, 2000 2:06 PM
To: [EMAIL PROTECTED]
Subject: Re: [PATCH] tweak to bin/ant to support cygwin32


At 10:09  2/12/00 -0800, you wrote:
>This patch makes a couple changes to bin/ant that make it possible to run
it
>under cygwin32 with ANT_HOME and JAVA_HOME set in a way that will also work
>with ant.bat in a command window. I.e. you set them Windows-style: c:/ant
>and c:/jdk1.3.
>
>I'm hoping someone will commit this for me or point out some better way to
>run ant from bash on a windows box. Thanks.

Okay I modified it a bit to work like turbines script. Could you check it
still works for you ?

Thanks for the patch


Cheers,

Pete

*------------------------------------------------------*
| "Computers are useless. They can only give you       |
|            answers." - Pablo Picasso                 |
*------------------------------------------------------*
Index: src/bin/ant
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/bin/ant,v
retrieving revision 1.8
diff -u -r1.8 ant
--- src/bin/ant 2000/12/02 22:09:35     1.8
+++ src/bin/ant 2000/12/02 23:05:50
@@ -6,8 +6,13 @@
 
 # Cygwin support.
 if [ "$OSTYPE" == "cygwin32" ] || [ "$OSTYPE" = "cygwin" ]; then
-  ANT_HOME=`cygpath --path --unix $ANT_HOME`
-  JAVA_HOME=`cygpath --path --unix $JAVA_HOME`
+  if [ ! "$ANT_HOME" = "" ]; then
+    ANT_HOME=`cygpath --path --unix $ANT_HOME`
+  fi
+
+  if [ ! "$JAVA_HOME" = "" ]; then
+    JAVA_HOME=`cygpath --path --unix $JAVA_HOME`
+  fi
 fi
 
 if [ "$ANT_HOME" = "" ] ; then

Reply via email to