From d203be43c9e1006672a1a1da6b177fd43f4760c2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 13 Oct 2011 02:33:04 +0300 Subject: Move build scripts and logs to build dir. --- .gitignore | 39 ++++++++++++++--------------- bcmake | 7 ------ bdeb.sh | 3 --- bmake | 59 -------------------------------------------- bmake0 | 55 ----------------------------------------- bmake44 | 49 ------------------------------------- bmake46 | 63 ----------------------------------------------- build/bcmake | 9 +++++++ build/bdeb.sh | 4 +++ build/bmake | 61 ++++++++++++++++++++++++++++++++++++++++++++++ build/bmake0 | 57 +++++++++++++++++++++++++++++++++++++++++++ build/bmake44 | 51 ++++++++++++++++++++++++++++++++++++++ build/bmake46 | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ build/clmake | 17 +++++++++++++ build/fink.sh | 36 +++++++++++++++++++++++++++ build/makecheck1 | 3 +++ build/makecheck2 | 3 +++ build/makecheck3 | 6 +++++ build/makecheck4 | 5 ++++ build/makeflawfinder | 4 +++ build/makegprof | 6 +++++ build/mclean | 2 ++ build/packwin | 14 +++++++++++ build/pmake | 32 ++++++++++++++++++++++++ build/pmake46 | 31 +++++++++++++++++++++++ build/toolchain.cmake | 33 +++++++++++++++++++++++++ build/toolchain.nightly | 33 +++++++++++++++++++++++++ build/update-creator.sh | 11 +++++++++ clmake | 16 ------------ fink.sh | 34 -------------------------- makecheck1 | 3 --- makecheck2 | 3 --- makecheck3 | 6 ----- makeflawfinder | 4 --- makegprof | 6 ----- nightly/buildwindows.sh | 4 +-- packwin | 12 --------- pmake | 30 ----------------------- pmake46 | 29 ---------------------- toolchain.cmake | 33 ------------------------- toolchain.nightly | 33 ------------------------- update-creator.sh | 8 ------ 42 files changed, 505 insertions(+), 474 deletions(-) delete mode 100755 bcmake delete mode 100755 bdeb.sh delete mode 100755 bmake delete mode 100755 bmake0 delete mode 100755 bmake44 delete mode 100755 bmake46 create mode 100755 build/bcmake create mode 100755 build/bdeb.sh create mode 100755 build/bmake create mode 100755 build/bmake0 create mode 100755 build/bmake44 create mode 100755 build/bmake46 create mode 100755 build/clmake create mode 100755 build/fink.sh create mode 100755 build/makecheck1 create mode 100755 build/makecheck2 create mode 100755 build/makecheck3 create mode 100755 build/makecheck4 create mode 100755 build/makeflawfinder create mode 100755 build/makegprof create mode 100755 build/mclean create mode 100755 build/packwin create mode 100755 build/pmake create mode 100755 build/pmake46 create mode 100644 build/toolchain.cmake create mode 100644 build/toolchain.nightly create mode 100755 build/update-creator.sh delete mode 100755 clmake delete mode 100755 fink.sh delete mode 100755 makecheck1 delete mode 100755 makecheck2 delete mode 100755 makecheck3 delete mode 100755 makeflawfinder delete mode 100755 makegprof delete mode 100755 packwin delete mode 100755 pmake delete mode 100755 pmake46 delete mode 100644 toolchain.cmake delete mode 100644 toolchain.nightly delete mode 100755 update-creator.sh diff --git a/.gitignore b/.gitignore index e775b63f9..bef2937de 100644 --- a/.gitignore +++ b/.gitignore @@ -79,25 +79,26 @@ mana.creator.user* run/* my/* win/* -make.log -make1.log -make2.log -make_nsiqcppstyle.txt -bcmake1 -bmake1 -gprof.png -gprof.txt -gmon.out -makecheck.txt -makecheck_err.txt -makeflawfinder.log -makegprof1 -pmake1 -packwin1 -toolchain.cmake1 -makerats.log -make_hc.txt -make_hc2.txt +build/make.log +build/make1.log +build/make2.log +build/make_nsiqcppstyle.txt +build/bcmake1 +build/bmake1 +build/gprof.png +build/gprof.txt +build/gprof.dot +build/gmon.out +build/makecheck.txt +build/makecheck_err.txt +build/makeflawfinder.log +build/makegprof1 +build/pmake1 +build/packwin1 +build/toolchain.cmake1 +build/makerats.log +build/make_hc.txt +build/make_hc2.txt # debian debian/* diff --git a/bcmake b/bcmake deleted file mode 100755 index fd6196df7..000000000 --- a/bcmake +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -export PATH=/usr/i586-mingw32msvc/bin:$PATH -CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=./toolchain.cmake . 2>make1.log - -make -j5 2>make.log - diff --git a/bdeb.sh b/bdeb.sh deleted file mode 100755 index a09a29f0c..000000000 --- a/bdeb.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -dpkg-buildpackage -rfakeroot -uc -b diff --git a/bmake b/bmake deleted file mode 100755 index 0dea9d942..000000000 --- a/bmake +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -#may be -#-Waggregate-return -Winline - -#for feature -#-Wstrict-overflow=4 -Wfloat-equal -#-Wunsafe-loop-optimizations -#-Wnon-virtual-dtor -#-Woverloaded-virtual -#-Wformat=2 -#-Wswitch-enum - -#for better code -# -Weffc++ - -#need fix: -Wold-style-cast -Wconversion -#prof -pg - -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 -./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-applebuild=yes -#--without-librt - -cd po -#make -j5 update-po 2>../make1.log -make -j5 update-gmo 2>../make1.log -cd .. -make -j5 2>make2.log - diff --git a/bmake0 b/bmake0 deleted file mode 100755 index 0b32247ef..000000000 --- a/bmake0 +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -#may be -#-Wshadow -Waggregate-return -Winline - -#for feature -#-Wstrict-overflow=4 -Wfloat-equal -#-Wunsafe-loop-optimizations -#-Wnon-virtual-dtor -#-Woverloaded-virtual -#-Wformat=2 -#-Wswitch-enum - -#for better code -# -Weffc++ - -#need fix: -Wold-style-cast -Wconversion -#prof -pg - -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 -O0 -pipe \ --fno-default-inline -fno-inline" - -autoreconf -i -./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=yes \ ---enable-googleprofiler=yes - -#--without-librt - -cd po -#make -j5 update-po 2>../make1.log -make -j5 update-gmo 2>../make1.log -cd .. -make -j5 2>make2.log - diff --git a/bmake44 b/bmake44 deleted file mode 100755 index 08f78be79..000000000 --- a/bmake44 +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -#may be -#-Wshadow -Waggregate-return -Winline - -#for feature -#-Wstrict-overflow=4 -Wfloat-equal -#-Wunsafe-loop-optimizations -#-Wnon-virtual-dtor -#-Woverloaded-virtual -#-Wformat=2 -#-Wswitch-enum - -#for better code -# -Weffc++ - -#need fix: -Wold-style-cast -Wconversion -#prof -pg - -dir=`pwd` - -export CC=gcc-4.4 -export CXX=g++-4.4 - -export LANG=C -export CXXFLAGS="-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 -D_FORTIFY_SOURCE=2" - -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>../make1.log -make -j5 update-gmo 2>../make1.log -cd .. -make -j5 2>make2.log - diff --git a/bmake46 b/bmake46 deleted file mode 100755 index 8874f802b..000000000 --- a/bmake46 +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -#may be -#-Wshadow -Waggregate-return -Winline - -#for feature -#-Wstrict-overflow=4 -Wfloat-equal -#-Wunsafe-loop-optimizations -#-Wnon-virtual-dtor -#-Woverloaded-virtual -#-Wformat=2 -#-Wswitch-enum -#-Werror - -#for better code -# -Weffc++ - -#from time to time fix: -Wold-style-cast -Wconversion -Wswitch-enum -Waggregate-return -#from time to time fix: -Winline -Woverloaded-virtual -#need fix: -Wsuggest-attribute=pure -Wsuggest-attribute=const -#need fix: -Wstrict-overflow=5 -fstrict-overflow -#need fix: -Wstrict-aliasing=3 -#need fix: -Wdouble-promotion -#need fix: -Wfloat-equal -#need fix: -Wunsafe-loop-optimizations -#need fix: -Wpadded -#prof -pg - -dir=`pwd` - -export CC=gcc-4.6 -export CXX=g++-4.6 - -export LANG=C - -export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ --Wpacked-bitfield-compat -Wcast-qual -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 -Wcast-qual -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" - -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>../make1.log -make -j5 update-gmo 2>../make1.log -cd .. -make -j5 2>make2.log - diff --git a/build/bcmake b/build/bcmake new file mode 100755 index 000000000..21de1da77 --- /dev/null +++ b/build/bcmake @@ -0,0 +1,9 @@ +#!/bin/bash + +cd .. + +export PATH=/usr/i586-mingw32msvc/bin:$PATH +CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=build/toolchain.cmake . 2>build/make1.log + +make -j5 2>build/make.log + diff --git a/build/bdeb.sh b/build/bdeb.sh new file mode 100755 index 000000000..a1b2e5b4b --- /dev/null +++ b/build/bdeb.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +cd .. +dpkg-buildpackage -rfakeroot -uc -b diff --git a/build/bmake b/build/bmake new file mode 100755 index 000000000..d99766ea7 --- /dev/null +++ b/build/bmake @@ -0,0 +1,61 @@ +#!/bin/sh + +cd .. + +#may be +#-Waggregate-return -Winline + +#for feature +#-Wstrict-overflow=4 -Wfloat-equal +#-Wunsafe-loop-optimizations +#-Wnon-virtual-dtor +#-Woverloaded-virtual +#-Wformat=2 +#-Wswitch-enum + +#for better code +# -Weffc++ + +#need fix: -Wold-style-cast -Wconversion +#prof -pg + +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 +./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-applebuild=yes +#--without-librt + +cd po +#make -j5 update-po 2>../make1.log +make -j5 update-gmo 2>../build/make1.log +cd .. +make -j5 2>build/make2.log + diff --git a/build/bmake0 b/build/bmake0 new file mode 100755 index 000000000..8dcb357fe --- /dev/null +++ b/build/bmake0 @@ -0,0 +1,57 @@ +#!/bin/sh + +cd .. + +#may be +#-Wshadow -Waggregate-return -Winline + +#for feature +#-Wstrict-overflow=4 -Wfloat-equal +#-Wunsafe-loop-optimizations +#-Wnon-virtual-dtor +#-Woverloaded-virtual +#-Wformat=2 +#-Wswitch-enum + +#for better code +# -Weffc++ + +#need fix: -Wold-style-cast -Wconversion +#prof -pg + +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 -O0 -pipe \ +-fno-default-inline -fno-inline" + +autoreconf -i +./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=yes \ +--enable-googleprofiler=yes + +#--without-librt + +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 + diff --git a/build/bmake44 b/build/bmake44 new file mode 100755 index 000000000..ad61b7707 --- /dev/null +++ b/build/bmake44 @@ -0,0 +1,51 @@ +#!/bin/sh + +cd .. + +#may be +#-Wshadow -Waggregate-return -Winline + +#for feature +#-Wstrict-overflow=4 -Wfloat-equal +#-Wunsafe-loop-optimizations +#-Wnon-virtual-dtor +#-Woverloaded-virtual +#-Wformat=2 +#-Wswitch-enum + +#for better code +# -Weffc++ + +#need fix: -Wold-style-cast -Wconversion +#prof -pg + +dir=`pwd` + +export CC=gcc-4.4 +export CXX=g++-4.4 + +export LANG=C +export CXXFLAGS="-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 -D_FORTIFY_SOURCE=2" + +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 + diff --git a/build/bmake46 b/build/bmake46 new file mode 100755 index 000000000..e4d3e7e8e --- /dev/null +++ b/build/bmake46 @@ -0,0 +1,65 @@ +#!/bin/sh + +cd .. + +#may be +#-Wshadow -Waggregate-return -Winline + +#for feature +#-Wstrict-overflow=4 -Wfloat-equal +#-Wunsafe-loop-optimizations +#-Wnon-virtual-dtor +#-Woverloaded-virtual +#-Wformat=2 +#-Wswitch-enum +#-Werror + +#for better code +# -Weffc++ + +#from time to time fix: -Wold-style-cast -Wconversion -Wswitch-enum -Waggregate-return +#from time to time fix: -Winline -Woverloaded-virtual +#need fix: -Wsuggest-attribute=pure -Wsuggest-attribute=const +#need fix: -Wstrict-overflow=5 -fstrict-overflow +#need fix: -Wstrict-aliasing=3 +#need fix: -Wdouble-promotion +#need fix: -Wfloat-equal +#need fix: -Wunsafe-loop-optimizations +#need fix: -Wpadded +#prof -pg + +dir=`pwd` + +export CC=gcc-4.6 +export CXX=g++-4.6 + +export LANG=C + +export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ +-Wpacked-bitfield-compat -Wcast-qual -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 -Wcast-qual -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" + +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 + diff --git a/build/clmake b/build/clmake new file mode 100755 index 000000000..a290af529 --- /dev/null +++ b/build/clmake @@ -0,0 +1,17 @@ +#!/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/make2.log + diff --git a/build/fink.sh b/build/fink.sh new file mode 100755 index 000000000..8c74de65a --- /dev/null +++ b/build/fink.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +cd .. + +FINKDIR=/sw +GCCVER=4.0 + +. ${FINKDIR}/bin/init.sh +export CC=gcc-${GCCVER} +export CXX=g++-${GCCVER} +export CPP=cpp-${GCCVER} +export CXXCPP=cpp-${GCCVER} +export CPPFLAGS="-I/sw/include" +export LDFLAGS="-framework OpenGL" +dir=`pwd`/run +#dir=${FINKDIR} + +autoreconf -i 2>build/fink1.log + +# with prefix +#./configure --enable-applebuild=yes \ +#--prefix=${dir} \ +#--datadir=${dir}/share/games \ +#--bindir=${dir}/bin \ +#--mandir=${dir}/share/man 2>fink2.log 1>fink2_ok.log + +# without prefix +./configure --enable-applebuild=yes \ +--datarootdir=${dir}/share/games \ +--bindir=${dir}/bin \ +--sbindir=${dir}/bin \ +--mandir=${dir}/share/man 2>build/fink2.log + +# simple +#./configure --enable-applebuild=yes 2>fink2.log 1>fink2_ok.log +make 2>build/fink3.log diff --git a/build/makecheck1 b/build/makecheck1 new file mode 100755 index 000000000..96b49e5c7 --- /dev/null +++ b/build/makecheck1 @@ -0,0 +1,3 @@ +#!/bin/bash + +cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>makecheck_err.txt diff --git a/build/makecheck2 b/build/makecheck2 new file mode 100755 index 000000000..b9108b6ef --- /dev/null +++ b/build/makecheck2 @@ -0,0 +1,3 @@ +#!/bin/bash + +../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >make_nsiqcppstyle.txt diff --git a/build/makecheck3 b/build/makecheck3 new file mode 100755 index 000000000..95e04ad28 --- /dev/null +++ b/build/makecheck3 @@ -0,0 +1,6 @@ +#!/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 diff --git a/build/makecheck4 b/build/makecheck4 new file mode 100755 index 000000000..852986459 --- /dev/null +++ b/build/makecheck4 @@ -0,0 +1,5 @@ +#!/bin/bash + +../../checkheaders/checkheaders ../src 2>tmp.txt +sed '/(style): Header not found/d' tmp.txt >makecheck4.txt +rm tmp.txt diff --git a/build/makeflawfinder b/build/makeflawfinder new file mode 100755 index 000000000..9b5ff2809 --- /dev/null +++ b/build/makeflawfinder @@ -0,0 +1,4 @@ +#!/bin/sh + +flawfinder ../src 1> makeflawfinder.log +rats ../src 1> makerats.log diff --git a/build/makegprof b/build/makegprof new file mode 100755 index 000000000..d408bf0d3 --- /dev/null +++ b/build/makegprof @@ -0,0 +1,6 @@ +#!/bin/sh + +mv ../run/gmon.out . +gprof ../run/bin/manaplus >gprof.txt +cat gprof.txt | gprof2dot.py >gprof.dot +cat gprof.dot | dot -Tpng -o gprof.png diff --git a/build/mclean b/build/mclean new file mode 100755 index 000000000..fa5ff4ed5 --- /dev/null +++ b/build/mclean @@ -0,0 +1,2 @@ +cd .. +make clean diff --git a/build/packwin b/build/packwin new file mode 100755 index 000000000..cef5d27fa --- /dev/null +++ b/build/packwin @@ -0,0 +1,14 @@ +#!/bin/bash + +cd .. + +dir=`pwd` + +cd packaging/windows +./make-translations.sh +makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ + -DPRODUCT_VERSION="1.1.10.2" \ + -DEXESUFFIX=/src \ + -DUPX=true \ + setup.nsi + diff --git a/build/pmake b/build/pmake new file mode 100755 index 000000000..7ad12eaec --- /dev/null +++ b/build/pmake @@ -0,0 +1,32 @@ +#!/bin/sh + +cd .. + +dir=`pwd` + +export CC=gcc-4.5 +export CXX=g++-4.5 + +#-D_GLIBCXX_PROFILE + +export LANG=C +export CXXFLAGS="-pg -fno-inline -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 -Wredundant-decls -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 -O0 -pipe \ +-fno-default-inline -fno-inline" + +autoreconf -i +./configure --prefix=$dir/run \ + --datadir=$dir/run/share/games \ + --bindir=$dir/run/bin \ + --mandir=$dir/run/share/man + +make -j5 2>build/make.log + diff --git a/build/pmake46 b/build/pmake46 new file mode 100755 index 000000000..dc9a5f584 --- /dev/null +++ b/build/pmake46 @@ -0,0 +1,31 @@ +#!/bin/sh + +cd .. + +dir=`pwd` + +export CC=gcc-4.6 +export CXX=g++-4.6 + +#-D_GLIBCXX_PROFILE + +export LANG=C +export CXXFLAGS="-pg -fno-inline -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 -Wredundant-decls -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" + +autoreconf -i +./configure --prefix=$dir/run \ + --datadir=$dir/run/share/games \ + --bindir=$dir/run/bin \ + --mandir=$dir/run/share/man + +make -j5 2>build/make.log + diff --git a/build/toolchain.cmake b/build/toolchain.cmake new file mode 100644 index 000000000..c8493c0c5 --- /dev/null +++ b/build/toolchain.cmake @@ -0,0 +1,33 @@ +# the name of the target operating system +SET(CMAKE_SYSTEM_NAME Windows) + +# toolchain prefix, can be overridden by -DTOOLCHAIN=... +# IF (NOT TOOLCHAIN) +SET(TOOLCHAIN "i586-mingw32msvc-") +# ENDIF() + +# which compilers to use for C and C++ +SET(CMAKE_C_COMPILER ${TOOLCHAIN}gcc) +SET(CMAKE_CXX_COMPILER ${TOOLCHAIN}g++) +SET(CMAKE_RC_COMPILER ${TOOLCHAIN}windres) + +SET(CMAKE_INSTALL_PREFIX ./win) +SET(CMAKE_BUILD_TYPE RelWithDebInfo) + +SET(SDLIMAGE_INCLUDE_DIR ../mana_win/libs/include/SDL) +SET(SDLMIXER_INCLUDE_DIR ../mana_win/libs/include/SDL) +SET(SDLNET_INCLUDE_DIR ../mana_win/libs/include/SDL) +SET(SDLTTF_INCLUDE_DIR ../mana_win/libs/include/SDL) +SET(SDL_INCLUDE_DIR ../mana_win/libs/include/SDL) +SET(ENABLE_MANASERV OFF) + +# here is the target environment located +SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc /../mana_win/libs ) + +# adjust the default behaviour of the FIND_XXX() commands: +# search headers and libraries in the target environment, search +# programs in the host environment +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + diff --git a/build/toolchain.nightly b/build/toolchain.nightly new file mode 100644 index 000000000..6093a82f8 --- /dev/null +++ b/build/toolchain.nightly @@ -0,0 +1,33 @@ +# the name of the target operating system +SET(CMAKE_SYSTEM_NAME Windows) + +# toolchain prefix, can be overridden by -DTOOLCHAIN=... +# IF (NOT TOOLCHAIN) +SET(TOOLCHAIN "i586-mingw32msvc-") +# ENDIF() + +# which compilers to use for C and C++ +SET(CMAKE_C_COMPILER ${TOOLCHAIN}gcc) +SET(CMAKE_CXX_COMPILER ${TOOLCHAIN}g++) +SET(CMAKE_RC_COMPILER ${TOOLCHAIN}windres) + +SET(CMAKE_INSTALL_PREFIX ./win) +SET(CMAKE_BUILD_TYPE Release) + +SET(SDLIMAGE_INCLUDE_DIR ./packaging/windows/libs/include/SDL) +SET(SDLMIXER_INCLUDE_DIR ./packaging/windows/libs/include/SDL) +SET(SDLNET_INCLUDE_DIR ./packaging/windows/libs/include/SDL) +SET(SDLTTF_INCLUDE_DIR ./packaging/windows/libs/include/SDL) +SET(SDL_INCLUDE_DIR ./packaging/windows/libs/include/SDL) +SET(ENABLE_MANASERV OFF) + +# here is the target environment located +SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc ./packaging/windows/ ) + +# adjust the default behaviour of the FIND_XXX() commands: +# search headers and libraries in the target environment, search +# programs in the host environment +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + diff --git a/build/update-creator.sh b/build/update-creator.sh new file mode 100755 index 000000000..f3fc9e28c --- /dev/null +++ b/build/update-creator.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +cd .. + +find -name \*.cpp \ + -o -name \*.h \ + -o -name \*.am \ + -o -name \*.txt \ + -o -name \*.xml \ + -o -name \*.manaplus \ + | sort > manaplus.files diff --git a/clmake b/clmake deleted file mode 100755 index eec44c58f..000000000 --- a/clmake +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - - -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>make2.log - diff --git a/fink.sh b/fink.sh deleted file mode 100755 index 8c78dd724..000000000 --- a/fink.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -FINKDIR=/sw -GCCVER=4.0 - -. ${FINKDIR}/bin/init.sh -export CC=gcc-${GCCVER} -export CXX=g++-${GCCVER} -export CPP=cpp-${GCCVER} -export CXXCPP=cpp-${GCCVER} -export CPPFLAGS="-I/sw/include" -export LDFLAGS="-framework OpenGL" -dir=`pwd`/run -#dir=${FINKDIR} - -autoreconf -i 2>fink1.log - -# with prefix -#./configure --enable-applebuild=yes \ -#--prefix=${dir} \ -#--datadir=${dir}/share/games \ -#--bindir=${dir}/bin \ -#--mandir=${dir}/share/man 2>fink2.log 1>fink2_ok.log - -# without prefix -./configure --enable-applebuild=yes \ ---datarootdir=${dir}/share/games \ ---bindir=${dir}/bin \ ---sbindir=${dir}/bin \ ---mandir=${dir}/share/man 2>fink2.log - -# simple -#./configure --enable-applebuild=yes 2>fink2.log 1>fink2_ok.log -make 2>fink3.log diff --git a/makecheck1 b/makecheck1 deleted file mode 100755 index 790316bf2..000000000 --- a/makecheck1 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v . 1>makecheck.txt 2>makecheck_err.txt diff --git a/makecheck2 b/makecheck2 deleted file mode 100755 index 566b60005..000000000 --- a/makecheck2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ./src >make_nsiqcppstyle.txt diff --git a/makecheck3 b/makecheck3 deleted file mode 100755 index e7ddc5f7f..000000000 --- a/makecheck3 +++ /dev/null @@ -1,6 +0,0 @@ -#!/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>../makecheck.txt 2>../makecheck_err.txt diff --git a/makeflawfinder b/makeflawfinder deleted file mode 100755 index 13d7dde19..000000000 --- a/makeflawfinder +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -flawfinder ./src 1> makeflawfinder.log -rats ./src 1> makerats.log diff --git a/makegprof b/makegprof deleted file mode 100755 index b1ea32c7b..000000000 --- a/makegprof +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -mv run/gmon.out . -gprof run/bin/manaplus >gprof.txt -cat gprof.txt | gprof2dot.py >gprof.dot -cat gprof.dot | dot -Tpng -o gprof.png diff --git a/nightly/buildwindows.sh b/nightly/buildwindows.sh index ecd7a35f9..b55ea8134 100755 --- a/nightly/buildwindows.sh +++ b/nightly/buildwindows.sh @@ -4,13 +4,13 @@ dir=`pwd` cd .. export PATH=/usr/i586-mingw32msvc/bin:$PATH -CXXFLAGS="-Wall -g0 -O3" cmake -DCMAKE_TOOLCHAIN_FILE=./toolchain.nightly . +CXXFLAGS="-Wall -g0 -O3" cmake -DCMAKE_TOOLCHAIN_FILE=./build/toolchain.nightly . result=$? if [ "$result" != 0 ]; then exit $result fi -make -j5 2>make.log +make -j5 2>build/make.log result=$? if [ "$result" != 0 ]; then exit $result diff --git a/packwin b/packwin deleted file mode 100755 index 633f895b8..000000000 --- a/packwin +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -dir=`pwd` - -cd packaging/windows -./make-translations.sh -makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.10.2" \ - -DEXESUFFIX=/src \ - -DUPX=true \ - setup.nsi - diff --git a/pmake b/pmake deleted file mode 100755 index 6a523efe8..000000000 --- a/pmake +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -dir=`pwd` - -export CC=gcc-4.5 -export CXX=g++-4.5 - -#-D_GLIBCXX_PROFILE - -export LANG=C -export CXXFLAGS="-pg -fno-inline -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 -Wredundant-decls -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 -O0 -pipe \ --fno-default-inline -fno-inline" - -autoreconf -i -./configure --prefix=$dir/run \ - --datadir=$dir/run/share/games \ - --bindir=$dir/run/bin \ - --mandir=$dir/run/share/man - -make -j5 2>make.log - diff --git a/pmake46 b/pmake46 deleted file mode 100755 index 361825e86..000000000 --- a/pmake46 +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -dir=`pwd` - -export CC=gcc-4.6 -export CXX=g++-4.6 - -#-D_GLIBCXX_PROFILE - -export LANG=C -export CXXFLAGS="-pg -fno-inline -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 -Wredundant-decls -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" - -autoreconf -i -./configure --prefix=$dir/run \ - --datadir=$dir/run/share/games \ - --bindir=$dir/run/bin \ - --mandir=$dir/run/share/man - -make -j5 2>make.log - diff --git a/toolchain.cmake b/toolchain.cmake deleted file mode 100644 index c8493c0c5..000000000 --- a/toolchain.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# the name of the target operating system -SET(CMAKE_SYSTEM_NAME Windows) - -# toolchain prefix, can be overridden by -DTOOLCHAIN=... -# IF (NOT TOOLCHAIN) -SET(TOOLCHAIN "i586-mingw32msvc-") -# ENDIF() - -# which compilers to use for C and C++ -SET(CMAKE_C_COMPILER ${TOOLCHAIN}gcc) -SET(CMAKE_CXX_COMPILER ${TOOLCHAIN}g++) -SET(CMAKE_RC_COMPILER ${TOOLCHAIN}windres) - -SET(CMAKE_INSTALL_PREFIX ./win) -SET(CMAKE_BUILD_TYPE RelWithDebInfo) - -SET(SDLIMAGE_INCLUDE_DIR ../mana_win/libs/include/SDL) -SET(SDLMIXER_INCLUDE_DIR ../mana_win/libs/include/SDL) -SET(SDLNET_INCLUDE_DIR ../mana_win/libs/include/SDL) -SET(SDLTTF_INCLUDE_DIR ../mana_win/libs/include/SDL) -SET(SDL_INCLUDE_DIR ../mana_win/libs/include/SDL) -SET(ENABLE_MANASERV OFF) - -# here is the target environment located -SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc /../mana_win/libs ) - -# adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search -# programs in the host environment -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - diff --git a/toolchain.nightly b/toolchain.nightly deleted file mode 100644 index 6093a82f8..000000000 --- a/toolchain.nightly +++ /dev/null @@ -1,33 +0,0 @@ -# the name of the target operating system -SET(CMAKE_SYSTEM_NAME Windows) - -# toolchain prefix, can be overridden by -DTOOLCHAIN=... -# IF (NOT TOOLCHAIN) -SET(TOOLCHAIN "i586-mingw32msvc-") -# ENDIF() - -# which compilers to use for C and C++ -SET(CMAKE_C_COMPILER ${TOOLCHAIN}gcc) -SET(CMAKE_CXX_COMPILER ${TOOLCHAIN}g++) -SET(CMAKE_RC_COMPILER ${TOOLCHAIN}windres) - -SET(CMAKE_INSTALL_PREFIX ./win) -SET(CMAKE_BUILD_TYPE Release) - -SET(SDLIMAGE_INCLUDE_DIR ./packaging/windows/libs/include/SDL) -SET(SDLMIXER_INCLUDE_DIR ./packaging/windows/libs/include/SDL) -SET(SDLNET_INCLUDE_DIR ./packaging/windows/libs/include/SDL) -SET(SDLTTF_INCLUDE_DIR ./packaging/windows/libs/include/SDL) -SET(SDL_INCLUDE_DIR ./packaging/windows/libs/include/SDL) -SET(ENABLE_MANASERV OFF) - -# here is the target environment located -SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc ./packaging/windows/ ) - -# adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search -# programs in the host environment -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - diff --git a/update-creator.sh b/update-creator.sh deleted file mode 100755 index 781261f5d..000000000 --- a/update-creator.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -find -name \*.cpp \ - -o -name \*.h \ - -o -name \*.am \ - -o -name \*.txt \ - -o -name \*.xml \ - -o -name \*.manaplus \ - | sort > manaplus.files -- cgit v1.2.3-70-g09d2