projects / oweals / minetest.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LuaItemStack: Add __tostring metamethod (#8785)
[oweals/minetest.git] / util / buildbot / buildwin64.sh
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index e13cbd0247686bb4812ccfb6e0636fee75ee8d4f..94e009c29540eb17e87e495887c34f10b626c3f4 100755 (executable)
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 set -e
 
+CORE_GIT=https://github.com/minetest/minetest
+CORE_BRANCH=master
+CORE_NAME=minetest
+GAME_GIT=https://github.com/minetest/minetest_game
+GAME_BRANCH=master
+GAME_NAME=minetest_game
+
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ $# -ne 1 ]; then
        echo "Usage: $0 <build directory>"
@@ -12,17 +19,17 @@ builddir="$( cd "$builddir" && pwd )"
 packagedir=$builddir/packages
 libdir=$builddir/libs
 
-toolchain_file=$dir/toolchain_mingw64.cmake
-irrlicht_version=1.8.1
-ogg_version=1.3.1
-vorbis_version=1.3.4
-curl_version=7.38.0
-gettext_version=0.18.2
-freetype_version=2.5.3
-sqlite3_version=3.8.7.4
-luajit_version=2.0.3
-leveldb_version=1.15
-zlib_version=1.2.8
+toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
+irrlicht_version=1.8.4
+ogg_version=1.3.2
+vorbis_version=1.3.5
+curl_version=7.65.3
+gettext_version=0.20.1
+freetype_version=2.10.1
+sqlite3_version=3.27.2
+luajit_version=2.1.0-beta3
+leveldb_version=1.22
+zlib_version=1.2.11
 
 mkdir -p $packagedir
 mkdir -p $libdir
@@ -38,15 +45,15 @@ cd $builddir
        -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/libcurl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/libcurl-$curl_version-win64.zip \
-       -c -O $packagedir/libcurl-$curl_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/freetype-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/libfreetype-$freetype_version-win64.zip \
-       -c -O $packagedir/freetype-$freetype_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-static-win64.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
@@ -56,13 +63,13 @@ cd $builddir
 
 # Extract stuff
 cd $libdir
-[ -d irrlicht-$irrlicht_version ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip
+[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
 [ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
 [ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
 [ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
-[ -d libcurl ] || unzip -o $packagedir/libcurl-$curl_version.zip -d libcurl
+[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl
 [ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
-[ -d freetype ] || unzip -o $packagedir/freetype-$freetype_version.zip -d freetype
+[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
 [ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
 [ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
 [ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
@@ -71,22 +78,21 @@ cd $libdir
 # Get minetest
 cd $builddir
 if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then
-       ln -s $EXISTING_MINETEST_DIR minetest
+       cd /$EXISTING_MINETEST_DIR # must be absolute path
 else
-       [ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
+       [ -d $CORE_NAME ] && (cd $CORE_NAME && git pull) || (git clone -b $CORE_BRANCH $CORE_GIT)
+       cd $CORE_NAME
 fi
-cd minetest
-git_hash=`git show | head -c14 | tail -c7`
+git_hash=$(git rev-parse --short HEAD)
 
 # Get minetest_game
-cd games
 if [ "x$NO_MINETEST_GAME" = "x" ]; then
-       [ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game)
+       cd games
+       [ -d $GAME_NAME ] && (cd $GAME_NAME && git pull) || (git clone -b $GAME_BRANCH $GAME_GIT)
+       cd ..
 fi
-cd ../..
 
 # Build the thing
-cd minetest
 [ -d _build ] && rm -Rf _build/
 mkdir _build
 cd _build
@@ -102,9 +108,9 @@ cmake .. \
        -DENABLE_FREETYPE=1 \
        -DENABLE_LEVELDB=1 \
        \
-       -DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht-$irrlicht_version/include \
-       -DIRRLICHT_LIBRARY=$libdir/irrlicht-$irrlicht_version/lib/Win64-gcc/libIrrlicht.dll.a \
-       -DIRRLICHT_DLL=$libdir/irrlicht-$irrlicht_version/bin/Win64-gcc/Irrlicht.dll \
+       -DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include \
+       -DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/Win64-gcc/libIrrlicht.dll.a \
+       -DIRRLICHT_DLL=$libdir/irrlicht/bin/Win64-gcc/Irrlicht.dll \
        \
        -DZLIB_INCLUDE_DIR=$libdir/zlib/include \
        -DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
@@ -131,6 +137,12 @@ cmake .. \
        -DCURL_INCLUDE_DIR=$libdir/libcurl/include \
        -DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
        \
+       -DGETTEXT_MSGFMT=`which msgfmt` \
+       -DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \
+       -DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv-2.dll \
+       -DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
+       -DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \
+       \
        -DFREETYPE_INCLUDE_DIR_freetype2=$libdir/freetype/include/freetype2 \
        -DFREETYPE_INCLUDE_DIR_ft2build=$libdir/freetype/include/freetype2 \
        -DFREETYPE_LIBRARY=$libdir/freetype/lib/libfreetype.dll.a \
@@ -142,15 +154,11 @@ cmake .. \
        \
        -DLEVELDB_INCLUDE_DIR=$libdir/leveldb/include \
        -DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
-       -DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll \
-       \
-       -DCUSTOM_GETTEXT_PATH=$libdir/gettext \
-       -DGETTEXT_MSGFMT=`which msgfmt` \
-       -DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \
-       -DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv-2.dll \
-       -DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
-       -DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a
+       -DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll
+
+make -j$(nproc)
 
-make package -j2
+[ "x$NO_PACKAGE" = "x" ] && make package
 
+exit 0
 # EOF
Unnamed repository; edit this file 'description' to name the repository.