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/baxter build.xml default.properties
Date Thu, 01 Aug 2002 21:53:17 GMT
hammant     2002/08/01 14:53:17

  Modified:    baxter   build.xml default.properties
  Log:
  Bacter now has docs in dists
  
  Revision  Changes    Path
  1.27      +38 -4     jakarta-avalon-excalibur/baxter/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml	21 Jul 2002 09:15:51 -0000	1.26
  +++ build.xml	1 Aug 2002 21:53:17 -0000	1.27
  @@ -262,8 +262,8 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="dist-jar, test-reports, checkstyle, javadocs"
  -        description="Generates a distribution (jar + javadocs + unit tests + checkstyle
reports)">
  +        depends="dist-jar, test-reports, checkstyle, site"
  +        description="Generates a distribution (jar + docs + javadocs + unit tests + checkstyle
reports)">
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
  @@ -276,6 +276,7 @@
   
           <zip zipfile="${dist.base}/${dist.name}.zip" compress="true">
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
  +            <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
   
           <delete dir="${dist.dir}" />
  @@ -302,9 +303,42 @@
   
       </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="javadocs" description="Generates the Docs"
-->
  -         <ant antfile="${basedir}/../cocoonbuild.xml"/>
  +    <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>
   
       <target name="site" depends="javadocs, docs" description=" Places Docs ready for
hosting on website">
  
  
  
  1.6       +3 -4      jakarta-avalon-excalibur/baxter/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties	16 Apr 2002 12:00:39 -0000	1.5
  +++ default.properties	1 Aug 2002 21:53:17 -0000	1.6
  @@ -47,12 +47,11 @@
   context.dir = ../../jakarta-avalon/src/documentation
   tools.dir = ../../jakarta-avalon/tools
   tools.jar = ${java.home}/../lib/tools.jar
  -docs.dir = dist/docs
  -xdocs.dir = ${src.dir}/xdocs
  +docs.dir = docs
   
   #  Set the properties for distribution directories
  -dist.dir = dist
  -dist.javadocs = ${dist.dir}/docs/api
  +dist.dir = ${basedir}/dist
  +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