avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/altrmi default.properties build.xml
Date Thu, 04 Apr 2002 12:56:43 GMT
jefft       02/04/04 04:56:43

  Modified:    altrmi   Tag: depchecking build.xml
  Added:       altrmi   Tag: depchecking default.properties
  Log:
  Implement depchecking in this project
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +24 -52    jakarta-avalon-excalibur/altrmi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- build.xml	4 Apr 2002 05:27:44 -0000	1.4
  +++ build.xml	4 Apr 2002 12:56:43 -0000	1.4.2.1
  @@ -2,61 +2,15 @@
   
   <project name="Excalibur AltRMI" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
       <!--
         Give user a chance to override without editing this file
         (and without typing -D each time he compiles it)
       -->
  -    <property file="ant.properties"/>
  -    <property file="../ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="${basedir}/build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.genjava" value="${build.dir}/genjava"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="${basedir}/src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>  
  -    
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="docs"/>
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="${basedir}/dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- Version of release -->
  -    <property name="version" value="0.6"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -65,6 +19,7 @@
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  +    <property name="cp" refid="project.class.path"/>
       
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -76,8 +31,21 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  +            <property name="name" value="junit.jar"/>
  +            <property name="class" value="junit.framework.Test"/>
  +            <property name="classpath" value="${cp}"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="avalon-framework.jar"/>
  +            <property name="path" value="${avalon-framework.jar}"/>
  +            <property name="proj.home" value="${basedir}/../../jakarta-avalon"/>
  +        </ant>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -326,7 +294,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +70 -0     jakarta-avalon-excalibur/altrmi/Attic/default.properties
  
  
  
  

--
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