You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@locus.apache.org on 2000/01/14 15:50:17 UTC

cvs commit: jakarta-tools/moo build.bat build.sh

rubys       00/01/14 06:50:16

  Modified:    moo      build.bat build.sh
  Log:
  Convert to supporting jakarta-ant, remove ksh dependency
  
  Revision  Changes    Path
  1.4       +13 -6     jakarta-tools/moo/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tools/moo/build.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.bat	1999/12/31 15:29:19	1.3
  +++ build.bat	2000/01/14 14:50:15	1.4
  @@ -1,23 +1,30 @@
   @echo off
  -rem $Id: build.bat,v 1.3 1999/12/31 15:29:19 rubys Exp $
  +rem $Id: build.bat,v 1.4 2000/01/14 14:50:15 rubys Exp $
   rem Build file for stoopid dos machines
   
  -if "%CLASSPATH%" == "" got noclasspath
   
  +SET _ANTHOME=%ANT_HOME%
  +if "%ANT_HOME%" == "" SET ANT_HOME=..\..\jakarta-ant
  +
  +if "%CLASSPATH%" == "" goto noclasspath
  +
   rem else
   set _CLASSPATH=%CLASSPATH%
  -set CLASSPATH=.\..\ant.jar;.\..\projectx-tr2.jar;%CLASSPATH%
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar
   goto next
   
   :noclasspath
   set _CLASSPATH=
  -set CLASSPATH=.\..\ant.jar
  -goto next
  -
  +set CLASSPATH=%ANT_HOME%\lib\ant.jar
   :next
  +
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\xml.jar
  +
   echo Using classpath: %CLASSPATH%
   java org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   rem clean up classpath after
   set CLASSPATH=%_CLASSPATH%
   set _CLASSPATH=
  +SET ANT_HOME=%_ANTHOME%
  +SET _ANTHOME=
  
  
  
  1.3       +4 -4      jakarta-tools/moo/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tools/moo/build.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.sh	1999/12/31 15:29:19	1.2
  +++ build.sh	2000/01/14 14:50:16	1.3
  @@ -1,11 +1,11 @@
  -#!/bin/ksh
  +#!/bin/sh
   #
  -# $Id: build.sh,v 1.2 1999/12/31 15:29:19 rubys Exp $
  +# $Id: build.sh,v 1.3 2000/01/14 14:50:16 rubys Exp $
   # Ksh wrapper around ant build system.
   
  -ADDL_CLASSPATH=./../ant.jar:./../projectx-tr2.jar
  +ADDL_CLASSPATH=./../../jakarta-ant/lib/ant.jar:./../../jakarta-ant/lib/xml.jar
   
  -if [[ -n $CLASSPATH ]]; then
  +if test -n $CLASSPATH; then
     export CLASSPATH=$ADDL_CLASSPATH:$CLASSPATH
   else
     export CLASSPATH=$ADDL_CLASSPATH