You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by je...@apache.org on 2002/04/04 11:37:45 UTC

cvs commit: jakarta-avalon-excalibur/util default.properties ant.properties.sample build.xml project.properties

jefft       02/04/04 01:37:45

  Modified:    util     Tag: depchecking ant.properties.sample build.xml
  Added:       util     Tag: depchecking default.properties
  Removed:     util     Tag: depchecking project.properties
  Log:
  Add util to the depchecking system
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -5      jakarta-avalon-excalibur/util/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/util/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- ant.properties.sample	4 Apr 2002 05:09:06 -0000	1.1
  +++ ant.properties.sample	4 Apr 2002 09:37:45 -0000	1.1.2.1
  @@ -9,7 +9,7 @@
   # The ant.properties values in this directory apply only to this component, and
   # override the defaults in ../ant.properties.
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/04 05:09:06 leif Exp $
  +# $Id: ant.properties.sample,v 1.1.2.1 2002/04/04 09:37:45 jefft Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -32,10 +32,6 @@
   # ----- Avalon Framework -----
   avalon-framework.home=../../jakarta-avalon/build/lib
   avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
  -
  -# ----- Excalibur Component -----
  -excalibur-component.home=../component/build/lib
  -excalibur-component.jar=${excalibur-component.home}/excalibur-component-1.0.jar
   
   # ----- JUnit Unit Test Suite, version 3.7 or later -----
   junit.home=${base.path}/junit3.7
  
  
  
  1.1.2.1   +19 -40    jakarta-avalon-excalibur/util/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/util/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- build.xml	4 Apr 2002 05:09:06 -0000	1.1
  +++ build.xml	4 Apr 2002 09:37:45 -0000	1.1.2.1
  @@ -2,50 +2,15 @@
   
   <project name="Excalibur Pool" 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="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.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="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"/>
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- 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">
  @@ -56,12 +21,26 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  +    <property name="cp" refid="project.class.path"/>
   
       <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}"/>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +59 -0     jakarta-avalon-excalibur/util/Attic/default.properties
  
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>