Update buildbot

This commit is contained in:
BlockMen 2015-11-27 00:06:55 +01:00
parent 84fa2a4d03
commit fa754cc4ff
2 changed files with 12 additions and 25 deletions

View File

@ -73,25 +73,19 @@ cd $libdir
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version-static-win32.zip -d luajit [ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version-static-win32.zip -d luajit
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version-win32.zip -d leveldb [ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version-win32.zip -d leveldb
# Get minetest # Get blockplanet
cd $builddir cd $builddir
if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then if [ ! "x$EXISTING_BLOCKPLANET_DIR" = "x" ]; then
ln -s $EXISTING_MINETEST_DIR minetest ln -s $EXISTING_BLOCKPLANET_DIR blockplanet
else else
[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest) [ -d blockplanet ] && (cd blockplanet && git pull) || (git clone https://github.com/blockplanet/blockplanet)
fi fi
cd minetest cd blockplanet
git_hash=`git show | head -c14 | tail -c7` git_hash=`git show | head -c14 | tail -c7`
# Get minetest_game
cd games
if [ "x$NO_MINETEST_GAME" = "x" ]; then
[ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game)
fi
cd ../..
# Build the thing # Build the thing
cd minetest cd blockplanet
[ -d _build ] && rm -Rf _build/ [ -d _build ] && rm -Rf _build/
mkdir _build mkdir _build
cd _build cd _build

View File

@ -68,25 +68,18 @@ cd $libdir
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit [ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb [ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
# Get minetest # Get blockplanet
cd $builddir cd $builddir
if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then if [ ! "x$EXISTING_BLOCKPLANET_DIR" = "x" ]; then
ln -s $EXISTING_MINETEST_DIR minetest ln -s $EXISTING_BLOCKPLANET_DIR blockplanet
else else
[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest) [ -d blockplanet ] && (cd blockplanet && git pull) || (git clone https://github.com/blockplanet/blockplanet)
fi fi
cd minetest cd blockplanet
git_hash=`git show | head -c14 | tail -c7` git_hash=`git show | head -c14 | tail -c7`
# Get minetest_game
cd games
if [ "x$NO_MINETEST_GAME" = "x" ]; then
[ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game)
fi
cd ../..
# Build the thing # Build the thing
cd minetest cd blockplanet
[ -d _build ] && rm -Rf _build/ [ -d _build ] && rm -Rf _build/
mkdir _build mkdir _build
cd _build cd _build