From 417bb21a57ddcfc5185777119dae23c7dbcb9fbb Mon Sep 17 00:00:00 2001 From: Maksim Gamarnik Date: Sun, 21 Feb 2016 04:18:49 +0200 Subject: [PATCH] v. 1.1.0 release | MinGW --- util/buildbot/buildwin32.sh => buildwin32.sh | 0 util/buildbot/buildwin64.sh => buildwin64.sh | 30 +++---------------- po/be/{minetest.po => MultiCraft.po} | 0 po/ca/{minetest.po => MultiCraft.po} | 0 po/cs/{minetest.po => MultiCraft.po} | 0 po/da/{minetest.po => MultiCraft.po} | 0 po/de/{minetest.po => MultiCraft.po} | 0 po/eo/{minetest.po => MultiCraft.po} | 0 po/es/{minetest.po => MultiCraft.po} | 0 po/et/{minetest.po => MultiCraft.po} | 0 po/fr/{minetest.po => MultiCraft.po} | 0 po/he/{minetest.po => MultiCraft.po} | 0 po/hu/{minetest.po => MultiCraft.po} | 0 po/id/{minetest.po => MultiCraft.po} | 0 po/it/{minetest.po => MultiCraft.po} | 0 po/ja/{minetest.po => MultiCraft.po} | 0 po/jbo/{minetest.po => MultiCraft.po} | 0 po/ko/{minetest.po => MultiCraft.po} | 0 po/ky/{minetest.po => MultiCraft.po} | 0 po/lt/{minetest.po => MultiCraft.po} | 0 po/nb/{minetest.po => MultiCraft.po} | 0 po/nl/{minetest.po => MultiCraft.po} | 0 po/pl/{minetest.po => MultiCraft.po} | 0 po/pt/{minetest.po => MultiCraft.po} | 0 po/pt_BR/{minetest.po => MultiCraft.po} | 0 po/ro/{minetest.po => MultiCraft.po} | 0 po/ru/{minetest.po => MultiCraft.po} | 0 po/tr/{minetest.po => MultiCraft.po} | 0 po/uk/{minetest.po => MultiCraft.po} | 0 po/zh_CN/{minetest.po => MultiCraft.po} | 0 po/zh_TW/{minetest.po => MultiCraft.po} | 0 src/defaultsettings.cpp | 2 +- ...chain_mingw.cmake => toolchain_mingw.cmake | 0 ...n_mingw64.cmake => toolchain_mingw64.cmake | 0 util/updatepo.sh | 2 +- 35 files changed, 6 insertions(+), 28 deletions(-) rename util/buildbot/buildwin32.sh => buildwin32.sh (100%) mode change 100755 => 100644 rename util/buildbot/buildwin64.sh => buildwin64.sh (88%) mode change 100755 => 100644 rename po/be/{minetest.po => MultiCraft.po} (100%) rename po/ca/{minetest.po => MultiCraft.po} (100%) rename po/cs/{minetest.po => MultiCraft.po} (100%) rename po/da/{minetest.po => MultiCraft.po} (100%) rename po/de/{minetest.po => MultiCraft.po} (100%) rename po/eo/{minetest.po => MultiCraft.po} (100%) rename po/es/{minetest.po => MultiCraft.po} (100%) rename po/et/{minetest.po => MultiCraft.po} (100%) rename po/fr/{minetest.po => MultiCraft.po} (100%) rename po/he/{minetest.po => MultiCraft.po} (100%) rename po/hu/{minetest.po => MultiCraft.po} (100%) rename po/id/{minetest.po => MultiCraft.po} (100%) rename po/it/{minetest.po => MultiCraft.po} (100%) rename po/ja/{minetest.po => MultiCraft.po} (100%) rename po/jbo/{minetest.po => MultiCraft.po} (100%) rename po/ko/{minetest.po => MultiCraft.po} (100%) rename po/ky/{minetest.po => MultiCraft.po} (100%) rename po/lt/{minetest.po => MultiCraft.po} (100%) rename po/nb/{minetest.po => MultiCraft.po} (100%) rename po/nl/{minetest.po => MultiCraft.po} (100%) rename po/pl/{minetest.po => MultiCraft.po} (100%) rename po/pt/{minetest.po => MultiCraft.po} (100%) rename po/pt_BR/{minetest.po => MultiCraft.po} (100%) rename po/ro/{minetest.po => MultiCraft.po} (100%) rename po/ru/{minetest.po => MultiCraft.po} (100%) rename po/tr/{minetest.po => MultiCraft.po} (100%) rename po/uk/{minetest.po => MultiCraft.po} (100%) rename po/zh_CN/{minetest.po => MultiCraft.po} (100%) rename po/zh_TW/{minetest.po => MultiCraft.po} (100%) rename util/buildbot/toolchain_mingw.cmake => toolchain_mingw.cmake (100%) rename util/buildbot/toolchain_mingw64.cmake => toolchain_mingw64.cmake (100%) diff --git a/util/buildbot/buildwin32.sh b/buildwin32.sh old mode 100755 new mode 100644 similarity index 100% rename from util/buildbot/buildwin32.sh rename to buildwin32.sh diff --git a/util/buildbot/buildwin64.sh b/buildwin64.sh old mode 100755 new mode 100644 similarity index 88% rename from util/buildbot/buildwin64.sh rename to buildwin64.sh index e13cbd02..b05a11f0 --- a/util/buildbot/buildwin64.sh +++ b/buildwin64.sh @@ -1,18 +1,11 @@ #!/bin/bash set -e -dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -if [ $# -ne 1 ]; then - echo "Usage: $0 " - exit 1 -fi -builddir=$1 -mkdir -p $builddir -builddir="$( cd "$builddir" && pwd )" +builddir="$( pwd )" packagedir=$builddir/packages libdir=$builddir/libs -toolchain_file=$dir/toolchain_mingw64.cmake +toolchain_file=$builddir/toolchain_mingw64.cmake irrlicht_version=1.8.1 ogg_version=1.3.1 vorbis_version=1.3.4 @@ -68,25 +61,10 @@ cd $libdir [ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit [ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb -# Get minetest +# Get MultiCraft cd $builddir -if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then - ln -s $EXISTING_MINETEST_DIR minetest -else - [ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest) -fi -cd minetest -git_hash=`git show | head -c14 | tail -c7` - -# 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) -fi -cd ../.. # Build the thing -cd minetest [ -d _build ] && rm -Rf _build/ mkdir _build cd _build @@ -151,6 +129,6 @@ cmake .. \ -DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \ -DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a -make package -j2 +make package -j8 # EOF diff --git a/po/be/minetest.po b/po/be/MultiCraft.po similarity index 100% rename from po/be/minetest.po rename to po/be/MultiCraft.po diff --git a/po/ca/minetest.po b/po/ca/MultiCraft.po similarity index 100% rename from po/ca/minetest.po rename to po/ca/MultiCraft.po diff --git a/po/cs/minetest.po b/po/cs/MultiCraft.po similarity index 100% rename from po/cs/minetest.po rename to po/cs/MultiCraft.po diff --git a/po/da/minetest.po b/po/da/MultiCraft.po similarity index 100% rename from po/da/minetest.po rename to po/da/MultiCraft.po diff --git a/po/de/minetest.po b/po/de/MultiCraft.po similarity index 100% rename from po/de/minetest.po rename to po/de/MultiCraft.po diff --git a/po/eo/minetest.po b/po/eo/MultiCraft.po similarity index 100% rename from po/eo/minetest.po rename to po/eo/MultiCraft.po diff --git a/po/es/minetest.po b/po/es/MultiCraft.po similarity index 100% rename from po/es/minetest.po rename to po/es/MultiCraft.po diff --git a/po/et/minetest.po b/po/et/MultiCraft.po similarity index 100% rename from po/et/minetest.po rename to po/et/MultiCraft.po diff --git a/po/fr/minetest.po b/po/fr/MultiCraft.po similarity index 100% rename from po/fr/minetest.po rename to po/fr/MultiCraft.po diff --git a/po/he/minetest.po b/po/he/MultiCraft.po similarity index 100% rename from po/he/minetest.po rename to po/he/MultiCraft.po diff --git a/po/hu/minetest.po b/po/hu/MultiCraft.po similarity index 100% rename from po/hu/minetest.po rename to po/hu/MultiCraft.po diff --git a/po/id/minetest.po b/po/id/MultiCraft.po similarity index 100% rename from po/id/minetest.po rename to po/id/MultiCraft.po diff --git a/po/it/minetest.po b/po/it/MultiCraft.po similarity index 100% rename from po/it/minetest.po rename to po/it/MultiCraft.po diff --git a/po/ja/minetest.po b/po/ja/MultiCraft.po similarity index 100% rename from po/ja/minetest.po rename to po/ja/MultiCraft.po diff --git a/po/jbo/minetest.po b/po/jbo/MultiCraft.po similarity index 100% rename from po/jbo/minetest.po rename to po/jbo/MultiCraft.po diff --git a/po/ko/minetest.po b/po/ko/MultiCraft.po similarity index 100% rename from po/ko/minetest.po rename to po/ko/MultiCraft.po diff --git a/po/ky/minetest.po b/po/ky/MultiCraft.po similarity index 100% rename from po/ky/minetest.po rename to po/ky/MultiCraft.po diff --git a/po/lt/minetest.po b/po/lt/MultiCraft.po similarity index 100% rename from po/lt/minetest.po rename to po/lt/MultiCraft.po diff --git a/po/nb/minetest.po b/po/nb/MultiCraft.po similarity index 100% rename from po/nb/minetest.po rename to po/nb/MultiCraft.po diff --git a/po/nl/minetest.po b/po/nl/MultiCraft.po similarity index 100% rename from po/nl/minetest.po rename to po/nl/MultiCraft.po diff --git a/po/pl/minetest.po b/po/pl/MultiCraft.po similarity index 100% rename from po/pl/minetest.po rename to po/pl/MultiCraft.po diff --git a/po/pt/minetest.po b/po/pt/MultiCraft.po similarity index 100% rename from po/pt/minetest.po rename to po/pt/MultiCraft.po diff --git a/po/pt_BR/minetest.po b/po/pt_BR/MultiCraft.po similarity index 100% rename from po/pt_BR/minetest.po rename to po/pt_BR/MultiCraft.po diff --git a/po/ro/minetest.po b/po/ro/MultiCraft.po similarity index 100% rename from po/ro/minetest.po rename to po/ro/MultiCraft.po diff --git a/po/ru/minetest.po b/po/ru/MultiCraft.po similarity index 100% rename from po/ru/minetest.po rename to po/ru/MultiCraft.po diff --git a/po/tr/minetest.po b/po/tr/MultiCraft.po similarity index 100% rename from po/tr/minetest.po rename to po/tr/MultiCraft.po diff --git a/po/uk/minetest.po b/po/uk/MultiCraft.po similarity index 100% rename from po/uk/minetest.po rename to po/uk/MultiCraft.po diff --git a/po/zh_CN/minetest.po b/po/zh_CN/MultiCraft.po similarity index 100% rename from po/zh_CN/minetest.po rename to po/zh_CN/MultiCraft.po diff --git a/po/zh_TW/minetest.po b/po/zh_TW/MultiCraft.po similarity index 100% rename from po/zh_TW/minetest.po rename to po/zh_TW/MultiCraft.po diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 92fbf157..79a86988 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -99,6 +99,7 @@ void set_default_settings(Settings *settings) settings->setDefault("screenH", "600"); settings->setDefault("fullscreen", "false"); settings->setDefault("fullscreen_bpp", "24"); + settings->setDefault("screen_dpi", "72"); settings->setDefault("fsaa", "0"); settings->setDefault("vsync", "false"); settings->setDefault("address", ""); @@ -354,7 +355,6 @@ void set_default_settings(Settings *settings) settings->setDefault("pause_fps_max", "10"); settings->setDefault("max_objects_per_block", "32"); settings->setDefault("sqlite_synchronous", "1"); - settings->setDefault("screen_dpi", "72"); settings->setDefault("gui_scaling", "1.1"); settings->setDefault("curl_verify_cert","false"); settings->setDefault("mouse_sensitivity", "0.15"); diff --git a/util/buildbot/toolchain_mingw.cmake b/toolchain_mingw.cmake similarity index 100% rename from util/buildbot/toolchain_mingw.cmake rename to toolchain_mingw.cmake diff --git a/util/buildbot/toolchain_mingw64.cmake b/toolchain_mingw64.cmake similarity index 100% rename from util/buildbot/toolchain_mingw64.cmake rename to toolchain_mingw64.cmake diff --git a/util/updatepo.sh b/util/updatepo.sh index 0d5b095e..d240e1ca 100755 --- a/util/updatepo.sh +++ b/util/updatepo.sh @@ -64,7 +64,7 @@ xgettext --package-name=MultiCraft \ # Now iterate on all languages and create the po file if missing, or update it # if it exists already for lang in $langs ; do # note the missing quotes around $langs - pofile=po/$lang/minetest.po + pofile=po/$lang/MultiCraft.po if test -e $pofile; then echo "[$lang]: updating strings" msgmerge --update --sort-by-file $pofile $potfile