avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/etc project.mf
Date Sun, 07 Jul 2002 05:16:30 GMT
mcconnell    2002/07/06 22:16:30

  Modified:    assembly build.xml
               assembly/src/etc project.mf
  Log:
  seperation of the metamodel build from the assembly framework build
  
  Revision  Changes    Path
  1.10      +25 -1     jakarta-avalon-excalibur/assembly/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	7 Jul 2002 04:26:22 -0000	1.9
  +++ build.xml	7 Jul 2002 05:16:30 -0000	1.10
  @@ -44,6 +44,7 @@
     <property name="jdk.href"  value="http://java.sun.com/j2se/1.4/docs/api/" />
     <property name="overview.html" value="${etc}/overview.html" />
     <property name="project.manifest" value="project.mf" />
  +  <property name="meta.jar" value="avalon-meta.jar" />
   
     <!-- classpath -->
   
  @@ -86,7 +87,7 @@
       </uptodate>
     </target>
   
  -  <target name="build" depends="context,demo.build" unless="uptodate" >
  +  <target name="build" depends="context,demo.build,meta.build" unless="uptodate" >
         <echo message="Building Block"/>
         <mkdir dir="${build}/main"/>
         <javac debug="off" destdir="${build}/main" deprecation="true">
  @@ -94,6 +95,7 @@
   	    <path refid="project.classpath" />
   	  </classpath>
           <src path="${src}/java" />
  +        <exclude name="org/apache/excalibur/meta/**"/>
         </javac>
         <copy todir="${build}/main">
           <fileset dir="${src}/java">
  @@ -106,6 +108,27 @@
            basedir="${build}/main" manifest="${etc}/${project.manifest}"/>
     </target>
   
  +  <target name="meta.build" depends="context" unless="uptodate" >
  +      <echo message="Building MetaModel"/>
  +      <mkdir dir="${build}/meta"/>
  +      <javac debug="off" destdir="${build}/meta" deprecation="true">
  +        <classpath>
  +	    <path refid="project.classpath" />
  +	  </classpath>
  +        <src path="${src}/java" />
  +      </javac>
  +      <copy todir="${build}/main">
  +        <fileset dir="${src}/java">
  +          <include name="**/*.xinfo"/>
  +          <include name="**/*.xml"/>
  +          <include name="**/*.properties"/>
  +        </fileset>
  +      </copy>
  +      <jar jarfile="${dist}/${meta.jar}" 
  +         basedir="${build}/meta" manifest="${etc}/meta.mf"/>
  +  </target>
  +
  +
     <target name="demo.context" depends="prepare">
       <mkdir dir="dist"/>
       <uptodate property="demo.uptodate" targetfile="${dist}/demo.jar">
  @@ -174,6 +197,7 @@
        <mkdir dir="${deploy}"/>
        <copy todir="${deploy}">
          <fileset dir="${dist}">
  +         <include name="${meta.jar}"/>
            <include name="assembly.jar"/>
          </fileset>
          <fileset dir="${lib}">
  
  
  
  1.7       +1 -1      jakarta-avalon-excalibur/assembly/src/etc/project.mf
  
  Index: project.mf
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/etc/project.mf,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.mf	7 Jul 2002 04:27:00 -0000	1.6
  +++ project.mf	7 Jul 2002 05:16:30 -0000	1.7
  @@ -5,7 +5,7 @@
   Specification-Version: 1.0
   Implementation-Vendor: Apache Software Foundation
   Implementation-Version: 0.1
  -Class-Path: avalon-framework.jar logkit.jar excalibur-i18n-1.0.jar excalibur-configuration-1.0.jar
excalibur-extension-1.0a.jar
  +Class-Path: avalon-framework.jar logkit.jar excalibur-i18n-1.0.jar excalibur-configuration-1.0.jar
excalibur-extension-1.0a.jar avalon-meta.jar
   Main-Class: org.apache.excalibur.merlin.kernel.Main
   
   Name: org/apache/excalibur/merlin/kernel/DefaultContainer.class
  
  
  

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


Mime
View raw message