avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin maven.xml platform.xml
Date Wed, 10 Sep 2003 20:14:58 GMT
mcconnell    2003/09/10 13:14:58

  Modified:    merlin   maven.xml platform.xml
  Log:
  Remove dependency of the meta package.
  
  Revision  Changes    Path
  1.59      +25 -11    avalon-sandbox/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- maven.xml	10 Sep 2003 13:28:47 -0000	1.58
  +++ maven.xml	10 Sep 2003 20:14:58 -0000	1.59
  @@ -44,6 +44,16 @@
       </copy>
     </goal>
   
  +  <goal name="merlin:validate" description="Validate that the tutorial targets are buildable."
>
  +    <maven:reactor
  +      basedir="${basedir}"
  +      includes="merlin-platform/tutorials/**/project.xml"
  +      excludes="merlin-platform/tutorials/project.xml,**/target/**"
  +      goals=""
  +      banner="Validate:"
  +      ignoreFailures="false" />
  +  </goal>
  +
     <goal name="merlin:demo" description="Execute the demo targets." >
       <maven:reactor
         basedir="${basedir}"
  @@ -75,16 +85,6 @@
       <ant:mkdir dir="${merlin.build.inst.dir}/ext"/>
       <ant:mkdir dir="${merlin.build.inst.dir}/bin/lib"/>
   
  -    <ant:mkdir dir="${maven.build.dir}/plugins"/>
  -    <ant:copy toDir="${maven.build.dir}/plugins">
  -      <fileset dir="${basedir}/kernel/plugin/target">
  -        <include name="${merlin.plugin.jar}"/>
  -      </fileset>
  -      <fileset dir="${basedir}/../meta/plugin/target">
  -        <include name="${meta.plugin.jar}"/>
  -      </fileset>
  -    </ant:copy>
  -
       <!-- import bootstrap jar -->
       <ant:copy 
          file="${basedir}/kernel/bootstrap/target/${merlin.bootstrap.jar}" 
  @@ -98,6 +98,18 @@
         banner="Resolving dependencies:"
         ignoreFailures="false"/>
   
  +    <!-- create a directory containing the plugins -->
  +    <ant:copy 
  +       file="${merlin.build.inst.dir}/repository/avalon-meta/jars/${meta.plugin.jar}" 
  +       toDir="${maven.build.dir}/plugins"/>
  +    <delete file="${merlin.build.inst.dir}/repository/avalon-meta/jars/${meta.plugin.jar}"/>
  +    <ant:mkdir dir="${maven.build.dir}/plugins"/>
  +    <ant:copy toDir="${maven.build.dir}/plugins">
  +      <fileset dir="${basedir}/kernel/plugin/target">
  +        <include name="${merlin.plugin.jar}"/>
  +      </fileset>
  +    </ant:copy>
  +
       <!-- copy the xml api jar file to the merlin/ext directory -->
       <ant:copy 
          file="${merlin.build.inst.dir}/repository/xml-apis/jars/xml-apis-2.0.2.jar" 
  @@ -237,7 +249,7 @@
   
   
     <!--
  -  The the tuturials.
  +  Build the tuturials distribution.
     -->
     <goal name="merlin:tutorials"
       description="Build tutorials.">
  @@ -261,6 +273,8 @@
           <include name="context/**"/>
           <include name="composition/**"/>
           <include name="dependencies/**"/>
  +        <include name="lifecycle/**"/>
  +        <include name="meta/**"/>
           <exclude name="**/target/**"/>
           <exclude name="**/*.log"/>
         </fileset>
  
  
  
  1.5       +5 -0      avalon-sandbox/merlin/platform.xml
  
  Index: platform.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/platform.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- platform.xml	10 Sep 2003 09:49:17 -0000	1.4
  +++ platform.xml	10 Sep 2003 20:14:58 -0000	1.5
  @@ -80,6 +80,11 @@
         <artifactId>avalon-meta-tools</artifactId>
         <version>1.1-RC1</version>
       </dependency>
  +    <dependency>
  +      <groupId>avalon-meta</groupId>
  +      <artifactId>avalon-meta-plugin</artifactId>
  +      <version>1.1</version>
  +    </dependency>
   
       <dependency>
         <groupId>avalon-activation</groupId>
  
  
  

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


Mime
View raw message