You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by do...@apache.org on 2001/02/24 05:05:17 UTC
cvs commit: jakarta-avalon build.xml
donaldp 01/02/23 20:05:17
Modified: . build.xml
Log:
Updated build file
* Removed some cruft
* Readded j2ee checking in so conditionally compile datasource
* Removed copy of source tree
Revision Changes Path
1.2 +17 -34 jakarta-avalon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/02/23 10:47:32 1.1
+++ build.xml 2001/02/24 04:05:16 1.2
@@ -36,7 +36,7 @@
-->
<property name="build.compiler.emacs" value="on"/>
<property name="build.compiler.warnings" value="true"/>
-<!-- <property name="build.compiler.pedantic" value="true"/> -->
+ <property name="build.compiler.pedantic" value="true"/>
<property name="build.compiler.depend" value="true"/>
<property name="build.compiler.fulldepend" value="true"/>
@@ -76,7 +76,7 @@
Main target
===================================================================
-->
- <target name="main" depends="dist-lite" />
+ <target name="main" depends="jars" />
<!--
===================================================================
@@ -133,9 +133,10 @@
Checks the environment for existing resources
===================================================================
-->
- <target name="check-environment">
- <available property="test-task.present" classname="org.apache.tools.ant.taskdefs.Test" />
- <available property="xalan.present" classname="org.apache.xalan.xpath.XPath" />
+ <target name="check-environment" depends="check-datasource" if="jndi.present"/>
+
+ <target name="check-datasource" if="datasource.present">
+ <property name="j2ee.present" value="true"/>
</target>
<!--
@@ -145,21 +146,8 @@
-->
<target name="prepare" depends="check-environment,setup-properties">
<tstamp/>
- <filter token="year" value="${year}"/>
- <filter token="version" value="${version}"/>
- <filter token="date" value="${TODAY}"/>
- <property name="date" value="${TODAY}" />
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.lib}"/>
- <copy file="${lib.dir}/xerces.jar" todir="${build.lib}"/>
-
- <mkdir dir="${build.src}"/>
- <copy todir="${build.src}">
- <fileset dir="${java.dir}">
- </fileset>
- </copy>
-
</target>
<!--
@@ -171,17 +159,19 @@
<mkdir dir="${build.classes}"/>
- <javac srcdir="${build.src}"
+ <javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}">
<classpath>
- <pathelement location="${lib.dir}/log.jar"/>
- <fileset dir="${build.lib}">
+ <fileset dir="${lib.dir}">
<include name="*.jar" />
</fileset>
</classpath>
+
+ <exclude name="org/apache/avalon/util/datasource/J2eeDataSource.java"
+ unless="j2ee.present"/>
</javac>
</target>
@@ -220,29 +210,22 @@
-->
<target name="jars" depends="compile">
- <jar jarfile="${build.lib}/${dist.name}.jar" basedir="${build.classes}">
+ <jar jarfile="${build.lib}/avalonapi.jar" basedir="${build.classes}">
<include name="org/apache/avalon/**"/>
+ <zipfileset src="${lib.dir}/log.jar" includes="**/*.class"/>
</jar>
</target>
<!--
===================================================================
- Create the lite build
+ Create the distribution
===================================================================
-->
- <target name="dist-lite" depends="jars">
-
- <mkdir dir="${dist.dir}"/>
- <copy file="${build.lib}/${dist.name}.jar" tofile="${dist.dir}/${dist.name}.jar"/>
+ <target name="dist" depends="jars,javadocs,docs">
- </target>
+ <mkdir dir="${dist.dir}"/>
+ <copy file="${build.lib}/avalonapi.jar" tofile="${dist.dir}/${dist.name}.jar"/>
- <!--
- ===================================================================
- Create the distribution
- ===================================================================
- -->
- <target name="dist" depends="dist-lite,javadocs,docs">
<mkdir dir="${dist.docs}"/>
<mkdir dir="${dist.javadocs}"/>