jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-watchdog build.bat build.sh build.xml
Date Fri, 04 Aug 2000 19:13:07 GMT
craigmcc    00/08/04 12:12:54

  Modified:    .        build.bat build.sh build.xml
  Log:
  The most recent versions of Ant (post 1.1?) seem to have problems in the
  <chmod> task if the "ant.home" property is not set.  Patch the build
  scripts to define this.
  
  Revision  Changes    Path
  1.7       +2 -2      jakarta-watchdog/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/build.bat,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.bat	2000/06/19 22:10:32	1.6
  +++ build.bat	2000/08/04 19:12:29	1.7
  @@ -1,5 +1,5 @@
   @echo off
  -rem $Id: build.bat,v 1.6 2000/06/19 22:10:32 craigmcc Exp $
  +rem $Id: build.bat,v 1.7 2000/08/04 19:12:29 craigmcc Exp $
   rem Build file for stoopid dos machines
   
   SET _ANTHOME=%ANT_HOME%
  @@ -20,7 +20,7 @@
   :next
   echo Using classpath: %CLASSPATH%
   
  -java org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
  +java org.apache.tools.ant.Main -Dant.home=%ANT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   :clean
   
  
  
  
  1.10      +7 -3      jakarta-watchdog/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/build.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.sh	2000/06/19 22:10:32	1.9
  +++ build.sh	2000/08/04 19:12:33	1.10
  @@ -1,13 +1,17 @@
   #!/bin/sh
   #
  -# $Id: build.sh,v 1.9 2000/06/19 22:10:32 craigmcc Exp $
  +# $Id: build.sh,v 1.10 2000/08/04 19:12:33 craigmcc Exp $
   # Ksh wrapper around ant build system.
   
   baseDir=`pwd`
   
   echo $baseDir .....
   
  -ADDL_CLASSPATH=../jakarta-ant/lib/ant.jar:$JAVA_HOME/lib/tools.jar
  +if [ -n $ANT_HOME ]; then
  +  ANT_HOME=../jakarta-ant
  +fi
  +
  +ADDL_CLASSPATH=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar
   
   if [ -n $CLASSPATH ]; then
     CLASSPATH=$CLASSPATH:$ADDL_CLASSPATH
  @@ -18,5 +22,5 @@
   
   echo Building with classpath $CLASSPATH
   
  -java org.apache.tools.ant.Main $*
  +java org.apache.tools.ant.Main -Dant.home=$ANT_HOME $*
   
  
  
  
  1.34      +1 -0      jakarta-watchdog/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/build.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- build.xml	2000/05/01 19:36:18	1.33
  +++ build.xml	2000/08/04 19:12:34	1.34
  @@ -2,6 +2,7 @@
   
      <!-- System property definitions -->
   
  +   <property name="ant.home" value="../jakarta-ant"/>
      <property name="build.compiler" value="classic"/>
      <property name="watchdog.build" value="../build/watchdog"/>
      <property name="watchdog.dist" value="../dist/watchdog"/>
  
  
  

Mime
View raw message