You are viewing a plain text version of this content. The canonical link for it is here.
Posted to watchdog-dev@jakarta.apache.org by co...@hyperreal.org on 1999/11/11 23:13:33 UTC
cvs commit: jakarta-watchdog build.sh build.xml
costin 99/11/11 14:13:24
Modified: . build.sh build.xml
Log:
Fixes for automatic build
Revision Changes Path
1.5 +6 -5 jakarta-watchdog/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-watchdog/build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.sh 1999/11/09 20:38:41 1.4
+++ build.sh 1999/11/11 22:13:02 1.5
@@ -1,19 +1,20 @@
-#!/bin/ksh
+#!/bin/sh
#
-# $Id: build.sh,v 1.4 1999/11/09 20:38:41 costin Exp $
+# $Id: build.sh,v 1.5 1999/11/11 22:13:02 costin Exp $
# Ksh wrapper around ant build system.
baseDir=`pwd`
echo $baseDir .....
-ADDL_CLASSPATH=./../jakarta-tools/ant.jar:./../jakarta-tools/moo.jar:./../jakarta-tools/projectx-tr2.jar:../build/tomcat/lib/servlet.jar:../build/tomcat/lib/jasper.jar:../build/tomcat/lib/xml.jar
+ADDL_CLASSPATH=../build/tomcat/classes:../jakarta-tools/ant.jar:../jakarta-tools/moo.jar:../jakarta-tools/projectx-tr2.jar:../build/tomcat/lib/servlet.jar:../build/tomcat/lib/jasper.jar:../build/tomcat/lib/xml.jar
if [[ -n $CLASSPATH ]]; then
- export CLASSPATH=$ADDL_CLASSPATH:$CLASSPATH
+ CLASSPATH=$ADDL_CLASSPATH:$CLASSPATH
else
- export CLASSPATH=$ADDL_CLASSPATH
+ CLASSPATH=$ADDL_CLASSPATH
fi
+export CLASSPATH
echo Building with classpath $CLASSPATH
1.17 +1 -4 jakarta-watchdog/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 1999/11/09 20:38:46 1.16
+++ build.xml 1999/11/11 22:13:09 1.17
@@ -1,4 +1,5 @@
<project name="jakarta-watchdog" default="main" basedir=".">
+ <property name="build.compiler" value="classic"/>
<!-- system properties can be defined here, compiler can have the values:
classic, modern, jikes -->
@@ -20,7 +21,6 @@
<mkdir dir="${watchdog.build}/webapps/jsp-tests/WEB-INF/lib"/>
<mkdir dir="${watchdog.build}/webapps/jsp-tests"/>
- <copydir src="src/server/servlet-tests" dest="${watchdog.build}/webapps/servlet-tests"/>
<copydir src="src/server/jsp-tests" dest="${watchdog.build}/webapps/jsp-tests"/>
<copyfile src="../jakarta-tools/moo.jar" dest="${watchdog.build}/lib/moo.jar"/>
@@ -40,9 +40,6 @@
<chmod src="${watchdog.build}/runtest.sh" perm="+x"/>
</target>
<target name="main" depends="prepare">
-
- <javac srcdir="src/server/servlet-tests/WEB-INF/classes"
- destdir="${watchdog.build}/webapps/servlet-tests/WEB-INF/classes"/>
<javac srcdir="src/server/jsp-tests/WEB-INF/classes"
destdir="${watchdog.build}/webapps/jsp-tests/WEB-INF/classes"/>