From 252d8b8d884deee92effaff9721a999310348985 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@kn-bremen.de>
Date: Sat, 11 Jul 2015 23:25:09 +0200
Subject: [PATCH] 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