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/merlin ant.properties.sample build.xml default.properties
Date Sat, 11 May 2002 09:11:02 GMT
jefft       02/05/11 02:11:02

  Modified:    .        dependencies.txt depchecker.xml
               merlin   build.xml default.properties
  Added:       merlin   ant.properties.sample
  Log:
  Add a missing dep for merlin, which should now build out the box
  
  Revision  Changes    Path
  1.22      +1 -1      jakarta-avalon-excalibur/dependencies.txt
  
  Index: dependencies.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/dependencies.txt,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- dependencies.txt	10 May 2002 17:58:22 -0000	1.21
  +++ dependencies.txt	11 May 2002 09:11:01 -0000	1.22
  @@ -11,7 +11,6 @@
   * concurrent -> .
   * configuration -> framework
   * context -> framework
  -* merlin -> context, configuration, framework
   * extension -> .
   * i18n -> .
   * instrument -> .
  @@ -37,5 +36,6 @@
   * pool -> framework, collections, logkit, instrument [Unit tests: junit, testcase, junitperf]
   * testcase -> framework, component, logkit, logger
   * monitor -> framework, logkit, logger, sourceresolve [Unit tests: junit, testcase]
  +* merlin -> context, configuration, framework, logkit
   * xmlbundle -> framework, logger, logkit, component, pool, sourceresolve, store
   * sourceresolve -> framework, pool
  
  
  
  1.27      +15 -1     jakarta-avalon-excalibur/depchecker.xml
  
  Index: depchecker.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/depchecker.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- depchecker.xml	2 May 2002 10:04:04 -0000	1.26
  +++ depchecker.xml	11 May 2002 09:11:01 -0000	1.27
  @@ -3,7 +3,7 @@
   <!--
   ============================================================
                   Dependency updater
  -                   Version $Revision: 1.26 $
  +                   Version $Revision: 1.27 $
              Jeff Turner <jefft@apache.org>
   
   This Ant script provides "functions" to check if
  @@ -373,6 +373,20 @@
               <property name="name" value="excalibur-concurrent.jar"/>
               <property name="path" value="${excalibur-concurrent.jar}"/>
               <property name="proj.home" value="${basedir}/../concurrent"/>
  +        </ant>
  +    </target>
  +    <target name="checkConfiguration">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-configuration.jar"/>
  +            <property name="path" value="${excalibur-configuration.jar}"/>
  +            <property name="proj.home" value="${basedir}/../configuration"/>
  +        </ant>
  +    </target>
  +    <target name="checkContext">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-context.jar"/>
  +            <property name="path" value="${excalibur-context.jar}"/>
  +            <property name="proj.home" value="${basedir}/../context"/>
           </ant>
       </target>
       <target name="checkPool">
  
  
  
  1.2       +4 -0      jakarta-avalon-excalibur/merlin/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/merlin/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	10 May 2002 17:53:48 -0000	1.1
  +++ build.xml	11 May 2002 09:11:02 -0000	1.2
  @@ -13,6 +13,7 @@
       <path id="project.class.path">
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${excalibur-configuration.jar}"/>
           <pathelement location="${excalibur-context.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  @@ -38,6 +39,9 @@
   
       <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkConfiguration"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkContext"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
       </target>
   
  
  
  
  1.2       +5 -0      jakarta-avalon-excalibur/merlin/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/merlin/default.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- default.properties	10 May 2002 17:53:48 -0000	1.1
  +++ default.properties	11 May 2002 09:11:02 -0000	1.2
  @@ -31,6 +31,11 @@
   excalibur-context.lib=${excalibur-context.home}/build/lib
   excalibur-context.jar=${excalibur-context.lib}/excalibur-context-1.0.jar
   
  +# ----- Logkit -----
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
  +
   # --------------------------------------------------
   
   #  Settings used to configure compile environment
  
  
  
  1.1                  jakarta-avalon-excalibur/merlin/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  # -----------------------------------------------------------------------------
  # Component ant.properties.sample
  #
  # This is an example "ant.properties" file, used to customize the building of
  # the component for your local environment.  It defines the location of all
  # 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.
  # 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/05/11 09:11:02 jefft Exp $
  # -----------------------------------------------------------------------------
  
  # ----- 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=${basedir}/../..
  
  # --------------------------------------------------
  #                REQUIRED LIBRARIES
  # --------------------------------------------------
  
  # ----- Avalon Framework, version 4.1 or later -----
  avalon-framework.home=${basedir}/../../jakarta-avalon
  avalon-framework.lib=${avalon-framework.home}/build/lib
  avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
  
  # ----- Excalibur Configuration -----
  excalibur-configuration.home=${basedir}/../configuration
  excalibur-configuration.lib=${excalibur-configuration.home}/build/lib
  excalibur-configuration.jar=${excalibur-configuration.lib}/excalibur-configuration-1.0.jar
  
  # ----- Excalibur Context -----
  excalibur-context.home=${basedir}/../context
  excalibur-context.lib=${excalibur-context.home}/build/lib
  excalibur-context.jar=${excalibur-context.lib}/excalibur-context-1.0.jar
  
  # ----- Logkit -----
  logkit.home=${basedir}/../../jakarta-avalon-logkit
  logkit.lib=${logkit.home}/build/lib
  logkit.jar=${logkit.lib}/logkit.jar
  
  # --------------------------------------------------
  
  
  # --------------------------------------------------
  #                OPTIONAL LIBRARIES
  # --------------------------------------------------
  
  # ----- 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
  checkstyle.lib=${checkstyle.home}
  checkstyle.jar=${checkstyle.lib}/checkstyle-all-2.1.jar
  
  
  

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