Skip to content

Commit 9660ae2

Browse files
sfan5sfan5
authoredApr 27, 2021
Update library versions in buildbot (#11229)
·
5.11.05.5.0
1 parent 776015c commit 9660ae2

File tree

2 files changed

+76
-94
lines changed

2 files changed

+76
-94
lines changed
 

Diff for: ‎util/buildbot/buildwin32.sh

+38-47
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ fi
1616
builddir=$1
1717
mkdir -p $builddir
1818
builddir="$( cd "$builddir" && pwd )"
19-
packagedir=$builddir/packages
2019
libdir=$builddir/libs
2120

2221
# Test which win32 compiler is present
@@ -32,58 +31,50 @@ fi
3231
echo "Using $toolchain_file"
3332

3433
irrlicht_version=1.9.0mt1
35-
ogg_version=1.3.2
36-
vorbis_version=1.3.5
37-
curl_version=7.65.3
34+
ogg_version=1.3.4
35+
vorbis_version=1.3.7
36+
curl_version=7.76.1
3837
gettext_version=0.20.1
39-
freetype_version=2.10.1
40-
sqlite3_version=3.27.2
38+
freetype_version=2.10.4
39+
sqlite3_version=3.35.5
4140
luajit_version=2.1.0-beta3
42-
leveldb_version=1.22
41+
leveldb_version=1.23
4342
zlib_version=1.2.11
4443

45-
mkdir -p $packagedir
4644
mkdir -p $libdir
4745

48-
cd $builddir
46+
download () {
47+
local url=$1
48+
local filename=$2
49+
[ -z "$filename" ] && filename=${url##*/}
50+
local foldername=${filename%%[.-]*}
51+
local extract=$3
52+
[ -z "$extract" ] && extract=unzip
53+
54+
[ -d "./$foldername" ] && return 0
55+
wget "$url" -c -O "./$filename"
56+
if [ "$extract" = "unzip" ]; then
57+
unzip -o "$filename" -d "$foldername"
58+
elif [ "$extract" = "unzip_nofolder" ]; then
59+
unzip -o "$filename"
60+
else
61+
return 1
62+
fi
63+
}
4964

5065
# Get stuff
51-
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip \
52-
-c -O $packagedir/irrlicht-$irrlicht_version.zip
53-
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip \
54-
-c -O $packagedir/zlib-$zlib_version.zip
55-
[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip \
56-
-c -O $packagedir/libogg-$ogg_version.zip
57-
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip \
58-
-c -O $packagedir/libvorbis-$vorbis_version.zip
59-
[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip \
60-
-c -O $packagedir/curl-$curl_version.zip
61-
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip \
62-
-c -O $packagedir/gettext-$gettext_version.zip
63-
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip \
64-
-c -O $packagedir/freetype2-$freetype_version.zip
65-
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip \
66-
-c -O $packagedir/sqlite3-$sqlite3_version.zip
67-
[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip \
68-
-c -O $packagedir/luajit-$luajit_version.zip
69-
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \
70-
-c -O $packagedir/libleveldb-$leveldb_version.zip
71-
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped.zip \
72-
-c -O $packagedir/openal_stripped.zip
73-
74-
# Extract stuff
7566
cd $libdir
76-
[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
77-
[ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
78-
[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
79-
[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
80-
[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl
81-
[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
82-
[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
83-
[ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
84-
[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
85-
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
86-
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
67+
download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip" irrlicht-$irrlicht_version.zip
68+
download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip"
69+
download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip"
70+
download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip"
71+
download "http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip"
72+
download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip"
73+
download "http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip" freetype-$freetype_version.zip
74+
download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip"
75+
download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip"
76+
download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip" leveldb-$leveldb_version.zip
77+
download "http://minetest.kitsunemimi.pw/openal_stripped.zip" '' unzip_nofolder
8778

8879
# Set source dir, downloading Minetest as needed
8980
if [ -n "$EXISTING_MINETEST_DIR" ]; then
@@ -146,9 +137,9 @@ cmake -S $sourcedir -B . \
146137
-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
147138
-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
148139
\
149-
-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \
150-
-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
151-
-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
140+
-DCURL_DLL=$libdir/curl/bin/libcurl-4.dll \
141+
-DCURL_INCLUDE_DIR=$libdir/curl/include \
142+
-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
152143
\
153144
-DGETTEXT_MSGFMT=`which msgfmt` \
154145
-DGETTEXT_DLL="$gettext_dlls" \

Diff for: ‎util/buildbot/buildwin64.sh

+38-47
Original file line numberDiff line numberDiff line change
@@ -16,63 +16,54 @@ fi
1616
builddir=$1
1717
mkdir -p $builddir
1818
builddir="$( cd "$builddir" && pwd )"
19-
packagedir=$builddir/packages
2019
libdir=$builddir/libs
2120

2221
toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
2322
irrlicht_version=1.9.0mt1
24-
ogg_version=1.3.2
25-
vorbis_version=1.3.5
26-
curl_version=7.65.3
23+
ogg_version=1.3.4
24+
vorbis_version=1.3.7
25+
curl_version=7.76.1
2726
gettext_version=0.20.1
28-
freetype_version=2.10.1
29-
sqlite3_version=3.27.2
27+
freetype_version=2.10.4
28+
sqlite3_version=3.35.5
3029
luajit_version=2.1.0-beta3
31-
leveldb_version=1.22
30+
leveldb_version=1.23
3231
zlib_version=1.2.11
3332

34-
mkdir -p $packagedir
3533
mkdir -p $libdir
3634

37-
cd $builddir
35+
download () {
36+
local url=$1
37+
local filename=$2
38+
[ -z "$filename" ] && filename=${url##*/}
39+
local foldername=${filename%%[.-]*}
40+
local extract=$3
41+
[ -z "$extract" ] && extract=unzip
3842

39-
# Get stuff
40-
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip \
41-
-c -O $packagedir/irrlicht-$irrlicht_version.zip
42-
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip \
43-
-c -O $packagedir/zlib-$zlib_version.zip
44-
[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip \
45-
-c -O $packagedir/libogg-$ogg_version.zip
46-
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip \
47-
-c -O $packagedir/libvorbis-$vorbis_version.zip
48-
[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip \
49-
-c -O $packagedir/curl-$curl_version.zip
50-
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip \
51-
-c -O $packagedir/gettext-$gettext_version.zip
52-
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip \
53-
-c -O $packagedir/freetype2-$freetype_version.zip
54-
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip \
55-
-c -O $packagedir/sqlite3-$sqlite3_version.zip
56-
[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip \
57-
-c -O $packagedir/luajit-$luajit_version.zip
58-
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip \
59-
-c -O $packagedir/libleveldb-$leveldb_version.zip
60-
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped64.zip \
61-
-c -O $packagedir/openal_stripped.zip
43+
[ -d "./$foldername" ] && return 0
44+
wget "$url" -c -O "./$filename"
45+
if [ "$extract" = "unzip" ]; then
46+
unzip -o "$filename" -d "$foldername"
47+
elif [ "$extract" = "unzip_nofolder" ]; then
48+
unzip -o "$filename"
49+
else
50+
return 1
51+
fi
52+
}
6253

63-
# Extract stuff
54+
# Get stuff
6455
cd $libdir
65-
[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
66-
[ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
67-
[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
68-
[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
69-
[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl
70-
[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
71-
[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
72-
[ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
73-
[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
74-
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
75-
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
56+
download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip" irrlicht-$irrlicht_version.zip
57+
download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip"
58+
download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip"
59+
download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip"
60+
download "http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip"
61+
download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip"
62+
download "http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip" freetype-$freetype_version.zip
63+
download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip"
64+
download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip"
65+
download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip" leveldb-$leveldb_version.zip
66+
download "http://minetest.kitsunemimi.pw/openal_stripped64.zip" 'openal_stripped.zip' unzip_nofolder
7667

7768
# Set source dir, downloading Minetest as needed
7869
if [ -n "$EXISTING_MINETEST_DIR" ]; then
@@ -135,9 +126,9 @@ cmake -S $sourcedir -B . \
135126
-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
136127
-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
137128
\
138-
-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \
139-
-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
140-
-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
129+
-DCURL_DLL=$libdir/curl/bin/libcurl-4.dll \
130+
-DCURL_INCLUDE_DIR=$libdir/curl/include \
131+
-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
141132
\
142133
-DGETTEXT_MSGFMT=`which msgfmt` \
143134
-DGETTEXT_DLL="$gettext_dlls" \

0 commit comments

Comments
 (0)
Please sign in to comment.