avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/xdocs book.xml
Date Thu, 11 Jul 2002 15:25:30 GMT
bloritsch    2002/07/11 08:25:30

  Modified:    fortress build.xml default.properties
               fortress/src/xdocs book.xml
  Log:
  update fortress so that it builds docs
  
  Revision  Changes    Path
  1.27      +57 -0     jakarta-avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml	7 Jul 2002 08:38:12 -0000	1.26
  +++ build.xml	11 Jul 2002 15:25:30 -0000	1.27
  @@ -1,13 +1,20 @@
   <?xml version="1.0"?>
  +<!DOCTYPE project [
  +<!-- =================  Cocoon project targets =================  -->
  +<!ENTITY cocoon-targets     SYSTEM "../cocoon.xtarget">
  +]>
   
   <project name="Excalibur Fortress" default="main" basedir=".">
   
  +    &cocoon-targets;
  +
       <property file="${user.home}/build.properties"/>
       <property file="${basedir}/../ant.properties"/>
       <property file="${basedir}/ant.properties"/>
       <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">
  @@ -29,6 +36,13 @@
           <pathelement path="${java.class.path}"/>
       </path>
   
  +    <path id="tools.class.path">
  +        <pathelement location="${junit.jar}"/>
  +        <pathelement location="${tools.jar}"/>
  +        <fileset dir="${tools.dir}/lib"/>
  +        <fileset dir="${tools.dir}/ext"/>
  +    </path>
  +
       <path id="test.class.path">
           <pathelement location="${build.testclasses}"/>
           <pathelement location="${junit.jar}"/>
  @@ -375,6 +389,49 @@
   
       </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="html-docs, javadocs" description="generates all the
Avalon documentation"/>
  +
  +    <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}"/>
  +      <copy todir="../site/dist/docs/${dir-name}">
  +        <fileset dir="${build.docs}">
  +          <include name="**"/>
  +        </fileset>
  +      </copy>        
  +  
  +    </target>
  +    
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
           <delete file="checkstyle.cache"/>
  
  
  
  1.18      +0 -10     jakarta-avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- default.properties	7 Jul 2002 08:38:12 -0000	1.17
  +++ default.properties	11 Jul 2002 15:25:30 -0000	1.18
  @@ -144,16 +144,6 @@
   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.dir}/xdocs
  -
   #  Set the properties for distribution directories
   dist.dir = dist
   dist.javadocs = ${dist.dir}/docs/api
  
  
  
  1.3       +11 -6     jakarta-avalon-excalibur/fortress/src/xdocs/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/xdocs/book.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- book.xml	16 Jun 2002 11:26:12 -0000	1.2
  +++ book.xml	11 Jul 2002 15:25:30 -0000	1.3
  @@ -4,14 +4,19 @@
         title="Avalon Excalibur Documentation - Fortress"
         copyright="@year@ The Apache Software Foundation">
   
  -  <project label="Back to Avalon" href="@AVALON_BASE@" />
  -  <project label="Back to Excalibur" href="../index.html" />
   
  -  <menu label="About">
  +	<menu label="Related">
  +		<menu-item type="external" id="AvalonHome" label="Avalon Home" href="http://jakarta.apache.org/avalon/"/>
  +		<menu-item type="external" id="ExcaliburHome" label="Excalibur Home" href="http://jakarta.apache.org/avalon/excalibur/"/>
  +		<menu-item type="external" id="PhoenixHome" label="Avalon Phoenix" href="http://jakarta.apache.org/avalon/phoenix"/>
  +		<menu-item type="external" id="ECMHome" label="ECM" href="http://jakarta.apache.org/avalon/excalibur/component"/>
  +		<menu-item type="external" id="FortressHome" label="Fortress" href="http://jakarta.apache.org/avalon/excalibur/fortress"/>
  +	</menu>
  +	
  +  <menu label="Essentials">
       <menu-item label="Overview" href="index.html"/>
  -    <menu-item type="external" id="ExcaliburHome" label="Excalibur Home" href="http://jakarta.apache.org/avalon/excalibur/index.html"/>
  -    <menu-item type="external" id="downloads" label="Download" href="http://jakarta.apache.org/builds/jakarta-avalon-excalibur/release"/>
  -    <menu-item type="external" id="api-docs" label="API Docs" href="api/index.html"/>
  +    <menu-item type="external" id="download" label="Download" href="http://jakarta.apache.org/builds/jakarta-avalon-excalibur/release"/>
  +    <menu-item type="external" id="api-docs" label="API Docs" href="api/"/>
   
     </menu>
   
  
  
  

--
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