Update of /var/cvs/speeltuin/nightly
In directory james.mmbase.org:/home/nightly/bin
Modified Files:
build-stable.sh build.sh copy-artifacts.sh version-stable.sh
version.sh
Added Files:
cvs-stable.sh
Log Message:
See also: http://cvs.mmbase.org/viewcvs/speeltuin/nightly
cvs-stable.sh is new
Index: build-stable.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/build-stable.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- build-stable.sh 24 Sep 2008 10:35:13 -0000 1.18
+++ build-stable.sh 25 Sep 2008 19:48:49 -0000 1.19
@@ -32,19 +32,7 @@
echo generating version, and some directories
-#nightly build:
-version=`date '+%Y-%m-%d'`
-cvsversionoption="-D"
-cvsversion="${version} `date '+%H:%M:%S'`"
-echo CVS $cvsversionrevision=MMBase-1_8
-revision=MMBase-1_8
-headrevision="-A"
-
-#release:
-#version=MMBase-1_8_6_Final
-#Bcvsversion=
-#revision=MMBase-1_8_6_Final
-#headrevision="-r MMBase-1_8_6_Final"
+source version-stable.sh
echo $cvsversion
@@ -71,38 +59,9 @@
echo update cvs to `pwd` using -r '${cvsversionoption} ${cvsversion}' | tee
-a ${builddir}/messages.log
-if ( true ) ; then
- for i in '.' 'applications' 'contributions'; do
- echo updating `pwd`/$i using ${CVS} -q update -d -P -l
${cvsversionoption} ${cvsversion} -r "${revision}" $i | tee -a
${builddir}/messages.log;
- ${CVS} -q update -d -P -l ${cvsversionoption} "${cvsversion}" -r
"${revision}" $i | tee -a ${builddir}/messages.log 2>> ${builddir}/errors.log
- done
- for i in 'applications/build.xml' 'contributions/build.xml' 'download.xml'
; do
- echo updating `pwd`/$i to HEAD using -l ${cvsversionoption}
${cvsversion} ${headrevision} | tee -a ${builddir}/messages.log 2>>
${builddir}/errors.log
- ${CVS} -q update -d -P -l ${cvsversionoption} "${cvsversion}"
${headrevision} $i | tee -a ${builddir}/messages.log 2>>
${builddir}/errors.log
- done
- echo "Build from ${revision} ${cvsversionoption} ${cvsversion} against
java 1.4 are" > ${builddir}/README
- for i in 'src' 'documentation' 'tests' 'config' 'html' \
- 'applications/resources' 'applications/cloudsecurity'
'applications/mynews' 'application/xmlimporter' 'contributions/calendar' \
- 'applications/taglib' 'applications/editwizard' 'applications/dove'
'applications/cloudcontext' \
- 'applications/rmmci' 'applications/vwms' 'applications/scan'
'applications/clustering' 'applications/oscache-cache' \
- 'applications/media' 'applications/packaging' 'applications/community'
'applications/largeobjects' \
- 'contributions/aselect' 'contributions/mmbar' \
- 'contributions/principletracker' \
- ; do
- echo updating `pwd`/$i | tee -a ${builddir}/messages.log
- echo $i >> ${builddir}/README
- ${CVS} -q update -d -P ${cvsversionoption} "${cvsversion}" -r
"${revision}" $i | tee -a ${builddir}/messages.log 2>> ${builddir}/errors.log
- done
- echo "==========UPDATING TO HEAD========" >> ${builddir}/messages.log
- echo "Build from HEAD ${cvsversionoption} ${cvsversion} against java 1.5
are" >> ${builddir}/README
- for i in 'applications/email' 'contributions/lucene' 'contributions/mmbob'
'contributions/thememanager' 'contributions/didactor2' 'applications/richtext' \
- 'applications/jumpers' 'applications/commandserver'
'applications/notifications' 'applications/crontab' 'contributions/poll'
'contributions/calendar contributions/multilanguagegui' \
- ; do
- echo updating to HEAD `pwd`/$i | tee -a ${builddir}/messages.log
- echo $i >> ${builddir}/README
- ${CVS} -q update -d -P ${cvsversionoption} "${cvsversion}" ${headrevision}
$i | tee -a ${builddir}/messages.log 2>> ${builddir}/errors.log
- done
-fi
+
+cvs-stable.sh
+
stableoptions="-Doptional.lib.dir=${optdir} -Dbuild.documentation=false
-Ddestination.dir=${builddir} -Ddownload.dir=${downloaddir}"
echo "options : ${stableoptions}"
Index: build.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/build.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- build.sh 9 Sep 2008 07:26:59 -0000 1.23
+++ build.sh 25 Sep 2008 19:48:49 -0000 1.24
@@ -86,10 +86,10 @@
showtests=1
if [ 1 == 1 ] ; then
if [ -f latest/messages.log ] ; then
- if (( `cat latest/messages.log | grep 'FAILED' | wc -l` > 0 )) ; 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 "FAILED"
| \
+ cat latest/messages.log latest/errors.log | grep -B
10 "\[javac\]" | \
mutt -s "Build failed ${version}" ${BUILD_MAILADDRESS}
showtests=0;
fi
Index: copy-artifacts.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/copy-artifacts.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- copy-artifacts.sh 20 Aug 2008 08:18:37 -0000 1.1
+++ copy-artifacts.sh 25 Sep 2008 19:48:49 -0000 1.2
@@ -3,8 +3,16 @@
source version.sh
echo Copying todays artifacts | tee -a ${builddir}/messages.log
-echo $HOME
+
+# only files which name ends in these:
+jar=-$mmbaseversion.jar
+war=-$mmbaseversion.war
+mm=-$mmbaseversion.mmbase-module
+
for i in `/usr/bin/find $HOME/.maven/repository/mmbase -mtime -1` ; do
#echo copy $i to ${builddir} | tee -a ${builddir}/messages.log
+ if [ ${i%$jar} != $i -o ${i%$war} != $i -o ${i%$mm} != $i ]; then
+ #echo $i
cp $i ${builddir}
+ fi
done
Index: version-stable.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/version-stable.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- version-stable.sh 24 Sep 2008 08:46:26 -0000 1.1
+++ version-stable.sh 25 Sep 2008 19:48:49 -0000 1.2
@@ -1,13 +1,14 @@
-version=`date -u '+%Y-%m-%d'`
-cvsversionoption="-D"
-cvsversion=`date '+%Y-%m-%d %H:%M'`
-revision="-A"
+#version=`date -u '+%Y-%m-%d'`
+#cvsversionoption="-D"
+#cvsversion=`date '+%Y-%m-%d %H:%M'`
+#revision="-A"
-#version="MMBase-1.8.6
-#cvsversion=
-#cvsversionoption="-r"
-#revision="MMBase-1_8_6
+version="MMBase-1.8.6"
+cvsversion=
+cvsversionoption="-r"
+revision=MMBase-1_8_6_Final
dir=${version}
builddir="/home/nightly/builds/stable/${dir}"
mkdir -p ${builddir}
+
Index: version.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/version.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- version.sh 20 Aug 2008 08:18:37 -0000 1.1
+++ version.sh 25 Sep 2008 19:48:49 -0000 1.2
@@ -1,3 +1,5 @@
+mmbaseversion=1.9.0-SNAPSHOT
+
version=`date -u '+%Y-%m-%d'`
cvsversionoption="-D"
cvsversion=`date '+%Y-%m-%d %H:%M'`
@@ -11,3 +13,5 @@
dir=${version}
builddir="/home/nightly/builds/${dir}"
mkdir -p ${builddir}
\ No newline at end of file
+
+
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
