Author: michiel
Date: 2009-12-08 18:37:25 +0100 (Tue, 08 Dec 2009)
New Revision: 40163
Added:
speeltuin/nightly/build-18.sh
speeltuin/nightly/version-18.sh
Removed:
speeltuin/nightly/build-stable.sh
speeltuin/nightly/version-stable.sh
Log:
moved away some cvs stuff
Copied: speeltuin/nightly/build-18.sh (from rev 40162,
speeltuin/nightly/build-stable.sh)
===================================================================
--- speeltuin/nightly/build-18.sh (rev 0)
+++ speeltuin/nightly/build-18.sh 2009-12-08 17:37:25 UTC (rev 40163)
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+
+#echo Removing old build stuff if there was...
+#rm -rf /export/home/nightlybuild/data/build
+
+echo setting PATH, JAVA HOME and ANT HOME
+export
PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/ccs/bin:/home/nightly/bin:/usr/local/ant/bin
+
+## java 1.4
+JAVA_HOME14=/usr/java/jdk
+JAVAC14=${JAVA_HOME14}/bin/javac
+
+#$ java 1.5
+JAVA_HOME15=/home/nightly/jdk
+JAVAC15=${JAVA_HOME15}/bin/javac
+
+export ANT_HOME=/usr/ant
+SVN="/usr/bin/svn"
+FILTER="/home/nightly/nin/filterlog"
+BUILD_HOME="/home/nightly"
+
+#I hate ant, I hate java
+export CLASSPATH=
+for i in ~/.ant/lib/* ; do export CLASSPATH=${CLASSPATH}:$i ; done
+
+
+# settings
+antcommand="/usr/bin/ant"
+downloaddir="/home/nightly/download"
+optdir="/home/nightly/optional-libs"
+
+echo generating version, and some directories
+
+source $HOME/bin/version-18.sh
+
+echo $cvsversion
+
+# STABLE branch
+builddir="/home/nightly/builds/stable/${version}"
+mkdir -p ${builddir}
+
+me=`cd -P -- "$(dirname -- "$0")" && pwd -P`/$0
+
+
+echo cleaning $0
+echo ${antcommand}
+#${antcommand} clean > ${builddir}/messages.log 2> ${builddir}/errors.log
+
+STABLE=${BUILD_HOME}/stable/nightly-build/MMBase-1_8
+cd ${STABLE}
+
+
+#rm -rf ${builddir}/*
+
+echo cleaning in ${STABLE} | tee ${builddir}/messages.log
+find ${STABLE} -name build | xargs rm -r
+
+
+echo update cvs to `pwd` using -r '${cvsversionoption} ${cvsversion}' | tee
-a ${builddir}/messages.log
+
+
+cvs-stable.sh
+
+stableoptions="-Doptional.lib.dir=${optdir} -Dbuild.documentation=false
-Ddestination.dir=${builddir} -Ddownload.dir=${downloaddir}"
+echo "options : ${stableoptions}"
+
+echo "Ant Command: ${antcommand} ${stableoptions} "
+
+if ( true ) ; then
+ echo "Starting nightly build" + `pwd` | tee -a ${builddir}/messages.log
+
+ echo "JAVA 14 from now on" | tee -a ${builddir}/messages.log
+ export JAVA_HOME=${JAVA_HOME14}
+ export JAVAC=${JAVAC14}
+ cd ${STABLE}
+ ${antcommand} jar ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
+
+ echo "JAVA 14 from now on" | tee -a ${builddir}/messages.log
+ export JAVA_HOME=${JAVA_HOME14}
+ export JAVAC=${JAVAC14}
+ echo "BINDIST DOWING NOW" | tee -a ${builddir}/messages.log
+ cd ${STABLE}
+ ${antcommand} bindist ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
+ if ( true ) ; then
+ echo "APPS14 building now" | tee -a ${builddir}/messages.log
+ cd ${STABLE}/applications
+ ${antcommand} all18_14 ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
+ cd ${STABLE}/contributions
+ ${antcommand} all18_14 ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
+ cd ${STABLE}
+ ${antcommand} srcdist ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
+ ${antcommand} minimalistic.war ${stableoptions} >>
${builddir}/messages.log 2>> ${builddir}/errors.log
+
+ echo "JAVA 15 from now on" | tee -a ${builddir}/messages.log
+ export JAVA_HOME=${JAVA_HOME15}
+ export JAVAC=${JAVAC15}
+
+ cd ${STABLE}/applications
+ pwd >> ${builddir}/messages.log
+ ${antcommand} -Djava.source.version=1.5 all18_15 ${stableoptions} >>
${builddir}/messages.log 2>> ${builddir}/errors.log
+ cd ${STABLE}/contributions
+ pwd >> ${builddir}/messages.log
+ ${antcommand} -Djava.source.version=1.5 all18_15 ${stableoptions} >>
${builddir}/messages.log 2>> ${builddir}/errors.log
+
+
+
+ fi
+fi
+
+cd ${STABLE}
+for i in `find . -regex ".*/mmbase.*\.zip"` ; do
+ cp -a $i ${builddir}
+done
+
+for i in `find . -regex ".*/.*\.war"` ; do
+ cp -a $i ${builddir}
+done
+for i in 'documentation/releases/release-notes.txt' $me ; do
+ cp -a $i ${builddir}
+done
+
+echo Creating sym for last build
+latest=/home/nightly/builds/stable/latest
+rm -f ${latest}
+
+ln -s ${version} ${latest}
+
Deleted: speeltuin/nightly/build-stable.sh
===================================================================
--- speeltuin/nightly/build-stable.sh 2009-12-08 17:36:05 UTC (rev 40162)
+++ speeltuin/nightly/build-stable.sh 2009-12-08 17:37:25 UTC (rev 40163)
@@ -1,128 +0,0 @@
-#!/bin/bash
-
-
-#echo Removing old build stuff if there was...
-#rm -rf /export/home/nightlybuild/data/build
-
-echo setting PATH, JAVA HOME and ANT HOME
-export
PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/ccs/bin:/home/nightly/bin:/usr/local/ant/bin
-
-## java 1.4
-JAVA_HOME14=/usr/java/jdk
-JAVAC14=${JAVA_HOME14}/bin/javac
-
-#$ java 1.5
-JAVA_HOME15=/home/nightly/jdk
-JAVAC15=${JAVA_HOME15}/bin/javac
-
-export ANT_HOME=/usr/ant
-SVN="/usr/bin/svn"
-FILTER="/home/nightly/nin/filterlog"
-BUILD_HOME="/home/nightly"
-
-#I hate ant, I hate java
-export CLASSPATH=
-for i in ~/.ant/lib/* ; do export CLASSPATH=${CLASSPATH}:$i ; done
-
-
-# settings
-antcommand="/usr/bin/ant"
-downloaddir="/home/nightly/download"
-optdir="/home/nightly/optional-libs"
-
-echo generating version, and some directories
-
-source $HOME/bin/version-stable.sh
-
-echo $cvsversion
-
-# STABLE branch
-builddir="/home/nightly/builds/stable/${version}"
-mkdir -p ${builddir}
-
-me=`cd -P -- "$(dirname -- "$0")" && pwd -P`/$0
-
-
-echo cleaning $0
-echo ${antcommand}
-#${antcommand} clean > ${builddir}/messages.log 2> ${builddir}/errors.log
-
-STABLE=${BUILD_HOME}/stable/nightly-build/MMBase-1_8
-cd ${STABLE}
-
-
-#rm -rf ${builddir}/*
-
-echo cleaning in ${STABLE} | tee ${builddir}/messages.log
-find ${STABLE} -name build | xargs rm -r
-
-
-echo update cvs to `pwd` using -r '${cvsversionoption} ${cvsversion}' | tee
-a ${builddir}/messages.log
-
-
-cvs-stable.sh
-
-stableoptions="-Doptional.lib.dir=${optdir} -Dbuild.documentation=false
-Ddestination.dir=${builddir} -Ddownload.dir=${downloaddir}"
-echo "options : ${stableoptions}"
-
-echo "Ant Command: ${antcommand} ${stableoptions} "
-
-if ( true ) ; then
- echo "Starting nightly build" + `pwd` | tee -a ${builddir}/messages.log
-
- echo "JAVA 14 from now on" | tee -a ${builddir}/messages.log
- export JAVA_HOME=${JAVA_HOME14}
- export JAVAC=${JAVAC14}
- cd ${STABLE}
- ${antcommand} jar ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
-
- echo "JAVA 14 from now on" | tee -a ${builddir}/messages.log
- export JAVA_HOME=${JAVA_HOME14}
- export JAVAC=${JAVAC14}
- echo "BINDIST DOWING NOW" | tee -a ${builddir}/messages.log
- cd ${STABLE}
- ${antcommand} bindist ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
- if ( true ) ; then
- echo "APPS14 building now" | tee -a ${builddir}/messages.log
- cd ${STABLE}/applications
- ${antcommand} all18_14 ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
- cd ${STABLE}/contributions
- ${antcommand} all18_14 ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
- cd ${STABLE}
- ${antcommand} srcdist ${stableoptions} >> ${builddir}/messages.log 2>>
${builddir}/errors.log
- ${antcommand} minimalistic.war ${stableoptions} >>
${builddir}/messages.log 2>> ${builddir}/errors.log
-
- echo "JAVA 15 from now on" | tee -a ${builddir}/messages.log
- export JAVA_HOME=${JAVA_HOME15}
- export JAVAC=${JAVAC15}
-
- cd ${STABLE}/applications
- pwd >> ${builddir}/messages.log
- ${antcommand} -Djava.source.version=1.5 all18_15 ${stableoptions} >>
${builddir}/messages.log 2>> ${builddir}/errors.log
- cd ${STABLE}/contributions
- pwd >> ${builddir}/messages.log
- ${antcommand} -Djava.source.version=1.5 all18_15 ${stableoptions} >>
${builddir}/messages.log 2>> ${builddir}/errors.log
-
-
-
- fi
-fi
-
-cd ${STABLE}
-for i in `find . -regex ".*/mmbase.*\.zip"` ; do
- cp -a $i ${builddir}
-done
-
-for i in `find . -regex ".*/.*\.war"` ; do
- cp -a $i ${builddir}
-done
-for i in 'documentation/releases/release-notes.txt' $me ; do
- cp -a $i ${builddir}
-done
-
-echo Creating sym for last build
-latest=/home/nightly/builds/stable/latest
-rm -f ${latest}
-
-ln -s ${version} ${latest}
-
Copied: speeltuin/nightly/version-18.sh (from rev 38949,
speeltuin/nightly/version-stable.sh)
===================================================================
--- speeltuin/nightly/version-18.sh (rev 0)
+++ speeltuin/nightly/version-18.sh 2009-12-08 17:37:25 UTC (rev 40163)
@@ -0,0 +1,15 @@
+version=`date -u '+%Y-%m-%d'`
+cvsversionoption="-D"
+cvsversion=`date '+%Y-%m-%d %H:%M'`
+revision="MMBase-1_8"
+headrevision="-A"
+
+#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}
+
Deleted: speeltuin/nightly/version-stable.sh
===================================================================
--- speeltuin/nightly/version-stable.sh 2009-12-08 17:36:05 UTC (rev 40162)
+++ speeltuin/nightly/version-stable.sh 2009-12-08 17:37:25 UTC (rev 40163)
@@ -1,15 +0,0 @@
-version=`date -u '+%Y-%m-%d'`
-cvsversionoption="-D"
-cvsversion=`date '+%Y-%m-%d %H:%M'`
-revision="MMBase-1_8"
-headrevision="-A"
-
-#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}
-
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
