jstrachan    2002/07/10 06:50:01

  Modified:    src/plugins/dist plugin.jelly
  Log:
  Patched the dist:build goal so that it now finds project.properties, maven.xml and 
LICENSE.txt files.
  
  Also I've split the goal into 2 parts introducing a dist:prepare-filesystem. This 
should allow pre/post goals to be done that add extra stuff into a distro.
  
  Revision  Changes    Path
  1.8       +33 -19    jakarta-turbine-maven/src/plugins/dist/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/dist/plugin.jelly,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly      9 Jul 2002 23:17:40 -0000       1.7
  +++ plugin.jelly      10 Jul 2002 13:50:00 -0000      1.8
  @@ -13,9 +13,9 @@
     <property name="maven.dist.dir" value="${maven.build.dir}/distributions"/>
   
     <goal
  -    name="dist:build"
  +    name="dist:prepare-filesystem"
       prereqs="java:jar,javadoc:generate"
  -    description="Build a distribution">
  +    description="Builds the distribution file system ready to be zipped up">
       
       <!--
       
  @@ -42,6 +42,9 @@
         <fileset dir=".">
           <include name="README.txt"/>
           <include name="LICENSE"/>
  +        <include name="LICENSE.txt"/>
  +        <include name="project.properties"/>
  +        <include name="maven.xml"/>
         </fileset>
       </copy>
   
  @@ -62,23 +65,6 @@
       <delete dir="${maven.dist.dir}"/>
       <mkdir dir="${maven.dist.dir}"/>
   
  -    <!-- Create a tar.gz file -->
  -    <tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
  -      <tarfileset dir="${maven.dist.assembly.dir}"/>
  -    </tar>
  -
  -    <gzip 
  -      zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
  -      src="${maven.dist.dir}/${maven.final.name}.tar"
  -    />
  -    
  -    <delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
  -
  -    <!-- Create a zip file -->
  -    <zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
  -      <zipfileset dir="${maven.dist.assembly.dir}"/>
  -    </zip>
  -
       <!-- S O U R C E  D I S T R I B U T I O N -->
   
       <echo>
  @@ -103,7 +89,35 @@
           <include name="**/*.properties"/>
         </fileset>
       </copy>
  +  </goal>
  +
  +  <goal
  +    name="dist:build"
  +    prereqs="dist:prepare-filesystem"
  +    description="Build a distribution">
  +
  +     <!-- binary tarballs -->
  +         
  +    <!-- Create a tar.gz file -->
  +    <tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
  +      <tarfileset dir="${maven.dist.assembly.dir}"/>
  +    </tar>
  +
  +    <gzip 
  +      zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
  +      src="${maven.dist.dir}/${maven.final.name}.tar"
  +    />
  +    
  +    <delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
  +
  +    <!-- Create a zip file -->
  +    <zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
  +      <zipfileset dir="${maven.dist.assembly.dir}"/>
  +    </zip>
  +
   
  +     <!-- source tarballs -->
  +     
       <!-- Create a tar.gz file -->
       <tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
         <tarfileset dir="${maven.dist.assembly.dir}"/>
  
  
  

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

Reply via email to