nicolaken    2002/07/02 08:49:52

  Modified:    tweety   build.xml
  Log:
  Switched docs generation to use common excalibur snippet for cocoon
  docs generation.
  
  Revision  Changes    Path
  1.3       +28 -68    jakarta-avalon-excalibur/tweety/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tweety/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml 23 Jun 2002 20:28:29 -0000      1.2
  +++ build.xml 2 Jul 2002 15:49:52 -0000       1.3
  @@ -1,6 +1,12 @@
   <?xml version="1.0"?>
  +<!DOCTYPE project [
  +<!-- =================  Cocoon project targets =================  -->
  +<!ENTITY cocoon-targets     SYSTEM "../cocoon.xtarget">
  +]>
   
   <project name="Avalon Excalibur's Tweety" default="main" basedir=".">
  +   
  +    &cocoon-targets;
   
       <property file="${user.home}/build.properties"/>
       <property file="${basedir}/../ant.properties"/>
  @@ -8,7 +14,8 @@
       <property file="${user.home}/.ant.properties"/>
       <property file="${basedir}/../default.properties"/>
       <property file="${basedir}/default.properties"/>
  -
  +    <property file="${basedir}/../cocoon.properties"/>
  +        
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement location="${build.classes}"/>
  @@ -338,77 +345,29 @@
         <filter token="status" value="${status}"/>
         <filter token="release" value="${release}"/>
         <filter token="short-version" value="${short.version}"/>
  -
  -      <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  -      <property name="framework.base" 
value="http://jakarta.apache.org/avalon/framework"/>
  -      <property name="phoenix.base" 
value="http://jakarta.apache.org/avalon/phoenix"/>
  -      <property name="cornerstone.base" 
value="http://jakarta.apache.org/avalon/cornerstone"/>
  -      <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  -      <property name="testlet.base" 
value="http://jakarta.apache.org/avalon/testlet"/>
  -
  -      <filter token="year" value="${year}"/>
  -      <filter token="AVALON_BASE" value="${avalon.base}"/>
  -      <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  -      <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  -      <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  -      <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  -      <filter token="TESTLET_BASE" value="${testlet.base}"/>
  +      
  +        <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  +        <property name="framework.base" 
value="http://jakarta.apache.org/avalon/framework"/>
  +        <property name="phoenix.base" 
value="http://jakarta.apache.org/avalon/phoenix"/>
  +        <property name="cornerstone.base" 
value="http://jakarta.apache.org/avalon/cornerstone"/>
  +        <property name="logkit.base" 
value="http://jakarta.apache.org/avalon/logkit"/>
  +        <property name="testlet.base" 
value="http://jakarta.apache.org/avalon/testlet"/>
  +
  +        <filter token="year" value="${year}"/>
  +        <filter token="AVALON_BASE" value="${avalon.base}"/>
  +        <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  +        <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  +        <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  +        <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  +        <filter token="TESTLET_BASE" value="${testlet.base}"/>
       </target>
  -    
  +        
       
       <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="setup-filters"> <!-- depends="javadocs" 
description="Generates the Docs" -->
  -      <mkdir dir="${docs.dir}"/>
  +    <target name="docs" depends="html-docs, javadocs" description="generates all 
the Avalon documentation"/>
   
  -      <mkdir dir="${build.context}"/>
  -      <mkdir dir="${build.xdocs}"/>
  -      <mkdir dir="${build.docs}"/>
  -      <mkdir dir="${build.dir}/work"/>
  -  
  -      <!-- Base pointers for non-xdocs documentation. Override these in 
.ant.properties to link to local docs -->
  -      <copy todir="${build.context}" filtering="on">
  -        <fileset dir="${context.dir}">
  -          <exclude name="diagrams/**"/>
  -          <exclude name="resources/**"/>
  -          <exclude name="xdocs"/>
  -        </fileset>
  -      </copy>
  -  
  -      <copy todir="${build.context}/xdocs" filtering="on" overwrite="yes">
  -        <fileset dir="${xdocs.dir}"/>
  -      </copy>
  -
  -      <copy todir="${build.context}/resources" filtering="off" overwrite="yes">
  -        <fileset dir="${context.dir}/resources"/>
  -        <fileset dir="${xdocs.dir}">
  -          <include name="**/images/**"/>
  -        </fileset>
  -      </copy>
  -
  -      <java classname="org.apache.cocoon.Main" fork="true">
  -        <arg value="-c${build.context}/"/>
  -        <arg value="-d${build.docs}"/>
  -        <arg value="-w${build.dir}/work"/>
  -        <arg value="-l${build.dir}/work/cocoon.log"/>
  -        <arg value="-uINFO"/>
  -        <arg value="-f${xdocs.dir}/${dir-name}.uris"/>
  -        <classpath>
  -          <path refid="tools.class.path"/>
  -          <fileset dir="${tools.dir}/ext"/>
  -        </classpath>
  -      </java>
  -
  -      <copy todir="${docs.dir}">
  -        <fileset dir="${build.docs}">
  -          <include name="**"/>
  -        </fileset>
  -      </copy>    
  -
  -      <!-- hack for stupid transport on api link -->
  -      <replace file="${docs.dir}/index.html" token="index.html.xml" 
value="index.html"/>
  -     
  -    </target>
  -    
  +    <target name="html-docs" depends="cocoon:html-docs" description="generates the 
xdocs-based documentation"/>
  +        
       <target name="site" depends="javadocs, docs" description=" Places Docs ready 
for hosting on website">  
     
         <mkdir dir="../site/dist/docs/${dir-name}"/>     
  @@ -436,3 +395,4 @@
       </target>
   
   </project>
  +
  
  
  

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

Reply via email to