Update of /var/cvs/speeltuin/nightly
In directory james.mmbase.org:/home/nightly/bin
Modified Files:
build.sh env.sh version.sh
Added Files:
mail-results.sh
Log Message:
See also: http://cvs.mmbase.org/viewcvs/speeltuin/nightly
mail-results.sh is new
Index: build.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/build.sh,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- build.sh 15 Nov 2008 09:40:05 -0000 1.28
+++ build.sh 2 Dec 2008 08:09:13 -0000 1.29
@@ -1,11 +1,6 @@
#!/bin/bash
source $HOME/bin/env.sh
-
-export MAILADDRESS="[EMAIL PROTECTED]"
-#export MAILADDRESS="[EMAIL PROTECTED]"
-export BUILD_MAILADDRESS=$MAILADDRESS
-
source $HOME/bin/version.sh
# UNSTABLE branch
@@ -51,7 +46,7 @@
if [ 1 == 1 ] ; then
- echo Now executing tests. Results in ${builder}/test-results. | tee -a
${builddir}/messages.log
+ echo Now executing tests. Results in ${builddir}/test-results.log | tee -a
${builddir}/messages.log
cd ${BUILD_HOME}/nightly-build/cvs/mmbase/tests
${antcommand} -quiet -listener org.apache.tools.ant.listener.Log4jListener
-lib lib:. run.all 2>&1 | tee ${builddir}/tests-results.log
fi
@@ -63,43 +58,4 @@
echo 'ln -s ${dir} latest' in `pwd` | tee -a ${builddir}/messages.log
ln -s ${dir} latest
- # Using one thread for all mail about failures
-parent="<[EMAIL PROTECTED]>";
-mutthdr="my_hdr In-Reply-To: ${parent}";
-
-
-showtests=1
-if [ 1 == 1 ] ; then
- if [ -f latest/messages.log ] ; then
- if (( `cat latest/messages.log | grep -P
'\[javac\]\s+[0-9]+\s+errors' | wc -l` > 0 )) ; then
- echo Build failed, sending mail to ${BUILD_MAILADDRESS} | tee -a
${builddir}/messages.log
- echo -e "Build on ${version} failed:\n\n" | \
- cat latest/messages.log latest/errors.log | grep -B 10
"\[javac\]" | \
- mutt -e "$mutthdr" -s "Build failed" ${BUILD_MAILADDRESS}
- showtests=0;
- fi
- else
- echo Build failed, sending mail to ${BUILD_MAILADDRESS} | tee -a
${builddir}/messages.log
- echo -e "No build created on ${version}\n\n" | \
- tail -q -n 20 - latest/errors.log | \
- mutt -e "$mutthdr" -s "Build failed" ${BUILD_MAILADDRESS}
- showtests=0;
- fi
-fi
-
-
-
-if [ 1 == $showtests ] ; then
- cd /home/nightly/builds
- echo Test results | tee -a ${builddir}/messages.log
-
- if [ -f latest/tests-results.log ] ; then
- if (( `cat latest/tests-results.log | grep 'FAILURES' | wc -l` > 0 ))
; then
- echo Failures, sending mail to ${MAILADDRESS} | tee -a
${builddir}/messages.log
- (echo "Failures on build ${version}" ; echo "See also
http://www.mmbase.org/download/builds/latest/tests-results.log"; ; \
- cat latest/tests-results.log | grep -P '(^Tests
run:|^[0-9]+\)|^\tat org\.mmbase|FAILURES|========================|OK)' ) | \
- mutt -e "$mutthdr" -s "Test cases failures" ${MAILADDRESS}
- fi
- fi
-fi
-
+$HOME/bin/mail-results.sh
\ No newline at end of file
Index: env.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/env.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- env.sh 4 Nov 2008 07:05:09 -0000 1.2
+++ env.sh 2 Dec 2008 08:09:13 -0000 1.3
@@ -1,6 +1,5 @@
-
echo setting PATH, JAVA HOME
-export
PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/ccs/bin:/home/nightly/bin
+export
PATH=/home/nightly/apache-ant/bin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/ccs/bin:/home/nightly/bin:/home/nightly/maven/bin
echo $HOME
@@ -9,11 +8,11 @@
export JAVA_HOME=/home/nightly/jdk
export JAVAC=${JAVA_HOME}/bin/javac
-export MAVEN_OPTS=-Xmx700m -XX:MaxPermSize=128m
+export MAVEN_OPTS="-Xmx700m -XX:MaxPermSize=128m"
export MAVEN="/home/nightly/maven/bin/maven --nobanner --quiet"
export CVS="/usr/bin/cvs -d :pserver:[EMAIL PROTECTED]:/var/cvs"
-export ANT_HOME=/usr/ant
-antcommand="/usr/bin/ant"
+export ANT_HOME=/home/nightly/apache-ant
+antcommand="$ANT_HOME/bin/ant"
# Ant sucks incredibly. This classapth should not be necessary, but really, it
is (not with ant 1.7)
export
CLASSPATH=${BUILD_HOME}/.ant/lib/ant-apache-log4j.jar:${BUILD_HOME}/.ant/lib/log4j-1.2.13.jar
Index: version.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/version.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- version.sh 25 Sep 2008 19:48:49 -0000 1.2
+++ version.sh 2 Dec 2008 08:09:13 -0000 1.3
@@ -1,14 +1,14 @@
-mmbaseversion=1.9.0-SNAPSHOT
+mmbaseversion=1.9-SNAPSHOT
version=`date -u '+%Y-%m-%d'`
cvsversionoption="-D"
cvsversion=`date '+%Y-%m-%d %H:%M'`
revision="-A"
-#version="MMBase-1.9.0.beta2"
+#version="MMBase-1.9.0.final"
#cvsversion=
#cvsversionoption="-r"
-#revision="MMBase-1_9_0_beta2"
+#revision="MMBase-1_9_0_Final"
dir=${version}
builddir="/home/nightly/builds/${dir}"
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
