mcconnell    2002/08/24 19:49:09

  Modified:    meta     build.xml default.properties
               meta/src/java/org/apache/excalibur/meta/info/builder
                        package.html
  Log:
  Build procedure updates.
  
  Revision  Changes    Path
  1.4       +5 -43     jakarta-avalon-excalibur/meta/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/meta/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml 21 Aug 2002 03:34:31 -0000      1.3
  +++ build.xml 25 Aug 2002 02:49:09 -0000      1.4
  @@ -137,10 +137,10 @@
       <!-- Creates all the Javadocs -->
       <target name="javadocs" depends="compile" description="Generates the 
javadocs" unless="skip.javadocs">
   
  -        <mkdir dir="${dist.javadocs}"/>
  +        <mkdir dir="${build.javadocs}"/>
           <javadoc packagenames="org.apache.*"
               sourcepath="${java.dir}"
  -            destdir="${dist.javadocs}">
  +            destdir="${build.javadocs}">
               <classpath refid="project.class.path" />
               <doclet name="com.sun.tools.doclets.standard.Standard">
                   <param name="-author"/>
  @@ -297,48 +297,10 @@
   
       </target>
   
  -    <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>
  +    <target name="docs" depends="javadocs, xdocs" description="generates all 
the Avalon documentation"/>
   
  -        <anakia basedir="${xdocs.dir}"
  -            destdir="${docs.dir}"
  -            style="docs.vsl"
  -            projectfile="stylesheets/project.xml"
  -            includes="**/*.xml"
  -            excludes="stylesheets/**"
  -            
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 name="xdocs" description="generates the xdocs-based 
documentation">
  +      <ant antfile="${basedir}/../cocoonbuild.xml"/>
       </target>
   
       <target name="site" depends="javadocs, docs" description=" Places Docs 
ready for hosting on website">
  
  
  
  1.2       +2 -0      jakarta-avalon-excalibur/meta/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/meta/default.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- default.properties        20 Aug 2002 16:52:14 -0000      1.1
  +++ default.properties        25 Aug 2002 02:49:09 -0000      1.2
  @@ -49,6 +49,8 @@
   build.classes = ${build.dir}/classes
   build.tests = ${build.dir}/tests
   build.reports = ${build.dir}/reports
  +build.docs = ${build.dir}/docs
  +build.javadocs = ${build.docs}/api
   
   #  Set the properties for source directories
   src.dir = src
  
  
  
  1.2       +1 -1      
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/package.html
  
  Index: package.html
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html      20 Aug 2002 16:06:46 -0000      1.1
  +++ package.html      25 Aug 2002 02:49:09 -0000      1.2
  @@ -11,7 +11,7 @@
   <font color="gray"><i>&lt;!--
   Example of a component meta info external XML form. 
   The element contains the information required to construct an instance of
  -org.apache.excalibur.containerkit.metainfo.ComponentInfo.  It includes 
  +org.apache.excalibur.meta.info.Type.  It includes 
   information about the component type, the service it provides, and the 
   services it is dependent on.
   --&gt;</i></font>
  
  
  

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

Reply via email to