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

Update library versions in buildbot (#11229)

Browse Source
This commit is contained in:
sfan5 2021-04-27 11:50:40 +02:00 committed by GitHub
parent 776015c350
commit 9660ae288a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 76 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
util/buildbot/buildwin32.sh
View File

@ -16,7 +16,6 @@ fi
builddir=$1 builddir=$1
mkdir -p $builddir mkdir -p $builddir
builddir="$( cd "$builddir" && pwd )" builddir="$( cd "$builddir" && pwd )"
packagedir=$builddir/packages
libdir=$builddir/libs libdir=$builddir/libs
# Test which win32 compiler is present # Test which win32 compiler is present
@ -32,58 +31,50 @@ fi
echo "Using $toolchain_file" echo "Using $toolchain_file"
irrlicht_version=1.9.0mt1 irrlicht_version=1.9.0mt1
ogg_version=1.3.2 ogg_version=1.3.4
vorbis_version=1.3.5 vorbis_version=1.3.7
curl_version=7.65.3 curl_version=7.76.1
gettext_version=0.20.1 gettext_version=0.20.1
freetype_version=2.10.1 freetype_version=2.10.4
sqlite3_version=3.27.2 sqlite3_version=3.35.5
luajit_version=2.1.0-beta3 luajit_version=2.1.0-beta3
leveldb_version=1.22 leveldb_version=1.23
zlib_version=1.2.11 zlib_version=1.2.11
mkdir -p $packagedir
mkdir -p $libdir mkdir -p $libdir
cd $builddir download () {
local url=$1
local filename=$2
[ -z "$filename" ] && filename=${url##*/}
local foldername=${filename%%[.-]*}
local extract=$3
[ -z "$extract" ] && extract=unzip
[ -d "./$foldername" ] && return 0
wget "$url" -c -O "./$filename"
if [ "$extract" = "unzip" ]; then
unzip -o "$filename" -d "$foldername"
elif [ "$extract" = "unzip_nofolder" ]; then
unzip -o "$filename"
else
return 1
fi
}
# Get stuff # Get stuff
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip \
-c -O $packagedir/irrlicht-$irrlicht_version.zip
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip \
-c -O $packagedir/zlib-$zlib_version.zip
[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip \
-c -O $packagedir/libogg-$ogg_version.zip
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip \
-c -O $packagedir/libvorbis-$vorbis_version.zip
[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip \
-c -O $packagedir/curl-$curl_version.zip
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip \
-c -O $packagedir/gettext-$gettext_version.zip
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip \
-c -O $packagedir/freetype2-$freetype_version.zip
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip \
-c -O $packagedir/sqlite3-$sqlite3_version.zip
[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip \
-c -O $packagedir/luajit-$luajit_version.zip
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \
-c -O $packagedir/libleveldb-$leveldb_version.zip
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped.zip \
-c -O $packagedir/openal_stripped.zip
# Extract stuff
cd $libdir cd $libdir
[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip" irrlicht-$irrlicht_version.zip
[ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip"
[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip"
[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip"
[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl download "http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip"
[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip"
[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype download "http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip" freetype-$freetype_version.zip
[ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3 download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip"
[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip"
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip" leveldb-$leveldb_version.zip
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb download "http://minetest.kitsunemimi.pw/openal_stripped.zip" '' unzip_nofolder
# Set source dir, downloading Minetest as needed # Set source dir, downloading Minetest as needed
if [ -n "$EXISTING_MINETEST_DIR" ]; then if [ -n "$EXISTING_MINETEST_DIR" ]; then
@ -146,9 +137,9 @@ cmake -S $sourcedir -B . \
-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \ -DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \ -DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
\ \
-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \ -DCURL_DLL=$libdir/curl/bin/libcurl-4.dll \
-DCURL_INCLUDE_DIR=$libdir/libcurl/include \ -DCURL_INCLUDE_DIR=$libdir/curl/include \
-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \ -DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
\ \
-DGETTEXT_MSGFMT=`which msgfmt` \ -DGETTEXT_MSGFMT=`which msgfmt` \
-DGETTEXT_DLL="$gettext_dlls" \ -DGETTEXT_DLL="$gettext_dlls" \

85
util/buildbot/buildwin64.sh
View File

@ -16,63 +16,54 @@ fi
builddir=$1 builddir=$1
mkdir -p $builddir mkdir -p $builddir
builddir="$( cd "$builddir" && pwd )" builddir="$( cd "$builddir" && pwd )"
packagedir=$builddir/packages
libdir=$builddir/libs libdir=$builddir/libs
toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
irrlicht_version=1.9.0mt1 irrlicht_version=1.9.0mt1
ogg_version=1.3.2 ogg_version=1.3.4
vorbis_version=1.3.5 vorbis_version=1.3.7
curl_version=7.65.3 curl_version=7.76.1
gettext_version=0.20.1 gettext_version=0.20.1
freetype_version=2.10.1 freetype_version=2.10.4
sqlite3_version=3.27.2 sqlite3_version=3.35.5
luajit_version=2.1.0-beta3 luajit_version=2.1.0-beta3
leveldb_version=1.22 leveldb_version=1.23
zlib_version=1.2.11 zlib_version=1.2.11
mkdir -p $packagedir
mkdir -p $libdir mkdir -p $libdir
cd $builddir download () {
local url=$1
local filename=$2
[ -z "$filename" ] && filename=${url##*/}
local foldername=${filename%%[.-]*}
local extract=$3
[ -z "$extract" ] && extract=unzip
[ -d "./$foldername" ] && return 0
wget "$url" -c -O "./$filename"
if [ "$extract" = "unzip" ]; then
unzip -o "$filename" -d "$foldername"
elif [ "$extract" = "unzip_nofolder" ]; then
unzip -o "$filename"
else
return 1
fi
}
# Get stuff # Get stuff
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip \
-c -O $packagedir/irrlicht-$irrlicht_version.zip
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip \
-c -O $packagedir/zlib-$zlib_version.zip
[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip \
-c -O $packagedir/libogg-$ogg_version.zip
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip \
-c -O $packagedir/libvorbis-$vorbis_version.zip
[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip \
-c -O $packagedir/curl-$curl_version.zip
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip \
-c -O $packagedir/gettext-$gettext_version.zip
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip \
-c -O $packagedir/freetype2-$freetype_version.zip
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip \
-c -O $packagedir/sqlite3-$sqlite3_version.zip
[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip \
-c -O $packagedir/luajit-$luajit_version.zip
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip \
-c -O $packagedir/libleveldb-$leveldb_version.zip
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped64.zip \
-c -O $packagedir/openal_stripped.zip
# Extract stuff
cd $libdir cd $libdir
[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip" irrlicht-$irrlicht_version.zip
[ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip"
[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip"
[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip"
[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl download "http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip"
[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip"
[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype download "http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip" freetype-$freetype_version.zip
[ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3 download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip"
[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip"
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip" leveldb-$leveldb_version.zip
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb download "http://minetest.kitsunemimi.pw/openal_stripped64.zip" 'openal_stripped.zip' unzip_nofolder
# Set source dir, downloading Minetest as needed # Set source dir, downloading Minetest as needed
if [ -n "$EXISTING_MINETEST_DIR" ]; then if [ -n "$EXISTING_MINETEST_DIR" ]; then
@ -135,9 +126,9 @@ cmake -S $sourcedir -B . \
-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \ -DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \ -DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
\ \
-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \ -DCURL_DLL=$libdir/curl/bin/libcurl-4.dll \
-DCURL_INCLUDE_DIR=$libdir/libcurl/include \ -DCURL_INCLUDE_DIR=$libdir/curl/include \
-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \ -DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
\ \
-DGETTEXT_MSGFMT=`which msgfmt` \ -DGETTEXT_MSGFMT=`which msgfmt` \
-DGETTEXT_DLL="$gettext_dlls" \ -DGETTEXT_DLL="$gettext_dlls" \