cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject cvs commit: cocoon-2.1 build.properties build.xml
Date Sun, 16 Mar 2003 10:38:00 GMT
stefano     2003/03/16 02:38:00

  Modified:    .        build.properties build.xml
  Log:
  in order to increase the try/fail cycle, allow not to exclude javadoc/idldoc generation
from the webapp target (also remove the message about missed regeneration because that's obvious)
  
  Revision  Changes    Path
  1.7       +9 -5      cocoon-2.1/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.properties	15 Mar 2003 23:27:39 -0000	1.6
  +++ build.properties	16 Mar 2003 10:38:00 -0000	1.7
  @@ -15,8 +15,17 @@
   #exclude.webapp.scratchpad=true
   #exclude.webapp.samples=true
   
  +# ---- Build Exclusions --------------------------------------------------------
  +
   #exclude.scratchpad=true
   #exclude.deprecated=true
  +#exclude.javadocs=true
  +#exclude.idldocs=true
  +
  +# ---- Validation --------------------------------------------------------------
  +
  +validate.config=true
  +validate.xdocs=true
   
   # ---- Build -------------------------------------------------------------------
   
  @@ -67,11 +76,6 @@
   compiler.pedantic=off
   compiler.depend=on
   compiler.fulldepend=on
  -
  -# ---- Validation --------------------------------------------------------------
  -
  -validate.config=true
  -validate.xdocs=true
   
   
   # ------ System Properties -----------------------------------------------------
  
  
  
  1.14      +22 -20    cocoon-2.1/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml	15 Mar 2003 23:43:50 -0000	1.13
  +++ build.xml	16 Mar 2003 10:38:00 -0000	1.14
  @@ -72,7 +72,13 @@
       <condition property="unless.exclude.deprecated">
         <istrue value="${exclude.deprecated}"/>
       </condition>
  -
  +    <condition property="unless.exclude.javadocs">
  +      <istrue value="${exclude.javadocs}"/>
  +    </condition>
  +    <condition property="unless.exclude.idldocs">
  +      <istrue value="${exclude.idldocs}"/>
  +    </condition>
  +        
       <filter token="Name"                value="${fullname}"/>
       <filter token="name"                value="${fullname}"/>
       <filter token="year"                value="${year}"/>
  @@ -481,7 +487,7 @@
   <!-- Javadoc/IDLDoc Targets ================================================ -->
   
     <!-- Create IDL API documentation -->
  -  <target name="idldocs" depends="prepare-core" description="Builds the IDL API documentation
for non-java language bindings">
  +  <target name="idldocs" depends="prepare-core" unless="unless.exclude.idldocs" description="Builds
the IDL API documentation for non-java language bindings">
       <mkdir dir="${build.idldocs}"/>
       <java classname="org.openorb.compiler.doc.IdlDoc">
         <arg value="-I${idl}"/>
  @@ -492,26 +498,22 @@
       </java>
     </target>
   
  -  <!-- Set a variable if javadocs are already up-to-date. -->
  -  <target name="javadocs_check">
  +  <!-- Check if javadocs have to be generated -->
  +  <target name="javadocs-check">
       <mkdir dir="${build.javadocs}"/>
  -    <uptodate property="javadocs.notrequired" targetfile="${build.javadocs}/packages.html"
>
  -      <srcfiles dir= "${java}" includes="**/*.java,**/package.html"/>
  -      <srcfiles dir= "${deprecated.src}" includes="**/*.java,**/package.html"/>
  -    </uptodate>
  -  </target>
  -
  -  <!-- If javadocs are already up-to-date, print a message saying so. -->
  -  <target name="javadocs_done" depends="javadocs_check" if="javadocs.notrequired">
  -    <echo message="-------------------------------------------------------------"/>
  -    <echo message="Not rebuilding Javadocs, as they are up-to-date:"/>
  -    <echo message="  ${build.javadocs}/packages.html is more recent than"/>
  -    <echo message="  ${java}/**/*.java"/>
  -    <echo message="-------------------------------------------------------------"/>
  +    <condition property="javadocs.notrequired" value="true">
  +     <or>
  +      <uptodate targetfile="${build.javadocs}/packages.html" >
  +       <srcfiles dir= "${java}" includes="**/*.java,**/package.html"/>
  +       <srcfiles dir= "${deprecated.src}" includes="**/*.java,**/package.html"/>
  +      </uptodate>
  +      <istrue value="${unless.exclude.javadocs}"/>
  +     </or>
  +    </condition>
     </target>
   
     <!-- Creates Javadocs -->
  -  <target name="javadocs" depends="prepare-core, javadocs_done" unless="javadocs.notrequired"
description="Builds the API documentation (javadocs)">
  +  <target name="javadocs" depends="prepare-core, javadocs-check" unless="javadocs.notrequired"
description="Builds the API documentation (javadocs)">
   
       <condition property="javadoc.additionalparam" value="-breakiterator -tag todo:all:Todo:">
         <equals arg1="1.4" arg2="${ant.java.version}"/>
  @@ -742,7 +744,7 @@
         </fileset>
       </copy>
   
  -    <!-- patch the welcome page to tell we have javadocs to show -->
  +    <!-- patch the welcome page to tell we have documentation to show -->
       <xpatch directory="${documentation}" extension="xwelcome" configuration="${build.webapp}/welcome.xml"/>
   
     </target>
     
  
  
  

Mime
View raw message