dlr 2002/08/15 09:30:05
Modified: . build.xml build.properties
Log:
Adjusted build.xml and build.properties to match Maven output as closely as possible.
Revision Changes Path
1.16 +17 -28 xml-rpc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-rpc/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- build.xml 7 Aug 2002 02:50:00 -0000 1.15
+++ build.xml 15 Aug 2002 16:30:04 -0000 1.16
@@ -2,17 +2,15 @@
<project name="xmlrpc" default="jar" basedir=".">
+ <!-- Properties which are not allowed to be overridden -->
+ <property name="version" value="1.2-dev"/>
+
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
<!-- Set default values for the build -->
<property file="build.properties" />
- <property name="build.src" value="${build.dir}/src"/>
- <property name="build.dest" value="${build.dir}/classes"/>
- <property name="final.name" value="${project}-${version}"/>
- <property name="final.dir" value="../${final.name}/"/>
-
<!-- Construct compile classpath -->
<path id="classpath">
<pathelement location="${jsse.jar}"/>
@@ -123,24 +121,6 @@
<target name="prepare" depends="init">
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.dest}"/>
- <mkdir dir="${build.src}"/>
-
- <!--
- We don't care about the javascript interpreter or the
- the applet code so we'll just exclude it from the
- build. All we want is the client and server code.
- -->
-
- <copy todir="${build.src}">
- <fileset dir="${src.dir}">
- <include name="**/*.java"/>
- <exclude name="**/fesi/**"/>
- <exclude name="**/secure/**" unless="jsse.present"/>
- <exclude name="**/XmlRpcProxyServlet.java" unless="servlet.present"/>
- <exclude name="**/test/**"/>
- </fileset>
- </copy>
-
</target>
<!-- ================================================================== -->
@@ -149,13 +129,22 @@
<target name="compile" depends="prepare">
<javac
- srcdir="${build.src}"
+ srcdir="${src.dir}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"
>
- <classpath refid="classpath"/>
+ <classpath refid="classpath"/>
+
+ <!-- We don't care about the JavaScript interpreter or the the
+ applet code so we'll just exclude it from the build. For now,
+ all we want is the client and server code. -->
+ <include name="**/*.java"/>
+ <exclude name="**/fesi/**"/>
+ <exclude name="**/secure/**" unless="jsse.present"/>
+ <exclude name="**/XmlRpcProxyServlet.java" unless="servlet.present"/>
+ <exclude name="**/test/**"/>
</javac>
</target>
@@ -182,7 +171,7 @@
<target name="javadocs" depends="prepare">
<mkdir dir="${javadoc.destdir}"/>
<javadoc
- sourcepath="${build.src}/java"
+ sourcepath="${src.dir}/java"
packagenames="org.apache.xmlrpc.*"
destdir="${javadoc.destdir}"
author="true"
@@ -222,8 +211,8 @@
destdir="${build.test.dest}"
includes="**/*Test.java"
excludes="**/package.html"
- debug="${debug}"
- deprecation="${deprecation}"
+ debug="on"
+ deprecation="off"
optimize="${optimize}">
<classpath refid="classpath"/>
<classpath>
1.9 +7 -7 xml-rpc/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/xml-rpc/build.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- build.properties 6 Mar 2002 19:44:42 -0000 1.8
+++ build.properties 15 Aug 2002 16:30:04 -0000 1.9
@@ -6,15 +6,15 @@
# your ${user.home}/build.properties file.
# -------------------------------------------------------------------
-name = XmlRpc
-version = 1.2-dev
+name = XML-RPC
project = xmlrpc
-build.dir = ./bin
-build.test.dest = ${build.dir}/test
+build.dir = ./target
+build.dest = ${build.dir}/classes
+build.test.dest = ${build.dir}/test-classes
src.dir = ./src
src.test.dir = ${src.dir}/test
-test.reportsDirectory = tests
-javadoc.destdir = ./docs/apidocs
+test.reportsDirectory = test-reports
+javadoc.destdir = ${build.dir}/docs/api
jakarta.site2 = ../jakarta-site2
jdom.jar = jdom-b7.jar
docs.src = ./xdocs
@@ -23,7 +23,7 @@
year = 1999-2002
debug = off
optimize = on
-deprecation = off
+deprecation = on
final.name = ${project}-${version}
# You must set these values here, or in your
