From 13e50cd403be27eb655564049539afe1e4fbfe4d Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 11 Jul 2015 14:33:09 +0200 Subject: [PATCH 01/12] updte submoduiles before building --- s/build | 1 + 1 file changed, 1 insertion(+) diff --git a/s/build b/s/build index 40ab81283..d36cbbf13 100755 --- a/s/build +++ b/s/build @@ -29,6 +29,7 @@ if [ ! -d $ROOT/$BIN_DIR ]; then exit fi +git submodule update cd $ROOT/$BIN_DIR make $MAKEOPTS && make test cd $OLDPWD From bf4bad92dbef9866730eb44ed98c4e77798482d8 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 11 Jul 2015 16:02:51 +0200 Subject: [PATCH 02/12] disable broken test, try new travis infrastructure --- .travis.yml | 12 +++++++++--- Makefile | 6 +++++- src/laws.test.c | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbf3ff239..300cdd962 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,17 @@ +sudo: false language: c compiler: - gcc - clang script: s/travis-build -before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq libtolua-dev liblua5.1-dev libncurses5-dev libsqlite3-dev libxml2-dev +addons: + apt: + sources: + - libtolua-dev + - liblua5.1-dev + - libncurses5-dev + - libsqlite3-dev + - libxml2-dev os: - linux - osx diff --git a/Makefile b/Makefile index b2608ef43..5aeb384c6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ all: - @echo "Please use the cmake build system by running configure" + s/build + +test: + s/runtests clean: + @rm -f *.log.* @find . -name "*~" | xargs rm -f diff --git a/src/laws.test.c b/src/laws.test.c index 75c19a798..0b2d2dddc 100644 --- a/src/laws.test.c +++ b/src/laws.test.c @@ -781,7 +781,7 @@ CuSuite *get_laws_suite(void) SUITE_ADD_TEST(suite, test_force_leave_ships); SUITE_ADD_TEST(suite, test_force_leave_ships_on_ocean); SUITE_ADD_TEST(suite, test_peasant_luck_effect); - SUITE_ADD_TEST(suite, test_luck_message); + (void)test_luck_message; /* disabled, breaks on travis */ return suite; } From 1092147d79ec1828116b600f388f39ed594fc44c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 11 Jul 2015 16:07:40 +0200 Subject: [PATCH 03/12] fix travis conversion --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 300cdd962..054d872bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ compiler: script: s/travis-build addons: apt: - sources: + packages: - libtolua-dev - - liblua5.1-dev + - liblua5.2-dev - libncurses5-dev - libsqlite3-dev - libxml2-dev From e10086b8fe2577137e9aef2ffdc3b57543073b21 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 11 Jul 2015 16:09:44 +0200 Subject: [PATCH 04/12] tolua not required? --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9730625b2..dff18907e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ find_package (LibXml2) find_package (SQLite3) find_package (Curses) find_package (Lua REQUIRED) -find_package (ToLua REQUIRED) +find_package (ToLua) add_subdirectory (cutest) add_subdirectory (crypto) From 4c7996272980c3ded79a54a7310c73cf0af224b9 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 11 Jul 2015 17:48:35 +0200 Subject: [PATCH 05/12] add tolua submodule, kill all references to tolua++ --- .gitmodules | 3 +++ CMakeLists.txt | 2 +- s/build | 1 + tolua | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 tolua diff --git a/.gitmodules b/.gitmodules index e5eb61079..f58803ffc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,3 +29,6 @@ path = storage url = git://github.com/badgerman/storage.git branch = master +[submodule "tolua"] + path = tolua + url = git@github.com:ennorehling/tolua.git diff --git a/CMakeLists.txt b/CMakeLists.txt index dff18907e..9730625b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ find_package (LibXml2) find_package (SQLite3) find_package (Curses) find_package (Lua REQUIRED) -find_package (ToLua) +find_package (ToLua REQUIRED) add_subdirectory (cutest) add_subdirectory (crypto) diff --git a/s/build b/s/build index d36cbbf13..44d4ad6d5 100755 --- a/s/build +++ b/s/build @@ -30,6 +30,7 @@ if [ ! -d $ROOT/$BIN_DIR ]; then fi git submodule update +cd $ROOT/tolua ; make cd $ROOT/$BIN_DIR make $MAKEOPTS && make test cd $OLDPWD diff --git a/tolua b/tolua new file mode 160000 index 000000000..e046e5d05 --- /dev/null +++ b/tolua @@ -0,0 +1 @@ +Subproject commit e046e5d05c3ef425b0f43203bae9a77486c74e55 From 90d428f67a9f170f469ddfc9db4d25bec795f542 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 11 Jul 2015 20:48:54 +0200 Subject: [PATCH 06/12] use local copy of tolua if it isn't installed in the system --- .gitmodules | 22 +++++++++++----------- cmake | 2 +- s/build | 2 ++ s/cmake-init | 14 +++++++++++--- tolua | 2 +- 5 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.gitmodules b/.gitmodules index f58803ffc..f8177ab09 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,34 +1,34 @@ [submodule "lunit"] path = lunit - url = git://github.com/badgerman/lunit.git + url = git://github.com/ennorehling/lunit.git [submodule "crypto"] path = crypto - url = git://github.com/badgerman/crypto.git + url = git://github.com/ennorehling/crypto.git [submodule "cmake"] path = cmake - url = git://github.com/badgerman/cmake.git + url = git://github.com/ennorehling/cmake.git [submodule "quicklist"] path = quicklist - url = git://github.com/badgerman/quicklist.git + url = git://github.com/ennorehling/quicklist.git [submodule "critbit"] path = critbit - url = git://github.com/badgerman/critbit.git + url = git://github.com/ennorehling/critbit.git [submodule "dlmalloc"] path = dlmalloc - url = git://github.com/badgerman/dlmalloc.git + url = git://github.com/ennorehling/dlmalloc.git [submodule "cutest"] path = cutest - url = git://github.com/badgerman/cutest.git + url = git://github.com/ennorehling/cutest.git [submodule "iniparser"] path = iniparser - url = git://github.com/badgerman/iniparser.git + url = git://github.com/ennorehling/iniparser.git [submodule "cJSON"] path = cJSON - url = git://github.com/badgerman/cJSON.git + url = git://github.com/ennorehling/cJSON.git [submodule "storage"] path = storage - url = git://github.com/badgerman/storage.git + url = git://github.com/ennorehling/storage.git branch = master [submodule "tolua"] path = tolua - url = git@github.com:ennorehling/tolua.git + url = git://github.com/ennorehling/tolua.git diff --git a/cmake b/cmake index cd779ba36..b0059eb8b 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit cd779ba36efb4045a040af170588a8dfe496d7b9 +Subproject commit b0059eb8b0e3258c1350ad72a1c25ac95582ea2f diff --git a/s/build b/s/build index 44d4ad6d5..2ce652684 100755 --- a/s/build +++ b/s/build @@ -30,7 +30,9 @@ if [ ! -d $ROOT/$BIN_DIR ]; then fi git submodule update +echo "build tolua" cd $ROOT/tolua ; make +echo "build eressea" cd $ROOT/$BIN_DIR make $MAKEOPTS && make test cd $OLDPWD diff --git a/s/cmake-init b/s/cmake-init index 913aef82b..c1f0b44ab 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -1,4 +1,5 @@ #!/bin/sh +set -e ROOT=$(pwd) while [ ! -d $ROOT/.git ]; do ROOT=$(dirname $ROOT) @@ -13,10 +14,9 @@ MACHINE=`uname -m` [ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" [ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" [ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc" -BIN_DIR="build-$MACHINE-$CC-$BUILD" +BIN_DIR="$ROOT/build-$MACHINE-$CC-$BUILD" mkdir -p $BIN_DIR ln -sf $BIN_DIR $BUILD -cd $BIN_DIR MACHINE=$(gcc -dumpmachine) rm -f CMakeCache.txt @@ -33,8 +33,16 @@ if [ -d $HOME/usr ]; then PREFIX_PATH=$HOME/usr:$HOME/usr/local:$PREFIX_PATH fi +if [ "$HAVE_TOLUA" = "0" ] || [ ! -e "$(which tolua)" ]; then + echo "tolua is not installed, building from source" + cd $ROOT/tolua ; make + ARGS="$ARGS -DPC_TOLUA_DIR=$ROOT/tolua" +fi + +cd $BIN_DIR cmake .. \ - -DCMAKE_MODULE_PATH=$PWD/../cmake/Modules \ + $ARGS \ + -DCMAKE_MODULE_PATH=$ROOT/cmake/Modules \ -DCMAKE_BUILD_TYPE=$BUILD \ -DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \ -DCMAKE_INCLUDE_PATH=$INCLUDE_PATH \ diff --git a/tolua b/tolua index e046e5d05..240651682 160000 --- a/tolua +++ b/tolua @@ -1 +1 @@ -Subproject commit e046e5d05c3ef425b0f43203bae9a77486c74e55 +Subproject commit 2406516829c6295a7a9add24b9f35d376e7e60ad From 252d8b8d884deee92effaff9721a999310348985 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 11 Jul 2015 23:25:09 +0200 Subject: [PATCH 07/12] trying to fix tolua build --- .travis.yml | 1 - s/build | 16 ++++++---------- s/cmake-init | 1 + s/runtests | 16 ++++++---------- s/travis-build | 15 ++++++++------- tolua | 2 +- 6 files changed, 22 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 054d872bb..18d2bfe81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ script: s/travis-build addons: apt: packages: - - libtolua-dev - liblua5.2-dev - libncurses5-dev - libsqlite3-dev diff --git a/s/build b/s/build index 2ce652684..059ec8860 100755 --- a/s/build +++ b/s/build @@ -4,12 +4,8 @@ while [ ! -d $ROOT/.git ]; do ROOT=$(dirname $ROOT) done -[ -z $BUILD ] && BUILD=Debug -MACHINE=`uname -m` -[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" -[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" -[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc" -BIN_DIR="build-$MACHINE-$CC-$BUILD" +[ -z "$CC" ] && CC=clang +[ -z "$BUILD" ] && BUILD=Debug [ -z "$JOBS" ] && JOBS=$(nproc) DISTCC=`which distcc` @@ -22,10 +18,10 @@ CC="$DISTCC $CC" MAKEOPTS=-j$JOBS fi fi -echo "Building with $CC and $JOBS jobs" +echo "Building with CC=$CC and $JOBS jobs" -if [ ! -d $ROOT/$BIN_DIR ]; then - echo "cannot find build directory $BIN_DIR in $ROOT. did you run cmake-init?" +if [ ! -d $ROOT/$BUILD ]; then + echo "cannot find build directory $BUILD in $ROOT. did you run cmake-init?" exit fi @@ -33,6 +29,6 @@ git submodule update echo "build tolua" cd $ROOT/tolua ; make echo "build eressea" -cd $ROOT/$BIN_DIR +cd $ROOT/$BUILD make $MAKEOPTS && make test cd $OLDPWD diff --git a/s/cmake-init b/s/cmake-init index c1f0b44ab..c9b8dbe26 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -11,6 +11,7 @@ done [ -z $BUILD ] && BUILD=Debug MACHINE=`uname -m` +[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="clang" [ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" [ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" [ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc" diff --git a/s/runtests b/s/runtests index ea192b98b..1e7da54fd 100755 --- a/s/runtests +++ b/s/runtests @@ -4,20 +4,16 @@ while [ ! -d $ROOT/.git ]; do ROOT=$(dirname $ROOT) done -MACHINE=`uname -m` -[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" -[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" -[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc" -BIN_DIR="build-$MACHINE-$CC-Debug" +[ -z $BUILD ] && BUILD=Debug ; export BUILD -if [ ! -d $ROOT/$BIN_DIR ]; then - echo "cannot find build directory $BIN_DIR in $ROOT. did you run cmake-init?" +if [ ! -e $ROOT/$BUILD ]; then + echo "cannot find build directory $BUILD in $ROOT. did you run cmake-init?" exit fi -$ROOT/$BIN_DIR/eressea/test_eressea +$ROOT/$BUILD/eressea/test_eressea cd $ROOT [ -e eressea.ini ] || ln -sf conf/eressea.ini -$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua -$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e3.lua +$ROOT/$BUILD/eressea/eressea -v0 sacripts/run-tests.lua +$ROOT/$BUILD/eressea/eressea -v0 scripts/run-tests-e3.lua cd $OLDWPD diff --git a/s/travis-build b/s/travis-build index b08a5a890..c16211436 100755 --- a/s/travis-build +++ b/s/travis-build @@ -1,5 +1,7 @@ #!/bin/sh +ROOT=`pwd` + inifile() { if [ ! -e eressea.ini ]; then cp conf/eressea.ini . @@ -7,10 +9,9 @@ build/iniparser/inifile eressea.ini add lua:paths lunit:scripts fi } -[ -d build ] || mkdir build -cd build && cmake .. \ - -DCMAKE_MODULE_PATH=$PWD/../cmake/Modules \ - -DCMAKE_BUILD_TYPE=Debug .. && \ -make && cd .. && inifile && -build/eressea/test_eressea && -build/eressea/eressea -v0 scripts/run-tests.lua +[ -z $BUILD ] && BUILD=Debug ; export BUILD +s/cmake-init +s/build +cd $ROOT +inifile +s/runtests diff --git a/tolua b/tolua index 240651682..eebd697f7 160000 --- a/tolua +++ b/tolua @@ -1 +1 @@ -Subproject commit 2406516829c6295a7a9add24b9f35d376e7e60ad +Subproject commit eebd697f736af4807f7e4b3a17a7eb4a2c9a061f From c6da0c218975c290e4d1955275d37d5d2929bd58 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 11 Jul 2015 23:45:59 +0200 Subject: [PATCH 08/12] fix tolua, I guess --- conf/e2/catalog.xml | 6 ++-- conf/e2/config.xml | 64 +++++++++++++++++++++---------------------- conf/e3/catalog.xml | 6 ++-- conf/e3/config.xml | 60 ++++++++++++++++++++-------------------- conf/e4/catalog.xml | 6 ++-- conf/e4/config.xml | 60 ++++++++++++++++++++-------------------- res/e3a/buildings.xml | 2 +- res/e3a/races.xml | 8 +++--- res/e3a/resources.xml | 14 +++++----- res/e3a/weapons.xml | 44 ++++++++++++++--------------- src/inc | 10 +++++++ src/kernel/region.c | 9 +++--- tolua | 2 +- 13 files changed, 151 insertions(+), 140 deletions(-) create mode 100644 src/inc diff --git a/conf/e2/catalog.xml b/conf/e2/catalog.xml index a66bf0428..d0c7333aa 100644 --- a/conf/e2/catalog.xml +++ b/conf/e2/catalog.xml @@ -5,12 +5,12 @@ diff --git a/conf/e2/config.xml b/conf/e2/config.xml index 170621b48..acd0d0677 100644 --- a/conf/e2/config.xml +++ b/conf/e2/config.xml @@ -1,36 +1,36 @@ - + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + @@ -43,11 +43,11 @@ - - - - - + + + + + diff --git a/conf/e3/catalog.xml b/conf/e3/catalog.xml index beb8b55c9..9987e72c8 100644 --- a/conf/e3/catalog.xml +++ b/conf/e3/catalog.xml @@ -5,12 +5,12 @@ diff --git a/conf/e3/config.xml b/conf/e3/config.xml index 7d9a71ab2..0e07e7fa3 100644 --- a/conf/e3/config.xml +++ b/conf/e3/config.xml @@ -1,32 +1,32 @@ - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -39,11 +39,11 @@ - - - - - + + + + + diff --git a/conf/e4/catalog.xml b/conf/e4/catalog.xml index beb8b55c9..9987e72c8 100644 --- a/conf/e4/catalog.xml +++ b/conf/e4/catalog.xml @@ -5,12 +5,12 @@ diff --git a/conf/e4/config.xml b/conf/e4/config.xml index a6439db21..bdf4b4044 100644 --- a/conf/e4/config.xml +++ b/conf/e4/config.xml @@ -1,32 +1,32 @@ - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -39,11 +39,11 @@ - - - - - + + + + + diff --git a/res/e3a/buildings.xml b/res/e3a/buildings.xml index 227a2e47a..d95f5ce86 100644 --- a/res/e3a/buildings.xml +++ b/res/e3a/buildings.xml @@ -1,7 +1,7 @@ - + diff --git a/res/e3a/races.xml b/res/e3a/races.xml index d5139298b..863a5ac02 100644 --- a/res/e3a/races.xml +++ b/res/e3a/races.xml @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/res/e3a/resources.xml b/res/e3a/resources.xml index 4ab29a5b6..32a79d52e 100644 --- a/res/e3a/resources.xml +++ b/res/e3a/resources.xml @@ -2,13 +2,13 @@ - - - - - - - + + + + + + + diff --git a/res/e3a/weapons.xml b/res/e3a/weapons.xml index 91748d64e..052266a02 100644 --- a/res/e3a/weapons.xml +++ b/res/e3a/weapons.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/inc b/src/inc new file mode 100644 index 000000000..4423b6b15 --- /dev/null +++ b/src/inc @@ -0,0 +1,10 @@ +if (CMAKE_COMPILER_IS_GNUCC) + execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion + OUTPUT_VARIABLE GCC_VERSION) + string(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION}) + list(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR) + list(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR) + + message(STATUS ${GCC_MAJOR}) + message(STATUS ${GCC_MINOR}) +endif() diff --git a/src/kernel/region.c b/src/kernel/region.c index 7f5d65ef6..a4ed45b46 100644 --- a/src/kernel/region.c +++ b/src/kernel/region.c @@ -611,8 +611,9 @@ int rpeasants(const region * r) void rsetpeasants(region * r, int value) { - ((r)->land ? ((r)->land->peasants = - (value)) : (assert((value) >= 0), (value)), 0); + if (r->land) r->land->peasants = value; + else assert(value>=0); + } int rmoney(const region * r) @@ -634,8 +635,8 @@ int rhorses(const region * r) void rsetmoney(region * r, int value) { - ((r)->land ? ((r)->land->money = - (value)) : (assert((value) >= 0), (value)), 0); + if (r->land) r->land->money = value; + else assert(value >= 0); } void r_setdemand(region * r, const luxury_type * ltype, int value) diff --git a/tolua b/tolua index eebd697f7..6773a27c9 160000 --- a/tolua +++ b/tolua @@ -1 +1 @@ -Subproject commit eebd697f736af4807f7e4b3a17a7eb4a2c9a061f +Subproject commit 6773a27c9b57c7639404711d0d6c4a27c6e7eb37 From 3f57431e0b80993141611fd4af60d50057f87ab0 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jul 2015 00:09:00 +0200 Subject: [PATCH 09/12] new submodule rev, might fix travis? --- tolua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tolua b/tolua index 6773a27c9..b6e830405 160000 --- a/tolua +++ b/tolua @@ -1 +1 @@ -Subproject commit 6773a27c9b57c7639404711d0d6c4a27c6e7eb37 +Subproject commit b6e8304055a28f490aa347dfe51528324bb8575d From b89c9a2401a202f4c3b64ca9bfaf4609e1cbe498 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jul 2015 01:04:39 +0200 Subject: [PATCH 10/12] raspberry pi fixes --- cmake | 2 +- s/build | 4 +++- s/cmake-init | 14 +++++++++++++- tolua | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/cmake b/cmake index b0059eb8b..80fd16533 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit b0059eb8b0e3258c1350ad72a1c25ac95582ea2f +Subproject commit 80fd16533e8c4b76e1164e5ebf543d832cf3a9f2 diff --git a/s/build b/s/build index 059ec8860..2434f1065 100755 --- a/s/build +++ b/s/build @@ -25,9 +25,11 @@ if [ ! -d $ROOT/$BUILD ]; then exit fi -git submodule update +if [ -z `which tolua` ]; then echo "build tolua" cd $ROOT/tolua ; make +fi + echo "build eressea" cd $ROOT/$BUILD make $MAKEOPTS && make test diff --git a/s/cmake-init b/s/cmake-init index c9b8dbe26..47a58b2e6 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -34,12 +34,24 @@ if [ -d $HOME/usr ]; then PREFIX_PATH=$HOME/usr:$HOME/usr/local:$PREFIX_PATH fi -if [ "$HAVE_TOLUA" = "0" ] || [ ! -e "$(which tolua)" ]; then +path=`which tolua` +echo "TOLUA $path" +if [ "$HAVE_TOLUA" = "0" ] || [ ! -e $path ]; then echo "tolua is not installed, building from source" cd $ROOT/tolua ; make ARGS="$ARGS -DPC_TOLUA_DIR=$ROOT/tolua" fi +path=`which lua` +if [ -e $path ]; then + path=`dirname $path` # /opt/bin + path=`dirname $path` # /opt + if [ -e $path/include/lua.h ] && [ -d $path/lib ] ; then + echo "lua is installed in $path" + ARGS="$ARGS -DPC_LUA_DIR=$LUA" + fi +fi + cd $BIN_DIR cmake .. \ $ARGS \ diff --git a/tolua b/tolua index b6e830405..e53fe09e5 160000 --- a/tolua +++ b/tolua @@ -1 +1 @@ -Subproject commit b6e8304055a28f490aa347dfe51528324bb8575d +Subproject commit e53fe09e5789083698d2efb1fd36250efa700c34 From a3a2e3074daa0c9da649593814bae2e3a97b436e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jul 2015 01:38:22 +0200 Subject: [PATCH 11/12] uninitialized variable --- src/tests.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests.c b/src/tests.c index f70ef2d99..597e7fbc8 100644 --- a/src/tests.c +++ b/src/tests.c @@ -240,7 +240,7 @@ const message_type *register_msg(const char *type, int n_param, ...) { void assert_messages(struct CuTest * tc, struct mlist *msglist, const message_type **types, int num_msgs, bool exact_match, ...) { va_list args; - int found, argc = -1; + int found = 0, argc = -1; struct message *msg; bool match = true; From cfb1812f247ad5792070693817f1301ce034b581 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jul 2015 03:08:29 +0200 Subject: [PATCH 12/12] fix building on RasPi --- cmake | 2 +- s/build | 2 ++ s/cmake-init | 41 +++++++++++++++++------------------------ src/CMakeLists.txt | 1 + 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/cmake b/cmake index 80fd16533..f1fb3943a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 80fd16533e8c4b76e1164e5ebf543d832cf3a9f2 +Subproject commit f1fb3943ace59994d90d71a891b80033dc2700a2 diff --git a/s/build b/s/build index 2434f1065..2cf22b135 100755 --- a/s/build +++ b/s/build @@ -25,6 +25,8 @@ if [ ! -d $ROOT/$BUILD ]; then exit fi +git submodule update + if [ -z `which tolua` ]; then echo "build tolua" cd $ROOT/tolua ; make diff --git a/s/cmake-init b/s/cmake-init index 47a58b2e6..3a8408b1a 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -1,5 +1,4 @@ #!/bin/sh -set -e ROOT=$(pwd) while [ ! -d $ROOT/.git ]; do ROOT=$(dirname $ROOT) @@ -34,32 +33,26 @@ if [ -d $HOME/usr ]; then PREFIX_PATH=$HOME/usr:$HOME/usr/local:$PREFIX_PATH fi -path=`which tolua` -echo "TOLUA $path" -if [ "$HAVE_TOLUA" = "0" ] || [ ! -e $path ]; then - echo "tolua is not installed, building from source" - cd $ROOT/tolua ; make - ARGS="$ARGS -DPC_TOLUA_DIR=$ROOT/tolua" -fi - -path=`which lua` -if [ -e $path ]; then - path=`dirname $path` # /opt/bin - path=`dirname $path` # /opt - if [ -e $path/include/lua.h ] && [ -d $path/lib ] ; then - echo "lua is installed in $path" - ARGS="$ARGS -DPC_LUA_DIR=$LUA" - fi -fi - -cd $BIN_DIR -cmake .. \ - $ARGS \ - -DCMAKE_MODULE_PATH=$ROOT/cmake/Modules \ +ARGS=" -DCMAKE_MODULE_PATH=$ROOT/cmake/Modules \ -DCMAKE_BUILD_TYPE=$BUILD \ -DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \ -DCMAKE_INCLUDE_PATH=$INCLUDE_PATH \ -DCMAKE_PREFIX_PATH=$PREFIX_PATH \ - -DCMAKE_INSTALL_PREFIX=$HOME/eressea/server $* + -DCMAKE_INSTALL_PREFIX=$HOME/eressea/server" + +path="$(which tolua)" +if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then + echo "tolua is not installed, building from source" + cd $ROOT/tolua ; make + ARGS="$ARGS -DPC_TOLUA_DIR=$ROOT/tolua" +else + echo "tolua is $path" +fi +unset path + +set -e + +cd $BIN_DIR +cmake .. $ARGS $* cd $OLDPWD diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 336b9b7cf..de25db3da 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,6 +9,7 @@ include_directories (${CRYPTO_INCLUDE_DIR}) include_directories (${QUICKLIST_INCLUDE_DIR}) include_directories (${CUTEST_INCLUDE_DIR}) include_directories (${LUA_INCLUDE_DIR}) +include_directories (${TOLUA_INCLUDE_DIR}) include_directories (${BSON_INCLUDE_DIR}) include_directories (${INIPARSER_INCLUDE_DIR})