cziegeler    2002/07/15 23:58:39

  Modified:    .        build.xml
  Log:
  Fixing javadocs build for latest ant...
  
  Revision  Changes    Path
  1.248     +12 -10    xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.247
  retrieving revision 1.248
  diff -u -r1.247 -r1.248
  --- build.xml 15 Jul 2002 11:00:41 -0000      1.247
  +++ build.xml 16 Jul 2002 06:58:38 -0000      1.248
  @@ -294,11 +294,11 @@
       <mkdir dir="${tools.dir}/anttasks"/>
       <javac srcdir="${tools.dir}/src" 
              destdir="${tools.dir}/anttasks"
  -           debug="${debug}"
  -           optimize="${optimize}"
  -           deprecation="${deprecation}"
  -           target="${target.vm}"
  -           nowarn="${nowarn}"
  +           debug="off"
  +           optimize="on"
  +           deprecation="on"
  +           target="1.2"
  +           nowarn="on"
              classpathref="anttasks.classpath"/>
   
     </target>
  @@ -1486,7 +1486,7 @@
     <!-- =================================================================== -->
     <!-- Creates the API documentation for pre JDK 1.4                       -->
     <!-- =================================================================== -->
  -  <target name="javadocs13" depends="init" unless="jdbc3.present">
  +  <target name="javadocs13" unless="jdbc3.present">
       <javadoc packagenames="${packages}.*"
                sourcepath="${build.src}"
                destdir="${build.javadocs}"
  @@ -1505,8 +1505,10 @@
     <!-- =================================================================== -->
     <!-- Creates the API documentation for JDK 1.4                           -->
     <!-- =================================================================== -->
  -  <target name="javadocs14" depends="init" if="jdbc3.present">
  -    <javadoc additionalparam="-subpackages ${packages}"
  +  <target name="javadocs14" if="jdbc3.present">
  +    <javadoc packagenames="${packages}.*"
  +             additionalparam="-subpackages ${packages}"
  +             
excludepackagenames="org.apache.cocoon.components.language.programming.java"
                sourcepath="${build.src}"
                destdir="${build.javadocs}"
                author="true"
  @@ -1527,8 +1529,8 @@
     <target name="javadocs" depends="prepare-src-main, javadocs_check, javadocs_done"
            unless="javadocs.notrequired"
            description="Builds the API documentation (javadocs)">
  -      <antcall target="javadocs13"/>
  -      <antcall target="javadocs14"/>
  +    <antcall target="javadocs13" inheritAll="true" inheritRefs="true"/>
  +    <antcall target="javadocs14" inheritAll="true" inheritRefs="true"/>
     </target>
   
     <!-- =================================================================== -->
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to