craigmcc 01/05/21 15:05:30
Modified: . .cvsignore build.xml
Added: . build.properties.sample
Log:
Enable building using "ant" command directly, in a manner compatible with
the revised Tomcat 4.0 build procedures. At some future point in time,
the build.bat and build.sh scripts will be removed.
Revision Changes Path
1.2 +1 -0 jakarta-watchdog-4.0/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2001/01/24 23:07:22 1.1
+++ .cvsignore 2001/05/21 22:05:22 1.2
@@ -1,2 +1,3 @@
build
+build.properties
dist
1.10 +7 -3 jakarta-watchdog-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 2001/02/03 23:01:51 1.9
+++ build.xml 2001/05/21 22:05:24 1.10
@@ -2,12 +2,16 @@
<!-- System property definitions -->
+ <property file="build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="ant.home" value="../jakarta-ant"/>
<property name="build.compiler" value="classic"/>
<property name="servletapi.home" value="../jakarta-servletapi-4"/>
+ <property name="servlet.jar" value="${servletapi.home}/lib/servlet.jar"/>
<property name="watchdog.build" value="./build"/>
<property name="watchdog.dist" value="./dist"/>
- <property name="watchdog-classpath"
value="${servletapi.home}/lib/servlet.jar:./src/tools" />
+ <property name="watchdog-classpath" value="${servlet.jar}:./src/tools" />
<!-- Prepare the unpacked destination directory -->
@@ -33,7 +37,7 @@
<copyfile src="${ant.home}/lib/ant.jar"
dest="${watchdog.build}/lib/ant.jar"/>
- <copyfile src="${servletapi.home}/lib/servlet.jar"
+ <copyfile src="${servlet.jar}"
dest="${watchdog.build}/lib/servlet.jar"/>
@@ -131,7 +135,7 @@
<copyfile src="${ant.home}/lib/ant.jar"
dest="${watchdog.dist}/lib/ant.jar"/>
- <copyfile src="${servletapi.home}/lib/servlet.jar"
+ <copyfile src="${servlet.jar}"
dest="${watchdog.dist}/lib/servlet.jar"/>
<copydir src="src/clients/org/apache/jcheck/jsp/client"
1.1 jakarta-watchdog-4.0/build.properties.sample
Index: build.properties.sample
===================================================================
# -----------------------------------------------------------------------------
# build.properties.sample
#
# This is an example "build.properties" file, used to customize building Tomcat
# for your local environment. Make any changes you need, and rename this file
# to "build.properties" in the same directory that contains the top level
# "build.xml" file.
#
# $Id: build.properties.sample,v 1.1 2001/05/21 22:05:24 craigmcc Exp $
# -----------------------------------------------------------------------------
# The directory containing your binary distribution of the Servlet 2.3
# and JSP 1.2 API classes
servletapi.home=/usr/local/jakarta-servletapi-4/dist
