X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=util%2Fbuildbot%2Fbuildwin32.sh;h=a4238fbd842d5ceea79b1fb1977274f104fe2912;hb=d3780cefd10472a57425cf5e0ab4cf4b816401be;hp=37352e6071cf100345af989ea616eeb9b78a7e5c;hpb=fa670fa4b591a423d76ed1b38ece01fccb0482ca;p=dragonfireclient.git

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index 37352e607..a4238fbd8 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -1,4 +1,13 @@
 #!/bin/bash
+set -e
+
+CORE_GIT=https://github.com/EliasFleckenstein03/dragonfireclient
+CORE_BRANCH=master
+CORE_NAME=dragonfireclient
+GAME_GIT=https://git.minetest.land/Wuzzy/MineClone2
+GAME_BRANCH=master
+GAME_NAME=mineclone2
+
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ $# -ne 1 ]; then
 	echo "Usage: $0 <build directory>"
@@ -10,114 +19,154 @@ builddir="$( cd "$builddir" && pwd )"
 packagedir=$builddir/packages
 libdir=$builddir/libs
 
-toolchain_file=$dir/toolchain_mingw.cmake
-openal_stripped_file=$dir/openal_stripped.zip
-mingwm10_dll_file=$dir/mingwm10.dll
-irrlicht_version=1.7.2
-ogg_version=1.2.1
-vorbis_version=1.3.2
+# Test which win32 compiler is present
+which i586-mingw32msvc-windres &>/dev/null && toolchain_file=$dir/toolchain_i586-mingw32msvc.cmake
+which i686-w64-mingw32-windres &>/dev/null && toolchain_file=$dir/toolchain_i646-w64-mingw32.cmake
 
-# unzip -l $openal_stripped_file:
-#        0  2012-04-03 00:25   openal_stripped/
-#        0  2012-04-03 00:25   openal_stripped/bin/
-#   109080  2012-04-03 00:03   openal_stripped/bin/OpenAL32.dll
-#        0  2012-04-03 00:29   openal_stripped/include/
-#    26443  2006-12-08 17:30   openal_stripped/include/al.h
-#     8282  2007-04-13 17:02   openal_stripped/include/alc.h
-#        0  2012-04-03 00:07   openal_stripped/lib/
-#    20552  2005-08-02 08:53   openal_stripped/lib/OpenAL32.lib
+if [ -z "$toolchain_file" ]; then
+	echo "Unable to determine which mingw32 compiler to use"
+	exit 1
+fi
+echo "Using $toolchain_file"
+
+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
 
 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
+[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://minetest.kitsunemimi.pw/irrlicht-$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
 
-# 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/\/.*$//'`
-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/\/.*$//'`
+# Extract stuff
+cd $libdir
+[ -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/curl-$curl_version.zip -d libcurl
+[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
+[ -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
+[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
 
-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
+# Get minetest
+cd $builddir
+if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then
+	cd /$EXISTING_MINETEST_DIR # must be absolute path
+else
+	[ -d $CORE_NAME ] && (cd $CORE_NAME && git pull) || (git clone -b $CORE_BRANCH $CORE_GIT)
+	cd $CORE_NAME
 fi
+git_hash=$(git rev-parse --short HEAD)
 
-# Symlink minetestdir
-rm -rf $builddir/minetest
-ln -s $minetestdir $builddir/minetest
-
-# Extract minetest_game
-cd $minetestdir/games || exit 1
-rm -rf minetest_game || exit 1
-unzip -o $packagedir/minetest_game.zip || exit 1
-minetest_gamedir=$minetestdir/games/$minetest_gamedirname || exit 1
-mv $minetest_gamedir $minetestdir/games/minetest_game || exit 1
+# Get minetest_game
+if [ "x$NO_MINETEST_GAME" = "x" ]; then
+	cd games
+	[ -d $GAME_NAME ] && (cd $GAME_NAME && git pull) || (git clone -b $GAME_BRANCH $GAME_GIT)
+	cd ..
+fi
 
 # Build the thing
-cd $minetestdir || exit 1
-mkdir -p build || exit 1
-cd build || exit 1
-cmake $minetestdir -DCMAKE_TOOLCHAIN_FILE=$toolchain_file -DENABLE_SOUND=1 \
-	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht-$irrlicht_version/include \
-	-DIRRLICHT_LIBRARY=$libdir/irrlicht-$irrlicht_version/lib/Win32-gcc/libIrrlicht.dll.a \
-	-DIRRLICHT_DLL=$libdir/irrlicht-$irrlicht_version/bin/Win32-gcc/Irrlicht.dll \
-	-DZLIB_INCLUDE_DIR=$libdir/zlib-1.2.5 \
-	-DZLIB_LIBRARIES=$libdir/zlib125dll/dll32/zlibwapi.lib \
-	-DZLIB_DLL=$libdir/zlib125dll/dll32/zlibwapi.dll \
+[ -d _build ] && rm -Rf _build/
+mkdir _build
+cd _build
+cmake .. \
+	-DCMAKE_INSTALL_PREFIX=/tmp \
+	-DVERSION_EXTRA=$git_hash \
+	-DBUILD_CLIENT=1 -DBUILD_SERVER=0 \
+	-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
+	\
+	-DENABLE_SOUND=1 \
+	-DENABLE_CURL=1 \
+	-DENABLE_GETTEXT=1 \
+	-DENABLE_FREETYPE=1 \
+	-DENABLE_LEVELDB=1 \
+	\
+	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include \
+	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/Win32-gcc/libIrrlicht.dll.a \
+	-DIRRLICHT_DLL=$libdir/irrlicht/bin/Win32-gcc/Irrlicht.dll \
+	\
+	-DZLIB_INCLUDE_DIR=$libdir/zlib/include \
+	-DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
+	-DZLIB_DLL=$libdir/zlib/bin/zlib1.dll \
+	\
+	-DLUA_INCLUDE_DIR=$libdir/luajit/include \
+	-DLUA_LIBRARY=$libdir/luajit/libluajit.a \
+	\
 	-DOGG_INCLUDE_DIR=$libdir/libogg/include \
 	-DOGG_LIBRARY=$libdir/libogg/lib/libogg.dll.a \
 	-DOGG_DLL=$libdir/libogg/bin/libogg-0.dll \
+	\
 	-DVORBIS_INCLUDE_DIR=$libdir/libvorbis/include \
 	-DVORBIS_LIBRARY=$libdir/libvorbis/lib/libvorbis.dll.a \
 	-DVORBIS_DLL=$libdir/libvorbis/bin/libvorbis-0.dll \
 	-DVORBISFILE_LIBRARY=$libdir/libvorbis/lib/libvorbisfile.dll.a \
 	-DVORBISFILE_DLL=$libdir/libvorbis/bin/libvorbisfile-3.dll \
-	-DOPENAL_INCLUDE_DIR=$libdir/openal_stripped/include \
-	-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/OpenAL32.lib \
+	\
+	-DOPENAL_INCLUDE_DIR=$libdir/openal_stripped/include/AL \
+	-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
 	-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
-	-DMINGWM10_DLL=$packagedir/mingwm10.dll \
-	-DCMAKE_INSTALL_PREFIX=/tmp \
-	-DVERSION_EXTRA=$git_hash \
-	|| exit 1
-make -j2 package || exit 1
+	\
+	-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \
+	-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 \
+	-DFREETYPE_DLL=$libdir/freetype/bin/libfreetype-6.dll \
+	\
+	-DSQLITE3_INCLUDE_DIR=$libdir/sqlite3/include \
+	-DSQLITE3_LIBRARY=$libdir/sqlite3/lib/libsqlite3.dll.a \
+	-DSQLITE3_DLL=$libdir/sqlite3/bin/libsqlite3-0.dll \
+	\
+	-DLEVELDB_INCLUDE_DIR=$libdir/leveldb/include \
+	-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
+	-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll
+
+make -j$(nproc)
 
-#pubdir=/home/celeron55/public_html/random/`date +%Y-%m` || exit 1
-#mkdir -p $pubdir || exit 1
-#cp *autobuild*.zip $pubdir/ || exit 1
+[ "x$NO_PACKAGE" = "x" ] && make package
 
+exit 0
 # EOF