diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-04-03 08:55:13 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-04-03 08:55:13 +0300 |
| commit | b9b56bac6bf5a9701c2898d254a2df9cdf99425c (patch) | |
| tree | dcbc7113f9d5cfbc3db095ffe9dd3d33701bbfb5 | |
| parent | fa670fa4b591a423d76ed1b38ece01fccb0482ca (diff) | |
| download | minetest-b9b56bac6bf5a9701c2898d254a2df9cdf99425c.tar.gz minetest-b9b56bac6bf5a9701c2898d254a2df9cdf99425c.tar.bz2 minetest-b9b56bac6bf5a9701c2898d254a2df9cdf99425c.zip | |
Fix buildbot
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 70 |
2 files changed, 34 insertions, 38 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb1d19cb5..c42f7eab6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -386,7 +386,7 @@ endif() # Installation # if(WIN32) - if(MIGWM10_DLL) + if(MINGWM10_DLL) install(FILES ${MINGWM10_DLL} DESTINATION ${BINDIR}) endif() if(DEFINED ZLIB_DLL) diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index 37352e607..dff9dd2d5 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -32,29 +32,27 @@ mkdir -p $libdir cd $builddir -if [ "$DONT_FETCH" -ne "1" ]; then - # Get stuff - wget http://downloads.sourceforge.net/irrlicht/irrlicht-$irrlicht_version.zip \ - -c -O $packagedir/irrlicht-$irrlicht_version.zip || exit 1 - wget http://www.winimage.com/zLibDll/zlib125.zip \ - -c -O $packagedir/zlib125.zip || exit 1 - wget http://www.winimage.com/zLibDll/zlib125dll.zip \ - -c -O $packagedir/zlib125dll.zip || exit 1 - wget http://switch.dl.sourceforge.net/project/winlibs/libogg/libogg-$ogg_version-dev.7z \ - -c -O $packagedir/libogg-$ogg_version-dev.7z || exit 1 - wget http://switch.dl.sourceforge.net/project/winlibs/libogg/libogg-$ogg_version-dll.7z \ - -c -O $packagedir/libogg-$ogg_version-dll.7z || exit 1 - wget http://switch.dl.sourceforge.net/project/winlibs/libvorbis/libvorbis-$vorbis_version-dev.7z \ - -c -O $packagedir/libvorbis-$vorbis_version-dev.7z || exit 1 - wget http://switch.dl.sourceforge.net/project/winlibs/libvorbis/libvorbis-$vorbis_version-dll.7z \ - -c -O $packagedir/libvorbis-$vorbis_version-dll.7z || exit 1 - wget http://github.com/celeron55/minetest/zipball/master \ - -c -O $packagedir/minetest.zip || exit 1 - cp $openal_stripped_file $packagedir/openal_stripped.zip || exit 1 - cp $mingwm10_dll_file $packagedir/mingwm10.dll || exit 1 - wget http://github.com/celeron55/minetest_game/zipball/master \ - -c -O $packagedir/minetest_game.zip || exit 1 -fi +# Get stuff +wget http://downloads.sourceforge.net/irrlicht/irrlicht-$irrlicht_version.zip \ + -c -O $packagedir/irrlicht-$irrlicht_version.zip || exit 1 +wget http://www.winimage.com/zLibDll/zlib125.zip \ + -c -O $packagedir/zlib125.zip || exit 1 +wget http://www.winimage.com/zLibDll/zlib125dll.zip \ + -c -O $packagedir/zlib125dll.zip || exit 1 +wget http://switch.dl.sourceforge.net/project/winlibs/libogg/libogg-$ogg_version-dev.7z \ + -c -O $packagedir/libogg-$ogg_version-dev.7z || exit 1 +wget http://switch.dl.sourceforge.net/project/winlibs/libogg/libogg-$ogg_version-dll.7z \ + -c -O $packagedir/libogg-$ogg_version-dll.7z || exit 1 +wget http://switch.dl.sourceforge.net/project/winlibs/libvorbis/libvorbis-$vorbis_version-dev.7z \ + -c -O $packagedir/libvorbis-$vorbis_version-dev.7z || exit 1 +wget http://switch.dl.sourceforge.net/project/winlibs/libvorbis/libvorbis-$vorbis_version-dll.7z \ + -c -O $packagedir/libvorbis-$vorbis_version-dll.7z || exit 1 +wget http://github.com/celeron55/minetest/zipball/master \ + -c -O $packagedir/minetest.zip || exit 1 +cp $openal_stripped_file $packagedir/openal_stripped.zip || exit 1 +cp $mingwm10_dll_file $packagedir/mingwm10.dll || exit 1 +wget http://github.com/celeron55/minetest_game/zipball/master \ + -c -O $packagedir/minetest_game.zip || exit 1 # 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/\/.*$//'` @@ -62,20 +60,18 @@ minetestdir=$builddir/$minetestdirname || exit 1 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/\/.*$//'` -if [ "$DONT_FETCH" -ne "1" ]; then - # Extract stuff - cd $libdir || exit 1 - unzip -o $packagedir/irrlicht-$irrlicht_version.zip || exit 1 - unzip -o $packagedir/zlib125.zip || exit 1 - unzip -o $packagedir/zlib125dll.zip -d zlib125dll || exit 1 - 7z x -y -olibogg $packagedir/libogg-$ogg_version-dev.7z || exit 1 - 7z x -y -olibogg $packagedir/libogg-$ogg_version-dll.7z || exit 1 - 7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dev.7z || exit 1 - 7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dll.7z || exit 1 - unzip -o $packagedir/openal_stripped.zip || exit 1 - cd $builddir || exit 1 - unzip -o $packagedir/minetest.zip || exit 1 -fi +# Extract stuff +cd $libdir || exit 1 +unzip -o $packagedir/irrlicht-$irrlicht_version.zip || exit 1 +unzip -o $packagedir/zlib125.zip || exit 1 +unzip -o $packagedir/zlib125dll.zip -d zlib125dll || exit 1 +7z x -y -olibogg $packagedir/libogg-$ogg_version-dev.7z || exit 1 +7z x -y -olibogg $packagedir/libogg-$ogg_version-dll.7z || exit 1 +7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dev.7z || exit 1 +7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dll.7z || exit 1 +unzip -o $packagedir/openal_stripped.zip || exit 1 +cd $builddir || exit 1 +unzip -o $packagedir/minetest.zip || exit 1 # Symlink minetestdir rm -rf $builddir/minetest |