You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by jm...@apache.org on 2001/04/13 20:54:15 UTC

cvs commit: jakarta-alexandria build.xml

jmartin     01/04/13 11:54:15

  Modified:    .        build.xml
  Log:
  Convert site task to use Anakia
  
  Revision  Changes    Path
  1.13      +38 -31    jakarta-alexandria/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	2001/03/30 12:30:37	1.12
  +++ build.xml	2001/04/13 18:54:15	1.13
  @@ -2,7 +2,8 @@
       <property name="src.dir" value="src/java" />
       <property name="build.dir" value="build/alexandria" />
       <property name="project" value="Alexandria"/>
  -    <property name="javadoc.destdir" value="${build.dir}/docs/api"/>
  +    <property name="doc.dir" value="${build.dir}/docs"/>
  +    <property name="javadoc.dir" value="${doc.dir}/api"/>
       <property name="year" value="2000"/>
       <property name="build.classes" value="classes" />
       <property name="test.format" value="plain" />
  @@ -28,6 +29,8 @@
           <uptodate property="apis.uptodate" targetfile="${build.dir}/Alexandria.jar">
               <srcfiles dir="src/xml" includes="**/*.xsd"/>
           </uptodate>
  +      <available classname="org.apache.velocity.anakia.AnakiaTask" 
  +        property="AnakiaTask.present"/>
       </target>
   
       <target name="clean" description="Clear compiled classes">
  @@ -127,11 +130,11 @@
       </target>
   
       <target name="javadocs" description="Generate JavaDocs">
  -    	<mkdir dir="${javadoc.destdir}"/>
  -        <mkdir dir="${javadoc.destdir}"/>
  +    	<mkdir dir="${javadoc.dir}"/>
  +        <mkdir dir="${javadoc.dir}"/>
   
           <javadoc sourcepath="${src.dir}" 
  -                 destdir="${javadoc.destdir}" 
  +                 destdir="${javadoc.dir}" 
                    packagenames="org.apache.*"
                    private="false" 
                    windowtitle="${project} API"
  @@ -142,19 +145,39 @@
                    author="true"/>
       </target>
   
  +    <target depends="prepare" name="prepare-error" unless="AnakiaTask.present">
  +      <echo>
  +        AnakiaTask is not present! Please check to make sure that
  +        velocity.jar is in your classpath.
  +      </echo>
  +    </target>
  +
       <!-- =================================================================== -->
       <!-- Creates the web site                                                -->
       <!-- =================================================================== -->
  -    <target name="site" description="Generate web site">
  -      <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
  -      <property name="site.dir"      value="docs/site"/>  
  -      <property name="site"          value="docs/site"/>  
  -      <property name="docs.dir"      value="xdocs"/>  
  -      <property name="skin"          value="xdocs/skins/xml.apache.org/"/>  
  -
  -      <mkdir dir="${site.dir}"/>
  +    <target name="site" depends="prepare-error,javadocs">
  +      <property name="project.name"   value="site"/>
  +      <property name="docs.src" value="./xdocs"/>
  +
  +
  +      <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"/>
  +      <anakia basedir="${docs.src}" destdir="${doc.dir}/"
  +        extension=".html" style="./site.vsl"
  +        projectFile="stylesheets/project.xml"
  +        excludes="**/stylesheets/** empty.xml"
  +        includes="**/*.xml"
  +        lastModifiedCheck="true"
  +        templatePath="../jakarta-site2/xdocs/stylesheets"
  +      />
  +
  +      <copy toDir="${doc.dir}">
  +        <fileset dir="${docs.src}">
  +          <include name="images/*.png"/>
  +        </fileset>
  +      </copy>
   
         <!-- Generate Raster Version of SVG figures -->
  +      <!--
         <java fork="true" classname="org.apache.batik.apps.rasterizer.Main" >
           <classpath>
             <pathelement path="../batik/batik-rasterizer.jar"/>
  @@ -169,22 +192,6 @@
           <arg value="${docs.dir}/flow.svg"/>
           <arg value="${docs.dir}/build.svg"/>
         </java>
  -
  -      <!-- This is a hack that sitebook needs. -->
  -      <!--
  -      <copy file="xdocs/skins/alexandria/stylesheets/copyover.xsl"
  -                tofile="copyover.xsl"/>
  -                -->
  -
  -      <java classname="${doc.generator}" fork="yes"
  -            classpath="lib/stylebook-1.0-b3_xalan-2.jar:lib/xerces_1_2_1.jar:lib/xalan_2_0_D01.jar">
  -            <arg value="targetDirectory=${site.dir}"/>
  -            <arg value="${docs.dir}/site-book.xml"/>
  -            <arg value="${skin}"/>
  -      </java>
  -  
  -      <!--
  -      <delete file="copyover.xsl"/>
         -->
   
       </target>
  @@ -194,15 +201,15 @@
         <gzip src="alexandria.tar" zipfile="alexandria.tar.gz"/>
         <delete file="alexandria.tar"/>
       </target>
  -
  -    <property name="src.dir" value="src/java"/>
   
  -    <target name="test">
  +    <target name="test" depends="main">
         <junit>
           <formatter type="${test.format}"/>
           <classpath>
             <pathelement path="classes"/>
           </classpath>
  +        <classpath refid="classpath"/>
  +        <jvmarg value="-Dbase.dir=${base.dir}"/>
           <batchtest>
             <fileset dir="${src.dir}">
               <include name="**/test_*.java"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: alexandria-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: alexandria-dev-help@jakarta.apache.org