incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: incubator-ftpserver maven.xml
Date Thu, 06 Oct 2005 07:09:01 GMT
rana_b      2005/10/06 00:09:00

  Modified:    .        maven.xml
  Log:
  lib -> common/lib
  
  Revision  Changes    Path
  1.5       +31 -19    incubator-ftpserver/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/maven.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- maven.xml	28 Sep 2005 10:50:15 -0000	1.4
  +++ maven.xml	6 Oct 2005 07:09:00 -0000	1.5
  @@ -48,20 +48,30 @@
   
           <!-- Copy all the dependent jar files -->
           <j:forEach var="lib" items="${pom.artifacts}">
  -            <ant:copy file="${lib.path}" todir="${basedir}/lib"/>
  +            <ant:copy file="${lib.path}" todir="${basedir}/common/lib"/>
           </j:forEach>
       </goal>
   
   
  +    <!-- ========================================== -->
  +    <!-- Remove all the .gen files in res directory -->
  +    <!-- ========================================== -->
  +    <postGoal name="clean:clean">
  +        <ant:delete>
  +            <ant:fileset dir="${basedir}/res" includes="**/*.gen"/>
  +        </ant:delete>
  +    </postGoal>
  +
  +
       <!-- ======================================= -->
       <!-- Copy documents, scripts and fix newline -->
       <!-- ======================================= -->
       <postGoal name="dist:prepare-src-filesystem">
   
  -        <!-- Create lib directory -->
  -        <ant:mkdir dir="${maven.dist.src.assembly.dir}/lib"/>
  -        <ant:copy todir="${maven.dist.src.assembly.dir}/lib">
  -            <ant:fileset dir="${basedir}/lib" includes="*.txt"/>
  +        <!-- Create common directory -->
  +        <ant:mkdir dir="${maven.dist.src.assembly.dir}/common"/>
  +        <ant:copy todir="${maven.dist.src.assembly.dir}/common">
  +            <ant:fileset dir="${basedir}/common" excludes="**/*.jar"/>
           </ant:copy>
   
           <!-- Copy all the documents -->
  @@ -71,11 +81,12 @@
           </ant:copy>
   
           <!-- Copy all script files -->
  -        <ant:copy todir="${maven.dist.src.assembly.dir}">
  -            <ant:fileset dir="${basedir}" includes="*.bat,*.sh"/>
  +        <ant:mkdir dir="${maven.dist.src.assembly.dir}/bin"/>
  +        <ant:copy todir="${maven.dist.src.assembly.dir}/bin">
  +            <ant:fileset dir="${basedir}/bin"/>
           </ant:copy>
  -        <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="lf" eof="remove" includes="**/*.sh"/>
  -        <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="crlf" includes="**/*.bat"/>
  +        <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}/bin" eol="lf" eof="remove"
includes="*.sh"/>
  +        <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}/bin" eol="crlf" includes="*.bat"/>
   
           <!-- Copy other resources -->
           <ant:mkdir dir="${maven.dist.src.assembly.dir}/res"/>
  @@ -90,28 +101,29 @@
       <!-- ================================================= -->
       <postGoal name="dist:prepare-bin-filesystem">
   
  -        <!-- Create lib directory -->
  -        <ant:mkdir dir="${maven.dist.bin.assembly.dir}/lib"/>
  -        <ant:copy todir="${maven.dist.bin.assembly.dir}/lib">
  -            <ant:fileset dir="${basedir}/lib" includes="*.txt"/>
  +        <!-- Create common directory -->
  +        <ant:mkdir dir="${maven.dist.bin.assembly.dir}/common"/>
  +        <ant:copy todir="${maven.dist.bin.assembly.dir}/common">
  +            <ant:fileset dir="${basedir}/common" excludes="**/*.jar"/>
           </ant:copy>
   
           <!-- Copy the main ftpserver jar file -->
  -        <ant:move todir="${maven.dist.bin.assembly.dir}/lib">
  +        <ant:move todir="${maven.dist.bin.assembly.dir}/common/lib">
               <ant:fileset dir="${maven.dist.bin.assembly.dir}" includes="*.jar"/>
           </ant:move>
   
           <!-- Copy dependent jar files -->
           <j:forEach var="lib" items="${pom.artifacts}">
  -            <ant:copy file="${lib.path}" todir="${maven.dist.bin.assembly.dir}/lib"/>
  +            <ant:copy file="${lib.path}" todir="${maven.dist.bin.assembly.dir}/common/lib"/>
           </j:forEach>
   
           <!-- Copy all the scripts -->
  -        <ant:copy todir="${maven.dist.bin.assembly.dir}">
  -            <ant:fileset dir="${maven.src.dir}/bin" includes="*.bat,*.sh"/>
  +        <ant:mkdir dir="${maven.dist.bin.assembly.dir}/bin"/>
  +        <ant:copy todir="${maven.dist.bin.assembly.dir}/bin">
  +            <ant:fileset dir="${basedir}/bin"/>
           </ant:copy>
  -        <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="lf" eof="remove" includes="**/*.sh"/>
  -        <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="crlf" includes="**/*.bat"/>
  +        <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}/bin" eol="lf" eof="remove"
includes="*.sh"/>
  +        <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}/bin" eol="crlf" includes="*.bat"/>
   
           <!-- Copy other resource files -->
           <ant:mkdir dir="${maven.dist.bin.assembly.dir}/res"/>
  
  
  

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


Mime
View raw message