avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/component build.xml default.properties
Date Tue, 30 Jul 2002 23:02:52 GMT
hammant     2002/07/30 16:02:52

  Modified:    component build.xml default.properties
  Log:
  comp now includes docs in dist
  
  Revision  Changes    Path
  1.20      +7 -47     jakarta-avalon-excalibur/component/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	22 Jun 2002 16:35:00 -0000	1.19
  +++ build.xml	30 Jul 2002 23:02:52 -0000	1.20
  @@ -276,8 +276,8 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="dist-jar, test-reports, checkstyle-report, javadocs"
  -        description="Generates a distribution (jar + javadocs + unit tests + checkstyle
reports)">
  +        depends="dist-jar, test-reports, checkstyle-report, site"
  +        description="Generates a distribution (jar + docs + javadocs + unit tests + checkstyle
reports)">
   
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  @@ -287,6 +287,7 @@
   
           <zip zipfile="${dist.base}/${dist.name}-bin.zip" compress="true">
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
  +            <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
   
           <!--
  @@ -362,58 +363,17 @@
   
   
       <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="setup-filters"> <!-- depends="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>
  -
  -      <copy todir="${build.context}/resources" filtering="off" overwrite="yes">
  -        <fileset dir="${context.dir}/resources"/>
  -        <fileset dir="${xdocs.dir}">
  -          <include name="**/images/**"/>
  -        </fileset>
  -      </copy>
  -
  -      <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}/${dir-name}.uris"/>
  -        <classpath>
  -          <path refid="tools.class.path"/>
  -          <fileset dir="${tools.dir}/ext"/>
  -        </classpath>
  -      </java>
  +    <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>
  -
  -      <!-- hack for stupid transport on api link -->
  -      <replace file="${docs.dir}/index.html" token="index.html.xml" value="index.html"/>
  +      </copy>    
   
       </target>
  -
  +    
       <target name="site" depends="javadocs, docs" description=" Places Docs ready for
hosting on website">
   
         <mkdir dir="../site/dist/docs/${dir-name}"/>
  
  
  
  1.7       +2 -2      jakarta-avalon-excalibur/component/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/default.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- default.properties	25 Apr 2002 02:29:40 -0000	1.6
  +++ default.properties	30 Jul 2002 23:02:52 -0000	1.7
  @@ -66,7 +66,7 @@
   # ----- Excalibur instrument, version 0.1 or later -----
   excalibur-instrument.home=${basedir}/../instrument/dist
   excalibur-instrument.lib=${excalibur-instrument.home}
  -excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
  +excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.2.jar
   
   # --------------------------------------------------
   
  @@ -105,7 +105,7 @@
   
   #  Set the properties for distribution directories
   dist.dir = dist
  -dist.javadocs = ${dist.dir}/docs/api
  +dist.javadocs = ${docs.dir}/api
   
   #  name of .zip/.tar.gz/.bz2 files and their top-level directory
   dist.name = ${name}-${version}
  
  
  

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