Permalink
Browse files

buildbot: put build dirs in a single subdir (easier to test tmpfs etc…

…...)
  • Loading branch information...
1 parent 6c1b0ee commit 7571793624b0d5a4066ada3bcf6211ff7a04ff30 @tvo tvo committed Mar 8, 2011
Showing with 7 additions and 6 deletions.
  1. +3 −3 buildbot/slave/create-build-dirs.sh
  2. +2 −1 buildbot/slave/prepare.sh
  3. +2 −2 buildbot/slave/rsync.sh
@@ -3,12 +3,12 @@
# Quit on error.
set -e
-DIR=build-${1}
+DIR=build/${1}
shift
echo -n "creating ${DIR} ... "
if [ ! -d ${DIR} ] ; then
- mkdir ${DIR}
+ mkdir -p ${DIR}
echo "done."
else
echo "skipped."
@@ -17,7 +17,7 @@ fi
echo "configuring ${DIR} with $@ ..."
cd ${DIR}
-cmake .. $@
+cmake ../.. $@
echo "erasing old base content..."
rm -rf base
@@ -17,7 +17,8 @@ set -e
CONFIG=${1:-default}
BRANCH=${2:-master}
REV=$(git describe --tags)
-BUILDDIR=${PWD}/build-${CONFIG}
+SOURCEDIR=${PWD}
+BUILDDIR=${PWD}/build/${CONFIG}
TMP_BASE=/tmp/spring
TMP_PATH=${TMP_BASE}/${CONFIG}/${BRANCH}/${REV}
@@ -6,8 +6,8 @@ REMOTE_HOST=localhost
REMOTE_BASE=/home/buildbot/www
BASE_ARCHIVE="${TMP_PATH}/${VERSION}_base.7z"
MINGWLIBS_ARCHIVE="${TMP_PATH}/${VERSION}_mingwlibs.7z"
-CONTENT_DIR=$BUILDDIR/../cont
-MINGWLIBS_DIR=$BUILDDIR/../../../mingwlibs/dll
+CONTENT_DIR=${SOURCEDIR}/cont
+MINGWLIBS_DIR=${SOURCEDIR}/../../mingwlibs/dll
CMD="rsync -avz --chmod=D+rx,F+r"
umask 022

0 comments on commit 7571793

Please sign in to comment.