From lucas@worldos.com  Tue Feb 20 22:57:48 2001
Return-Path: <lucas@worldos.com>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 28469 invoked from network); 20 Feb 2001 22:57:48 -0000
Received: from mail2.panix.com (166.84.0.213)
  by h31.sny.collab.net with SMTP; 20 Feb 2001 22:57:48 -0000
Received: from obiwan (159-98.nyc.dsl.access.net [166.84.159.98])
	by mail2.panix.com (Postfix) with SMTP id C93FC8F51
	for <ant-dev@jakarta.apache.org>; Tue, 20 Feb 2001 17:57:29 -0500 (EST)
From: "Lucas Gonze" <lucas@worldos.com>
To: <ant-dev@jakarta.apache.org>
Subject: [PATCH] modifications to ant shell script to run under cygwin
Date: Tue, 20 Feb 2001 17:54:51 -0500
Message-ID: <NEBBJIHMMLKHEOPNOGHDEEIJDDAA.lucas@worldos.com>
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_000E_01C09B66.39488F80"
X-Priority: 3 (Normal)
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2910.0)
X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2615.200
Importance: Normal
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

------=_NextPart_000_000E_01C09B66.39488F80
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

The cygwin environment is mainly identical to unix except that java and javac use
semicolon for classpath separator instead of colon.  I have modified the ant shell
script to take this into account.  Not extensively tested but works on my system.

Apologies if this submission is halfbaked.  This is a 'scratch an itch' situation for
me.  Diff follows and complete version is attached.

Index: bin/ant

bash.exe-2.02$ diff /usr/ant/bin/ant-orig /usr/ant/bin/ant
2a3,4
> # modifications by lucas@gonze.com Feb 20, 2001 to make this run under Cygwin.
>
40c42,48
< LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
---
> if [ "$OSTYPE" = "cygwin32" ] ; then
>     LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ';'`
>     CLASSPATHSEP=";"
> else
>     LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
>     CLASSPATHSEP=":"
> fi
43c51
<   LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH
---
>   LOCALCLASSPATH="${CLASSPATH}${CLASSPATHSEP}${LOCALCLASSPATH}"
48c56
<     LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
---
>     LOCALCLASSPATH="${LOCALCLASSPATH}${CLASSPATHSEP}${JAVA_HOME}/lib/tools.jar"
52c60
<     LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
---
>     LOCALCLASSPATH="${LOCALCLASSPATH}${CLASSPATHSEP}${JAVA_HOME{/lib/classes.zip"

------=_NextPart_000_000E_01C09B66.39488F80
Content-Type: application/octet-stream;
	name="ant"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="ant"

#! /bin/sh

# modifications by lucas@gonze.com Feb 20, 2001 to make this run under =
Cygwin.

if [ -f $HOME/.antrc ] ; then=20
  . $HOME/.antrc
fi

if [ "$ANT_HOME" =3D "" ] ; then
  # try to find ANT
  if [ -d /opt/ant ] ; then=20
    ANT_HOME=3D/opt/ant
  fi

  if [ -d ${HOME}/opt/ant ] ; then=20
    ANT_HOME=3D${HOME}/opt/ant
  fi

  ## resolve links - $0 may be a link to ant's home
  PRG=3D$0
  progname=3D`basename $0`
 =20
  while [ -h "$PRG" ] ; do
    ls=3D`ls -ld "$PRG"`
    link=3D`expr "$ls" : '.*-> \(.*\)$'`
    if expr "$link" : '.*/.*' > /dev/null; then
	PRG=3D"$link"
    else
	PRG=3D"`dirname $PRG`/$link"
    fi
  done
 =20
  ANT_HOME=3D`dirname "$PRG"`/..

fi

# Allow .antrc to specifiy flags to java cmd
if [ "$JAVACMD" =3D "" ] ; then=20
  JAVACMD=3Djava
fi

if [ "$OSTYPE" =3D "cygwin32" ] ; then
    LOCALCLASSPATH=3D`echo $ANT_HOME/lib/*.jar | tr ' ' ';'`
    CLASSPATHSEP=3D";"
else
    LOCALCLASSPATH=3D`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
    CLASSPATHSEP=3D":"
fi

if [ "$CLASSPATH" !=3D "" ] ; then
  LOCALCLASSPATH=3D"${CLASSPATH}${CLASSPATHSEP}${LOCALCLASSPATH}"
fi

if [ "$JAVA_HOME" !=3D "" ] ; then
  if test -f $JAVA_HOME/lib/tools.jar ; then
    =
LOCALCLASSPATH=3D"${LOCALCLASSPATH}${CLASSPATHSEP}${JAVA_HOME}/lib/tools.=
jar"
  fi

  if test -f $JAVA_HOME/lib/classes.zip ; then
    =
LOCALCLASSPATH=3D"${LOCALCLASSPATH}${CLASSPATHSEP}${JAVA_HOME{/lib/classe=
s.zip"
  fi
else
  echo "Warning: JAVA_HOME environment variable is not set."
  echo "  If build fails because sun.* classes could not be found"
  echo "  you will need to set the JAVA_HOME environment variable"
  echo "  to the installation directory of java."
fi

# supply JIKESPATH to Ant as jikes.class.path
if [ "$JIKESPATH" !=3D "" ] ; then
  if [ "$ANT_OPTS" !=3D "" ] ; then
    ANT_OPTS=3D"$ANT_OPTS -Djikes.class.path=3D$JIKESPATH"
  else
    ANT_OPTS=3D-Djikes.class.path=3D$JIKESPATH
  fi
fi

$JAVACMD -classpath $LOCALCLASSPATH -Dant.home=3D${ANT_HOME} $ANT_OPTS =
org.apache.tools.ant.Main $@


------=_NextPart_000_000E_01C09B66.39488F80--