From 0260dcea2e9fbd06ba2ee166862d089dc72516f4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 8 Nov 2011 00:45:33 +0300 Subject: Add make script for gcc 4.7 snapshot. --- build/bmakesnapshot | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 build/bmakesnapshot (limited to 'build') diff --git a/build/bmakesnapshot b/build/bmakesnapshot new file mode 100755 index 000000000..4736fb8a5 --- /dev/null +++ b/build/bmakesnapshot @@ -0,0 +1,44 @@ +#!/bin/sh + +cd .. + +#need fix: -Wzero-as-null-pointer-constant + +dir=`pwd` + +export PATH=/usr/lib/gcc-snapshot/bin:$PATH +export CC=gcc +export CXX=g++ + +export LANG=C + +export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ +-Wpacked-bitfield-compat -Wtrampolines \ +-Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \ +-fstrict-aliasing -Wunreachable-code -Wabi -Wdisabled-optimization \ +-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ +-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ +-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ +-Wctor-dtor-privacy -Wstrict-null-sentinel -Wlogical-op \ +-Wcast-align -Wpointer-arith -Wundef \ +-Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ +-Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \ +-Wstack-protector -Wshadow -Wunused -Wunused-macros -Wsynth \ +-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \ +-Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ +-Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ +-Wvector-operation-performance" + +autoreconf -i +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man + +cd po +#make -j5 update-po 2>../build/make1.log +make -j5 update-gmo 2>../build/make1.log +cd .. +make -j5 2>build/make2.log + -- cgit v1.2.3-70-g09d2 From 48b21bdfdff3c329bd1b7666ab34f3e211ef25f1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 12 Nov 2011 02:29:16 +0300 Subject: Change version to 1.1.11.12. --- ChangeLog | 21 +++++++++++++++++++++ README | 2 +- README.txt | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 6 files changed, 27 insertions(+), 6 deletions(-) (limited to 'build') diff --git a/ChangeLog b/ChangeLog index f1158ae7d..cbf0956f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2011-11-12 New release 1.1.11.12 +ManaPlus: +fix: hide death message on reconnect. +fix: stop move after open npc dialog. +fix: disable incomplete hr, hy translations. +fix: self player ignore. +fix: double network error dialog. +fix: joystick support. +fix: random key press loses. +add: pseudo away. +Command: /pseudoaway text +add: enemy relation. (no any ignore, but mark player as enemy) +add: option for attack players in pvp "Switch pvp attack". Default key not assigned +add: interface language selection. +Settings / Theme / Language. +add: Bold text type in chat. (To enable command ##B, to disable ##b) +Example: ##Bbold##b text. +add: update mplus fonts. +add: joystick selection, option for joystick usage only in active game. +add: enable joystick hat (if exists). + 2011-10-30 New release 1.1.10.30 ManaPlus: fix: disable autofix position for archer mode. diff --git a/README b/README index fd3bcf6fd..a2a2e70d8 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.10.30 Date: 2011-10-30 + Version: 1.1.11.12 Date: 2011-11-12 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 846685c60..27db90d2c 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.10.30 Date: 2011-10-30 + Version: 1.1.11.12 Date: 2011-11-12 Development team: - See AUTHORS file for a list diff --git a/build/packwin b/build/packwin index a817b5d4b..2d43c0b42 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.10.30" \ + -DPRODUCT_VERSION="1.1.11.12" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index f718e7318..9f68bf2cb 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.10.30], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.1.11.12], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/src/main.h b/src/main.h index 63db481a5..f0f3b8c2c 100644 --- a/src/main.h +++ b/src/main.h @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.1.10.30" -#define CHECK_VERSION "01.01.10.30" +#define SMALL_VERSION "1.1.11.12" +#define CHECK_VERSION "01.01.11.12" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-70-g09d2 From e83d1e8551d258fb4ce04d9aecc6f1cf3fcd0520 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 12 Nov 2011 16:38:18 +0300 Subject: Move make test script to build directory. --- build/maketest.sh | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/maketest.sh | 148 ----------------------------------------------------- 2 files changed, 149 insertions(+), 148 deletions(-) create mode 100755 build/maketest.sh delete mode 100755 tests/maketest.sh (limited to 'build') diff --git a/build/maketest.sh b/build/maketest.sh new file mode 100755 index 000000000..61b20f0fe --- /dev/null +++ b/build/maketest.sh @@ -0,0 +1,149 @@ +#!/bin/sh + +dir=`pwd` +export LANG=C + +cd .. +#--enable-applebuild=yes +#--without-librt + +echo start >build/make.log + +autoreconf -i +echo opengl+debug+guichan >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=yes \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+guichan >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no +make -j5 2>>build/make.log + +autoreconf -i +echo opengl >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=no \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+manaserv >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=no \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-manaserv=yes +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+guichan+manaserv >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-manaserv=yes +make -j5 2>>build/make.log + +autoreconf -i +echo guichan >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--without-opengl +make -j5 2>>build/make.log + +autoreconf -i +echo "-" >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=no \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--without-opengl +make -j5 2>>build/make.log + +autoreconf -i +echo guichan+manaserv >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-manaserv=yes \ +--without-opengl +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+debug+guichan+portable >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=yes \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-portable=yes +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+guichan+portable+manaserv >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-manaserv=yes \ +--enable-portable=yes +make -j5 2>>build/make.log diff --git a/tests/maketest.sh b/tests/maketest.sh deleted file mode 100755 index eeea5706e..000000000 --- a/tests/maketest.sh +++ /dev/null @@ -1,148 +0,0 @@ -#!/bin/sh - -dir=`pwd` -export LANG=C - -#--enable-applebuild=yes -#--without-librt - -echo start >make2.log - -autoreconf -i -echo opengl+debug+guichan >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=yes \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no -make -j5 2>>make2.log - -autoreconf -i -echo opengl+guichan >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no -make -j5 2>>make2.log - -autoreconf -i -echo opengl >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=no \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no -make -j5 2>>make2.log - -autoreconf -i -echo opengl+manaserv >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=no \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-manaserv=yes -make -j5 2>>make2.log - -autoreconf -i -echo opengl+guichan+manaserv >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-manaserv=yes -make -j5 2>>make2.log - -autoreconf -i -echo guichan >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---without-opengl -make -j5 2>>make2.log - -autoreconf -i -echo "-" >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=no \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---without-opengl -make -j5 2>>make2.log - -autoreconf -i -echo guichan+manaserv >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-manaserv=yes \ ---without-opengl -make -j5 2>>make2.log - -autoreconf -i -echo opengl+debug+guichan+portable >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=yes \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-portable=yes -make -j5 2>>make2.log - -autoreconf -i -echo opengl+guichan+portable+manaserv >>make2.log -make clean 2>>make2.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-manaserv=yes \ ---enable-portable=yes -make -j5 2>>make2.log -- cgit v1.2.3-70-g09d2