Author: michiel
Date: 2009-06-05 13:58:37 +0200 (Fri, 05 Jun 2009)
New Revision: 35767

Modified:
   speeltuin/nightly/build.sh
Log:
no point in building with maven 1 any more

Modified: speeltuin/nightly/build.sh
===================================================================
--- speeltuin/nightly/build.sh  2009-06-05 11:14:31 UTC (rev 35766)
+++ speeltuin/nightly/build.sh  2009-06-05 11:58:37 UTC (rev 35767)
@@ -1,54 +1,64 @@
 #!/bin/bash
 
-THIS=`dirname $0`
+DIRNAME=`dirname $0`
+THIS=`(cd $DIRNAME ; pwd)`
 
 source $THIS/env.sh
 source $THIS/version.sh
 
 
+
 # trunk
 
-if [ 1 == 1 ] ; then
-    cd ${MMBASE}
-    echo cwd: `pwd`, build dir: ${builddir}
+cd ${MMBASE}
+echo cwd: `pwd`, build dir: ${builddir}
 
-    echo Cleaning
-    echo >  ${builddir}/messages.log 2> ${builddir}/errors.log
-    # removes all 'target' directories
-    # the same as ${MAVEN} multiproject:clean >>  ${builddir}/messages.log 2>> 
${builddir}/errors.log
-    find . -type d -name target -print | xargs rm -rf  >> 
${builddir}/messages.log
+# 
===========CLEANING=====================================================================
+echo Cleaning
+echo >  ${builddir}/messages.log 2> ${builddir}/errors.log
+# removes all 'target' directories
+# the same as ${MAVEN} multiproject:clean >>  ${builddir}/messages.log 2>> 
${builddir}/errors.log
+find . -type d -name target -print | xargs rm -rf  >> ${builddir}/messages.log
 
-    pwd
-    echo "svn up" | tee -a ${builddir}/messages.log
-    ${SVN}  up | tee -a ${builddir}/messages.log
+# ===========SVN 
UP=====================================================================
+pwd
+echo "svn up" | tee -a ${builddir}/messages.log
+${SVN}  up | tee -a ${builddir}/messages.log
 
-    echo Starting nightly build | tee -a ${builddir}/messages.log
+echo Starting nightly build | tee -a ${builddir}/messages.log
 
-    echo creating RECENTCHANGES |  tee -a ${builddir}/messages.log
-    ${SVN} log -r {`$THIS/dynamicdate.sh 'today-1week' 'yyyy-MM-dd'`}:HEAD > 
${builddir}/RECENTCHANGES.txt
 
-    $THIS/maven1.sh
+# ===========RECENT 
CHANGES=====================================================================
+echo creating RECENTCHANGES |  tee -a ${builddir}/messages.log
+${SVN} log -r {`$THIS/dynamicdate.sh 'today-1week' 'yyyy-MM-dd'`}:HEAD > 
${builddir}/RECENTCHANGES.txt
 
-    $THIS/maven2.sh
 
+# ===========BUILDS 
====================================================================
 
-fi
 
-if [ 1 == 1 ] ; then
-    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
+$THIS/maven2.sh
 
 
+# ===========MAVEN 
SITE=====================================================================
+
+cd ${MMBASE}/maven
+echo Creating site `pwd`. | tee -a ${builddir}/messages.log
+${MAVEN2} site-deploy |  tee -a ${builddir}/messages.log
+
+
+# 
================================================================================
 $THIS/copy-artifacts.sh
 
+
+# =====EXECUTING TESTS (using maven2 artifacts) 
===========================================================================
 $THIS/tests.sh
 
+
+# 
================================================================================
 echo Creating symlink for latest build | tee -a ${builddir}/messages.log
 rm $HOME/builds/latest
 cd $HOME/builds
 echo 'ln -s ${dir} latest' in `pwd` | tee -a ${builddir}/messages.log
 ln -s ${dir} latest
 
-$HOME/bin/mail-results.sh
+$THIS/mail-results.sh

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to