You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@locus.apache.org on 2000/11/19 02:39:52 UTC
cvs commit: jakarta-struts build.bat build.sh
craigmcc 00/11/18 17:39:52
Modified: . build.bat build.sh
Log:
Add Ant's "optional.jar" file to the classpath used to build Struts, if
it exists.
Revision Changes Path
1.8 +3 -3 jakarta-struts/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-struts/build.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.bat 2000/09/20 04:21:48 1.7
+++ build.bat 2000/11/19 01:39:51 1.8
@@ -21,7 +21,7 @@
rem TOMCAT_HOME Build directory for "jakarta-tomcat".
rem [../build/tomcat]
rem
-rem $Id: build.bat,v 1.7 2000/09/20 04:21:48 craigmcc Exp $
+rem $Id: build.bat,v 1.8 2000/11/19 01:39:51 craigmcc Exp $
rem ---------------------------------------------------------------------------
@@ -62,10 +62,10 @@
rem ----- Set Up The Runtime Classpath ----------------------------------------
if "%CLASSPATH%" == "" goto noClasspath
-set CP=%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%CLASSPATH%
+set CP=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar;%CLASSPATH%
goto gotClasspath
:noClasspath
-set CP=%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar
+set CP=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar
:gotClasspath
1.4 +3 -3 jakarta-struts/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-struts/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.sh 2000/09/20 04:21:48 1.3
+++ build.sh 2000/11/19 01:39:52 1.4
@@ -21,7 +21,7 @@
# TOMCAT_HOME Build directory for "jakarta-tomcat".
# [../build/tomcat]
#
-# $Id: build.sh,v 1.3 2000/09/20 04:21:48 craigmcc Exp $
+# $Id: build.sh,v 1.4 2000/11/19 01:39:52 craigmcc Exp $
# -----------------------------------------------------------------------------
@@ -56,9 +56,9 @@
# ----- Set Up The Runtime Classpath ------------------------------------------
if [ "$CLASSPATH" = "" ] ; then
- CP=$ANT_HOME/lib/ant.jar:$SERVLETAPI_HOME/lib/servlet.jar:$JAVA_HOME/lib/tools.jar
+ CP=$ANT_HOME/lib/ant.jar:$ANT_HOME/lib/optional.jar:$SERVLETAPI_HOME/lib/servlet.jar:$JAVA_HOME/lib/tools.jar
else
- CP=$ANT_HOME/lib/ant.jar:$SERVLETAPI_HOME/lib/servlet.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH
+ CP=$ANT_HOME/lib/ant.jar:$ANT_HOME/lib/optional.jar:$SERVLETAPI_HOME/lib/servlet.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH
fi