You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@hyperreal.org on 1999/11/12 22:20:59 UTC
cvs commit: jakarta-tools/buildscripts do-build-tomcat env-i386-Linux env-sparc-Linux env-sparc-solaris2.4 client-nightly do-build do-package env-client taz-nightly
costin 99/11/12 13:20:57
Modified: buildscripts client-nightly do-build do-package env-client
taz-nightly
Added: buildscripts do-build-tomcat env-i386-Linux env-sparc-Linux
env-sparc-solaris2.4
Log:
- separate prepare/checkout from do-build ( co takes too much
time to do full build tests)
- changed date format
- changed log name to include platform
Revision Changes Path
1.8 +11 -34 jakarta-tools/buildscripts/client-nightly
Index: client-nightly
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/client-nightly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- client-nightly 1999/11/12 01:43:46 1.7
+++ client-nightly 1999/11/12 21:20:23 1.8
@@ -3,44 +3,21 @@
BASEDIR=`dirname $0`
. ${BASEDIR}/env-client
-${SCRIPT_DIR}/do-prepare-dir
+if [ -d ${BUILD_DIR}/result ]; then
+ echo
+else
+ mkdir ${BUILD_DIR}/result
+fi
-## Try to keep the log file XML-like, so we can XSL-extract
-# usefull info from it
-echo "<build-report>" > $TLOGFILE
-echo "<build-id>$TDSTRING</build-id>" >> $TLOGFILE
-## echo "<platform>" `uname -a` "</platform>" >> $TLOGFILE
-echo "<hostname>$HOSTNAME</hostname>" >> $TLOGFILE
-echo "<hosttype>$HOSTTYPE</hosttype>" >> $TLOGFILE
-echo "<ostype>$OSTYPE</ostype>" >> $TLOGFILE
+if [ -d ${BUILD_DIR}/ws ]; then
+ rm -rf ${BUILD_DIR}/ws
+fi
-echo >> $TLOGFILE
-echo >> $TLOGFILE
-${SCRIPT_DIR}/do-checkout 2>&1 >> $TLOGFILE
+mkdir ${BUILD_DIR}/ws
-echo >> $TLOGFILE
-echo >> $TLOGFILE
-${SCRIPT_DIR}/do-build 2>&1 >> $TLOGFILE
+${SCRIPT_DIR}/do-checkout
-echo >> $TLOGFILE
-echo >> $TLOGFILE
-${SCRIPT_DIR}/do-build-test 2>&1 >> $TLOGFILE
-
-echo >> $TLOGFILE
-echo >> $TLOGFILE
-${SCRIPT_DIR}/do-build-apache1.3 2>&1 >> $TLOGFILE
-
-echo >> $TLOGFILE
-echo >> $TLOGFILE
-${SCRIPT_DIR}/do-test 2>&1 >> $TLOGFILE
-
-echo >> $TLOGFILE
-echo >> $TLOGFILE
-${SCRIPT_DIR}/do-package 2>&1 >> $TLOGFILE
-
-echo "</build-report>" >> $TLOGFILE
-
-
+${SCRIPT_DIR}/do-build
1.3 +35 -5 jakarta-tools/buildscripts/do-build
Index: do-build
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/do-build,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- do-build 1999/11/11 21:24:51 1.2
+++ do-build 1999/11/12 21:20:25 1.3
@@ -3,10 +3,40 @@
BASEDIR=`dirname $0`
. ${BASEDIR}/env-client
-# XXX will become do-build-tomcat
+## Try to keep the log file XML-like, so we can XSL-extract
+# usefull info from it
+echo "<build-report>" > $TLOGFILE
+echo "<build-start>" `date` "</build-start>" >> $TLOGFILE
+echo "<build-id>$TDSTRING</build-id>" >> $TLOGFILE
+## echo "<platform>" `uname -a` "</platform>" >> $TLOGFILE
+echo "<hostname>$HOSTNAME</hostname>" >> $TLOGFILE
+echo "<hosttype>$HOSTTYPE</hosttype>" >> $TLOGFILE
+echo "<ostype>$OSTYPE</ostype>" >> $TLOGFILE
-echo "<build name=\"jakarta-tomcat\">"
-cd ${BUILD_DIR}/ws/jakarta-tomcat
-sh build.sh dist
-echo "</build>"
+echo >> $TLOGFILE
+echo >> $TLOGFILE
+${SCRIPT_DIR}/do-build-tomcat 2>&1 >> $TLOGFILE
+
+echo >> $TLOGFILE
+echo >> $TLOGFILE
+${SCRIPT_DIR}/do-build-test 2>&1 >> $TLOGFILE
+
+echo >> $TLOGFILE
+echo >> $TLOGFILE
+${SCRIPT_DIR}/do-build-apache1.3 2>&1 >> $TLOGFILE
+
+echo >> $TLOGFILE
+echo >> $TLOGFILE
+${SCRIPT_DIR}/do-test 2>&1 >> $TLOGFILE
+
+echo >> $TLOGFILE
+echo >> $TLOGFILE
+${SCRIPT_DIR}/do-package 2>&1 >> $TLOGFILE
+
+echo "<build-end>" `date` "</build-end>" >> $TLOGFILE
+echo "</build-report>" >> $TLOGFILE
+
+
+
+
1.4 +5 -0 jakarta-tools/buildscripts/do-package
Index: do-package
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/do-package,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do-package 1999/11/12 01:43:50 1.3
+++ do-package 1999/11/12 21:20:28 1.4
@@ -12,3 +12,8 @@
compress -f tomcat-$TDSTRING.tar
cp tomcat-$TDSTRING.tar.Z tomcat-$TDSTRING.log $FTP_DIR
+
+cd /opt/apache-1.3.9
+tar cf ${BUILD_DIR}/result/tomcat-$TDSTRING.tar *
+cd ${BUILD_DIR}/result
+compress -f tomcat-$TDSTRING.tar
1.5 +21 -23 jakarta-tools/buildscripts/env-client
Index: env-client
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/env-client,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- env-client 1999/11/12 01:43:52 1.4
+++ env-client 1999/11/12 21:20:29 1.5
@@ -1,41 +1,40 @@
#!/bin/sh
+# This script defines:
+#
+# Layout/directory variables
+# BUILD_DIR TOOLS_DIR SCRIPT_DIR SRC_DIR
+# APACHE_HOME
+# FTP_DIR
+#
+# TLOGFILE
+#
+# TDSTRING
+#
+# We also use some pre-defined shell variables:
+# OSTYPE
+# HOSTTYPE
+#
+#
+
# This the client nightly build sh script. This was originally written
# for tokyo, a sparc solaris client.
TYEAR=`date +%Y`
TMONTH=`date +%m`
TDAY=`date +%d`
-TDSTRING=$TYEAR-$TMONTH-$TDAY
-TSEP=-----------------------------------------------
+TDSTRING=$TYEAR$TMONTH$TDAY
-#
-# WARNING: right now, all these scripts are deadly specific to tokyo
-# we need to define the following parametrs in a nightly.conf file
-# that is unique to the client.
-#
-# For example, we should have a tokyo.conf file for tokyo that
-# contains the following information:
-#
-# $WS_DIR
-# $RESULT_DIR
-# $FTP_PICKUP_DIR
-# $BUILD_STANDALONE boolean flag to build tomcat standalone
-# $BUILD_INTEGRATED boolean flag to build tomcat+apache
-#
-# other hosts should have a hostname.conf file and this script should
-# be called via `client-nightly hostname.conf` from the cron job
-#
-
# default, may be overriden in host-specific
BUILD_DIR=$HOME
+SRC_DIR=$HOME/ws
## Better ? BUILD_DIR=/tmp/$TDSTRING
## XXX Duncan specific, cut build
TOOLS_DIR=$HOME/build/jakarta-tools
SCRIPT_DIR=${TOOLS_DIR}/buildscripts
-TLOGFILE=${BUILD_DIR}/result/tomcat-$TDSTRING.log
+TLOGFILE=${BUILD_DIR}/result/tomcat-${HOSTTYPE}-${OSTYPE}-$TDSTRING.log
if [ "$APACHE_HOME" = "" ] ; then
APACHE_HOME=/opt/apache-1.3.9
@@ -45,10 +44,9 @@
CVSROOT=:pserver:anoncvs@dev.apache.org:/home/cvspublic
fi
-FTP_DIR=/export/home/ftp/pub
-
export TDSTRING TLOGFILE TSEP BUILD_DIR TOOLS_DIR SCRIPT_DIR CVSROOT FTP_DIR
+## Override with platform specific, host specific and user specific options
# per arch - "official"
if [ -f ${SCRIPT_DIR}/env-${HOSTTYPE}-${OSTYPE} ]; then
1.3 +20 -10 jakarta-tools/buildscripts/taz-nightly
Index: taz-nightly
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/taz-nightly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- taz-nightly 1999/11/12 07:53:44 1.2
+++ taz-nightly 1999/11/12 21:20:31 1.3
@@ -12,15 +12,8 @@
# Get Canonical Unix build
-ftp ftp://tokyo.javasoft.com/pub/tomcat-$TDSTRING.log
-ftp ftp://tokyo.javasoft.com/pub/tomcat-$TDSTRING.tar.Z
-cat tomcat-$TDSTRING.log | mail -s "Unix Standalone Build $TDSTRING" tomcat-dev@jakarta.apache.org
-mv tomcat-$TDSTRING.log tomcat-$TDSTRING-sparc-sol-7-jdk117.log
-cp tomcat-$TDSTRING.tar.Z tomcat-foo.tar.Z
-uncompress tomcat-foo.tar.Z
-mv tomcat-foo.tar tomcat-$TDSTRING.tar
-bzip2 --stdout tomcat-$TDSTRING.tar > tomcat-$TDSTRING.bz2
-gzip tomcat-$TDSTRING.tar
+ftp ftp://tokyo.javasoft.com/pub/tomcat/tomcat-sparc-solaris2.4-$TDSTRING.log
+ftp ftp://tokyo.javasoft.com/pub/tomcat/tomcat-$TDSTRING.tar.Z
# Get Canoncial Windows build
@@ -31,9 +24,26 @@
# Solaris Intel
# Linux Sparc
+ftp ftp://kyoto.javasoft.com/pub/tomcat/tomcat-sparc-Linux-$TDSTRING.log
# Linux Intel
+ftp ftp://osaka.javasoft.com/pub/tomcat/tomcat-i386-Linux-$TDSTRING.log
# FBSD Intel
+
+# Windows NT
+
+
+
+## Post processing
+cat tomcat-sparc-solaris2.4-$TDSTRING.log | mail -s "Unix Standalone Build $TDSTRING" tomcat-dev@jakarta.apache.org
+
+# XXX mv tomcat-$TDSTRING.log tomcat-$TDSTRING-sparc-sol-7-jdk117.log
+
+# Re-Compress of standard Java builds
+cp tomcat-$TDSTRING.tar.Z tomcat-foo.tar.Z
+uncompress tomcat-foo.tar.Z
+mv tomcat-foo.tar tomcat-$TDSTRING.tar
+bzip2 --stdout tomcat-$TDSTRING.tar > tomcat-$TDSTRING.bz2
+gzip tomcat-$TDSTRING.tar
-# Windows NT
\ No newline at end of file
1.1 jakarta-tools/buildscripts/do-build-tomcat
Index: do-build-tomcat
===================================================================
#!/bin/sh
BASEDIR=`dirname $0`
. ${BASEDIR}/env-client
# XXX will become do-build-tomcat
echo "<build name=\"jakarta-tomcat\">"
cd ${BUILD_DIR}/ws/jakarta-tomcat
sh build.sh dist
echo "</build>"
1.1 jakarta-tools/buildscripts/env-i386-Linux
Index: env-i386-Linux
===================================================================
FTP_DIR=/home/ftp/pub/tomcat
export FTP_DIR
1.1 jakarta-tools/buildscripts/env-sparc-Linux
Index: env-sparc-Linux
===================================================================
FTP_DIR=/home/ftp/pub/tomcat
export FTP_DIR
1.1 jakarta-tools/buildscripts/env-sparc-solaris2.4
Index: env-sparc-solaris2.4
===================================================================
FTP_DIR=/export/home/ftp/pub/tomcat
export FTP_DIR