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/property default.properties ant.properties.sample build.xml
Date Sat, 06 Apr 2002 12:53:01 GMT
jefft       02/04/06 04:53:01

  Modified:    property ant.properties.sample Tag: depchecking build.xml
  Added:       property Tag: depchecking default.properties
  Log:
  Add depchecking
  
  Revision  Changes    Path
  1.2       +13 -16    jakarta-avalon-excalibur/property/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/property/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	5 Apr 2002 06:46:37 -0000	1.1
  +++ ant.properties.sample	6 Apr 2002 12:53:01 -0000	1.2
  @@ -6,43 +6,40 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/05 06:46:37 hammant Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/06 12:53:01 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- JUnit Unit Test Suite, version 3.7 or later. -----
  +#  Not needed if junit.jar is in $ANT_HOME/lib 
  +junit.home=${base.path}/junit3.7
  +junit.lib=${junit.home}
  +junit.jar=${junit.lib}/junit.jar
  +
   
  +# ----- Checkstyle, version 2.1 or later -----
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +17 -56    jakarta-avalon-excalibur/property/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/property/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- build.xml	5 Apr 2002 06:46:37 -0000	1.1
  +++ build.xml	6 Apr 2002 12:53:01 -0000	1.1.2.1
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Property" 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="${user.home}/build.properties"/>
       <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"/>
  -
  -    <!-- 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"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- 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="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  +    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -75,8 +28,12 @@
       <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="checkCommon"/>
  +    </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}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,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   +58 -0     jakarta-avalon-excalibur/property/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