avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-apps/hsql/src/xdocs book.xml
Date Thu, 06 Jun 2002 10:28:14 GMT
hammant     2002/06/06 03:28:14

  Modified:    hsql     build.xml
               hsql/src/xdocs book.xml
  Log:
  xdoclet not included in distributables.
  
  Revision  Changes    Path
  1.22      +21 -9     jakarta-avalon-apps/hsql/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/hsql/build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- build.xml	6 Jun 2002 09:41:45 -0000	1.21
  +++ build.xml	6 Jun 2002 10:28:14 -0000	1.22
  @@ -124,8 +124,12 @@
   
     </target>
   
  +  <target name="test-xdoclet">  
  +    <available classname="xdoclet.XDocletMain" classpathref="project.class.path" property="xdoclet.present"/>
   
  +  </target>
  +
     <!-- Make .xinfo and manifest automatically for blocks -->
  -  <target name="phoenix-xdoclet" depends="compile">
  +  <target name="phoenix-xdoclet" depends="compile" if="xdoclet.present">
     
       <mkdir dir="${build.xdoclet}"/>
     
  @@ -145,8 +149,18 @@
   
     </target>
   
  +  <!-- Make .xinfo and manifest automatically for blocks -->
  +  <target name="no-phoenix-xdoclet" depends="compile" unless="xdoclet.present">
  +  
  +    <mkdir dir="${build.xdoclet}"/>
  +  
  +    <unzip src="${src.dir}/generated-by-xdoclet.zip" dest="${build.xdoclet}" />
  +
  +  </target>
  +
  +
     <!-- Jars up project -->
  -  <target name="jars" depends="phoenix-xdoclet">
  +  <target name="jars" depends="test-xdoclet, phoenix-xdoclet, no-phoenix-xdoclet">
   
       <mkdir dir="${build.lib}"/>
   
  @@ -342,9 +356,6 @@
           <include name="common/lib/avalon-*"/>
           <include name="common/lib/cornerstone.jar"/>
           <include name="common/lib/phoenix-*"/>
  -        <include name="common/lib/xdoclet*"/>
  -        <include name="common/lib/xjavadoc*"/>
  -        <include name="common/lib/log4j-core*"/>
         </fileset>
       </zip>
   
  @@ -360,9 +371,6 @@
           <include name="common/lib/avalon-*"/>
           <include name="common/lib/cornerstone.jar"/>
           <include name="common/lib/phoenix-*"/>
  -        <include name="common/lib/xdoclet*"/>
  -        <include name="common/lib/xjavadoc*"/>
  -        <include name="common/lib/log4j-core*"/>
         </tarfileset>
         
       </tar>
  @@ -400,15 +408,19 @@
       <property name="src.dist.src" value="${src.dist.dir}/src"/>
       <property name="src.dist.docs" value="${src.dist.dir}/docs"/>
   
  -    <mkdir dir="${src.dist.docs}"/>
  +    <mkdir dir="${src.dist.docs}"/>     
   
       <copy todir="${src.dist.docs}">
         <fileset dir="${docs.dir}"/>
  +      <fileset dir="${build.docs}"/>          
       </copy>
   
       <copy todir="${src.dist.src}">
         <fileset dir="${src.dir}"/>
       </copy>
  +
  +      <zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
  +           basedir="${build.xdoclet}"/>
       
       <copy todir="${src.dist.dir}">
         <fileset dir=".">
  
  
  
  1.5       +9 -0      jakarta-avalon-apps/hsql/src/xdocs/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/hsql/src/xdocs/book.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- book.xml	28 Mar 2002 11:03:28 -0000	1.4
  +++ book.xml	6 Jun 2002 10:28:14 -0000	1.5
  @@ -11,6 +11,15 @@
       <menu-item label="Overview" href="index.html"/>
       <menu-item type="external" id="downloads" label="Download" href="http://jakarta.apache.org/builds/jakarta-avalon/apps"/>
   
     </menu>
  +  
  +  <!--  This causes Cocoon to barf 
  +  
  +  <menu label="Reference">
  +    <menu-item type="external" id="api-docs" label="API Docs" href="api/index.html"/>
  +  </menu>
  +  
  +  -->
  +  
   
   </book>
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message