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 15:42:01 UTC
cvs commit: jakarta-avalon-excalibur/util build.xml
jefft 02/04/04 05:42:01
Modified: all Tag: depchecking build.xml default.properties
baxter Tag: depchecking default.properties
bzip2 Tag: depchecking build.xml
command Tag: depchecking build.xml default.properties
instrument Tag: depchecking default.properties
instrument-manager Tag: depchecking build.xml
default.properties
util Tag: depchecking build.xml
Log:
Lots of depchecking updates. Everything except fortress now builds
Revision Changes Path
No revision
No revision
1.122.2.9 +28 -6 jakarta-avalon-excalibur/all/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/build.xml,v
retrieving revision 1.122.2.8
retrieving revision 1.122.2.9
diff -u -r1.122.2.8 -r1.122.2.9
--- build.xml 2 Apr 2002 12:38:44 -0000 1.122.2.8
+++ build.xml 4 Apr 2002 13:41:59 -0000 1.122.2.9
@@ -36,7 +36,13 @@
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-concurrent.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
+ <pathelement location="${excalibur-component.jar}"/>
<pathelement location="${excalibur-event.jar}"/>
+ <pathelement location="${excalibur-pool.jar}"/>
+ <!--
+ for one class in scratchpad. Commented out as this is recursive
+ <pathelement location="${excalibur-fortress.jar}"/>
+ -->
<pathelement location="${j2ee.jar}"/>
<pathelement location="${logkit.jar}"/>
<pathelement location="${bsf.jar}"/>
@@ -161,7 +167,7 @@
<property name="name" value="junit.jar"/>
<property name="class" value="junit.framework.Test"/>
<property name="classpath" value="${cp}"/>
- </ant>
+ </ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
<property name="name" value="excalibur-collections.jar"/>
<property name="path" value="${excalibur-collections.jar}"/>
@@ -171,23 +177,37 @@
<property name="name" value="excalibur-concurrent.jar"/>
<property name="path" value="${excalibur-concurrent.jar}"/>
<property name="proj.home" value="${basedir}/../concurrent"/>
- </ant>
+ </ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
<property name="name" value="excalibur-instrument.jar"/>
<property name="path" value="${excalibur-instrument.jar}"/>
<property name="proj.home" value="${basedir}/../instrument"/>
</ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
+ <property name="name" value="excalibur-component.jar"/>
+ <property name="path" value="${excalibur-component.jar}"/>
+ <property name="proj.home" value="${basedir}/../component"/>
+ </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
<property name="name" value="excalibur-event.jar"/>
<property name="path" value="${excalibur-event.jar}"/>
<property name="proj.home" value="${basedir}/../event"/>
</ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
+ <property name="name" value="excalibur-pool.jar"/>
+ <property name="path" value="${excalibur-pool.jar}"/>
+ <property name="proj.home" value="${basedir}/../pool"/>
+ </ant>
+ <!--
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
+ <property name="name" value="excalibur-fortress.jar"/>
+ <property name="path" value="${excalibur-fortress.jar}"/>
+ <property name="proj.home" value="${basedir}/../fortress"/>
+ </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>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
<property name="name" value="xerces.jar"/>
@@ -206,7 +226,7 @@
<property name="name" value="xml-apis.jar"/>
<property name="class" value="javax.xml.parsers.SAXParser"/>
<property name="classpath" value="${cp}"/>
- </ant>
+ </ant>
</target>
<!-- Compiles the source code -->
@@ -288,6 +308,8 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
+ <exclude name="**/mpool/**"/> <!-- Still has recursive dep on command -->
+ <exclude name="org/apache/avalon/excalibur/source/SourceResolverImpl.java"/> <!-- Recursive dep on Fortress -->
<exclude name="**/test/**"/>
</javac>
</target>
1.1.2.4 +17 -2 jakarta-avalon-excalibur/all/Attic/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/Attic/default.properties,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- default.properties 2 Apr 2002 10:56:13 -0000 1.1.2.3
+++ default.properties 4 Apr 2002 13:41:59 -0000 1.1.2.4
@@ -32,15 +32,30 @@
excalibur-concurrent.lib=${excalibur-concurrent.home}
excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
-# ----- Excalibur Instrument, version 1.0 or later -----
+# ----- Excalibur instrument, version 1.0 or later -----
excalibur-instrument.home=${basedir}/../instrument/dist
excalibur-instrument.lib=${excalibur-instrument.home}
excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
-# ----- Excalibur Event, version 1.0 or later -----
+# ----- Excalibur component, version 1.0 or later -----
+excalibur-component.home=${basedir}/../component/dist
+excalibur-component.lib=${excalibur-component.home}
+excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.0.jar
+
+# ----- Excalibur event, version 1.0 or later -----
excalibur-event.home=${basedir}/../event/dist
excalibur-event.lib=${excalibur-event.home}
excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0a.jar
+
+# ----- Excalibur pool, version 1.0 or later -----
+excalibur-pool.home=${basedir}/../pool/dist
+excalibur-pool.lib=${excalibur-pool.home}
+excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.0.jar
+
+# ----- Excalibur fortress, version 1.0 or later -----
+excalibur-fortress.home=${basedir}/../fortress/dist
+excalibur-fortress.lib=${excalibur-fortress.home}
+excalibur-fortress.jar=${excalibur-fortress.lib}/excalibur-fortress-1.0.jar
# ----- Avalon Framework, version 4.1 or later -----
avalon-framework.home=${basedir}/../../jakarta-avalon
No revision
No revision
1.1.2.3 +5 -0 jakarta-avalon-excalibur/baxter/Attic/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/Attic/default.properties,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- default.properties 1 Apr 2002 08:57:02 -0000 1.1.2.2
+++ default.properties 4 Apr 2002 13:42:00 -0000 1.1.2.3
@@ -10,6 +10,11 @@
version=1.0a
year=2000-2002
+# --------------------------------------------------
+# REQUIRED LIBRARIES
+# --------------------------------------------------
+# --------------------------------------------------
+
# Settings used to configure compile environment
build.debug = on
build.optimize = off
No revision
No revision
1.7.2.3 +1 -1 jakarta-avalon-excalibur/bzip2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/build.xml,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- build.xml 1 Apr 2002 11:57:26 -0000 1.7.2.2
+++ build.xml 4 Apr 2002 13:42:00 -0000 1.7.2.3
@@ -115,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" />
No revision
No revision
1.5.2.5 +20 -0 jakarta-avalon-excalibur/command/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/command/build.xml,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -r1.5.2.4 -r1.5.2.5
--- build.xml 1 Apr 2002 11:57:27 -0000 1.5.2.4
+++ build.xml 4 Apr 2002 13:42:00 -0000 1.5.2.5
@@ -17,6 +17,8 @@
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${excalibur-event.jar}"/>
+ <pathelement location="${excalibur-util.jar}"/>
+ <pathelement location="${excalibur-thread.jar}"/>
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-concurrent.jar}"/>
<pathelement location="${excalibur-core.jar}"/>
@@ -42,11 +44,27 @@
<property name="proj.home" value="${basedir}/../event"/>
</ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
+ <property name="name" value="excalibur-util.jar"/>
+ <property name="path" value="${excalibur-util.jar}"/>
+ <property name="proj.home" value="${basedir}/../util"/>
+ </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
+ <property name="name" value="excalibur-thread.jar"/>
+ <property name="path" value="${excalibur-thread.jar}"/>
+ <property name="proj.home" value="${basedir}/../thread"/>
+ </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
<property name="name" value="excalibur-collections.jar"/>
<property name="path" value="${excalibur-collections.jar}"/>
<property name="proj.home" value="${basedir}/../collections"/>
</ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
+ <property name="name" value="excalibur-util.jar"/>
+ <property name="path" value="${excalibur-util.jar}"/>
+ <property name="proj.home" value="${basedir}/../util"/>
+ <property name="proj.target" value="jar"/>
+ </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
<property name="name" value="excalibur-concurrent.jar"/>
<property name="path" value="${excalibur-concurrent.jar}"/>
<property name="proj.home" value="${basedir}/../concurrent"/>
@@ -56,6 +74,7 @@
<property name="path" value="${avalon-framework.jar}"/>
<property name="proj.home" value="${basedir}/../../jakarta-avalon"/>
</ant>
+ <!--
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
<property name="name" value="excalibur-core.jar"/>
<property name="path" value="${excalibur-core.jar}"/>
@@ -68,6 +87,7 @@
<property name="proj.home" value="${basedir}/../all"/>
<property name="proj.target" value="compile"/>
</ant>
+ -->
</target>
<!-- Compiles the source code -->
1.1.2.3 +16 -1 jakarta-avalon-excalibur/command/Attic/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/command/Attic/default.properties,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- default.properties 1 Apr 2002 08:57:03 -0000 1.1.2.2
+++ default.properties 4 Apr 2002 13:42:00 -0000 1.1.2.3
@@ -13,11 +13,21 @@
# --------------------------------------------------
# REQUIRED LIBRARIES
# --------------------------------------------------
-# ----- Excalibur Event, version 1.0 or later -----
+# ----- Excalibur event, version 1.0 or later -----
excalibur-event.home=${basedir}/../event/dist
excalibur-event.lib=${excalibur-event.home}
excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0a.jar
+# ----- Excalibur util, version 1.0 or later -----
+excalibur-util.home=${basedir}/../util/dist
+excalibur-util.lib=${excalibur-util.home}
+excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.jar
+
+# ----- Excalibur thread, version 1.0 or later -----
+excalibur-thread.home=${basedir}/../thread/dist
+excalibur-thread.lib=${excalibur-thread.home}
+excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.0.jar
+
# ----- Excalibur Collections, version 1.0 or later -----
excalibur-collections.home=${basedir}/../collections/dist
excalibur-collections.lib=${excalibur-collections.home}
@@ -27,6 +37,11 @@
excalibur-concurrent.home=${basedir}/../concurrent/dist
excalibur-concurrent.lib=${excalibur-concurrent.home}
excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
+
+# ----- Excalibur Util, version 1.0 or later -----
+excalibur-util.home=${basedir}/../util/build/lib
+excalibur-util.lib=${excalibur-util.home}
+excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.jar
# ----- Excalibur Scratchpad -----
excalibur-scratchpad.home=${basedir}/../all
No revision
No revision
1.1.2.3 +5 -0 jakarta-avalon-excalibur/instrument/Attic/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/Attic/default.properties,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- default.properties 1 Apr 2002 08:57:04 -0000 1.1.2.2
+++ default.properties 4 Apr 2002 13:42:00 -0000 1.1.2.3
@@ -10,6 +10,11 @@
version=0.1
year=2002
+# --------------------------------------------------
+# REQUIRED LIBRARIES
+# --------------------------------------------------
+# --------------------------------------------------
+
# Settings used to configure compile environment
build.debug = on
build.optimize = off
No revision
No revision
1.10.2.4 +18 -13 jakarta-avalon-excalibur/instrument-manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/build.xml,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -r1.10.2.3 -r1.10.2.4
--- build.xml 1 Apr 2002 11:57:27 -0000 1.10.2.3
+++ build.xml 4 Apr 2002 13:42:00 -0000 1.10.2.4
@@ -16,14 +16,14 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${logkit.jar}"/>
+ <pathelement location="${avalon-logkit.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-core.jar}"/>
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
- <pathelement location="${commons-altrmi-common.jar}"/>
- <pathelement location="${commons-altrmi-server-impl.jar}"/>
- <pathelement location="${commons-altrmi-server-interfaces.jar}"/>
+ <pathelement location="${excalibur-altrmi-common.jar}"/>
+ <pathelement location="${excalibur-altrmi-server-impl.jar}"/>
+ <pathelement location="${excalibur-altrmi-server-interfaces.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
</path>
@@ -60,22 +60,23 @@
<property name="proj.target" value="all"/>
</ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
- <property name="name" value="logkit.jar"/>
- <property name="path" value="${logkit.jar}"/>
+ <property name="name" value="avalon-logkit.jar"/>
+ <property name="path" value="${avalon-logkit.jar}"/>
<property name="proj.home" value="${basedir}/../../jakarta-avalon-logkit"/>
<property name="proj.target" value="compile"/>
</ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
- <property name="name" value="commons-altrmi-common.jar"/>
- <property name="path" value="${commons-altrmi-common.jar}"/>
+ <property name="name" value="excalibur-altrmi-common.jar"/>
+ <property name="path" value="${excalibur-altrmi-common.jar}"/>
+ <property name="proj.home" value="${basedir}/../altrmi"/>
</ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
- <property name="name" value="commons-altrmi-server-impl.jar"/>
- <property name="path" value="${commons-altrmi-server-impl.jar}"/>
+ <property name="name" value="excalibur-altrmi-server-impl.jar"/>
+ <property name="path" value="${excalibur-altrmi-server-impl.jar}"/>
</ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
- <property name="name" value="commons-altrmi-server-interfaces.jar"/>
- <property name="path" value="${commons-altrmi-server-interfaces.jar}"/>
+ <property name="name" value="excalibur-altrmi-server-interfaces.jar"/>
+ <property name="path" value="${excalibur-altrmi-server-interfaces.jar}"/>
</ant>
</target>
@@ -316,7 +317,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}"/>
1.1.2.4 +9 -9 jakarta-avalon-excalibur/instrument-manager/Attic/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/Attic/default.properties,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- default.properties 4 Apr 2002 00:42:29 -0000 1.1.2.3
+++ default.properties 4 Apr 2002 13:42:00 -0000 1.1.2.4
@@ -15,12 +15,12 @@
# --------------------------------------------------
# ----- Logkit -----
-logkit.home=${basedir}/../../jakarta-avalon-logkit
-logkit.lib=${logkit.home}/build/lib
-logkit.jar=${logkit.lib}/logkit.jar
+avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
+avalon-logkit.lib=${avalon-logkit.home}/build/lib
+avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
# ----- Avalon Framework -----
-avalon-framework.home=${basedir}../../jakarta-avalon
+avalon-framework.home=${basedir}/../../jakarta-avalon
avalon-framework.lib=${avalon-framework.home}/build/lib
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
@@ -40,10 +40,10 @@
excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
# ----- Altrmi -----
-commons-altrmi.home=${basedir}/../altrmi/dist
-commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
-commons-altrmi-server-impl.jar=${commons-altrmi.home}/commons-altrmi-server-impl.jar
-commons-altrmi-server-interfaces.jar=${commons-altrmi.home}/commons-altrmi-server-interfaces.jar
+excalibur-altrmi.home=${basedir}/../altrmi/dist
+excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
+excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
+excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
@@ -76,7 +76,7 @@
# name of .zip/.tar.gz/.bz2 files and their top-level directory
dist.name = ${name}-${version}
-dist-interfaces.name = excalibur-${name}-interfaces-${version}
+dist-interfaces.name = ${name}-interfaces-${version}
# name of jar file
jar.name = ${name}-${version}.jar
No revision
No revision
1.1.2.2 +1 -2 jakarta-avalon-excalibur/util/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/util/build.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- build.xml 4 Apr 2002 09:37:45 -0000 1.1.2.1
+++ build.xml 4 Apr 2002 13:42:00 -0000 1.1.2.2
@@ -17,7 +17,6 @@
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${excalibur-component.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
</path>
@@ -78,7 +77,7 @@
<fileset dir="../" includes="LICENSE.txt"/>
<fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
<filterset>
- <filtersfile file="project.properties"/>
+ <filtersfile file="default.properties"/>
</filterset>
</copy>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>