ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant bootstrap.sh
Date Thu, 09 Aug 2001 02:59:57 GMT
conor       01/08/08 19:59:57

  Modified:    .        bootstrap.sh
  Log:
  Cygwin support in bootstrap.sh
  
  PR:	3014
  Submitted by:	tpv@spamcop.net (Tim Vernum)
  
  Revision  Changes    Path
  1.52      +8 -7      jakarta-ant/bootstrap.sh
  
  Index: bootstrap.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- bootstrap.sh	2001/08/07 05:45:16	1.51
  +++ bootstrap.sh	2001/08/09 02:59:57	1.52
  @@ -1,5 +1,11 @@
   #!/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"`
  +fi
  +
   # You will need to specify JAVA_HOME if compiling with 1.2 or later.
   
   if [ -n "$JAVA_HOME" ] ; then
  @@ -49,11 +55,6 @@
     exit
   fi
   
  -# More Cygwin support
  -if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
  -  CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
  -fi
  -
   ANT_HOME=.
   export ANT_HOME
   
  @@ -97,7 +98,7 @@
   
   echo ... Compiling Ant Classes
   
  -${JAVAC} -d ${CLASSDIR} ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
  +"${JAVAC}" -d ${CLASSDIR} ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
       ${TOOLS}/ant/util/regexp/RegexpMatcher.java \
       ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
       ${TOOLS}/ant/util/*.java ${TOOLS}/ant/types/*.java \
  @@ -118,7 +119,7 @@
   
   cp -r ${CLASSDIR} build
   
  -${JAVACMD} -classpath ${CLASSPATH} -Dant.home=. org.apache.tools.ant.Main -emacs bootstrap
  +"${JAVACMD}" -classpath "${CLASSPATH}" -Dant.home=. org.apache.tools.ant.Main -emacs bootstrap
   
   echo ... Cleaning Up Build Directories
   
  
  
  

Mime
View raw message