From da44888ee2de9ae1e5c006126e84b36fcc95d4e5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Feb 2012 00:50:20 +0300 Subject: Add makecheck5 tool. --- build/makecheck5 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 build/makecheck5 (limited to 'build') diff --git a/build/makecheck5 b/build/makecheck5 new file mode 100755 index 000000000..e20b58729 --- /dev/null +++ b/build/makecheck5 @@ -0,0 +1,5 @@ +#!/bin/bash + +find ../src -type f -name "*.cpp" -exec ../../vera++/vera++ {} \; 2>makecheck_err.txt +find ../src -type f -name "*.hpp" -exec ../../vera++/vera++ {} \; 2>>makecheck_err.txt +find ../src -type f -name "*.h" -exec ../../vera++/vera++ {} \; 2>>makecheck_err.txt -- cgit v1.2.3-60-g2f50 From 1e255ec19ececda196874f751a81682169cf64c3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Feb 2012 18:32:53 +0300 Subject: Add support for gtest framework. --- build/bmaketests | 79 +++++++++++++++++++++++++++++ build/buildtest | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ build/maketest.sh | 149 ------------------------------------------------------ configure.ac | 13 +++++ src/Makefile.am | 4 ++ src/main.cpp | 17 +++++++ 6 files changed, 262 insertions(+), 149 deletions(-) create mode 100755 build/bmaketests create mode 100755 build/buildtest delete mode 100755 build/maketest.sh (limited to 'build') diff --git a/build/bmaketests b/build/bmaketests new file mode 100755 index 000000000..e1d980a98 --- /dev/null +++ b/build/bmaketests @@ -0,0 +1,79 @@ +#!/bin/sh + +cd .. + +dir=`pwd` + +export CC=gcc-4.5 +export CXX=g++-4.5 + +export LANG=C +export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \ +-Wabi -Wdisabled-optimization -Wuninitialized \ +-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 \ +-Wunused-parameter -Wlogical-op \ +-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ +-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ +-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ +-Wpacked -Wshadow -Wunused -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" + +autoreconf -i 2>../build/make.log + +result=$? +if [ "$result" != 0 ]; then + echo autoreconf error + exit 1 +fi + +./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-unittests=yes + +result=$? +if [ "$result" != 0 ]; then + echo configure error + exit 1 +fi + +cd po +#make -j5 update-po 2>../make1.log +make -j5 update-gmo 2>../build/make1.log + +result=$? +if [ "$result" != 0 ]; then + echo update-gmo error + exit 1 +fi + +cd .. +make -j5 2>build/make2.log + +result=$? +if [ "$result" != 0 ]; then + echo make error + exit 1 +fi + +make install + +result=$? +if [ "$result" != 0 ]; then + echo make install error + exit 1 +fi + +cd run +export GLIBCXX_FORCE_NEW=1 +./bin/manaplus diff --git a/build/buildtest b/build/buildtest new file mode 100755 index 000000000..61b20f0fe --- /dev/null +++ b/build/buildtest @@ -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/build/maketest.sh b/build/maketest.sh deleted file mode 100755 index 61b20f0fe..000000000 --- a/build/maketest.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/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/configure.ac b/configure.ac index ef92317d6..996ad3f3c 100755 --- a/configure.ac +++ b/configure.ac @@ -209,6 +209,19 @@ esac],[memdebug_enabled=false]) AM_CONDITIONAL(ENABLE_MEM_DEBUG, test x$memdebug_enabled = xtrue) +# Enable unit tests +AC_ARG_ENABLE(unittests, +[ --enable-unittests Turn on unit tests], +[case "${enableval}" in + yes) unittests_enabled=true +LIBS="$LIBS -lgtest" + ;; + no) unittests_enabled=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-tests) ;; +esac],[unittests_enabled=false]) + +AM_CONDITIONAL(ENABLE_UNITTESTS, test x$unittests_enabled = xtrue) + # Enable tcmalloc AC_ARG_ENABLE(tcmalloc, [ --enable-tcmalloc Turn on tcmalloc], diff --git a/src/Makefile.am b/src/Makefile.am index 204c21bfc..62b762af6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,6 +21,10 @@ else manaplus_SOURCES = endif +if ENABLE_UNITTESTS +manaplus_CXXFLAGS += -DUNITTESTS +endif + if USE_INTERNALGUICHAN manaplus_CXXFLAGS += -DUSE_INTERNALGUICHAN manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \ diff --git a/src/main.cpp b/src/main.cpp index dc87ca9e0..f30e7bc62 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,6 +35,10 @@ #include "utils/stringutils.h" #include "utils/xml.h" +#ifdef UNITTESTS +#include +#endif + #ifdef __MINGW32__ #include #endif @@ -210,6 +214,8 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) extern "C" char const *_nl_locale_name_default(void); #endif +#ifndef UNITTESTS +// main for normal game usage int main(int argc, char *argv[]) { #if defined(__MINGW32__) @@ -262,3 +268,14 @@ int main(int argc, char *argv[]) return client.testsExec(); } } + +#else + +// main for unit testing +int main(int argc, char **argv) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} + +#endif -- cgit v1.2.3-60-g2f50 From bb156df11431e3eb286ddd3311adf1ac710945e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Feb 2012 19:39:06 +0300 Subject: Remove some unneeded includes. --- build/makecheck4 | 2 +- src/actorspritemanager.cpp | 2 -- src/being.cpp | 1 - src/being.h | 1 - src/client.cpp | 2 -- src/compoundsprite.cpp | 3 ++- src/flooritem.cpp | 2 +- src/graphics.cpp | 1 - src/gui/ministatuswindow.h | 1 - src/guichanfwd.h | 6 ------ src/itemshortcut.cpp | 1 - src/localplayer.cpp | 5 ----- src/net/charhandler.h | 2 -- src/net/ea/playerhandler.cpp | 1 + src/net/playerhandler.h | 1 - src/net/tmwa/playerhandler.cpp | 1 + src/utils/stringutils.cpp | 2 -- 17 files changed, 6 insertions(+), 28 deletions(-) (limited to 'build') diff --git a/build/makecheck4 b/build/makecheck4 index 852986459..5c77d7f3a 100755 --- a/build/makecheck4 +++ b/build/makecheck4 @@ -1,5 +1,5 @@ #!/bin/bash -../../checkheaders/checkheaders ../src 2>tmp.txt +../../checkheaders/checkheaders --skip debug.h ../src 2>tmp.txt sed '/(style): Header not found/d' tmp.txt >makecheck4.txt rm tmp.txt diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 89a592005..803a30e7e 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -31,8 +31,6 @@ #include "gui/chatwindow.h" #include "gui/equipmentwindow.h" -#include "gui/killstats.h" -#include "gui/skilldialog.h" #include "gui/socialwindow.h" #include "gui/viewport.h" diff --git a/src/being.cpp b/src/being.cpp index 92d01097b..47a74c7b2 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -40,7 +40,6 @@ #include "sound.h" #include "sprite.h" #include "text.h" -#include "statuseffect.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" diff --git a/src/being.h b/src/being.h index a52963746..0b9257e83 100644 --- a/src/being.h +++ b/src/being.h @@ -27,7 +27,6 @@ #include "configlistener.h" #include "equipment.h" #include "map.h" -#include "particlecontainer.h" #include "position.h" #include "vector.h" diff --git a/src/client.cpp b/src/client.cpp index 023eb5353..a7825a835 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -69,7 +69,6 @@ #include "gui/worldselectdialog.h" #include "gui/widgets/button.h" -#include "gui/widgets/chattab.h" #include "gui/widgets/desktop.h" #include "net/charhandler.h" @@ -80,7 +79,6 @@ #include "net/loginhandler.h" #include "net/net.h" #include "net/npchandler.h" -#include "net/packetcounters.h" #include "net/partyhandler.h" #include "net/worldinfo.h" diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index 61fb3d4e0..62ef2d01c 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -24,11 +24,12 @@ #include "configuration.h" #include "game.h" #include "graphics.h" + #ifdef USE_OPENGL #include "openglgraphics.h" #include "opengl1graphics.h" #endif -#include "localplayer.h" + #include "map.h" #include "resources/image.h" diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 111019546..f126f336b 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -31,7 +31,7 @@ #include "gui/gui.h" #include "gui/sdlfont.h" -#include "net/net.h" +//#include "net/net.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" diff --git a/src/graphics.cpp b/src/graphics.cpp index 635cc6ab9..e98b1a283 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -24,7 +24,6 @@ #include "graphicsvertexes.h" #include "logger.h" -#include "map.h" #include "resources/image.h" #include "resources/imageloader.h" diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index ba2cf7b2d..eb6ded7dd 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -27,7 +27,6 @@ #include "listener.h" #include "gui/widgets/popup.h" -#include "gui/widgets/window.h" #include diff --git a/src/guichanfwd.h b/src/guichanfwd.h index b3808d8ba..7ccc221b4 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -27,11 +27,6 @@ namespace gcn { class ActionEvent; class ActionListener; - class AllegroFont; - class AllegroGraphics; - class AllegroImage; - class AllegroImageLoader; - class AllegroInput; class BasicContainer; class Button; class CheckBox; @@ -70,7 +65,6 @@ namespace gcn class MouseEvent; class MouseInput; class MouseListener; - class OpenGLAllegroImageLoader; class OpenGLGraphics; class OpenGLImage; class OpenGLSDLImageLoader; diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index f267dd755..fedb92257 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -24,7 +24,6 @@ #include "inventory.h" #include "item.h" #include "itemshortcut.h" -#include "localplayer.h" #include "playerinfo.h" #include "spellmanager.h" diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 01e8c1ae8..99108bd3a 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -41,21 +41,16 @@ #include "simpleanimation.h" #include "sound.h" #include "statuseffect.h" -#include "text.h" #include "dropshortcut.h" #include "gui/chatwindow.h" #include "gui/gui.h" -#include "gui/inventorywindow.h" -#include "gui/killstats.h" #include "gui/ministatuswindow.h" #include "gui/okdialog.h" #include "gui/outfitwindow.h" -#include "gui/palette.h" #include "gui/shopwindow.h" #include "gui/skilldialog.h" #include "gui/socialwindow.h" -#include "gui/statuswindow.h" #include "gui/theme.h" #include "gui/userpalette.h" #include "gui/viewport.h" diff --git a/src/net/charhandler.h b/src/net/charhandler.h index 492e27e55..cee319719 100644 --- a/src/net/charhandler.h +++ b/src/net/charhandler.h @@ -26,8 +26,6 @@ #include "localplayer.h" #include "playerinfo.h" -#include "net/logindata.h" - #include #include diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 76a7b0dbc..27aa4da80 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -22,6 +22,7 @@ #include "net/ea/playerhandler.h" +#include "localplayer.h" #include "logger.h" #include "party.h" #include "playerinfo.h" diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 6ae912102..aa5d2b793 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -25,7 +25,6 @@ #include "being.h" #include "flooritem.h" -#include "localplayer.h" namespace Net { diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 16e833ec9..bfe9eea42 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -23,6 +23,7 @@ #include "net/tmwa/playerhandler.h" #include "configuration.h" +#include "client.h" #include "logger.h" #include "net/messagein.h" diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 5e7bf19a0..798690602 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -22,8 +22,6 @@ #include "utils/stringutils.h" -#include "configuration.h" - #include #include #include -- cgit v1.2.3-60-g2f50 From a99b870ef80206eb58fb1b03dd64e8d0990ee268 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Feb 2012 04:01:03 +0300 Subject: Move logs from makecheck tools to subdir --- .gitignore | 1 + build/makecheck1 | 2 +- build/makecheck2 | 2 +- build/makecheck3 | 4 +--- build/makecheck4 | 2 +- build/makecheck5 | 7 ++++--- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'build') diff --git a/.gitignore b/.gitignore index bef2937de..42a6980d6 100644 --- a/.gitignore +++ b/.gitignore @@ -79,6 +79,7 @@ mana.creator.user* run/* my/* win/* +build/logs build/make.log build/make1.log build/make2.log diff --git a/build/makecheck1 b/build/makecheck1 index 96b49e5c7..58f231e14 100755 --- a/build/makecheck1 +++ b/build/makecheck1 @@ -1,3 +1,3 @@ #!/bin/bash -cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>makecheck_err.txt +cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>logs/cppcheck1.txt diff --git a/build/makecheck2 b/build/makecheck2 index b9108b6ef..184903c7a 100755 --- a/build/makecheck2 +++ b/build/makecheck2 @@ -1,3 +1,3 @@ #!/bin/bash -../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >make_nsiqcppstyle.txt +../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >logs/nsiqcppstyle.txt diff --git a/build/makecheck3 b/build/makecheck3 index 95e04ad28..c09d002cb 100755 --- a/build/makecheck3 +++ b/build/makecheck3 @@ -1,6 +1,4 @@ #!/bin/bash cd ../src -#../../cppcheck/cppcheck --enable=all --force -j 5 -v -I /usr/include -I /usr/include/c++/4.5 -I /usr/include/libxml2 -I /usr/include/SDL . 1>../makecheck.txt 2>../makecheck_err.txt -#../../cppcheck/cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v . 1>../makecheck.txt 2>../makecheck_err.txt -../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/makecheck_err.txt +../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/logs/cppcheck2.txt diff --git a/build/makecheck4 b/build/makecheck4 index 5c77d7f3a..946761892 100755 --- a/build/makecheck4 +++ b/build/makecheck4 @@ -1,5 +1,5 @@ #!/bin/bash ../../checkheaders/checkheaders --skip debug.h ../src 2>tmp.txt -sed '/(style): Header not found/d' tmp.txt >makecheck4.txt +sed '/(style): Header not found/d' tmp.txt >logs/checkheader.txt rm tmp.txt diff --git a/build/makecheck5 b/build/makecheck5 index e20b58729..9cf5450b6 100755 --- a/build/makecheck5 +++ b/build/makecheck5 @@ -1,5 +1,6 @@ #!/bin/bash -find ../src -type f -name "*.cpp" -exec ../../vera++/vera++ {} \; 2>makecheck_err.txt -find ../src -type f -name "*.hpp" -exec ../../vera++/vera++ {} \; 2>>makecheck_err.txt -find ../src -type f -name "*.h" -exec ../../vera++/vera++ {} \; 2>>makecheck_err.txt +find ../src -type f -name "*.cpp" -exec ../../vera++/vera++ {} \; 2>logs/vera.txt +find ../src -type f -name "*.hpp" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt +find ../src -type f -name "*.h" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt +find ../src -type f -name "*.cc" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt -- cgit v1.2.3-60-g2f50 From ebf1cc07c1c48ebb56a719641442f0c1f7e2af4a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Feb 2012 19:34:22 +0300 Subject: Small changes in build scripts. --- build/bmakesnapshot | 2 +- build/clmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'build') diff --git a/build/bmakesnapshot b/build/bmakesnapshot index 89f465251..b13b31bfa 100755 --- a/build/bmakesnapshot +++ b/build/bmakesnapshot @@ -37,7 +37,7 @@ autoreconf -i cd po #make -j5 update-po 2>../build/make1.log -make -j5 update-gmo 2>../build/make1.log +make -j5 update-gmo 2>../build/logs/gcc47.txt cd .. make -j5 2>build/make2.log diff --git a/build/clmake b/build/clmake index a290af529..3817e6b89 100755 --- a/build/clmake +++ b/build/clmake @@ -13,5 +13,4 @@ export CXX=clang++ --bindir=$dir/run/bin \ --mandir=$dir/run/share/man -make -j5 2>build/make2.log - +make -j5 2>build/logs/clang.txt -- cgit v1.2.3-60-g2f50 From b0906cbb3e852db03eaa3203553e4c2dfcee7e42 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 18 Feb 2012 03:23:59 +0300 Subject: Remove from git test scripts. --- .gitignore | 8 ++++++++ build/bmakesnapshot | 43 ------------------------------------------- build/clmake | 16 ---------------- build/makecheck1 | 3 --- build/makecheck2 | 3 --- build/makecheck3 | 4 ---- build/makecheck4 | 5 ----- build/makecheck5 | 6 ------ 8 files changed, 8 insertions(+), 80 deletions(-) delete mode 100755 build/bmakesnapshot delete mode 100755 build/clmake delete mode 100755 build/makecheck1 delete mode 100755 build/makecheck2 delete mode 100755 build/makecheck3 delete mode 100755 build/makecheck4 delete mode 100755 build/makecheck5 (limited to 'build') diff --git a/.gitignore b/.gitignore index 42a6980d6..2f9c8690e 100644 --- a/.gitignore +++ b/.gitignore @@ -100,6 +100,14 @@ build/toolchain.cmake1 build/makerats.log build/make_hc.txt build/make_hc2.txt +build/makecheck1 +build/makecheck2 +build/makecheck3 +build/makecheck4 +build/makecheck5 +build/makecheck6 +build/clmake +build/bmakesnapshot # debian debian/* diff --git a/build/bmakesnapshot b/build/bmakesnapshot deleted file mode 100755 index b13b31bfa..000000000 --- a/build/bmakesnapshot +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -cd .. - -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-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 -Wfree-nonheap-object -Winvalid-memory-model \ --Wnarrowing -Wzero-as-null-pointer-constant" - -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/logs/gcc47.txt -cd .. -make -j5 2>build/make2.log - diff --git a/build/clmake b/build/clmake deleted file mode 100755 index 3817e6b89..000000000 --- a/build/clmake +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -cd .. - -dir=`pwd` - -export LANG=C -export CC=clang -export CXX=clang++ - -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man - -make -j5 2>build/logs/clang.txt diff --git a/build/makecheck1 b/build/makecheck1 deleted file mode 100755 index 58f231e14..000000000 --- a/build/makecheck1 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>logs/cppcheck1.txt diff --git a/build/makecheck2 b/build/makecheck2 deleted file mode 100755 index 184903c7a..000000000 --- a/build/makecheck2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >logs/nsiqcppstyle.txt diff --git a/build/makecheck3 b/build/makecheck3 deleted file mode 100755 index c09d002cb..000000000 --- a/build/makecheck3 +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -cd ../src -../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/logs/cppcheck2.txt diff --git a/build/makecheck4 b/build/makecheck4 deleted file mode 100755 index 946761892..000000000 --- a/build/makecheck4 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -../../checkheaders/checkheaders --skip debug.h ../src 2>tmp.txt -sed '/(style): Header not found/d' tmp.txt >logs/checkheader.txt -rm tmp.txt diff --git a/build/makecheck5 b/build/makecheck5 deleted file mode 100755 index 9cf5450b6..000000000 --- a/build/makecheck5 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -find ../src -type f -name "*.cpp" -exec ../../vera++/vera++ {} \; 2>logs/vera.txt -find ../src -type f -name "*.hpp" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt -find ../src -type f -name "*.h" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt -find ../src -type f -name "*.cc" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt -- cgit v1.2.3-60-g2f50 From 950bc2e6e485c0fe2c6a418913fd4d380f6f21b6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 18 Feb 2012 17:28:44 +0300 Subject: Change version to 1.2.2.19. --- ChangeLog | 15 +++++++++++++++ README | 2 +- README.txt | 2 +- build/packevol | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 7 files changed, 22 insertions(+), 7 deletions(-) (limited to 'build') diff --git a/ChangeLog b/ChangeLog index 2474682d7..2ddfb696d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2012-02-19 New release 1.2.2.19 +add: client data translations (items, etc). +add: increased max value for drop counter from 9 to 30. +add: chat command /setdrop N. to set drop counter from scripts. +add: hide map layers feature. +add: show gms with green color in online list (evol server). +add: relative position for floor items (item drops). +add: option to enable/disable grouping friends in online list. +add: enable chat logging by default. +add: set default max chat lines to 40. +add: update windows libs. +add: center game on screen in windows and osx. +add: race name to status and debug windows. +add: update liberation and mplus fonts. + 2012-02-05 New release 1.2.2.5 ManaPlus: fix: particle font in japan localisation. diff --git a/README b/README index d7e46430c..f2974689c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.2.2.5 Date: 2012-02-05 + Version: 1.2.2.19 Date: 2012-02-19 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 4f4a397fc..8f99f0484 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.2.2.5 Date: 2012-02-05 + Version: 1.2.2.19 Date: 2012-02-19 Development team: - See AUTHORS file for a list diff --git a/build/packevol b/build/packevol index 9059fdf58..7f89238ab 100755 --- a/build/packevol +++ b/build/packevol @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.2.2.5" \ + -DPRODUCT_VERSION="1.2.2.19" \ -DEXESUFFIX=/src \ -DUPX=true \ evol.nsi diff --git a/build/packwin b/build/packwin index 296039482..ab7087768 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.2.2.5" \ + -DPRODUCT_VERSION="1.2.2.19" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index 996ad3f3c..e1f2c55db 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.2.2.5], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.2.2.19], [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 fbc672939..abc152ed3 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.2.2.5" -#define CHECK_VERSION "01.02.02.05" +#define SMALL_VERSION "1.2.2.19" +#define CHECK_VERSION "01.02.02.19" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-60-g2f50