Skip to content

Commit 035933f

Browse files
sfan5celeron55
sfan5
authored and
celeron55
committedJan 23, 2013
Tweak buildbot
* CURL support * only download packages if they don't exist * fixed download links (libvorbis and libogg) * manual downloading if automatic downloading fails (only minetest and minetest_game) * mingwm10.dll and openal_stripped.zip are downloaded automatically
·
0.4.5
1 parent 1163fdf commit 035933f

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed
 

‎util/buildbot/buildwin32.sh

+25-12
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ openal_stripped_file=$dir/openal_stripped.zip
1515
mingwm10_dll_file=$dir/mingwm10.dll
1616
irrlicht_version=1.7.2
1717
ogg_version=1.2.1
18-
vorbis_version=1.3.2
18+
vorbis_version=1.3.3
19+
curl_version=7.18.0
1920

2021
# unzip -l $openal_stripped_file:
2122
# 0 2012-04-03 00:25 openal_stripped/
@@ -33,26 +34,33 @@ mkdir -p $libdir
3334
cd $builddir
3435

3536
# Get stuff
36-
wget http://downloads.sourceforge.net/irrlicht/irrlicht-$irrlicht_version.zip \
37+
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://downloads.sourceforge.net/irrlicht/irrlicht-$irrlicht_version.zip \
3738
-c -O $packagedir/irrlicht-$irrlicht_version.zip || exit 1
38-
wget http://www.winimage.com/zLibDll/zlib125.zip \
39+
[ -e $packagedir/zlib125.zip ] || wget http://www.winimage.com/zLibDll/zlib125.zip \
3940
-c -O $packagedir/zlib125.zip || exit 1
40-
wget http://www.winimage.com/zLibDll/zlib125dll.zip \
41+
[ -e $packagedir/zlib125dll.zip ] || wget http://www.winimage.com/zLibDll/zlib125dll.zip \
4142
-c -O $packagedir/zlib125dll.zip || exit 1
42-
wget http://switch.dl.sourceforge.net/project/winlibs/libogg/libogg-$ogg_version-dev.7z \
43+
[ -e $packagedir/libogg-$ogg_version-dev.7z ] || wget http://mirror.transact.net.au/sourceforge/w/project/wi/winlibs/libogg/libogg-$ogg_version-dev.7z \
4344
-c -O $packagedir/libogg-$ogg_version-dev.7z || exit 1
44-
wget http://switch.dl.sourceforge.net/project/winlibs/libogg/libogg-$ogg_version-dll.7z \
45+
[ -e $packagedir/libogg-$ogg_version-dll.7z ] || wget http://mirror.transact.net.au/sourceforge/w/project/wi/winlibs/libogg/libogg-$ogg_version-dll.7z \
4546
-c -O $packagedir/libogg-$ogg_version-dll.7z || exit 1
46-
wget http://switch.dl.sourceforge.net/project/winlibs/libvorbis/libvorbis-$vorbis_version-dev.7z \
47+
[ -e $packagedir/libvorbis-$vorbis_version-dev.7z ] || wget http://minetest.ru/bin/libvorbis-$vorbis_version-dev.7z \
4748
-c -O $packagedir/libvorbis-$vorbis_version-dev.7z || exit 1
48-
wget http://switch.dl.sourceforge.net/project/winlibs/libvorbis/libvorbis-$vorbis_version-dll.7z \
49+
[ -e $packagedir/libvorbis-$vorbis_version-dll.7z ] || wget http://minetest.ru/bin/libvorbis-$vorbis_version-dll.7z \
4950
-c -O $packagedir/libvorbis-$vorbis_version-dll.7z || exit 1
51+
[ -e $packagedir/libcurl-$curl_version-win32-msvc.zip ] || wget http://curl.haxx.se/download/libcurl-$curl_version-win32-msvc.zip \
52+
-c -O $packagedir/libcurl-$curl_version-win32-msvc.zip || exit 1
5053
wget http://github.com/celeron55/minetest/zipball/master \
51-
-c -O $packagedir/minetest.zip || exit 1
52-
cp $openal_stripped_file $packagedir/openal_stripped.zip || exit 1
53-
cp $mingwm10_dll_file $packagedir/mingwm10.dll || exit 1
54+
-c -O $packagedir/minetest.zip --tries=3 || (echo "Please download http://github.com/celeron55/minetest/zipball/master manually and save it as $packagedir/minetest.zip"; read -s)
55+
[ -e $packagedir/minetest.zip ] || (echo "minetest.zip not found"; exit 1)
5456
wget http://github.com/celeron55/minetest_game/zipball/master \
55-
-c -O $packagedir/minetest_game.zip || exit 1
57+
-c -O $packagedir/minetest_game.zip --tries=3 || (echo "Please download http://github.com/celeron55/minetest_game/zipball/master manually and save it as $packagedir/minetest_game.zip"; read -s)
58+
[ -e $packagedir/minetest_game.zip ] || (echo "minetest_game.zip not found"; exit 1)
59+
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.ru/bin/openal_stripped.zip \
60+
-c -O $packagedir/openal_stripped.zip || exit 1
61+
[ -e $packagedir/mingwm10.dll ] || wget http://minetest.ru/bin/mingwm10.dll \
62+
-c -O $packagedir/mingwm10.dll || exit 1
63+
5664

5765
# Figure out some path names from the packages
5866
minetestdirname=`unzip -l $packagedir/minetest.zip | head -n 7 | tail -n 1 | sed -e 's/^[^c]*//' -e 's/\/.*$//'`
@@ -69,6 +77,7 @@ unzip -o $packagedir/zlib125dll.zip -d zlib125dll || exit 1
6977
7z x -y -olibogg $packagedir/libogg-$ogg_version-dll.7z || exit 1
7078
7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dev.7z || exit 1
7179
7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dll.7z || exit 1
80+
unzip -o $packagedir/libcurl-$curl_version-win32-msvc.zip -d libcurl || exit 1
7281
unzip -o $packagedir/openal_stripped.zip || exit 1
7382
cd $builddir || exit 1
7483
unzip -o $packagedir/minetest.zip || exit 1
@@ -106,6 +115,10 @@ cmake $minetestdir -DCMAKE_TOOLCHAIN_FILE=$toolchain_file -DENABLE_SOUND=1 \
106115
-DOPENAL_INCLUDE_DIR=$libdir/openal_stripped/include \
107116
-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/OpenAL32.lib \
108117
-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
118+
-DENABLE_CURL=1 \
119+
-DCURL_DLL=$libdir/libcurl/libcurl.dll \
120+
-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
121+
-DCURL_LIBRARY=$libdir/libcurl/libcurl.lib \
109122
-DMINGWM10_DLL=$packagedir/mingwm10.dll \
110123
-DCMAKE_INSTALL_PREFIX=/tmp \
111124
-DVERSION_EXTRA=$git_hash \

0 commit comments

Comments
 (0)
Please sign in to comment.