You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2002/04/22 18:50:07 UTC

cvs commit: jakarta-commons/latka build.xml

dion        02/04/22 09:50:07

  Modified:    latka    build.xml
  Log:
  Modified build to work with new directory structure
  
  Revision  Changes    Path
  1.33      +16 -21    jakarta-commons/latka/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/latka/build.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- build.xml	30 Mar 2002 10:25:08 -0000	1.32
  +++ build.xml	22 Apr 2002 16:50:07 -0000	1.33
  @@ -1,4 +1,4 @@
  -<!-- $Id: build.xml,v 1.32 2002/03/30 10:25:08 dion Exp $ -->
  +<!-- $Id: build.xml,v 1.33 2002/04/22 16:50:07 dion Exp $ -->
   <project name="commons-latka" default="build-java" basedir=".">
   
       <!-- patternset describing files to be copied from the doc directory -->
  @@ -58,20 +58,20 @@
   
           <property name="workdir" value="${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}"/>
           <property name="source" value="${basedir}"/>
  -        <property name="source.props" value="${source}/lib"/> <!-- properties files -->
           <property name="source.src" value="${basedir}/src"/>
  +        <property name="source.props" value="${source.src}/resources"/> <!-- properties files -->
           <property name="source.src.java" value="${source.src}/java"/>
           <property name="source.src.test" value="${source.src}/test"/>
  -        <property name="source.doc" value="${basedir}/doc"/>
  -        <property name="source.doc.xsl" value="${basedir}/xsl/docbook/html/docbook.xsl"/>
  -        <property name="dest" value="${basedir}/build"/>
  +        <property name="source.doc" value="${source.src}/docbook"/>
  +        <property name="source.doc.xsl" value="${source.src}/xsl/docbook/html/docbook.xsl"/>
  +        <property name="dest" value="${basedir}/target"/>
           <property name="dest.classes" value="${dest}/classes"/>
  -        <property name="dest.doc" value="${dest}/docs"/>
  +        <property name="dest.doc" value="${basedir}/docs"/>
           <property name="dest.doc.api" value="${dest.doc}/api"/>
           <property name="dist" value="${basedir}/dist"/>
           <property name="dist.docs" value="${dist}/docs"/>
           <property name="dist.docs.dtds" value="${dist.docs}/dtds/1.0"/>
  -        <property name="resource" value="${basedir}/resource"/>
  +        <property name="resource" value="${source.src}/resources"/>
           <!-- does this module have docs? -->
           <available property="available-doc" file="${source.doc}"/> 
           <!-- does this module have java src? -->      
  @@ -80,12 +80,12 @@
           <available property="available-src-test" file="${source.src.test}"/>
   
           <!-- properties for xdocs creation -->
  -        <property name="dest.xdocs" value="${dest}/xdocs" />
  -        <property name="source.xdocs" value="${source}/xdocs"/>
  +        <property name="dest.xdocs" value="${dest}/generated-xdocs" />
  +        <property name="source.xdocs" value="${source.src}/xdocs"/>
           <property name="source.xsl.converter.docbook"
  -                  value="${basedir}/xsl/site/docbook2document.xsl"/>
  +                  value="${source.src}/xsl/site/docbook2document.xsl"/>
           <property name="source.xsl.converter.site"
  -                  value="${basedir}/xsl/site/site.xsl"/>
  +                  value="${source.src}/xsl/site/site.xsl"/>
   
           <!-- now combine the classpaths -->
           <path id="classpath">
  @@ -136,7 +136,8 @@
   -->
       <!-- ######################################################### -->
   
  -    <target name="clean" depends="init,clean-dist" description="removes generated files">
  +    <target name="clean" depends="init,clean-dist"
  +        description="removes generated files">
           <delete dir="${dest}"/>
       </target>
   
  @@ -246,7 +247,7 @@
               </fileset>
           </copy>
           <copy todir="${dest.xdocs}/stylesheets">    
  -            <fileset dir="${basedir}/xsl/site">
  +            <fileset dir="${source.src}/xsl/site">
                   <include name="site.xsl"/>
               </fileset>
           </copy>
  @@ -347,14 +348,11 @@
               <fileset dir="${dest.doc}">
                   <include name="**/*"/>
               </fileset>
  -            <fileset dir="${source}/tests/samples">
  -                <include name="TestCommonsWebsite.xml"/>
  -            </fileset>
           </copy>
           <!-- copy dtds and entities-->
           <mkdir dir="${dist.docs.dtds}" />
           <copy todir="${dist.docs.dtds}">
  -            <fileset dir="${source}/conf">
  +            <fileset dir="${source.src}/distribution/conf">
                   <include name="**/*.dtd"/>
                   <include name="**/*.ent"/>
               </fileset>
  @@ -390,13 +388,10 @@
               <fileset dir="${dest.doc}">
                   <include name="**/*"/>
               </fileset>
  -            <fileset dir="${source}/tests/samples">
  -                <include name="TestCommonsWebsite.xml"/>
  -            </fileset>
           </copy>
           <!-- copy dtds and entities-->
           <copy todir="${dest.webpages}/dtds/1.0">
  -            <fileset dir="${source}/conf">
  +            <fileset dir="${source.src}/distribution/conf">
                   <include name="**/*.dtd"/>
                   <include name="**/*.ent"/>
               </fileset>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>