ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Morrison, John" <John.Morri...@uk.experian.com>
Subject RE: cvs commit: jakarta-ant bootstrap.sh
Date Mon, 10 Dec 2001 10:03:09 GMT
Thanks, I'll double check this ASAP.  I'll only bother folks again if it
doesn't work ;)

> -----Original Message-----
> From: bodewig@apache.org [mailto:bodewig@apache.org]
> Sent: Monday, 10 December 2001 9:37 am
> To: jakarta-ant-cvs@apache.org
> Subject: cvs commit: jakarta-ant bootstrap.sh
> 
> 
> bodewig     01/12/10 01:37:07
> 
>   Modified:    .        bootstrap.sh
>   Log:
>   Make Cygwin detection work with newer versions of it.
>   
>   Submitted by:	Bill Burton <billb@progress.com>
>   
>   This is more or less untested (I can verify it doesn't 
> break building
>   on Linux or FreeBSD 8-) as I don't run Windows or even Cygwin.
>   
>   Revision  Changes    Path
>   1.58      +20 -12    jakarta-ant/bootstrap.sh
>   
>   Index: bootstrap.sh
>   ===================================================================
>   RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
>   retrieving revision 1.57
>   retrieving revision 1.58
>   diff -u -r1.57 -r1.58
>   --- bootstrap.sh	2001/11/22 16:16:46	1.57
>   +++ bootstrap.sh	2001/12/10 09:37:07	1.58
>   @@ -1,9 +1,17 @@
>    #!/bin/sh
>    
>   -# Make sure that the classpath & java_home are in Unix 
> format before we use them
>   -if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
>   -  CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
>   -  JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
>   +# OS specific support.  $var _must_ be set to either true or false.
>   +cygwin=false;
>   +case "`uname`" in
>   +  CYGWIN*) cygwin=true ;;
>   +esac
>   +
>   +# For Cygwin, ensure paths are in UNIX format before 
> anything is touched
>   +if $cygwin ; then
>   +  [ -n "$JAVA_HOME" ] &&
>   +    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
>   +  [ -n "$CLASSPATH" ] &&
>   +    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
>    fi
>    
>    # You will need to specify JAVA_HOME if compiling with 1.2 
> or later.
>   @@ -12,7 +20,7 @@
>      if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
>        CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
>      fi
>   - 
>   +
>      if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
>        CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/classes.zip
>      fi
>   @@ -28,7 +36,7 @@
>    # JAVA_HOME/sh for javac and rmic
>    if [ -z "$JAVAC" ] ; then
>      if [ -n "$JAVA_HOME"  ] ; then
>   -    if [ -x "$JAVA_HOME/sh/javac" ] ; then 
>   +    if [ -x "$JAVA_HOME/sh/javac" ] ; then
>          JAVAC=${JAVA_HOME}/sh/javac;
>        else
>          JAVAC=${JAVA_HOME}/bin/javac;
>   @@ -37,9 +45,9 @@
>        JAVAC=javac
>      fi
>    fi
>   -if [ -z "$JAVACMD" ] ; then 
>   +if [ -z "$JAVACMD" ] ; then
>      if [ -n "$JAVA_HOME"  ] ; then
>   -    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
>   +    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
>          JAVACMD=$JAVA_HOME/jre/sh/java
>        else
>          JAVACMD=$JAVA_HOME/bin/java
>   @@ -48,7 +56,7 @@
>        JAVACMD=java
>      fi
>    fi
>   - 
>   +
>    if [ ! -x "$JAVACMD" ] ; then
>      echo "Error: JAVA_HOME is not defined correctly."
>      echo "  We cannot execute $JAVACMD"
>   @@ -85,9 +93,9 @@
>    
>    CLASSPATH=${CLASSDIR}:src/main:${CLASSPATH}
>    
>   -# convert the unix path to windows
>   -if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
>   -   CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
>   +# For Cygwin, switch to Windows format before running java
>   +if $cygwin; then
>   +  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
>    fi
>    
>    export CLASSPATH
>   
>   
>   
> 
> --
> To unsubscribe, e-mail:   
<mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


=======================================================================
Information in this email and any attachments are confidential, and may
not be copied or used by anyone other than the addressee, nor disclosed
to any third party without our permission.  There is no intention to
create any legally binding contract or other commitment through the use
of this email.

Experian Limited (registration number 653331).  
Registered office: Talbot House, Talbot Street, Nottingham NG1 5HF

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


Mime
View raw message