hammant     2002/06/06 02:41:45

  Modified:    hsql     build.xml
  Log:
  docs now building
  
  Revision  Changes    Path
  1.21      +71 -46    jakarta-avalon-apps/hsql/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/hsql/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml 3 Jun 2002 20:47:40 -0000       1.20
  +++ build.xml 6 Jun 2002 09:41:45 -0000       1.21
  @@ -31,7 +31,7 @@
     <property name="build.javadocs" value="${build.dir}/javadocs"/>  
     <property name="build.docs" value="${build.dir}/docs"/>
     <property name="build.context" value="${build.dir}/documentation"/>  
  -  <property name="build.xdocs" value="${build.dir}/xdocs"/>  
  +  <property name="build.xdocs" value="${build.context}/content/xdocs"/>  
   
     <!-- Set the properties for source directories -->
     <property name="src.dir" value="src"/>
  @@ -84,17 +84,21 @@
       <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="excalibur.base" 
value="http://jakarta.apache.org/avalon/excalibur"/>
       <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"/>
  +    <property name="apps.base" 
value="http://jakarta.apache.org/avalon/apps"/>
   
       <filter token="year" value="${year}"/>
       <filter token="AVALON_BASE" value="${avalon.base}"/>
       <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  +    <filter token="EXCALIBUR_BASE" value="${excalibur.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}"/>
  +    <filter token="APPS_BASE" value="${apps.base}"/>
     </target>
   
     <!-- Compiles project -->
  @@ -217,55 +221,75 @@
       </javadoc>
     </target>
   
  -  <!-- Prepares the documentation directory -->
  -  <target name="docs" depends="setup-filters, javadocs" 
description="Generates the Docs">
  -    <mkdir dir="${docs.dir}"/>
  -
  -    <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>
  +    <!-- Prepares the documentation directory -->
  +    <target name="docs" depends="html-docs, javadocs" description="generates 
all the Avalon documentation"/>
   
  -    <copy todir="${build.context}/resources" filtering="off" overwrite="yes">
  -      <fileset dir="${context.dir}/resources"/>
  -      <fileset dir="${xdocs.dir}">
  -        <include name="**/images/**"/>
  -      </fileset>
  -    </copy>
  +  
  +    <target name="html-docs" depends="setup-filters" description="generates 
the xdocs-based documentation">
   
  -    <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}/cornerstone.uris"/>
  -      <classpath>
  -        <path refid="tools.class.path"/>
  -        <fileset dir="${tools.dir}/ext"/>
  -      </classpath>
  -    </java>
  +      <property name="use.skin"              value="avalon-site"/>
   
  -    <copy todir="docs">
  -      <fileset dir="${build.docs}">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>    
  +      <!-- Skin filters -->
  +      <filter token="skin"              value="${use.skin}"/>
  +      <filter token="link1"             value="apache"/>
  +      <filter token="link1.href"        value="http://www.apache.org"/>
  +      <filter token="link2"             value="jakarta"/>
  +      <filter token="link2.href"        value="http://jakarta.apache.org"/>
  +      <filter token="link3"             value="avalon"/>
  +      <filter token="link3.href"        
value="http://jakarta.apache.org/avalon/"/>
  +      <filter token="group-logo.src"    value="images/jakarta-logo.gif"/>
  +      <filter token="group-logo.href"   value="http://jakarta.apache.org/"/>
  +      <filter token="project-logo.src"  value="images/header.gif"/>          
          
  +      <filter token="project-logo.href" 
value="http://jakarta.apache.org/avalon/"/>                    
  +      <filter token="year" value="2002"/>  
  +      <filter token="vendor" value="Apache Software Foundation"/>  
       
  -  </target>
  +        <mkdir dir="${build.context}"/>
  +        <mkdir dir="${build.docs}"/>
  +        <mkdir dir="${build.xdocs}"/>
  +        <mkdir dir="${build.dir}/work"/>       
  +
  +        <copy todir="${build.context}" overwrite="true" filtering="on">
  +            <fileset dir="${context.dir}">
  +                <exclude name="**/*.gif"/>
  +                <exclude name="**/*.jpg"/>
  +                <exclude name="**/*.png"/>
  +            </fileset>
  +        </copy>
  +
  +        <copy todir="${build.context}" filtering="off">
  +            <fileset dir="${context.dir}">
  +                <include name="**/*.gif"/>
  +                <include name="**/*.jpg"/>
  +                <include name="**/*.png"/>
  +            </fileset>
  +        </copy>
  +        <copy todir="${build.xdocs}" filtering="on" overwrite="true">
  +            <fileset dir="${xdocs.dir}"/>
  +        </copy>
  +        
  +        <echo 
message="-------------------------------------------------------------"/>
  +        <echo message="  Building docs, please stand by ..."/>
  +        
  +        <java classname="org.apache.cocoon.Main" fork="true" 
maxmemory="128m" failonerror="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="-uWARN"/>
  +            <arg value="index.html"/>
  +            <classpath>
  +                <path refid="tools.class.path"/>
  +                <fileset dir="${tools.dir}/ext"/>
  +            </classpath>
  +        </java>
  +
  +
  +       <echo message="  ...docs generated succesfully in ./build/docs dir."/>
  +       <echo 
message="-------------------------------------------------------------"/>    
  +
  +    </target>
  +
     
     <target name="site" depends="docs" description=" Places Docs ready for 
hosting on website">  
     
  @@ -361,6 +385,7 @@
       <mkdir dir="${bin.dist.docs}"/>
       <copy todir="${bin.dist.docs}">
         <fileset dir="${docs.dir}"/>
  +      <fileset dir="${build.docs}"/>      
       </copy>
   
       <!-- Not allowed to distribute glue thus no soaphsql jar -->
  
  
  

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

Reply via email to