You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2004/08/24 05:15:32 UTC
cvs commit: jakarta-commons/jexl build.xml
dion 2004/08/23 20:15:32
Modified: jexl build.xml
Log:
Bump version
Revision Changes Path
1.3 +45 -74 jakarta-commons/jexl/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jexl/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 23 Jan 2003 11:33:46 -0000 1.2
+++ build.xml 24 Aug 2004 03:15:32 -0000 1.3
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--build.xml generated by maven from project.xml version 1.0-beta-3-SNAPSHOT
+ on date August 24 2004, time 1255-->
+
<project default="jar" name="commons-jexl" basedir=".">
<property name="defaulttargetdir" value="target">
</property>
@@ -9,14 +12,22 @@
</property>
<property name="testclassesdir" value="target/test-classes">
</property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
<property name="testreportdir" value="target/test-reports">
</property>
<property name="distdir" value="dist">
</property>
<property name="javadocdir" value="dist/docs/api">
</property>
- <property name="final.name" value="commons-jexl-1.0-beta-1">
+ <property name="final.name" value="commons-jexl-1.0-beta-3-SNAPSHOT">
</property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+ </path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
</mkdir>
@@ -24,6 +35,10 @@
<equals arg2="only" arg1="${build.sysclasspath}">
</equals>
</condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
</target>
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}">
@@ -33,44 +48,12 @@
<pathelement location="src/java">
</pathelement>
</src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <classpath refid="build.classpath">
</classpath>
</javac>
</target>
<target name="jar" description="o Create the jar" depends="compile,test">
- <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- <metainf dir="${basedir}">
- <include name="LICENSE.txt">
- </include>
- </metainf>
- <manifest>
- <attribute name="Built-By" value="${user.name}">
- </attribute>
- <attribute name="Created-By" value="Apache Jakarta Maven">
- </attribute>
- <attribute name="Package" value="org.apache.commons.jexl">
- </attribute>
- <attribute name="Build-Jdk" value="${java.version}">
- </attribute>
- <section name="org.apache.commons.jexl">
- <attribute name="Specification-Title" value="commons-jexl">
- </attribute>
- <attribute name="Specification-Version" value="1.0-beta-1">
- </attribute>
- <attribute name="Specification-Vendor" value="Apache Software Foundation">
- </attribute>
- <attribute name="Implementation-Title" value="org.apache.commons.jexl">
- </attribute>
- <attribute name="Implementation-Version" value="1.0-beta-1">
- </attribute>
- <attribute name="Implementation-Vendor" value="Apache Software Foundation">
- </attribute>
- </section>
- </manifest>
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
</jar>
</target>
<target name="clean" description="o Clean up the generated directories">
@@ -85,7 +68,7 @@
<copy todir="dist">
<fileset dir="${defaulttargetdir}" includes="*.jar">
</fileset>
- <fileset dir="${basedir}" includes="LICENSE*, README*, RELEASE*">
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
</fileset>
</copy>
</target>
@@ -93,10 +76,10 @@
<fail message="There were test failures.">
</fail>
</target>
- <target name="internal-test" depends="compile-tests">
+ <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}">
</mkdir>
- <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+ <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="false" haltonerror="true">
<sysproperty key="basedir" value=".">
</sysproperty>
<formatter type="xml">
@@ -104,10 +87,8 @@
<formatter usefile="false" type="plain">
</formatter>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${testclassesdir}">
</pathelement>
<pathelement path="${classesdir}">
@@ -115,20 +96,18 @@
</classpath>
<batchtest todir="${testreportdir}">
<fileset dir="src/test">
-
-
-<!--
- || I've manually disabled the unit tests for now in Jexl as they don't pass!
- ||
- || There are a few bugs to fix!!!
- -->
- <include name="**/*DISABLED_Test.java">
+ <include name="**/*Test.java">
</include>
</fileset>
</batchtest>
</junit>
</target>
- <target name="compile-tests" depends="compile">
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING ================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+ <echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
<mkdir dir="${testclassesdir}">
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
@@ -137,51 +116,43 @@
</pathelement>
</src>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${classesdir}">
</pathelement>
</classpath>
</javac>
</target>
- <target name="javadoc" description="o Generate javadoc" depends="jar">
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
<mkdir dir="${javadocdir}">
</mkdir>
<tstamp>
- <format pattern="2002-yyyy" property="year">
+ <format pattern="2003-yyyy" property="year">
</format>
</tstamp>
- <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved.">
+ <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved.">
</property>
- <property name="title" value="commons-jexl 1.0-beta-1 API">
+ <property name="title" value="Commons JEXL 1.0-beta-3-SNAPSHOT API">
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.jexl.*">
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement location="target/${final.name}.jar">
- </pathelement>
+ <path refid="build.classpath">
+ </path>
</classpath>
</javadoc>
</target>
<target name="get-deps" unless="noget" depends="init">
- <get dest="${libdir}/junit-3.7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.jar">
- </get>
- <get dest="${libdir}/commons-logging-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar">
- </get>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
- </get>
- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <setproxy>
+ </setproxy>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://public.planetmirror.com/pub/maven/junit/jars/junit-3.8.1.jar">
</get>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
+ <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://public.planetmirror.com/pub/maven/commons-logging/jars/commons-logging-1.0.3.jar">
</get>
</target>
<target name="install-maven">
- <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
</get>
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
</unjar>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org