Update of /var/cvs/speeltuin/nightly
In directory james.mmbase.org:/home/nightly/bin

Modified Files:
        build-maven.sh build-stable.sh 
Log Message:
maven build does not ignore unrecognized dirs. Pretty annoyging, while this 
means that I must recognize all HEAD applications in the 1.8 build too


See also: http://cvs.mmbase.org/viewcvs/speeltuin/nightly


Index: build-maven.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/build-maven.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build-maven.sh      24 Sep 2008 08:46:26 -0000      1.1
+++ build-maven.sh      24 Sep 2008 09:58:34 -0000      1.2
@@ -2,11 +2,11 @@
 
 
 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/jdk/bin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/ccs/bin:/home/nightly/bin
 
 echo $HOME
 
-export BUILD_HOME="/home/nightly"
+export BUILD_HOME="/home/nightly/"
 
 export JAVA_HOME=/home/nightly/jdk
 export JAVAC=${JAVA_HOME}/bin/javac
@@ -38,15 +38,15 @@
 
     echo Cleaning
     echo >  ${builddir}/messages-maven.log 2> ${builddir}/errors-maven.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-maven.log
 
     pwd
 
+    echo `java -version`
 
     echo Starting nightly build | tee -a ${builddir}/messages-maven.log
-    echo all:install
+    echo ${MAVEN} all:install
     ((${MAVEN} all:install | tee -a ${builddir}/messages-maven.log) 3>&1 1>&2 
2>&3 | tee -a ${builddir}/errors.log) 3>&1 1>&2 2>&3
 fi
 


Index: build-stable.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/build-stable.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- build-stable.sh     24 Sep 2008 08:46:26 -0000      1.16
+++ build-stable.sh     24 Sep 2008 09:58:34 -0000      1.17
@@ -82,6 +82,7 @@
     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' \
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to