You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2003/06/29 11:15:37 UTC

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

crossley    2003/06/29 02:15:37

  Modified:    src/targets forrest-build.xml validate-build.xml
                        webapp-build.xml
  Log:
  Looking for the correct point at which to copy the build jars table document,
  so that it is available to both the Forrest build docs and the Cocoon webapp.
  
  Revision  Changes    Path
  1.8       +4 -0      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- forrest-build.xml	21 May 2003 17:49:27 -0000	1.7
  +++ forrest-build.xml	29 Jun 2003 09:15:37 -0000	1.8
  @@ -1,6 +1,10 @@
   <!-- === Forrest Targets ================================================= -->
   
     <target name="forrest" depends="prepare, prepare-docs, forrest.init" description="Generates static HTML documentation">
  +    <!-- Add some other documents -->
  +    <copy file="${build.temp}/jars.xml"
  +      tofile="${build.context}/xdocs/installing/jars.xml" filtering="off"/>
  +
       <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/>
     </target>
   
  
  
  
  1.13      +0 -4      cocoon-2.1/src/targets/validate-build.xml
  
  Index: validate-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/validate-build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- validate-build.xml	27 Jun 2003 09:06:14 -0000	1.12
  +++ validate-build.xml	29 Jun 2003 09:15:37 -0000	1.13
  @@ -51,10 +51,6 @@
             style="${tools}/src/check-jars.xsl">
         <param name="current-files" expression="../../${build.temp}/current-jars.xml"/>
       </xslt>
  -
  -    <copy file="${build.temp}/jars.xml"
  -          tofile="${build.context}/xdocs/installing/jars.xml"
  -          filtering="off"/>
     </target>
   
     <!-- Validate configuration files. -->
  
  
  
  1.22      +5 -1      cocoon-2.1/src/targets/webapp-build.xml
  
  Index: webapp-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/webapp-build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- webapp-build.xml	23 Jun 2003 18:11:30 -0000	1.21
  +++ webapp-build.xml	29 Jun 2003 09:15:37 -0000	1.22
  @@ -151,7 +151,11 @@
               includes="**/*.xwelcome"/>    
     </target>
     
  -  <target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-idldocs,prepare-webapp-deprecated,prepare-webapp-scratchpad,validate-jars,validate-config,custom-conf" description="Builds web application folder"/>
  +  <target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-idldocs,prepare-webapp-deprecated,prepare-webapp-scratchpad,validate-jars,validate-config,custom-conf" description="Builds web application folder">
  +    <!-- Add some other documents -->
  +    <copy file="${build.temp}/jars.xml"
  +      tofile="${build.webapp.docs}/xdocs/installing/jars.xml" filtering="off"/>
  +  </target>
   
     <target name="war" depends="webapp" description="Builds web application archive">
       <!-- A task to create manifest for webapp. -->