You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by le...@apache.org on 2003/10/01 06:30:12 UTC
cvs commit: avalon-excalibur/instrument build.xml default.properties
leif 2003/09/30 21:30:12
Modified: instrument build.xml default.properties
Log:
Update the location of the framework jar now that it have been split into api
and impl jars.
Revision Changes Path
1.59 +7 -7 avalon-excalibur/instrument/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument/build.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- build.xml 31 May 2003 15:48:19 -0000 1.58
+++ build.xml 1 Oct 2003 04:30:12 -0000 1.59
@@ -16,7 +16,7 @@
<pathelement location="${checkstyle.jar}"/>
<!-- Optional jars -->
- <pathelement location="${avalon-framework.jar}"/>
+ <pathelement location="${avalon-framework-api.jar}"/>
<pathelement path="${java.class.path}"/>
</path>
@@ -40,14 +40,14 @@
<!-- Checks the environment for existing resources -->
<target name="check-environment">
- <available property="framework.present" classname="org.apache.avalon.framework.logger.AbstractLogEnabled">
+ <available property="framework-api.present" classname="org.apache.avalon.framework.logger.AbstractLogEnabled">
<classpath refid="project.class.path"/>
</available>
</target>
- <target name="framework-warning" unless="framework.present">
+ <target name="framework-api-warning" unless="framework-api.present">
<echo>****************************************************</echo>
- <echo>* avalon-framework.jar not found </echo>
+ <echo>* avalon-framework-api.jar not found </echo>
<echo>* </echo>
<echo>* Framework was not available so the jar file </echo>
<echo>* created by this build will not include the class: </echo>
@@ -57,7 +57,7 @@
<target name="dependencies" description="Check dependencies" unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFrameworkAPI"/>
</target>
<target name="dependencies-test" depends="dist-jar, dependencies"
@@ -68,7 +68,7 @@
</target>
<!-- Compiles the source code -->
- <target name="compile" depends="dependencies, check-environment, framework-warning"
+ <target name="compile" depends="dependencies, check-environment, framework-api-warning"
description="Compiles the source code">
<mkdir dir="${build.classes}"/>
@@ -83,7 +83,7 @@
<classpath refid="project.class.path" />
<include name="**/*.java"/>
<exclude name="org/apache/excalibur/instrument/AbstractLogEnabledInstrumentable.java"
- unless="framework.present"/>
+ unless="framework-api.present"/>
</javac>
<!-- copy resources to same location as .class files -->
1.19 +1 -3 avalon-excalibur/instrument/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument/default.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- default.properties 5 Mar 2003 04:03:24 -0000 1.18
+++ default.properties 1 Oct 2003 04:30:12 -0000 1.19
@@ -21,9 +21,7 @@
# OPTIONAL LIBRARIES
# --------------------------------------------------
# ----- Avalon Framework, version 4.1 or later -----
-avalon-framework.home=${basedir}/../../avalon
-avalon-framework.lib=${avalon-framework.home}/target/lib
-avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
+# defined in ../libraries.properties
# --------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org