BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix buildbot

Browse Source
This commit is contained in:
Perttu Ahola 2012-04-03 08:55:13 +03:00
parent fa670fa4b5
commit b9b56bac6b
2 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -386,7 +386,7 @@ endif()
# Installation # Installation
# #
if(WIN32) if(WIN32)
if(MIGWM10_DLL) if(MINGWM10_DLL)
install(FILES ${MINGWM10_DLL} DESTINATION ${BINDIR}) install(FILES ${MINGWM10_DLL} DESTINATION ${BINDIR})
endif() endif()
if(DEFINED ZLIB_DLL) if(DEFINED ZLIB_DLL)

4
util/buildbot/buildwin32.sh
View File

@ -32,7 +32,6 @@ mkdir -p $libdir
cd $builddir cd $builddir
if [ "$DONT_FETCH" -ne "1" ]; then
# Get stuff # Get stuff
wget http://downloads.sourceforge.net/irrlicht/irrlicht-$irrlicht_version.zip \ wget http://downloads.sourceforge.net/irrlicht/irrlicht-$irrlicht_version.zip \
-c -O $packagedir/irrlicht-$irrlicht_version.zip || exit 1 -c -O $packagedir/irrlicht-$irrlicht_version.zip || exit 1
@ -54,7 +53,6 @@ if [ "$DONT_FETCH" -ne "1" ]; then
cp $mingwm10_dll_file $packagedir/mingwm10.dll || exit 1 cp $mingwm10_dll_file $packagedir/mingwm10.dll || exit 1
wget http://github.com/celeron55/minetest_game/zipball/master \ wget http://github.com/celeron55/minetest_game/zipball/master \
-c -O $packagedir/minetest_game.zip || exit 1 -c -O $packagedir/minetest_game.zip || exit 1
fi
# Figure out some path names from the packages # Figure out some path names from the packages
minetestdirname=`unzip -l $packagedir/minetest.zip | head -n 7 | tail -n 1 | sed -e 's/^[^c]*//' -e 's/\/.*$//'` minetestdirname=`unzip -l $packagedir/minetest.zip | head -n 7 | tail -n 1 | sed -e 's/^[^c]*//' -e 's/\/.*$//'`
@ -62,7 +60,6 @@ minetestdir=$builddir/$minetestdirname || exit 1
git_hash=`echo $minetestdirname | sed -e 's/celeron55-minetest-//'` git_hash=`echo $minetestdirname | sed -e 's/celeron55-minetest-//'`
minetest_gamedirname=`unzip -l $packagedir/minetest_game.zip | head -n 7 | tail -n 1 | sed -e 's/^[^c]*//' -e 's/\/.*$//'` minetest_gamedirname=`unzip -l $packagedir/minetest_game.zip | head -n 7 | tail -n 1 | sed -e 's/^[^c]*//' -e 's/\/.*$//'`
if [ "$DONT_FETCH" -ne "1" ]; then
# Extract stuff # Extract stuff
cd $libdir || exit 1 cd $libdir || exit 1
unzip -o $packagedir/irrlicht-$irrlicht_version.zip || exit 1 unzip -o $packagedir/irrlicht-$irrlicht_version.zip || exit 1
@ -75,7 +72,6 @@ if [ "$DONT_FETCH" -ne "1" ]; then
unzip -o $packagedir/openal_stripped.zip || exit 1 unzip -o $packagedir/openal_stripped.zip || exit 1
cd $builddir || exit 1 cd $builddir || exit 1
unzip -o $packagedir/minetest.zip || exit 1 unzip -o $packagedir/minetest.zip || exit 1
fi
# Symlink minetestdir # Symlink minetestdir
rm -rf $builddir/minetest rm -rf $builddir/minetest