avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/info/src/xdocs/stylesheets project.xml
Date Sun, 08 Sep 2002 02:57:53 GMT
donaldp     2002/09/07 19:57:53

  Modified:    info     build.xml default.properties
               info/src/xdocs menu.xml
  Removed:     info/src/xdocs/stylesheets project.xml
  Log:
  Get documentation building again.
  
  Revision  Changes    Path
  1.2       +43 -39    jakarta-avalon-excalibur/info/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/info/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	31 Aug 2002 08:17:00 -0000	1.1
  +++ build.xml	8 Sep 2002 02:57:53 -0000	1.2
  @@ -22,9 +22,7 @@
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  -        <pathelement location="${tools.jar}"/>
  -        <fileset dir="${tools.dir}/lib"/>
  -        <fileset dir="${tools.dir}/ext"/>
  +        <fileset dir="${jakarta-site.dir}/lib"/>
       </path>
   
       <path id="test.class.path">
  @@ -344,45 +342,51 @@
   
       </target>
   
  -    <!-- Setup the filters -->
  -    <target name="setup-filters">
  -        <filter token="Name" value="Avalon ${Name}"/>
  -        <filter token="name" value="${dir-name}"/>
  -        <filter token="version" value="${version}"/>
  -        <filter token="year" value="${year}"/>
  -        <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}"/>
  -    </target>
  -
   
  -    <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="setup-filters" description="Generates the Docs">
  -    <ant antfile="${basedir}/../cocoonbuild.xml"/>
  -
  -      <copy todir="${docs.dir}">
  -        <fileset dir="${build.docs}">
  -          <include name="**"/>
  -        </fileset>
  -      </copy>    
  +    <target name="anakia-avail">
  +        <available classname="org.apache.velocity.anakia.AnakiaTask"
  +            property="AnakiaTask.present">
  +            <classpath refid="tools.class.path"/>
  +        </available>
  +    </target>
  +
  +    <target name="anakia-check" depends="anakia-avail" unless="AnakiaTask.present">
  +        <echo>
  +            AnakiaTask is not present! Please check to make sure that
  +            velocity.jar is in your classpath. The easiest way to build
  +            the documentation is to checkout jakarta-site CVS and specify
  +            jakarta-site.dir property.
  +        </echo>
  +    </target>
  +
  +    <target name="docs" depends="anakia-check" description="Generate documentation and
website">
  +        <taskdef name="anakia"
  +            classname="org.apache.velocity.anakia.AnakiaTask">
  +            <classpath refid="tools.class.path"/>
  +        </taskdef>
   
  +        <anakia basedir="${xdocs.dir}"
  +            destdir="${docs.dir}"
  +            style="docs.vsl"
  +            projectfile="menu.xml"
  +            includes="**/*.xml"
  +            excludes="menu.xml"
  +            velocitypropertiesfile="../site/src/stylesheets/velocity.properties"
  +            />
  +
  +     <copy todir="${docs.dir}" filtering="off">
  +      <fileset dir="../site/src" includes="css/*.css" />
  +      <fileset dir="${xdocs.dir}">
  +        <include name="**/images/**"/>
  +        <include name="**/*.gif"/>
  +        <include name="**/*.jpg"/>
  +        <include name="**/*.png"/>
  +        <include name="**/*.css"/>
  +        <include name="**/*.js"/>
  +      </fileset>
  +    </copy>
       </target>
  -    
  +        
       <target name="site" depends="javadocs, docs" description=" Places Docs ready for
hosting on website">
   
           <mkdir dir="../site/dist/docs/${dir-name}"/>
  
  
  
  1.2       +2 -9      jakarta-avalon-excalibur/info/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/info/default.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- default.properties	31 Aug 2002 08:17:00 -0000	1.1
  +++ default.properties	8 Sep 2002 02:57:53 -0000	1.2
  @@ -44,21 +44,14 @@
   build.classes = ${build.dir}/classes
   build.tests = ${build.dir}/tests
   build.reports = ${build.dir}/reports
  +docs.dir = ${build.dir}/docs
   
   #  Set the properties for source directories
   src.dir = src
   java.dir = ${src.dir}/java
   conf.dir = ${src.dir}/conf
   test.dir = ${src.dir}/test
  -
  -#  needed by Cocoon
  -build.context = ${build.dir}/documentation
  -build.docs = ${build.dir}/docs
  -build.xdocs = ${build.dir}/xdocs
  -context.dir = ../../jakarta-avalon/src/documentation
  -tools.dir = ../../jakarta-avalon/tools
  -tools.jar = ${java.home}/../lib/tools.jar
  -docs.dir = docs
  +xdocs.dir = src/xdocs
   
   #  Set the properties for distribution directories
   dist.dir = dist
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/info/src/xdocs/menu.xml
  
  Index: menu.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/info/src/xdocs/menu.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- menu.xml	31 Aug 2002 08:17:01 -0000	1.1
  +++ menu.xml	8 Sep 2002 02:57:53 -0000	1.2
  @@ -6,10 +6,10 @@
       <title>Avalon Info</title>
       <body>
           <menu name="About">
  -            <item name="Overview" href="index.html"/>
  +            <item name="Overview" href="/index.html"/>
               <item name="Excalibur Home" href="http://jakarta.apache.org/avalon/excalibur/index.html"/>
               <item name="Download" href="http://jakarta.apache.org/builds/jakarta-avalon-excalibur/release"/>
  -            <item name="API Docs" href="api/"/>
  +            <item name="API Docs" href="/api/"/>
           </menu>
       </body>
   </project>
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message