cmlenz      2003/01/22 09:52:47

  Modified:    documentation build.xml
  Log:
  Moving <checksitemap>-task from 'anttasks' to 'documentation'
  
  Revision  Changes    Path
  1.31      +23 -7     jakarta-cactus/documentation/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- build.xml 19 Jan 2003 13:11:52 -0000      1.30
  +++ build.xml 22 Jan 2003 17:52:47 -0000      1.31
  @@ -60,6 +60,8 @@
          ========================================================================
       -->
       <!-- Source locations for the build -->
  +    <property name="src.dir" location="${base.dir}/src"/>
  +    <property name="src.java.dir" location="${src.dir}/java"/>
       <property name="doc.dir" value="${base.dir}/docs"/>
       <property name="doc.dtd.dir" value="${doc.dir}/dtds"/>
       <property name="doc.skin.dir" value="${doc.dir}/skins"/>
  @@ -74,6 +76,9 @@
       -->
       <!-- Destination locations for the build -->
       <property name="target.dir" value="${base.dir}/target"/>
  +    <property name="target.classes.dir" location="${target.dir}/classes"/>
  +    <property name="target.classes.java.dir"
  +        location="${target.classes.dir}/java"/>
       <property name="target.doc.dir" value="${target.dir}/doc"/>
       <property name="target.xdoc.dir" value="${target.dir}/xdocs"/>
   
  @@ -83,10 +88,6 @@
       <property name="dist.doc.dir" value="${dist.dir}/doc"/>
       <property name="dist.doc.api.dir" value="${dist.doc.dir}/api"/>
   
  -    <!-- The location of the Cactus custom Ant tasks jar -->
  -    <property name="cactus.ant.jar"
  -        location="anttasks/dist/lib/cactus-ant.jar"/>
  -
       <!--
          ========================================================================
            Display configurable properties values
  @@ -147,6 +148,21 @@
   
       <!--
          ========================================================================
  +         Compile utility Java code
  +       ========================================================================
  +    -->
  +    <target name="compile"
  +        depends="init"
  +        description="Compile utility Java code">
  +
  +        <mkdir dir="${target.classes.java.dir}"/>
  +
  +        <javac srcdir="${src.java.dir}" destdir="${target.classes.java.dir}"/>
  +
  +    </target>
  +
  +    <!--
  +       ========================================================================
            Generate the documentation
          ========================================================================
       -->
  @@ -225,12 +241,12 @@
       </target>
   
       <target name="doc.checksitemap"
  -        depends="doc.validate">
  +        depends="compile, doc.validate">
   
           <taskdef name="checksitemap"
  -            classname="org.apache.cactus.ant.CheckSitemapTask">
  +            classname="org.apache.cactus.documentation.CheckSitemapTask">
             <classpath>
  -              <pathelement location="${cactus.ant.jar}"/>
  +              <pathelement location="${target.classes.java.dir}"/>
             </classpath>
           </taskdef>
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to