Return-Path: 
 <avalon-cvs-return-8363-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 4088 invoked from network); 9 Jul 2002 10:24:43 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 9 Jul 2002 10:24:43 -0000
Received: (qmail 26784 invoked by uid 97); 9 Jul 2002 10:25:07 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 26741 invoked by uid 97); 9 Jul 2002 10:25:07 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 26730 invoked by uid 97); 9 Jul 2002 10:25:06 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 9 Jul 2002 10:24:37 -0000
Message-ID: <20020709102437.72331.qmail@icarus.apache.org>
From: mcconnell@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit: jakarta-avalon-excalibur/assembly build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

mcconnell    2002/07/09 03:24:37

  Modified:    assembly build.xml
  Log:
  cleanup of build for meta (add build necessity check)
  
  Revision  Changes    Path
  1.15      +32 -20    jakarta-avalon-excalibur/assembly/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml	8 Jul 2002 09:57:36 -0000	1.14
  +++ build.xml	9 Jul 2002 10:24:37 -0000	1.15
  @@ -59,10 +59,10 @@
   
     <!-- MAIN TARGETS -->
   
  -  <target name="all" depends="clean,meta,merlin,deploy"/>
     <target name="dist" depends="build"/>
     <target name="meta" depends="meta.javadoc"/>
     <target name="merlin" depends="merlin.javadoc"/>
  +  <target name="all" depends="clean,meta,merlin,deploy"/>
   
     <target name="clean">
        <delete dir="${build}"/>
  @@ -80,11 +80,13 @@
   
     <!-- BLOCK -->
   
  -  <target name="context" depends="prepare">
  +  <target name="build" depends="demo.build,merlin.build"/>
  +
  +  <target name="merlin.context" depends="prepare">
       <mkdir dir="dist"/>
       <uptodate property="uptodate" targetfile="${dist}/${ant.project.name}.jar">
         <srcfiles dir="${src}/java">
  -         <include name="**/*.*"/>
  +         <include name="**/merlin/**/*.*"/>
         </srcfiles>
         <srcfiles dir="${etc}">
            <include name="${project.manifest}"/>
  @@ -92,42 +94,53 @@
       </uptodate>
     </target>
   
  -  <target name="build" depends="context,demo.build,meta.build" unless="uptodate" >
  -      <echo message="Building Block"/>
  +  <target name="merlin.build" depends="merlin.context,meta.build" unless="uptodate" >
  +      <echo message="Building Merlin"/>
         <mkdir dir="${build}/main"/>
  -      <javac debug="off" destdir="${build}/main" deprecation="true">
  +      <javac debug="off" destdir="${build}/main" deprecation="true"
  +        includes="org/apache/excalibur/merlin/**">
           <classpath>
   	    <path refid="project.classpath" />
  +          <pathelement path="${dist}/${meta.jar}" />
   	  </classpath>
           <src path="${src}/java" />
  -        <exclude name="org/apache/excalibur/meta/**"/>
         </javac>
         <copy todir="${build}/main">
           <fileset dir="${src}/java">
  -          <include name="**/*.xinfo"/>
  -          <include name="**/*.xml"/>
  -          <include name="**/*.properties"/>
  +          <include name="**/merlin/**/*.xinfo"/>
  +          <include name="**/merlin/**/*.xml"/>
  +          <include name="**/merlin/**/*.properties"/>
           </fileset>
         </copy>
         <jar jarfile="${dist}/${ant.project.name}.jar" 
            basedir="${build}/main" manifest="${etc}/${project.manifest}"/>
     </target>
   
  -  <target name="meta.build" depends="context" unless="uptodate" >
  +  <target name="meta.context" depends="prepare">
  +    <mkdir dir="dist"/>
  +    <uptodate property="meta.uptodate" targetfile="${dist}/${meta.jar}">
  +      <srcfiles dir="${src}">
  +         <include name="**/meta/**/*.*"/>
  +      </srcfiles>
  +    </uptodate>
  +  </target>
  +
  +  <target name="meta.build" depends="meta.context" unless="meta.uptodate" >
         <echo message="Building MetaModel"/>
         <mkdir dir="${build}/meta"/>
  -      <javac debug="off" destdir="${build}/meta" deprecation="true">
  +      <javac debug="off" destdir="${build}/meta" deprecation="true"
  +        includes="org/apache/excalibur/meta/**">
           <classpath>
   	    <path refid="project.classpath" />
   	  </classpath>
           <src path="${src}/java" />
         </javac>
  -      <copy todir="${build}/main">
  +      <copy todir="${build}/meta">
           <fileset dir="${src}/java">
  -          <include name="**/*.xinfo"/>
  -          <include name="**/*.xml"/>
  -          <include name="**/*.properties"/>
  -          <include name="**/*.dtd"/>
  +          <include name="**/meta/**/*.xinfo"/>
  +          <include name="**/meta/**/*.xml"/>
  +          <include name="**/meta/**/*.properties"/>
  +          <include name="**/meta/**/*.dtd"/>
           </fileset>
         </copy>
         <jar jarfile="${dist}/${meta.jar}" 
  @@ -229,7 +242,7 @@
   
     <target name="deploy" depends="build">
        <mkdir dir="${deploy}"/>
  -     <copy todir="${deploy}">
  +     <copy todir="${deploy}" preservelastmodified="true">
          <fileset dir="${dist}">
            <include name="${meta.jar}"/>
            <include name="assembly.jar"/>
  @@ -240,8 +253,7 @@
            <include name="excalibur-i18n-1.0.jar" />
            <include name="excalibur-extension-1.0a.jar" />
            <include name="excalibur-configuration-1.0.jar" />
  -         <include name="excalibur-io-1.1.jar" />
  -         <include name="excalibur-util-1.0.jar" />
  +         <include name="excalibur-logger-1.0.jar" />
          </fileset>
        </copy>
     </target>
  
  
  

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