ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@locus.apache.org
Subject cvs commit: jakarta-ant bootstrap.bat bootstrap.sh
Date Fri, 07 Jul 2000 01:30:44 GMT
rubys       00/07/06 18:30:43

  Modified:    .        bootstrap.bat bootstrap.sh
  Log:
  Pick up jar files from the lib directory in the bootstrap process
  
  Revision  Changes    Path
  1.11      +8 -4      jakarta-ant/bootstrap.bat
  
  Index: bootstrap.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- bootstrap.bat	2000/07/02 16:29:40	1.10
  +++ bootstrap.bat	2000/07/07 01:30:43	1.11
  @@ -17,8 +17,12 @@
   echo.
   echo ... Bootstrapping Ant Distribution
   
  -set CLASSPATH=src\main;classes;%CLASSPATH%
  -if exist %JAVA_HOME%\lib\tools.jar set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
  +SET LOCALCLASSPATH=classes
  +if exist lib\ant.jar erase lib\ant.jar
  +for %%i in (lib\*.jar) do call lcp.bat %%i
  +if exist %JAVA_HOME%\lib\tools.jar call lcp.bat %JAVA_HOME%\lib\tools.jar
  +if exist %JAVA_HOME%\lib\classes.zip call lcp.bat %JAVA_HOME%\lib\classes.zip
  +SET CLASSPATH=%CLASSPATH%;%LOCALCLASSPATH%
   
   echo JAVA_HOME=%JAVA_HOME%
   echo JAVA=%JAVA%
  @@ -44,8 +48,7 @@
   echo.
   echo ... Building Ant Distribution
   
  -%JAVA% org.apache.tools.ant.Main clean main %1 %2 %3 %4 %5
  -%JAVA% org.apache.tools.ant.Main install %1 %2 %3 %4 %5
  +%JAVA% org.apache.tools.ant.Main clean main install %1 %2 %3 %4 %5
   
   echo.
   echo ... Cleaning Up Build Directories
  @@ -64,5 +67,6 @@
   set OLDJAVA=
   set OLDJAVAC=
   set OLDCLASSPATH=
  +set LOCALCLASSPATH=
   set TOOLS=
   
  
  
  
  1.13      +27 -5     jakarta-ant/bootstrap.sh
  
  Index: bootstrap.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- bootstrap.sh	2000/07/02 16:29:40	1.12
  +++ bootstrap.sh	2000/07/07 01:30:43	1.13
  @@ -6,13 +6,36 @@
   
   SRCDIR=src/main/org/apache/tools
   CLASSDIR=classes
  -CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/classes.zip:${JAVA_HOME}/lib/tools.jar
  -CLASSPATH=${CLASSPATH}:src/main:${CLASSDIR}
   
  +if test -f lib/ant.jar ; then
  +  rm lib/ant.jar
  +fi
  +
  +LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
  +
  +if [ "$CLASSPATH" != "" ] ; then
  +  CLASSPATH=$CLASSPATH:$LOCALCLASSPATH
  +else
  +  CLASSPATH=$LOCALCLASSPATH
  +fi
  +
  +if test -f $JAVA_HOME/lib/tools.jar ; then
  +  CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
  +fi
  +
  +if test -f $JAVA_HOME/lib/classes.zip ; then
  +  CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/classes.zip
  +fi
  +
  +CLASSPATH=${CLASSPATH}:${CLASSDIR}:src/main
  +
   mkdir -p ${CLASSDIR}
   
   export CLASSPATH
  -echo $CLASSPATH
  +
  +echo
  +echo Building with classpath: $CLASSPATH
  +echo
   
   javac  -d ${CLASSDIR} ${SRCDIR}/tar/*.java
   javac  -d ${CLASSDIR} ${SRCDIR}/ant/*.java
  @@ -20,8 +43,7 @@
   
   cp src/main/org/apache/tools/ant/taskdefs/defaults.properties ${CLASSDIR}/org/apache/tools/ant/taskdefs
   
  -java org.apache.tools.ant.Main clean main
  -java org.apache.tools.ant.Main install
  +java org.apache.tools.ant.Main clean main install
   java org.apache.tools.ant.Main clean 
   
   if test ! -d bin; then mkdir bin; fi
  
  
  

Mime
View raw message