You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@locus.apache.org on 2000/01/15 18:35:10 UTC
cvs commit: jakarta-tomcat build.bat build.sh build.xml
rubys 00/01/15 09:35:10
Modified: . build.bat build.sh build.xml
Log:
Changes in support of the new jakarta-ant project
Revision Changes Path
1.4 +27 -1 jakarta-tomcat/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.bat 1999/12/17 00:18:01 1.3
+++ build.bat 2000/01/15 17:35:10 1.4
@@ -1,3 +1,29 @@
@echo off
REM convience bat file to build with
-java -classpath "..\jakarta-tools\ant.jar;..\jakarta-tools\moo.jar;..\jakarta-tools\projectx-tr2.jar;%CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
+
+SET _ANTHOME=%ANT_HOME%
+if "%ANT_HOME%" == "" SET ANT_HOME=..\jakarta-ant
+
+if "%CLASSPATH%" == "" goto noclasspath
+
+rem else
+set _CLASSPATH=%CLASSPATH%
+set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\moo.jar
+goto next
+
+:noclasspath
+set _CLASSPATH=
+set CLASSPATH=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\moo.jar
+goto next
+
+:next
+
+java org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+:clean
+
+rem clean up classpath after
+set CLASSPATH=%_CLASSPATH%
+set _CLASSPATH=
+SET ANT_HOME=%_ANTHOME%
+SET _ANTHOME=
1.7 +2 -2 jakarta-tomcat/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.sh 1999/12/17 06:37:44 1.6
+++ build.sh 2000/01/15 17:35:10 1.7
@@ -1,6 +1,6 @@
#! /bin/sh
-# $Id: build.sh,v 1.6 1999/12/17 06:37:44 akv Exp $
+# $Id: build.sh,v 1.7 2000/01/15 17:35:10 rubys Exp $
if [ -z "$JAVA_HOME" ]
then
@@ -16,7 +16,7 @@
JAVACMD=$JAVA_HOME/bin/java
-cp=../jakarta-tools/ant.jar:../jakarta-tools/moo.jar:../jakarta-tools/projectx-tr2.jar:../build/tomcat/classes:$JAVA_HOME/lib/tools.jar
+cp=../jakarta-ant/lib/ant.jar:../jakarta-tools/moo.jar:../jakarta-ant/lib/xml.jar:../build/tomcat/classes:$JAVA_HOME/lib/tools.jar
$JAVACMD -classpath $cp:$CLASSPATH org.apache.tools.ant.Main "$@"
1.19 +2 -2 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 2000/01/11 16:04:28 1.18
+++ build.xml 2000/01/15 17:35:10 1.19
@@ -15,7 +15,7 @@
<copydir src="src/webpages" dest="${tomcat.build}/webpages"/>
<copydir src="src/examples" dest="${tomcat.build}/examples"/>
<copydir src="src/share/javax" dest="${tomcat.build}/src/javax"/>
- <copyfile src="../jakarta-tools/projectx-tr2.jar" dest="${tomcat.build}/lib/xml.jar"/>
+ <copyfile src="../jakarta-ant/lib/xml.jar" dest="${tomcat.build}/lib/xml.jar"/>
<copydir src="src/shell" dest="${tomcat.build}" />
@@ -85,7 +85,7 @@
<copydir src="src/share/javax" dest="${tomcat.home}/src/javax"/>
<copyfile src="../jakarta-tools/ant.jar" dest="${tomcat.home}/lib/ant.jar"/>
- <copyfile src="../jakarta-tools/projectx-tr2.jar" dest="${tomcat.home}/lib/xml.jar"/>
+ <copyfile src="../jakarta-ant/lib/xml.jar" dest="${tomcat.home}/lib/xml.jar"/>
<copydir src="src/shell" dest="${tomcat.home}" />