plynch      2002/07/11 17:04:47

  Modified:    src/plugins/xdoc plugin.jelly
  Log:
  o Check for the existence of a generated docs dir before actually trying to 
transform them. This is a problem if the user just called xdoc:transform instead of 
site:generate
  
  Revision  Changes    Path
  1.14      +18 -6     jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- plugin.jelly      11 Jul 2002 03:56:44 -0000      1.13
  +++ plugin.jelly      12 Jul 2002 00:04:47 -0000      1.14
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project xmlns:j="jelly:core">
  +<project xmlns:j="jelly:core" xmlns:log="jelly:log">
   
     <!-- ================================================================== -->
     <!-- P R O J E C T  D O C U M E N T A T I O N                           -->
  @@ -47,10 +47,19 @@
       <tstamp>
         <format property="maven.current.year" pattern="yyyy" />
       </tstamp>
  -    
  +
       <mkdir dir="${maven.docs.dest}"/>
   
       <!-- Transform the auto-generated xdocs first -->
  +    <available file="${maven.gen.docs}" type="dir"
  +      property="maven.gen.docs.available" />
  +    <j:if test="${!maven.gen.docs.available}" >
  +      <log:info>
  +        No Maven generated documentation to transform - skipping.
  +
  +      </log:info>
  +    </j:if>
  +    <j:if test="${maven.gen.docs.available}" >
       <dvsl
         basedir="${maven.gen.docs}"
         destdir="${maven.docs.dest}/"
  @@ -75,7 +84,11 @@
         <tool name="toolbox.string.testSrcPresent" value="${unitTestSourcesPresent}"/>
         <tool name="toolbox.string.currentYear" value="${maven.current.year}"/>
       </dvsl>
  +    </j:if>
   
  +    <log:info>
  +      Transforming user supplied documentation.
  +    </log:info>
       <!-- Then transform user supplied xdocs next -->
       <dvsl
         basedir="${maven.docs.src}"
  @@ -102,10 +115,10 @@
         <tool name="toolbox.string.currentYear" value="${maven.current.year}"/>
       </dvsl>
   
  -     <!-- create possibly missing directories just in case -->
  +    <!-- create possibly missing directories just in case -->
       <mkdir dir="${maven.docs.src}/images"/>
       <mkdir dir="${maven.docs.src}/style"/>
  -    
  +
       <!-- Copy site images -->
       <copy todir="${maven.docs.dest}/images" filtering="no">
         <fileset dir="${maven.home}/images">
  @@ -176,10 +189,9 @@
           <filter token="UI_HREF_LINK_SELFREF" value="${maven.ui.href.link.selfref}"/>
         </filterset>
       </copy>
  -    
  +
       <!-- A hack to make the fileset below work. The files don't have to be
            present but the directory does. -->
  -         
       <mkdir dir="${maven.docs.src}/stylesheets"/>
   
       <!-- Copy user supplied stylesheets, can override maven -->
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to