Merge branch 'master' of gitorious.org:manaplus/manaplus

10 files changed, 2 insertions, 83 deletions

diff --git a/build/bmake b/build/bmake
index d99766ea7..33df5d180 100755
--- a/build/bmake
+++ b/build/bmake
@@ -8,7 +8,6 @@ cd ..
 #for feature
 #-Wstrict-overflow=4 -Wfloat-equal
 #-Wunsafe-loop-optimizations
-#-Wnon-virtual-dtor
 #-Woverloaded-virtual
 #-Wformat=2
 #-Wswitch-enum
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
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