tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@locus.apache.org
Subject cvs commit: jakarta-tools/buildscripts main.xml
Date Sat, 01 Jan 2000 20:33:46 GMT
rubys       00/01/01 12:33:46

  Modified:    ant/src/bin antRun
               buildscripts main.xml
  Log:
  Remove explicit shell dependency from main ant build script
  
  Revision  Changes    Path
  1.2       +9 -2      jakarta-tools/ant/src/bin/antRun
  
  Index: antRun
  ===================================================================
  RCS file: /home/cvs/jakarta-tools/ant/src/bin/antRun,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- antRun	1999/12/14 01:21:18	1.1
  +++ antRun	2000/01/01 20:33:45	1.2
  @@ -2,6 +2,13 @@
   
   # Args: DIR command
   cd $1
  +CMD=$2
   shift
  -echo $@
  -$@ 2>&1
  +shift
  +
  +if test -e $CMD.sh; then
  +  CMD="sh $CMD.sh"
  +fi
  +
  +echo $CMD $@
  +$CMD $@ 2>&1
  
  
  
  1.11      +4 -4      jakarta-tools/buildscripts/main.xml
  
  Index: main.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tools/buildscripts/main.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- main.xml	1999/12/31 19:20:26	1.10
  +++ main.xml	2000/01/01 20:33:46	1.11
  @@ -82,17 +82,17 @@
   
      <!-- ******************** Testing  ******************** -->
      <target name="tomcat-test" depends="init">
  -     <exec dir="${ws.dir}/build/tomcat/test" command="sh runtest.sh " output="${package.dir}/tomcat/tomcat-test.log"
/>
  +     <exec dir="${ws.dir}/build/tomcat/test" command="runtest" output="${package.dir}/tomcat/tomcat-test.log"
/>
      </target>
   
      <target name="watchdog-test" depends="init">
  -     <exec dir="${ws.dir}/build/watchdog" command="sh runtest.sh  " output="${package.dir}/tomcat/watchdog-test.log"
/>
  +     <exec dir="${ws.dir}/build/watchdog" command="runtest" output="${package.dir}/tomcat/watchdog-test.log"
/>
      </target>
   
      <target name="test-apache" depends="init">
        <exec dir="${ws.dir}" command="/usr/local/apache/bin/apachectl start" />
  -     <exec dir="${ws.dir}/build/tomcat/test" command="sh runtest.sh " output="${package.dir}/tomcat/tomcat-test.log"
/>
  -     <exec dir="${ws.dir}/build/watchdog" command="sh runtest.sh  " output="${package.dir}/tomcat/watchdog-test.log"
/>
  +     <exec dir="${ws.dir}/build/tomcat/test" command="runtest" output="${package.dir}/tomcat/tomcat-test.log"
/>
  +     <exec dir="${ws.dir}/build/watchdog" command="runtest" output="${package.dir}/tomcat/watchdog-test.log"
/>
        <exec dir="${ws.dir}" command="/usr/local/apache/bin/apachectl stop" />
      </target>
   
  
  
  

Mime
View raw message