costin 01/02/03 08:08:26
Modified: src/build/nightly README functions_build.sh nightly.sh
start_tomcat.sh stop_tomcat.sh weekly.sh
Added: src/build/nightly nightly32.sh weekly32.sh
Removed: src/build/nightly build_once.sh build_tomcat.sh cvs_get.sh
Log:
Added scripts for tomcat3.2.x nightly build & test.
Minor changes to reuse the previous script functions.
Revision Changes Path
1.2 +25 -4 jakarta-tomcat/src/build/nightly/README
Index: README
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README 2001/02/01 04:38:14 1.1
+++ README 2001/02/03 16:08:25 1.2
@@ -53,12 +53,33 @@
run_watchdog.sh -> start, run watchdog 3 times, run sanity, grep the
results for error counts
-cvs_get.sh -> update or clean checkoug, for tomcat or all
-
-build_tomcat.sh -> just build and zip the result ( after adding jaxp )
-
functions_build.sh -> various shell functions ( I use to source it and
use them in command line to repeat individual steps )
+
+Build Functions
+===============
+
+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 )
+
+cvs_update REPOSITORY CVSTAG -> update or clean get of repository
+cvs_get REPOSITORY CVSTAG
+
+zip_src REPOSITORY ZIPNAME ->
+zip_dist DISTNAME ARCHBASE -> zip dist ( tomcat ) to .zip and
+ tgz ( tomcat-full)
+
+count_errors LOGFILE -> do greps for OK and FAILURE in a watchdog log file
+...
+
+Future
+======
+
+Move back to ant ( as much as possible - we'll have to use a lot of <java>
+tasks to run ant1.1 and test with different VMs )
+
NOTE: don't expect nice code, it's just a hack to build and test tomcat.
1.2 +32 -51 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- functions_build.sh 2001/02/01 04:38:14 1.1
+++ functions_build.sh 2001/02/03 16:08:25 1.2
@@ -4,10 +4,6 @@
# PATH
# JDK11_HOME JDK12_HOME
-if [ -f $HOME/.nightlyrc ] ; then
- . $HOME/.nightlyrc
-fi
-
# Defaults
if [ "$WS" = "" ] ; then
WS=$HOME/ws
@@ -23,9 +19,19 @@
CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic
PATH=$HOME/bin:$HOME/bin/nightly:/usr/local/bin:$PATH
JSSE=$HOME/java/jsse
-EXTENTSIONS=$JSSE/jsse.jar:$JSSE/jnet.jar:$JSSE/jcert.jar:.
+EXTENSIONS=$JSSE/jsse.jar:$JSSE/jnet.jar:$JSSE/jcert.jar:.
ANT_HOME=$HOME/opt/ant-1.2
+if [ ! -d $WS ] ; then
+ mkdir $WS
+fi
+if [ ! -d $LOGDIR ] ; then
+ mkdir $LOGDIR
+fi
+if [ ! -d $ZIPDIR ] ; then
+ mkdir $ZIPDIR
+fi
+
export JAVA_HOME
export ZIP
export ZIPDIR
@@ -36,6 +42,11 @@
export EXTENSIONS
export ANT_HOME
+#Override
+if [ -f $HOME/.nightlyrc ] ; then
+ . $HOME/.nightlyrc
+fi
+
## Make sure all dirs exists
mkdir -p $ZIPDIR
mkdir -p $LOGDIR
@@ -57,12 +68,13 @@
# functions
cvs_get() {
- MOD=$1
+ MOD=$1
+ TAG=$2
cd $WS
rm -rf $MOD
- echo cvs -d $CVSROOT co $MOD
- cvs co $MOD >$LOGDIR/cvs-get-$MOD.log 2>&1
+ echo cvs -d $CVSROOT co $TAG $MOD
+ cvs co $TAG $MOD >$LOGDIR/cvs-get-$MOD.log 2>&1
wc $LOGDIR/cvs-get-$MOD.log
tail -5 $LOGDIR/cvs-get-$MOD.log
echo
@@ -70,6 +82,7 @@
cvs_update() {
MOD=$1
+ TAG=$2
cd $WS/$MOD
echo cvs -d -P $CVSROOT update
@@ -129,49 +142,6 @@
echo ---------- DONE $DIST BUILD `date` ----------
}
-ant_build_xml() {
- MOD=$1
- DIST=$2
- LOG=$LOGDIR/$3
- # ANT_HOME
- # JAVA_HOME
-
- echo ---------- $DIST BUILD `date` ----------
- echo JAVA_HOME=$JAVA_HOME
- echo LOG=$LOG
- echo WS=$WS/$MOD
- echo CLASSPATH=$CLASSPATH
- echo
-
- echo ---------- $DIST BUILD `date` ---------- >> $LOG 2>&1
- echo JAVA_HOME=$JAVA_HOME >> $LOG 2>&1
- echo LOG=$LOG >> $LOG 2>&1
- echo WS=$WS/$MOD >> $LOG 2>&1
- echo CLASSPATH=$CLASSPATH >> $LOG 2>&1
- echo >> $LOG 2>&1
- $JAVA_HOME/bin/java -version >> $LOG 2>&1
-
- cd $WS/$MOD
- echo rm -rf $WS/$MOD/build >> $LOG 2>&1
- rm -rf $WS/$MOD/build >> $LOG 2>&1
-
- JAVACMD=$JAVA_HOME/bin/java
- export JAVACMD
- $ANT_HOME/bin/ant dist 2>&1 >> $LOG
-
- grep "BUILD SUCCESSFUL" $LOG
- if [ "$?" != "0" ]; then
- echo BUILD FAILED.
- echo ---------- HEAD:
- head -10 $LOG
- echo ---------- TAIL:
- tail -20 $LOG
- echo ----------
- echo
- fi
- echo ---------- DONE $DIST BUILD `date` ----------
-}
-
zip_src() {
MOD=$1
ZIPNAME=$2
@@ -209,6 +179,17 @@
cp $ANT_HOME/lib/jaxp.jar $WS/dist/tomcat/lib
}
+## 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
+ fix_tomcat
+ zip_dist tomcat tomcat-$SUFIX
+}
+
+## Will count the errors in a watchdog script
count_errors() {
BASELOG=$1
1.2 +5 -8 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nightly.sh 2001/02/01 04:38:14 1.1
+++ nightly.sh 2001/02/03 16:08:25 1.2
@@ -13,12 +13,13 @@
export CLASSPATH
export JAVA_HOME
-cvs_get.sh
+cvs_update 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.sh noext >>$LOGDIR/nightly.log 2>&1
+build_tomcat 3.3-noext "main watchdog-web-based dist" >>$LOGDIR/nightly.log 2>&1
run_watchdog.sh noext >>$LOGDIR/nightly.log 2>&1
echo BUILD `date` >>$LOGDIR/nightly.log
@@ -27,18 +28,14 @@
LD_LIBRARY_PATH=$JAVA_HOME/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
CLASSPATH=.
-
echo BUILD `date` >>$LOGDIR/nightly.log
-build_tomcat.sh jdk11 >>$LOGDIR/nightly.log 2>&1
-#THREADS_FLAG=green
-#export THREADS_FLAG
+build_tomcat.sh 3.3-jdk11 "main watchdog-web-based 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
-#THREADS_FLAG=native
#unset LD_LIBARY_PATH
# Full build
@@ -47,7 +44,7 @@
echo $EXT
echo BUILD `date` >>$LOGDIR/nightly.log
-build_tomcat.sh full >>$LOGDIR/nightly.log 2>&1
+build_tomcat.sh 3.3-full "main watchdog-web-based dist" >>$LOGDIR/nightly.log 2>&1
run_watchdog.sh full >>$LOGDIR/nightly.log 2>&1
echo security test
run_watchdog.sh security >>$LOGDIR/nightly.log 2>&1
1.2 +6 -0 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- start_tomcat.sh 2001/02/01 04:38:14 1.1
+++ start_tomcat.sh 2001/02/03 16:08:25 1.2
@@ -48,6 +48,12 @@
grep "Http10Interceptor" $LOGDIR/tomcat-run$EXT.log \
>/dev/null 2>&1
STARTED=$?
+ if [ "$STARTED" != "0" ] ; then
+ grep "HttpConnectionHandler" $LOGDIR/tomcat-run$EXT.log \
+ >/dev/null 2>&1
+ STARTED=$?
+ fi
+
i=`expr $i + 1`
if [ "$i" = "120" ] ; then
echo "Can't start after 120 seconds "
1.2 +7 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stop_tomcat.sh 2001/02/01 04:38:14 1.1
+++ stop_tomcat.sh 2001/02/03 16:08:25 1.2
@@ -19,7 +19,12 @@
cd $ROOT/tomcat
bin/tomcat.sh stop
-pkill java
-killall -9 java
+if [ -f /usr/bin/pkill ] ; then
+ pkill java
+fi
+
+if [ -f /usr/bin/killall ] ; then
+ killall -9 java
+fi
1.2 +15 -3 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- weekly.sh 2001/02/01 04:38:14 1.1
+++ weekly.sh 2001/02/03 16:08:25 1.2
@@ -11,11 +11,23 @@
export CLASSPATH
export JAVA_HOME
-cvs_get.sh -f all >>$LOGDIR/weekly.log 2>&1
-build_once.sh >>$LOGDIR/weekly.log 2>&1
-build_tomcat.sh full >>$LOGDIR/weekly.log 2>&1
+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
+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
+# Both servlet api and watchdog need ant1.1
+echo Building watchdog >>$LOGDIR/weekly.log 2>&1
+echo --------------------------------------------------- >>$LOGDIR/weekly.log 2>&1
+ant_build jakarta-servletapi servletapi servletapi-build.log >>$LOGDIR/weekly.log
2>&1
+ant_build jakarta-watchdog watchdog watchdog-build.log >>$LOGDIR/weekly.log 2>&1
+tail -6 $LOGDIR/watchdog-build.log >>$LOGDIR/weekly.log 2>&1
1.1 jakarta-tomcat/src/build/nightly/nightly32.sh
Index: nightly32.sh
===================================================================
#!/bin/sh
WS=/home/costin/ws32
export WS
. $HOME/bin/nightly/functions_build.sh
PATH=$HOME/bin/nightly:$PATH
# will use the sticky tag ( that is already there )
cvs_update jakarta-tomcat
# Special builds - no ext
CLASSPATH=.
JAVA_HOME=$HOME/java/java1.2
TOMCAT_HOME=$WS/dist/tomcat
export TOMCAT_HOME
export CLASSPATH
export JAVA_HOME
echo rm -f $LOGDIR/*
rm -f $LOGDIR/*
# Full build
CLASSPATH=$EXTENSIONS
export CLASSPATH
echo Building with $CLASSPATH
JAVA_HOME=$HOME/java/java1.2
echo $EXT
echo BUILD `date` >>$LOGDIR/nightly.log
ant_build jakarta-tomcat tomcat tomcat-3.3-build-full.log dist >>$LOGDIR/nightly.log
2>&1
fix_tomcat
zip_dist tomcat tomcat-3.3-full
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.1 jakarta-tomcat/src/build/nightly/weekly32.sh
Index: weekly32.sh
===================================================================
#!/bin/sh
WS=/home/costin/ws32
export WS
. $HOME/bin/nightly/functions_build.sh
PATH=$HOME/bin/nightly:$PATH
echo "BUILD `date`" >$LOGDIR/weekly.log
CLASSPATH=$EXTENSIONS
JAVA_HOME=$HOME/java/java1.2
export CLASSPATH
export JAVA_HOME
cvs_get jakarta-tomcat "-r tomcat_32" >>$LOGDIR/weekly.log 2>&1
cvs_get jakarta-watchdog "-r tomcat_32" >>$LOGDIR/weekly.log 2>&1
cvs_get jakarta-tools>>$LOGDIR/weekly.log 2>&1
cvs_get jakarta-servletapi>>$LOGDIR/weekly.log 2>&1
zip_src jakarta-tomcat tomcat-3.2-src.zip>>$LOGDIR/weekly.log 2>&1
zip_src jakarta-watchdog watchdog-src-32.zip>>$LOGDIR/weekly.log 2>&1
zip_src jakarta-servletapi servletapi-src.zip>>$LOGDIR/weekly.log 2>&1
ant_build jakarta-servletapi servletapi servletapi-build.log
tail -6 $LOGDIR/servletapi-build.log
ANT_HOME=$HOME/opt/ant-1.1
export ANT_HOME
ant_build jakarta-watchdog watchdog watchdog-build.log
ANT_HOME=$HOME/opt/ant-1.2
export ANT_HOME
tail -6 $LOGDIR/watchdog-build.log
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
