commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r179756 - /jakarta/commons/proper/betwixt/branches/RELEASE_0_6_1_BRANCH/build.xml
Date Fri, 03 Jun 2005 09:30:57 GMT
Author: rdonkin
Date: Fri Jun  3 02:30:56 2005
New Revision: 179756

URL: http://svn.apache.org/viewcvs?rev=179756&view=rev
Log:
Regenerated ant build file in preparation for release

Modified:
    jakarta/commons/proper/betwixt/branches/RELEASE_0_6_1_BRANCH/build.xml

Modified: jakarta/commons/proper/betwixt/branches/RELEASE_0_6_1_BRANCH/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/branches/RELEASE_0_6_1_BRANCH/build.xml?rev=179756&r1=179755&r2=179756&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/branches/RELEASE_0_6_1_BRANCH/build.xml (original)
+++ jakarta/commons/proper/betwixt/branches/RELEASE_0_6_1_BRANCH/build.xml Fri Jun  3 02:30:56
2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--build.xml generated by maven from project.xml version 0.6.1-dev
-  on date October 13 2004, time 2122-->
+<!--build.xml generated by maven from project.xml version 0.6.1
+  on date June 3 2005, time 1039-->
 
 <project default="jar" name="commons-betwixt" basedir=".">
   <property name="defaulttargetdir" value="target">
@@ -20,8 +20,14 @@
   </property>
   <property name="javadocdir" value="dist/docs/api">
   </property>
-  <property name="final.name" value="commons-betwixt-0.6.1-dev">
+  <property name="final.name" value="commons-betwixt-0.6.1">
   </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>
@@ -29,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}">
@@ -38,11 +48,7 @@
         <pathelement location="src/java">
         </pathelement>
       </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
+      <classpath refid="build.classpath">
       </classpath>
     </javac>
     <copy todir="${classesdir}">
@@ -51,12 +57,6 @@
         </include>
       </fileset>
     </copy>
-    <copy todir="${testclassesdir}">
-      <fileset dir="src/test">
-        <include name="**/*.betwixt">
-        </include>
-      </fileset>
-    </copy>
   </target>
   <target name="jar" description="o Create the jar" depends="compile,test">
     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
@@ -82,7 +82,7 @@
     <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">
@@ -93,10 +93,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}">
@@ -110,7 +108,12 @@
       </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">
@@ -119,10 +122,8 @@
         </pathelement>
       </src>
       <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
+        <path refid="build.classpath">
+        </path>
         <pathelement path="${classesdir}">
         </pathelement>
       </classpath>
@@ -134,7 +135,7 @@
       </fileset>
     </copy>
   </target>
-  <target name="javadoc" description="o Generate javadoc">
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
     <mkdir dir="${javadocdir}">
     </mkdir>
     <tstamp>
@@ -143,20 +144,20 @@
     </tstamp>
     <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation.
All Rights Reserved.">
     </property>
-    <property name="title" value="Betwixt 0.6.1-dev API">
+    <property name="title" value="Betwixt 0.6.1 API">
     </property>
     <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="src/java" packagenames="org.apache.commons.betwixt.*">
       <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement location="${defaulttargetdir}/${final.name}.jar">
-        </pathelement>
+        <path refid="build.classpath">
+        </path>
       </classpath>
     </javadoc>
   </target>
   <target name="get-deps" unless="noget" depends="init">
+    <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+    <setproxy>
+    </setproxy>
     <get dest="${libdir}/commons-logging-1.0.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.2.jar">
     </get>
     <get dest="${libdir}/commons-beanutils-core-1.7.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-core-1.7.0.jar">
@@ -169,12 +170,6 @@
     </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}/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">
-    </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>
   </target>
   <target name="install-maven">
     <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
@@ -182,4 +177,4 @@
     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
     </unjar>
   </target>
-</project>
+</project>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message