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/11 22:25:04 UTC
cvs commit: jakarta-tools/buildscripts do-build-apache1.3 do-build-apache2.0 do-build-test do-prepare-dir env-client client-nightly do-build do-checkout do-package do-test
costin 99/11/11 13:25:01
Modified: buildscripts client-nightly do-build do-checkout do-package
do-test
Added: buildscripts do-build-apache1.3 do-build-apache2.0
do-build-test do-prepare-dir env-client
Log:
- Added initial apache build scripts
- output format is XML-like, to allow parsing and "smart" output
- each script can be called individaully, not only from the main
- per platform, per host and local configurations
- /bin/sh
Revision Changes Path
1.4 +25 -54 jakarta-tools/buildscripts/client-nightly
Index: client-nightly
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/client-nightly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- client-nightly 1999/11/11 18:15:38 1.3
+++ client-nightly 1999/11/11 21:24:50 1.4
@@ -1,60 +1,31 @@
-#!/bin/ksh
+#!/bin/sh
-# This the client nightly build sh script. This was originally written
-# for tokyo, a sparc solaris client.
-
export BASEDIR=`dirname $0`
+. ${BASEDIR}/env-client
+
+${SCRIPT_DIR}/do-prepare-dir
+
+## 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
+
+# echo $TSEP | cat >> $TLOGFILE
+${SCRIPT_DIR}/do-checkout
+
+# echo $TSEP | cat >> $TLOGFILE
+${SCRIPT_DIR}/do-build >> $TLOGFILE
+
+# echo $TSEP | cat >> $TLOGFILE
+${SCRIPT_DIR}/do-test >> $TLOGFILE
+
+${SCRIPT_DIR}/do-package
-export TYEAR=`date +%Y`
-export TMONTH=`date +%m`
-export TDAY=`date +%d`
-export TDSTRING=$TYEAR-$TMONTH-$TDAY
-export TLOGFILE=result/tomcat-$TDSTRING.log
-export TSEP=-----------------------------------------------
-
-echo Build: $TDSTRING | cat > $TLOGFILE
-echo Platform: `uname -a` | cat >> $TLOGFILE
-
-#
-# 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
-#
-
-if [ -d result ]; then
- echo
-else
- mkdir result
-fi
-
-if [ -d ws ]; then
- rm -rf ws
-fi
-
-mkdir ws
-
-echo $TSEP | cat >> $TLOGFILE
-$BASEDIR/do-checkout
-
-echo $TSEP | cat >> $TLOGFILE
-$BASEDIR/do-build >> $TLOGFILE
-
-echo $TSEP | cat >> $TLOGFILE
-$BASEDIR/do-test >> $TLOGFILE
-$BASEDIR/do-package
-./do-package
+echo "</build-report>" >> $TLOGFILE
1.2 +11 -5 jakarta-tools/buildscripts/do-build
Index: do-build
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/do-build,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- do-build 1999/11/10 00:22:08 1.1
+++ do-build 1999/11/11 21:24:51 1.2
@@ -1,6 +1,12 @@
-#!/bin/ksh
-echo BUILD:
-cd ws
-cd jakarta-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
-sh build.sh test
\ No newline at end of file
+echo "</build>"
+
1.3 +18 -4 jakarta-tools/buildscripts/do-checkout
Index: do-checkout
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/do-checkout,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- do-checkout 1999/11/11 00:41:55 1.2
+++ do-checkout 1999/11/11 21:24:51 1.3
@@ -1,5 +1,19 @@
-!/bin/ksh
-echo CHECKOUT:
-cd ws
-cvs -d :pserver:anoncvs@dev.apache.org:/home/cvspublic checkout jakarta-tools jakarta-tomcat jakarta-watchdog
+#!/bin/sh
+BASEDIR=`dirname $0`
+. ${BASEDIR}/env-client
+
+echo "<checkout>"
+cd ${BUILD_DIR}/ws
+
+ # filter out boring messages
+cvs -d :pserver:anoncvs@dev.apache.org:/home/cvspublic checkout \
+ jakarta-tools \
+ jakarta-tomcat \
+ jakarta-watchdog \
+ apache-1.3 \
+ apache-2.0 2>&1 \
+ | grep -v "cvs server: Updating" \
+ | grep -v "U "
+
+echo "</checkout>"
\ No newline at end of file
1.2 +3 -0 jakarta-tools/buildscripts/do-package
Index: do-package
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/do-package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- do-package 1999/11/10 00:22:09 1.1
+++ do-package 1999/11/11 21:24:52 1.2
@@ -1,5 +1,8 @@
#!/bin/ksh
+BASEDIR=`dirname $0`
+. ${BASEDIR}/env-client
+
echo PACKAGE:
export TYEAR=`date +%Y`
1.2 +13 -2 jakarta-tools/buildscripts/do-test
Index: do-test
===================================================================
RCS file: /home/cvs/jakarta-tools/buildscripts/do-test,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- do-test 1999/11/10 00:22:09 1.1
+++ do-test 1999/11/11 21:24:53 1.2
@@ -1,5 +1,16 @@
#!/bin/ksh
-echo TEST:
-cd ws/build/tomcat/test
+
+BASEDIR=`dirname $0`
+. ${BASEDIR}/env-client
+
+echo "<test name=\"jakarta-tomcat\">"
+cd ${BUILD_DIR}/ws/build/tomcat/test
sh runtest.sh
+echo "</test>"
+
+echo "<test name=\"jakarta-watchdog\">"
+cd ${BUILD_DIR}/ws/build/watchdog
+sh runtest.sh
+echo "</test>"
+
1.1 jakarta-tools/buildscripts/do-build-apache1.3
Index: do-build-apache1.3
===================================================================
#!/bin/sh
BASEDIR=`dirname $0`
. ${BASEDIR}/env-client
echo "<build name=\"apache-1.3\">"
cd ${BUILD_DIR}/ws/apache-1.3
./configure --prefix=/opt/apache-1.3.9 \
--enable-rule=SHARED_CORE \
--add-module=${BUILD_DIR}/ws/jakarta-tomcat/src/native/apache/modules/mod_ajp23.c \
--enable-module=all \
--enable-shared=max \
--disable-rule=WANTHSREGEX \
--enable-shared=ajp23
make
make install
echo "</build>"
1.1 jakarta-tools/buildscripts/do-build-apache2.0
Index: do-build-apache2.0
===================================================================
#!/bin/sh
BASEDIR=`dirname $0`
. ${BASEDIR}/env-client
echo "<build name=\"apache-2.0\">"
cd ${BUILD_DIR}/ws/apache-2.0
mkdir src/modules/extra
cp src/modules/example/Makefile.tmpl src/modules/extra
./configure --prefix=/opt/apache-2.0 \
--add-module=${BUILD_DIR}/ws/jakarta-tomcat/src/native/apache/modules/mod_ajp23.c \
--enable-module=ajp23
make
make install
echo "</build>"
1.1 jakarta-tools/buildscripts/do-build-test
Index: do-build-test
===================================================================
#!/bin/ksh
BASEDIR=`dirname $0`
. ${BASEDIR}/env-client
echo "<build name=\"jakarta-tomcat-test\">"
cd ${BUILD_DIR}/ws/jakarta-tomcat
sh build.sh test
echo "</build>"
echo "<build name=\"jakarta-watchdog\">"
cd ${BUILD_DIR}/ws/jakarta-watchdog
sh build.sh dist
echo "</build>"
1.1 jakarta-tools/buildscripts/do-prepare-dir
Index: do-prepare-dir
===================================================================
#!/bin/sh
BASEDIR=`dirname $0`
. ${BASEDIR}/env-client
if [ -d ${BUILD_DIR}/result ]; then
echo
else
mkdir ${BUILD_DIR}/result
fi
if [ -d ${BUILD_DIR}/ws ]; then
rm -rf ${BUILD_DIR}/ws
fi
mkdir ${BUILD_DIR}/ws
1.1 jakarta-tools/buildscripts/env-client
Index: env-client
===================================================================
#!/bin/sh
# 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=-----------------------------------------------
#
# 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
## 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
export TDSTRING TLOGFILE TSEP BUILD_DIR TOOLS_DIR SCRIPT_DIR
# per arch - "official"
if [ -f ${SCRIPT_DIR}/env-${HOSTTYPE}-${OSTYPE} ]; then
. ${SCRIPT_DIR}/env-${HOSTTYPE}-${OSTYPE}
fi
# per host - "official"
if [ -f ${SCRIPT_DIR}/env-$HOSTNAME ]; then
. ${SCRIPT_DIR}/env-$HOSTNAME
fi
# local settings
if [ -f ${HOME}/.env-jakarta ]; then
. ${HOME}/.env-jakarta
fi