carlos      2004/07/03 11:08:21

  Modified:    dist     plugin.jelly
               dist/xdocs changes.xml
  Log:
  Don't generate ant build file
  
  Revision  Changes    Path
  1.20      +3 -13     maven-plugins/dist/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/dist/plugin.jelly,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- plugin.jelly      3 Jul 2004 18:02:09 -0000       1.19
  +++ plugin.jelly      3 Jul 2004 18:08:21 -0000       1.20
  @@ -124,19 +124,9 @@
       <ant:available property="maven.dist.build.xml.avail"
                  file="${basedir}/build.xml"/>
   
  -    <j:choose>
  -      <j:when test="${maven.dist.build.xml.avail}">
  -        <ant:copy todir="${maven.dist.src.assembly.dir}" 
file="${basedir}/build.xml"/>
  -      </j:when>
  -      <j:otherwise>
  -        <j:if test="${sourcesPresent == 'true'}">
  -          <attainGoal name="ant:generate-build"/>
  -          <ant:move 
  -            file="${basedir}/build.xml"
  -            tofile="${maven.dist.src.assembly.dir}/build.xml"/>
  -        </j:if>
  -      </j:otherwise>
  -    </j:choose>
  +    <j:if test="${maven.dist.build.xml.avail}">
  +      <ant:copy todir="${maven.dist.src.assembly.dir}" file="${basedir}/build.xml"/>
  +    </j:if>
   
       <!-- Copy Source -->
       <util:available file="${maven.src.dir}">
  
  
  
  1.20      +1 -0      maven-plugins/dist/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/dist/xdocs/changes.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- changes.xml       3 Jul 2004 18:02:09 -0000       1.19
  +++ changes.xml       3 Jul 2004 18:08:21 -0000       1.20
  @@ -25,6 +25,7 @@
     </properties>
     <body>
       <release version="1.7-SNAPSHOT" date="in CVS">
  +      <action dev="carlos" type="update">Don't generate ant build file, call 
maven-ant-plugin before or set a preGoal</action>
         <action dev="carlos" type="update">Add NOTICE file to distribution</action>
       </release>
       <release version="1.6" date="2004-06-25">
  
  
  

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

Reply via email to