Return-Path: 
 <avalon-cvs-return-9187-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 39334 invoked from network); 30 Jul 2002 22:28:59 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 30 Jul 2002 22:28:59 -0000
Received: (qmail 13442 invoked by uid 97); 30 Jul 2002 22:29:24 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 13425 invoked by uid 97); 30 Jul 2002 22:29:23 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 13405 invoked by uid 97); 30 Jul 2002 22:29:23 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 30 Jul 2002 22:28:54 -0000
Message-ID: <20020730222854.69733.qmail@icarus.apache.org>
From: hammant@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit: jakarta-avalon-excalibur/threadcontext build.xml
 default.properties
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

hammant     2002/07/30 15:28:54

  Modified:    threadcontext build.xml default.properties
  Log:
  thread context now makes local docs
  
  Revision  Changes    Path
  1.19      +7 -47     jakarta-avalon-excalibur/threadcontext/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/threadcontext/build.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.xml	6 Jul 2002 05:44:27 -0000	1.18
  +++ build.xml	30 Jul 2002 22:28:54 -0000	1.19
  @@ -259,8 +259,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}"/>
  @@ -274,6 +274,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}" />
  @@ -328,58 +329,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.6       +1 -1      jakarta-avalon-excalibur/threadcontext/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/threadcontext/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties	16 Apr 2002 12:00:42 -0000	1.5
  +++ default.properties	30 Jul 2002 22:28:54 -0000	1.6
  @@ -51,7 +51,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>