costin 01/03/10 18:45:44
Modified: . build.xml
src/build/nightly README functions_build.sh nightly.sh
run_watchdog.sh start_tomcat.sh stop_tomcat.sh
weekly.sh
Log:
Few more fixes on the build system.
Revision Changes Path
1.122 +1 -1 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- build.xml 2001/03/10 18:27:16 1.121
+++ build.xml 2001/03/11 02:45:41 1.122
@@ -24,7 +24,7 @@
is installed in the same directory ).
Note that this assumes binary packages ( i.e. dists )
- --
+ -->
<property name="install.dir" value=".." />
1.4 +1 -1 jakarta-tomcat/src/build/nightly/README
Index: README
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README 2001/03/05 21:25:41 1.3
+++ README 2001/03/11 02:45:42 1.4
@@ -59,7 +59,7 @@
Build Functions
===============
-build_tomcat SUFIX TARGET -> build and zip the result
+build_tomcat SUFIX TARGET -> build, add jaxp1.0 and zip the result
ant_build REPOSITORY DISTNAME LOGFILE TARGET -> use ant to build
repository ( jakarta-tomcat ) into DISTNAME ( tomcat ),
with log ( build-full.log ) and using TARGET ( main )
1.4 +9 -14 jakarta-tomcat/src/build/nightly/functions_build.sh
Index: functions_build.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/functions_build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- functions_build.sh 2001/03/05 21:25:42 1.3
+++ functions_build.sh 2001/03/11 02:45:42 1.4
@@ -1,3 +1,4 @@
+
#!/bin/sh
# Config: ZIPDIR CVSROOT ANT_HOME JAVA_HOME
@@ -119,10 +120,10 @@
$JAVA_HOME/bin/java -version >> $LOG 2>&1
cd $WS/$MOD
- echo rm -rf $WS/build/$DIST >> $LOG 2>&1
- echo rm -rf $WS/dist/$DIST >> $LOG 2>&1
- rm -rf $WS/build/$DIST >> $LOG 2>&1
- rm -rf $WS/dist/$DIST >> $LOG 2>&1
+ echo rm -rf $WS/jakarta-tomcat/build/$DIST >> $LOG 2>&1
+ echo rm -rf $WS/jakarta-tomcat/dist/$DIST >> $LOG 2>&1
+ rm -rf $WS/jakarta-tomcat/build/$DIST >> $LOG 2>&1
+ rm -rf $WS/jakarta-tomcat/dist/$DIST >> $LOG 2>&1
JAVACMD=$JAVA_HOME/bin/java
export JAVACMD
@@ -149,7 +150,7 @@
cd $WS
echo
echo zip -r $ZIPNAME $MOD
- zip -r $MOD >/dev/null
+ zip -r $MOD -x \*CVS\* >/dev/null
mv zip.zip $ZIPDIR/$ZIPNAME
echo
}
@@ -161,7 +162,7 @@
echo
echo Creating $DIST distribution in $ZIPDIR:
echo $ARCH.tar.gz $ARCH.zip
- cd $WS/dist
+ cd $WS/jakarta-tomcat/dist
rm -f $ZIPDIR/$ARCH.tar >/dev/null 2>&1
rm -f $ZIPDIR/$ARCH.tar.gz >/dev/null 2>&1
@@ -172,19 +173,13 @@
mv zip.zip $ZIPDIR/$ARCH.zip
echo
}
-
-fix_tomcat() {
-
- cp $ANT_HOME/lib/parser.jar $WS/dist/tomcat/lib
- cp $ANT_HOME/lib/jaxp.jar $WS/dist/tomcat/lib
-}
-## Will build tomcat and zip the result
+## Will build tomcat, copy the jaxp files, and zip the result
build_tomcat() {
SUFIX=$1
TARGET=$2
- ant_build jakarta-tomcat tomcat tomcat-build-$SUFIX.log $TARGET
+ ant_build jakarta-tomcat tomcat tomcat-build-$SUFIX.log "$TARGET"
zip_dist tomcat tomcat-$SUFIX
}
1.3 +21 -19 jakarta-tomcat/src/build/nightly/nightly.sh
Index: nightly.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/nightly.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nightly.sh 2001/02/03 16:08:25 1.2
+++ nightly.sh 2001/03/11 02:45:42 1.3
@@ -8,20 +8,26 @@
# Special builds - no ext
CLASSPATH=.
JAVA_HOME=$HOME/java/java1.2
-TOMCAT_HOME=/home/costin/ws/dist/tomcat
+TOMCAT_HOME=/home/costin/ws/jakarta-tomcat/dist/tomcat
export TOMCAT_HOME
export CLASSPATH
export JAVA_HOME
-cvs_update jakarta-tomcat
+cvs_get jakarta-tomcat
zip_src jakarta-tomcat tomcat-3.3-src.zip
-echo rm -f $LOGDIR/*
rm -f $LOGDIR/*
-echo BUILD `date` >$LOGDIR/nightly.log
-build_tomcat 3.3-noext "main watchdog-web-based dist" >>$LOGDIR/nightly.log 2>&1
+
+echo Build 3.3 noext + test web apps `date` >$LOGDIR/nightly.log
+ant_build jakarta-tomcat tomcat tomcat-build-noext.log "dist tests.dist"
>>$LOGDIR/nightly.log 2>&1
+
+cp $TOMCAT_HOME/webapps/test.war $WS/zip
+cp $TOMCAT_HOME/webapps/jsp-tests.war $WS/zip
+cp $TOMCAT_HOME/webapps/servlet-tests.war $WS/zip
+
+echo Watchdog/3.3 noext start `date` >>$LOGDIR/nightly.log
run_watchdog.sh noext >>$LOGDIR/nightly.log 2>&1
-echo BUILD `date` >>$LOGDIR/nightly.log
+echo Watchdog end `date` >>$LOGDIR/nightly.log
# Special tomcat build - 1.1
JAVA_HOME=$HOME/java/java1.1
@@ -29,12 +35,10 @@
export LD_LIBRARY_PATH
CLASSPATH=.
echo BUILD `date` >>$LOGDIR/nightly.log
-build_tomcat.sh 3.3-jdk11 "main watchdog-web-based dist" >>$LOGDIR/nightly.log 2>&1
+
+ant_build jakarta-tomcat tomcat tomcat-build-3.3-jdk11.log dist
>>$LOGDIR/nightly.log 2>&1
+
# run_watchdog.sh jdk11 >>$LOGDIR/nightly.log 2>&1
-rm -rf $WS/dist/tomcat-1.1
-echo mv $WS/dist/tomcat $WS/dist/tomcat-1.1
-mv $WS/dist/tomcat $WS/dist/tomcat-1.1
-echo done
#echo BUILD `date` >>$LOGDIR/nightly.log
#unset LD_LIBARY_PATH
@@ -44,15 +48,13 @@
echo $EXT
echo BUILD `date` >>$LOGDIR/nightly.log
-build_tomcat.sh 3.3-full "main watchdog-web-based dist" >>$LOGDIR/nightly.log 2>&1
+build_tomcat 3.3-full dist >>$LOGDIR/nightly.log 2>&1
+
+cp $WS/zip/test.war $TOMCAT_HOME/webapps/test.war
+cp $WS/zip/jsp-tests.war $TOMCAT_HOME/webapps/jsp-tests.war
+cp $WS/zip/servlet-tests.war $TOMCAT_HOME/webapps/servlet-tests.war
+
run_watchdog.sh full >>$LOGDIR/nightly.log 2>&1
-echo security test
run_watchdog.sh security >>$LOGDIR/nightly.log 2>&1
-echo security done
echo BUILD `date` >>$LOGDIR/nightly.log
-
-# mail -s "Tomcat3.3 nightly build " \
-# [EMAIL PROTECTED] \
-# < $LOGDIR/nightly.log
-
1.2 +16 -24 jakarta-tomcat/src/build/nightly/run_watchdog.sh
Index: run_watchdog.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/run_watchdog.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- run_watchdog.sh 2001/02/01 04:38:14 1.1
+++ run_watchdog.sh 2001/03/11 02:45:43 1.2
@@ -4,13 +4,7 @@
######## MAIN
-ROOT=$WS/dist
-if [ "$1" = "-b" ] ; then
- ROOT=$WS/build
- BUILD=true
- echo Using build $1
- shift
-fi
+TOMCAT_HOME=$WS/jakarta-tomcat/dist
if [ "$1" = "-s" ] ; then
NOSTART=true;
echo No start
@@ -22,29 +16,22 @@
CLASSPATH=$ANT_HOME/lib/jaxp.jar:$CLASSPATH
CLASSPATH=$ANT_HOME/lib/ant.jar:$CLASSPATH
export CLASSPATH
-
-cd $ROOT
-cp $ANT_HOME/lib/ant.jar $ROOT/watchdog/lib
+cd $TOMCAT_HOME
-#rm -rf tomcat/webapps/jsp-tests >/dev/null 2>&1
-#rm -rf tomcat/webapps/servlet-tests >/dev/null 2>&1
-if [ "$BUILD" != "" ]; then
- ln -s $ROOT/watchdog/webapps/jsp-tests tomcat/webapps >/dev/null 2>&1
- ln -s $ROOT/watchdog/webapps/servlet-tests tomcat/webapps >/dev/null 2>&1
-else
- ln -s $ROOT/watchdog/webapps/jsp-tests.war tomcat/webapps >/dev/null 2>&1
- ln -s $ROOT/watchdog/webapps/servlet-tests.war tomcat/webapps >/dev/null 2>&1
-fi
+cp $ANT_HOME/lib/ant.jar $TOMCAT_HOME/watchdog/lib
+
+ln -s $WS/dist/watchdog/webapps/jsp-tests.war tomcat/webapps >/dev/null 2>&1
+ln -s $WS/dist/watchdog/webapps/servlet-tests.war tomcat/webapps >/dev/null 2>&1
echo ---------- Start tomcat `date` ----------
-echo WS=$ROOT EXT=$EXT
+echo WS=$TOMCAT_HOME EXT=$EXT
echo Start `date` >$LOGDIR/watchdog-$EXT-1.log 2>&1
# Port 9080
-mv $ROOT/tomcat/conf/server.xml $ROOT/tomcat/conf/server.xml.orig
-sed s/8080/9080/ <$ROOT/tomcat/conf/server.xml.orig >$ROOT/tomcat/conf/server.xml
+mv $TOMCAT_HOME/tomcat/conf/server.xml $TOMCAT_HOME/tomcat/conf/server.xml.orig
+sed s/8080/9080/ <$TOMCAT_HOME/tomcat/conf/server.xml.orig
>$TOMCAT_HOME/tomcat/conf/server.xml
if [ "$NOSTART" = "" ]; then
if [ "$BUILD" = "" ]; then
@@ -60,7 +47,7 @@
fi
fi
-cd $ROOT/watchdog
+cd $WS/dist/watchdog
WATCHDOG_HOME=`pwd`
export WATCHDOG_HOME
@@ -70,6 +57,9 @@
echo ---------- Running watchdog `date` ----------
echo JAVA_VERSION `$JAVA_HOME/bin/java -version`
+PATH_ORIG=$PATH
+PATH=$PATH:$JAVA_HOME/bin
+
rm -rf $TOMCAT_HOME/work/DEFAULT/jsp-tests/jsp/tagext
time bin/watchdog.sh all localhost 9080 >>$LOGDIR/watchdog-$EXT-1.log 2>&1
@@ -116,7 +106,9 @@
PATH=$X
export PATH
+PATH=$PATH_ORIG
+
if [ "$NOSTART" = "" ]; then
- stop_tomcat.sh >>$LOGDIR/watchdog-$EXT-1.log 2>&1
+ stop_tomcat.sh >>$LOGDIR/watchdog-$EXT-1.log 2>&1
fi
1.3 +2 -7 jakarta-tomcat/src/build/nightly/start_tomcat.sh
Index: start_tomcat.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/start_tomcat.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- start_tomcat.sh 2001/02/03 16:08:25 1.2
+++ start_tomcat.sh 2001/03/11 02:45:43 1.3
@@ -6,11 +6,7 @@
######## MAIN
-ROOT=$WS/dist
-if [ "$1" = "-b" ] ; then
- ROOT=$WS/build
- shift
-fi
+ROOT=$WS/jakarta-tomcat/dist
EXT=$1
@@ -30,12 +26,11 @@
echo Make sure tomcat is stopped
bin/tomcat.sh stop >/dev/null 2>&1
-cd $ROOT/tomcat
rm -f $LOGDIR/tomcat-run$EXT.log >/dev/null 2>&1
$JAVA_HOME/bin/java -version > $LOGDIR/tomcat-run$EXT.log 2>&1 &
if [ "$EXT" = "security" ] ; then
- bin/tomcat.sh run -security >> $LOGDIR/tomcat-run$EXT.log 2>&1 &
+ bin/tomcat.sh run -sandbox >> $LOGDIR/tomcat-run$EXT.log 2>&1 &
else
bin/tomcat.sh run >> $LOGDIR/tomcat-run$EXT.log 2>&1 &
fi
1.3 +1 -4 jakarta-tomcat/src/build/nightly/stop_tomcat.sh
Index: stop_tomcat.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/stop_tomcat.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stop_tomcat.sh 2001/02/03 16:08:25 1.2
+++ stop_tomcat.sh 2001/03/11 02:45:43 1.3
@@ -4,10 +4,7 @@
######## MAIN
-ROOT=$WS/dist
-if [ "$1" = "-b" ] ; then
- ROOT=$WS/build
-fi
+ROOT=$WS/jakarta-tomcat/dist
CLASSPATH=$ANT_HOME/lib/parser.jar:$CLASSPATH
CLASSPATH=$ANT_HOME/lib/jaxp.jar:$CLASSPATH
1.3 +6 -5 jakarta-tomcat/src/build/nightly/weekly.sh
Index: weekly.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/weekly.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- weekly.sh 2001/02/03 16:08:25 1.2
+++ weekly.sh 2001/03/11 02:45:43 1.3
@@ -12,16 +12,17 @@
export JAVA_HOME
cvs_get jakarta-tomcat >>$LOGDIR/weekly.log 2>&1
-cvs_get jakarta-watchdog>>$LOGDIR/weekly.log 2>&1
-cvs_get jakarta-tools>>$LOGDIR/weekly.log 2>&1
-cvs_get jakarta-servletapi>>$LOGDIR/weekly.log 2>&1
+cvs_get jakarta-watchdog "-r tomcat_32" >>$LOGDIR/weekly.log 2>&1
+cp $WS/jakarta-watchdog/README $WS/jakarta-watchdog/Readme
+cvs_get jakarta-tools >>$LOGDIR/weekly.log 2>&1
+cvs_get jakarta-servletapi >>$LOGDIR/weekly.log 2>&1
zip_src jakarta-tomcat tomcat-3.3-src.zip>>$LOGDIR/weekly.log 2>&1
zip_src jakarta-watchdog watchdog-src.zip>>$LOGDIR/weekly.log 2>&1
zip_src jakarta-servletapi servletapi-src.zip>>$LOGDIR/weekly.log 2>&1
-ANT_HOME=$HOME/opt/ant-1.1
-export ANT_HOME
+# ANT_HOME=$HOME/opt/ant-1.1
+# export ANT_HOME
# Both servlet api and watchdog need ant1.1
echo Building watchdog >>$LOGDIR/weekly.log 2>&1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
