You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/05/16 08:00:37 UTC

cvs commit: avalon/logging maven.xml project.xml

mcconnell    2004/05/15 23:00:37

  Modified:    logging  maven.xml project.xml
  Log:
  Add notice file handling and prep for 1.0.0 release.
  
  Revision  Changes    Path
  1.14      +10 -3     avalon/logging/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/maven.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- maven.xml	8 May 2004 18:24:16 -0000	1.13
  +++ maven.xml	16 May 2004 06:00:37 -0000	1.14
  @@ -38,7 +38,7 @@
     <ant:property name="maven.dist.src.archive.dir"
       value="${maven.dist.assembly.dir}/src"/>
     <ant:property name="maven.dist.bin.assembly.dir"
  -    value="${maven.dist.assembly.dir}/bin/avalon-${pom.currentVersion}"/>
  +    value="${maven.dist.assembly.dir}/bin/${pom.artifactId}"/>
     <ant:property name="maven.dist.src.assembly.dir"
       value="${maven.dist.assembly.dir}/src/${pom.artifactId}"/>
     <ant:property name="maven.dist.dir"
  @@ -266,8 +266,11 @@
       </ant:echo>
       <ant:copy todir="${maven.dist.bin.assembly.dir}">
         <ant:fileset dir=".">
  +        <ant:include name="README.txt"/>
  +      </ant:fileset>
  +      <ant:fileset dir="${avalon.buildsystem}/site">
           <ant:include name="LICENSE*"/>
  -        <ant:include name="README*"/>
  +        <ant:include name="NOTICE*"/>
         </ant:fileset>
       </ant:copy>
   
  @@ -300,8 +303,12 @@
       </ant:echo>
   
       <ant:copy todir="${maven.dist.src.assembly.dir}">
  -      <ant:fileset dir=".">
  +      <ant:fileset dir="${avalon.buildsystem}/site">
           <ant:include name="LICENSE*"/>
  +        <ant:include name="NOTICE*"/>
  +      </ant:fileset>
  +      <ant:fileset dir=".">
  +        <ant:include name="README.txt"/>
           <ant:include name="project.properties"/>
           <ant:include name="maven.xml"/>
           <ant:include name="project.xml"/>
  
  
  
  1.10      +3 -2      avalon/logging/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	1 May 2004 17:03:44 -0000	1.9
  +++ project.xml	16 May 2004 06:00:37 -0000	1.10
  @@ -175,9 +175,10 @@
           </includes>
         </resource>
         <resource>
  -        <directory>${basedir}</directory>
  +        <directory>${avalon.buildsystem}/site</directory>
           <includes>
  -          <include>LICENSE.txt</include>
  +          <include>LICENSE*</include>
  +          <include>NOTICE*</include>
           </includes>
         </resource>
       </resources>
  
  
  

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