Return-Path: <costin@hyperreal.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 20777 invoked by uid 2016); 14 Oct 1999 01:20:07 -0000
Delivered-To: apcore-jakarta-tomcat-cvs@apache.org
Received: (qmail 20775 invoked by uid 259); 14 Oct 1999 01:20:07 -0000
Date: 14 Oct 1999 01:20:07 -0000
Message-ID: <19991014012007.20774.qmail@hyperreal.org>
From: costin@hyperreal.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat build.xml

costin      99/10/13 18:20:06

  Modified:    .        build.xml
  Log:
  More changes to build.xml:
  - cleaned up dist ( it use the previus step instead of repeating it )
  - dist will be in the same dir as main
  
  build test is not working right now.
  I am still working on this, if you have any problems mail me.
  
  Revision  Changes    Path
  1.4       +7 -69     jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	1999/10/13 23:33:52	1.3
  +++ build.xml	1999/10/14 01:20:05	1.4
  @@ -71,79 +71,19 @@
     </target>
   
     <target name="dist" depends="main">
  -    <mkdir dir="./dist"/>
  -    <mkdir dir="./dist/tomcat"/>
  -    <mkdir dir="./dist/tomcat/etc"/>
  -    <mkdir dir="./dist/tomcat/lib"/>
  -
  -    <copydir src="src/webpages"
  -        dest="./dist/tomcat/webpages"/>
  -    <copydir src="src/examples"
  -        dest="./dist/tomcat/examples"/>
  -    <copydir src="src/share/javax"
  -        dest="./dist/tomcat/src/javax"/>
  -    <copyfile src="../jakarta-tools/projectx-tr2.jar"
  -        dest="./dist/tomcat/lib/xml.jar"/>
  -
  -    <copyfile src="src/shell/startup.sh"
  -        dest="./dist/tomcat/startserver"/>
  -    <copyfile src="src/shell/startup.bat"
  -        dest="./dist/tomcat/startserver.bat"/>
  -    <copyfile src="src/shell/shutdown.sh"
  -        dest="./dist/tomcat/stopserver"/>
  -    <copyfile src="src/shell/shutdown.bat"
  -        dest="./dist/tomcat/stopserver.bat"/>
  -    <copyfile src="src/share/org/apache/tomcat/shell/deployment/server.xml"
  -        dest="./dist/tomcat/server.xml"/>
  -    <copyfile src="src/share/org/apache/tomcat/shell/deployment/server.xml"
  -        dest="./dist/tomcat/etc/server.xml"/>
  -    <copyfile src="src/share/org/apache/tomcat/shell/deployment/server.dtd"
  -        dest="./dist/tomcat/etc/server.dtd"/>
  -    <copyfile src="src/share/org/apache/tomcat/deployment/web.xml"
  -        dest="./dist/tomcat/etc/web.xml"/>
  -    <copyfile src="src/share/org/apache/tomcat/deployment/web.dtd"
  -        dest="./dist/tomcat/etc/web.dtd"/>
  -    <copyfile src="src/etc/license.txt"
  -        dest="./dist/tomcat/LICENSE"/>
  -    <copyfile src="src/etc/readme"
  -        dest="./dist/tomcat/README"/>
  -    <copyfile src="src/etc/faq"
  -        dest="./dist/tomcat/FAQ"/>
  -    <copyfile src="src/etc/SimpleStartup.java"
  -        dest="./dist/tomcat/etc/SimpleStartup.java"/>
  -
  -    <javac srcdir="src/webpages/WEB-INF/classes"
  -        destdir="${dest}/webpages/WEB-INF/classes"
  -        classpath="${dest}/classes"/>
  -    <javac srcdir="src/examples/WEB-INF/classes"
  -        destdir="./dist/tomcat/examples/WEB-INF/classes"
  -        classpath="${dest}/classes"/>
  -
  -<!-- XXX
  -
  -     shouldn't this have been picked up by the
  -     previous javac
  -    <javac srcdir="src/examples/WEB-INF/classes/jsp/beans"
  -        destdir="${dest}/examples/WEB-INF/classes/jsp/beans"
  -        classpath="${dest}/classes"/>
  -
  --->
  -
  -    <javac srcdir="src/examples/jsp/plugin/applet"
  -        destdir="./dist/tomcat/examples/jsp/plugin/applet"/>
  -
  -    <jar jarfile="./dist/tomcat/webserver.jar"
  +    <jar jarfile="${dest}/webserver.jar"
           basedir="${dest}/classes"
           items="org/apache/tomcat"/>
  -    <jar jarfile="./dist/tomcat/lib/servlet.jar"
  +    <jar jarfile="${dest}/lib/servlet.jar"
           basedir="${dest}/classes"
           items="javax/servlet"/>
  -    <jar jarfile="./dist/tomcat/lib/jasper.jar"
  +    <jar jarfile="${dest}/lib/jasper.jar"
           basedir="${dest}/classes"
           items="org/apache/jasper"/>
  +    <deltree dir="${dest}/classes"/> 
     </target>
   
  -  <target name="test" depends="dist">
  +  <target name="test" depends="main">
       <mkdir dir="./test"/>
       <mkdir dir="./test/tomcat"/>
       <mkdir dir="./test/tomcat/classes"/>
  @@ -165,10 +105,10 @@
   
       <javac srcdir="src/tests/share"
           destdir="./test/tomcat/classes"
  -        classpath="./dist/tomcat/servlet.jar:./dist/tomcat/webserver.jar:./src/lib/moo.jar"/>
  +        classpath="${dest}/classes:${dest}/lib/servlet.jar:${dest}/webserver.jar:../jakarta-tools/moo.jar"/>
       <javac srcdir="src/tests/webpages/WEB-INF/classes"
           destdir="./test/tomcat/webpages/WEB-INF/classes"
  -        classpath="./dist/tomcat/lib/servlet.jar"/>
  +        classpath="${dest}/classes:${dest}/lib/servlet.jar"/>
     </target>
   
     <target name="servlet">
  @@ -186,8 +126,6 @@
   
     <target name="clean">
       <deltree dir="${dest}"/>
  -    <deltree dir="./dist/tomcat"/>
  -    <deltree dir="./test/tomcat"/>
     </target>
   
       <target name="all" depends="clean,main,dist,test"/>