costin 01/03/11 19:01:12
Modified: . build.xml
src/tests build.xml
Log:
Few more changes to the build. ( trying to fix the nightly )
Revision Changes Path
1.123 +7 -1 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- build.xml 2001/03/11 02:45:41 1.122
+++ build.xml 2001/03/12 03:01:11 1.123
@@ -7,6 +7,9 @@
<property name="debug" value="on"/>
<!-- Directories -->
+ <!-- Where source packages are located -->
+ <property name="ws" value=".." />
+
<!-- work.dir is the place where build places the work
files created in the build process, including the
build/ and dist/ dirs.
@@ -21,7 +24,7 @@
<!-- Location where various binaries are installed.
It can be "c:\Program Files" or /usr/share/java or
/opt/java. The default is .. ( assuming jakarta-tomcat
- is installed in the same directory ).
+ is installed in the same directory ) ( backward compat ).
Note that this assumes binary packages ( i.e. dists )
-->
@@ -43,6 +46,9 @@
<!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final -->
<property name="servlet22.jar" value="bin/servlet22.jar"/>
+
+ <!-- We can assume tomcat.build will hold a working tomcat -->
+ <property name="tomcat.home" value="${tomcat.build}"/>
<!-- ==================== Initialization - guessing config ========== -->
<target name="detect">
1.5 +12 -24 jakarta-tomcat/src/tests/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/02/12 23:09:34 1.4
+++ build.xml 2001/03/12 03:01:11 1.5
@@ -1,39 +1,28 @@
<?xml version="1.0"?>
-
-<!-- Emacs indentation & editting support
- <antstructure output="ant.dtd"/>
-<!DOCTYPE ant SYSTEM "ant.dtd" >
--->
-
<project name="Tomcat-test" default="main" basedir=".">
<!-- Compilation properties -->
<property name="build.compiler" value="classic"/>
<property name="optimize" value="false" />
- <property name="debug" value="off" />
+ <property name="debug" value="on" />
<!-- Directories -->
-
- <property name="tomcat.home" value="../../../build/tomcat"/>
- <property name="watchdog.src"
- value="${tomcat.home}/../../jakarta-watchdog"/>
- <property name="watchdog.build"
- value="${watchdog.src}/../build/watchdog"/>
-
-
- <!-- External packages we depend on -->
+ <property name="ws" value="../../.." />
+ <property name="work.dir" value="${ws}/jakarta-tomcat" />
+ <property name="install.dir" value="${ws}" />
- <property name="ant.home" value="../jakarta-ant" />
- <property name="jaxp" value="../jaxp1.0.1" />
+ <property name="tomcat.build" value="${ws}/jakarta-tomcat/build/tomcat"/>
+ <property name="tomcat.dist" value="${ws}/jakarta-tomcat/dist/tomcat"/>
- <!-- set it if not specified as -D or in parent antfile -->
- <property name="servlet.jar" value="${tomcat.home}/lib/servlet.jar" />
+ <property name="watchdog.src" value="${ws}/jakarta-watchdog"/>
+ <property name="watchdog.build" value="${watchdog.src}/../build/watchdog"/>
<!-- ==================== Initialization - guessing config ========== -->
<target name="init">
<available file="${watchdog.src}/build.xml"
property="watchdog.available" />
+ <echo message="Testing ${watchdog.src}/build.xml ${watchdog.available}" />
</target>
<!-- ==================== Copy static files ==================== -->
@@ -42,7 +31,7 @@
</target>
<!-- ==================== Build the internal test app ================== -->
- <target name="sanity-test" >
+ <target name="sanity-test" depends="init">
<mkdir dir="${tomcat.build}/webapps/test"/>
<!-- the golden files will be part of the webapp - no
need to have a separate directory or polute lib -->
@@ -94,9 +83,9 @@
<fileset dir="${watchdog.src}/src/server/servlet-tests" />
</copy>
- <copyfile src="${watchdog.build}/conf/jsp-gtest.xml"
+ <copyfile src="${watchdog.src}/src/conf/jsp-gtest.xml"
dest="${tomcat.build}/webapps/jsp-tests/WEB-INF/jsp-gtest.xml"/>
- <copyfile src="${watchdog.build}/conf/servlet-moo.xml"
+ <copyfile src="${watchdog.src}/src/conf/servlet-moo.xml"
dest="${tomcat.build}/webapps/servlet-tests/WEB-INF/servlet-moo.xml"/>
<javac
@@ -135,7 +124,6 @@
<target name="clean" depends="init">
<deltree dir="${tomcat.build}"/>
- <deltree dir="${tomcat.home}"/>
</target>
<target name="all" depends=""/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
