You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2003/05/21 19:49:27 UTC

cvs commit: cocoon-2.1/src/targets admin-build.xml forrest-build.xml

vgritsenko    2003/05/21 10:49:27

  Modified:    .        forrest.properties
               src/targets admin-build.xml forrest-build.xml
  Log:
  use filtered version of xdocs when doing forrest site
  
  Revision  Changes    Path
  1.11      +1 -1      cocoon-2.1/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/forrest.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- forrest.properties	21 May 2003 15:15:49 -0000	1.10
  +++ forrest.properties	21 May 2003 17:49:27 -0000	1.11
  @@ -26,7 +26,7 @@
   project.content-dir=src/documentation
   #project.conf-dir=${project.content-dir}/conf
   #project.sitemap=${project.content-dir}/sitemap.xmap
  -project.xdocs-dir=${project.content-dir}/xdocs
  +project.xdocs-dir=build/${project.name}/documentation/xdocs
   #project.stylesheets-dir=${project.content-dir}/resources/stylesheets
   project.images-dir=${project.content-dir}/images
   #project.schema-dir=${project.content-dir}/resources/schema
  
  
  
  1.9       +1 -1      cocoon-2.1/src/targets/admin-build.xml
  
  Index: admin-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/admin-build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- admin-build.xml	21 May 2003 15:15:49 -0000	1.8
  +++ admin-build.xml	21 May 2003 17:49:27 -0000	1.9
  @@ -1,7 +1,7 @@
   <!-- === Admin targets ===================================================== -->
   
     <!-- Creates the web site  -->
  -  <target name="site" depends="init, forrest, javadocs" description="[admin] Builds the site">
  +  <target name="site" depends="forrest, javadocs" description="[admin] Builds the site">
       <mkdir dir="${site}"/>
       <copy todir="${site}" filtering="off">
         <fileset dir="${build.site}"/>
  
  
  
  1.7       +1 -1      cocoon-2.1/src/targets/forrest-build.xml
  
  Index: forrest-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/forrest-build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- forrest-build.xml	24 Mar 2003 10:34:08 -0000	1.6
  +++ forrest-build.xml	21 May 2003 17:49:27 -0000	1.7
  @@ -1,6 +1,6 @@
   <!-- === Forrest Targets ================================================= -->
   
  -  <target name="forrest" depends="prepare, forrest.init" description="Generates static HTML documentation">
  +  <target name="forrest" depends="prepare, prepare-docs, forrest.init" description="Generates static HTML documentation">
       <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/>
     </target>