Author: michiel
Date: 2009-05-02 09:11:42 +0200 (Sat, 02 May 2009)
New Revision: 34906
Added:
speeltuin/nightly/dynamicdate.sh
speeltuin/nightly/maven1.sh
speeltuin/nightly/maven2.sh
Removed:
speeltuin/nightly/filterlog
Modified:
speeltuin/nightly/build-stable.sh
speeltuin/nightly/build.sh
speeltuin/nightly/env.sh
speeltuin/nightly/version.sh
Log:
fixed nightly build to work with svn
Modified: speeltuin/nightly/build-stable.sh
===================================================================
--- speeltuin/nightly/build-stable.sh 2009-05-02 06:55:49 UTC (rev 34905)
+++ speeltuin/nightly/build-stable.sh 2009-05-02 07:11:42 UTC (rev 34906)
@@ -16,7 +16,7 @@
JAVAC15=${JAVA_HOME15}/bin/javac
export ANT_HOME=/usr/ant
-CVS="/usr/bin/cvs -d :pserver:[email protected]:/var/cvs"
+SVN="/usr/bin/svn"
FILTER="/home/nightly/nin/filterlog"
BUILD_HOME="/home/nightly"
Modified: speeltuin/nightly/build.sh
===================================================================
--- speeltuin/nightly/build.sh 2009-05-02 06:55:49 UTC (rev 34905)
+++ speeltuin/nightly/build.sh 2009-05-02 07:11:42 UTC (rev 34906)
@@ -1,13 +1,15 @@
#!/bin/bash
-source $HOME/bin/env.sh
-source $HOME/bin/version.sh
+THIS=`dirname $0`
-# UNSTABLE branch
+source $THIS/env.sh
+source $THIS/version.sh
-if [ 1 == 1 ] ; then
- cd ${BUILD_HOME}/nightly-build/cvs/mmbase
+# trunk
+
+if [ 1 == 1 ] ; then
+ cd ${MMBASE}
echo cwd: `pwd`, build dir: ${builddir}
echo Cleaning
@@ -17,30 +19,23 @@
find . -type d -name target -print | xargs rm -rf >>
${builddir}/messages.log
pwd
- echo "CVS" | tee -a ${builddir}/messages.log
- echo ${CVS} -q update -d -P ${cvsversionoption} ${cvsversion}
${revision} | tee -a ${builddir}/messages.log
+ echo "svn up" | tee -a ${builddir}/messages.log
+ ${SVN} up | tee -a ${builddir}/messages.log
- # I realy don't get the deal with the quotes around ${cvsversion}.
- # undoubtly to do with some bash detail. If $cvsversion contains no space,
then it seems essential that these quotes are _not_ there
- # otherwise it seems essential _that_ they are. It's maddening.
- ${CVS} -q update -d -P ${cvsversionoption} "${cvsversion}" ${revision} |
tee -a ${builddir}/messages.log
-
-
echo Starting nightly build | tee -a ${builddir}/messages.log
- echo all:install
- ((${MAVEN} all:install | tee -a ${builddir}/messages.log) 3>&1 1>&2 2>&3 |
tee -a ${builddir}/errors.log) 3>&1 1>&2 2>&3
- echo
====================================================================== | tee
-a ${builddir}/messages.log
echo creating RECENTCHANGES | tee -a ${builddir}/messages.log
- ${CVS} log -N -d"last week<now" 2> /dev/null | ${FILTER} >
${builddir}/RECENTCHANGES.txt
+ ${SVN} log -r {`$THIS/dynamicdate.sh 'today-1week' 'yyyy-MM-dd'`}:HEAD >
${builddir}/RECENTCHANGES.txt
- echo ==================================MAVEN 2 EXPERIMENTAL==============
| tee -a ${builddir}/messages.log
- cd ${BUILD_HOME}/nightly-build/cvs/mmbase
- (cd maven; ${MAVEN2} -P deploy clean deploy) | tee -a
${builddir}/messages.log
+ $THIS/maven1.sh
+
+ $THIS/maven2.sh
+
+
fi
if [ 1 == 1 ] ; then
- cd maven-site
+ cd ${MMBASE}/maven-site
echo Creating site `pwd`. | tee -a ${builddir}/messages.log
((${MAVEN} multiproject:site | tee -a ${builddir}/messages.log) 3>&1 1>&2
2>&3 | tee -a ${builddir}/errors.log) 3>&1 1>&2 2>&3
fi
@@ -51,8 +46,9 @@
if [ 1 == 1 ] ; then
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
+ cd ${MMBASE}/tests
+ ${MAVEN2} compile jar:jar
+ ${antcommand} -quiet -listener org.apache.tools.ant.listener.Log4jListener
-lib target/dependency:. -Dnoconnection=true run.all 2>&1 | tee
${builddir}/tests-results.lo
fi
Added: speeltuin/nightly/dynamicdate.sh
===================================================================
--- speeltuin/nightly/dynamicdate.sh (rev 0)
+++ speeltuin/nightly/dynamicdate.sh 2009-05-02 07:11:42 UTC (rev 34906)
@@ -0,0 +1,4 @@
+
+export JAVA_HOME=/home/nightly/jdk
+
+$JAVA_HOME/bin/java -cp
~/.m2/repository/org/mmbase/mmbase/1.9-SNAPSHOT/mmbase-1.9-SNAPSHOT.jar
org.mmbase.util.DynamicDate $@
Property changes on: speeltuin/nightly/dynamicdate.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: speeltuin/nightly/env.sh
===================================================================
--- speeltuin/nightly/env.sh 2009-05-02 06:55:49 UTC (rev 34905)
+++ speeltuin/nightly/env.sh 2009-05-02 07:11:42 UTC (rev 34906)
@@ -11,12 +11,13 @@
export MAVEN_OPTS="-Xmx700m -XX:MaxPermSize=128m"
export MAVEN="/home/nightly/maven/bin/maven --nobanner --quiet"
export MAVEN2="/home/nightly/maven2/bin/mvn"
-export CVS="/usr/bin/cvs -d :pserver:[email protected]:/var/cvs"
+export SVN="/usr/bin/svn"
export ANT_HOME=/home/nightly/apache-ant
-antcommand="$ANT_HOME/bin/ant"
+export ANT="$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
+export MMBASE=${BUILD_HOME}/nightly-build/trunk
export FILTER="/home/nightly/bin/filterlog"
Deleted: speeltuin/nightly/filterlog
===================================================================
--- speeltuin/nightly/filterlog 2009-05-02 06:55:49 UTC (rev 34905)
+++ speeltuin/nightly/filterlog 2009-05-02 07:11:42 UTC (rev 34906)
@@ -1,39 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-my $printing;
-
-BEGIN {
- $printing = 0;
-}
-
-
-my ($file, $totrev, $selrev);
-while (<>) {
-
- if (/=====/) {
- $printing = 0;
- }
-
- if (/^Working file: (.*)/) {
- $file = $1;
- #print "WORK $file\n";
- }
-
- if (/^total revisions:(.*?);\s*selected revisions:(.*)/ ) {
- $totrev = $1;
- $selrev = $2;
- #print "tot: $totrev sel: $selrev\n\n";
- if ($selrev > 0) {
- $printing = 1;
- print "\n\n==================================================".
- "\nFILE: $file\n";
- next;
- }
- }
-
- if ($printing) {
- next if /^description:/;
- print;
- }
-}
Added: speeltuin/nightly/maven1.sh
===================================================================
--- speeltuin/nightly/maven1.sh (rev 0)
+++ speeltuin/nightly/maven1.sh 2009-05-02 07:11:42 UTC (rev 34906)
@@ -0,0 +1,8 @@
+
+source `dirname $0`/env.sh
+source `dirname $0`/version.sh
+
+cd ${MMBASE}
+echo =================================MAVEN 1 ============================== |
tee -a ${builddir}/messages.log
+echo all:install
+((${MAVEN} all:install | tee -a ${builddir}/messages.log) 3>&1 1>&2 2>&3 | tee
-a ${builddir}/errors.log) 3>&1 1>&2 2>&3
Property changes on: speeltuin/nightly/maven1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: speeltuin/nightly/maven2.sh
===================================================================
--- speeltuin/nightly/maven2.sh (rev 0)
+++ speeltuin/nightly/maven2.sh 2009-05-02 07:11:42 UTC (rev 34906)
@@ -0,0 +1,8 @@
+
+source `dirname $0`/env.sh
+source `dirname $0`/version.sh
+
+cd ${MMBASE}/maven
+echo ==================================MAVEN 2 ============== | tee -a
${builddir}/messages.log
+echo -P deploy clean deploy
+${MAVEN2} -P deploy clean deploy | tee -a ${builddir}/messages.log
Property changes on: speeltuin/nightly/maven2.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: speeltuin/nightly/version.sh
===================================================================
--- speeltuin/nightly/version.sh 2009-05-02 06:55:49 UTC (rev 34905)
+++ speeltuin/nightly/version.sh 2009-05-02 07:11:42 UTC (rev 34906)
@@ -1,15 +1,6 @@
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.final"
-#cvsversion=
-#cvsversionoption="-r"
-#revision="MMBase-1_9_0_Final"
-
dir=${version}
builddir="/home/nightly/builds/${dir}"
mkdir -p ${builddir}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
