forked from github/server
use local copy of tolua if it isn't installed in the system
This commit is contained in:
parent
4c79962729
commit
90d428f67a
|
@ -1,34 +1,34 @@
|
||||||
[submodule "lunit"]
|
[submodule "lunit"]
|
||||||
path = lunit
|
path = lunit
|
||||||
url = git://github.com/badgerman/lunit.git
|
url = git://github.com/ennorehling/lunit.git
|
||||||
[submodule "crypto"]
|
[submodule "crypto"]
|
||||||
path = crypto
|
path = crypto
|
||||||
url = git://github.com/badgerman/crypto.git
|
url = git://github.com/ennorehling/crypto.git
|
||||||
[submodule "cmake"]
|
[submodule "cmake"]
|
||||||
path = cmake
|
path = cmake
|
||||||
url = git://github.com/badgerman/cmake.git
|
url = git://github.com/ennorehling/cmake.git
|
||||||
[submodule "quicklist"]
|
[submodule "quicklist"]
|
||||||
path = quicklist
|
path = quicklist
|
||||||
url = git://github.com/badgerman/quicklist.git
|
url = git://github.com/ennorehling/quicklist.git
|
||||||
[submodule "critbit"]
|
[submodule "critbit"]
|
||||||
path = critbit
|
path = critbit
|
||||||
url = git://github.com/badgerman/critbit.git
|
url = git://github.com/ennorehling/critbit.git
|
||||||
[submodule "dlmalloc"]
|
[submodule "dlmalloc"]
|
||||||
path = dlmalloc
|
path = dlmalloc
|
||||||
url = git://github.com/badgerman/dlmalloc.git
|
url = git://github.com/ennorehling/dlmalloc.git
|
||||||
[submodule "cutest"]
|
[submodule "cutest"]
|
||||||
path = cutest
|
path = cutest
|
||||||
url = git://github.com/badgerman/cutest.git
|
url = git://github.com/ennorehling/cutest.git
|
||||||
[submodule "iniparser"]
|
[submodule "iniparser"]
|
||||||
path = iniparser
|
path = iniparser
|
||||||
url = git://github.com/badgerman/iniparser.git
|
url = git://github.com/ennorehling/iniparser.git
|
||||||
[submodule "cJSON"]
|
[submodule "cJSON"]
|
||||||
path = cJSON
|
path = cJSON
|
||||||
url = git://github.com/badgerman/cJSON.git
|
url = git://github.com/ennorehling/cJSON.git
|
||||||
[submodule "storage"]
|
[submodule "storage"]
|
||||||
path = storage
|
path = storage
|
||||||
url = git://github.com/badgerman/storage.git
|
url = git://github.com/ennorehling/storage.git
|
||||||
branch = master
|
branch = master
|
||||||
[submodule "tolua"]
|
[submodule "tolua"]
|
||||||
path = tolua
|
path = tolua
|
||||||
url = git@github.com:ennorehling/tolua.git
|
url = git://github.com/ennorehling/tolua.git
|
||||||
|
|
2
cmake
2
cmake
|
@ -1 +1 @@
|
||||||
Subproject commit cd779ba36efb4045a040af170588a8dfe496d7b9
|
Subproject commit b0059eb8b0e3258c1350ad72a1c25ac95582ea2f
|
2
s/build
2
s/build
|
@ -30,7 +30,9 @@ if [ ! -d $ROOT/$BIN_DIR ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git submodule update
|
git submodule update
|
||||||
|
echo "build tolua"
|
||||||
cd $ROOT/tolua ; make
|
cd $ROOT/tolua ; make
|
||||||
|
echo "build eressea"
|
||||||
cd $ROOT/$BIN_DIR
|
cd $ROOT/$BIN_DIR
|
||||||
make $MAKEOPTS && make test
|
make $MAKEOPTS && make test
|
||||||
cd $OLDPWD
|
cd $OLDPWD
|
||||||
|
|
14
s/cmake-init
14
s/cmake-init
|
@ -1,4 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
ROOT=$(pwd)
|
ROOT=$(pwd)
|
||||||
while [ ! -d $ROOT/.git ]; do
|
while [ ! -d $ROOT/.git ]; do
|
||||||
ROOT=$(dirname $ROOT)
|
ROOT=$(dirname $ROOT)
|
||||||
|
@ -13,10 +14,9 @@ MACHINE=`uname -m`
|
||||||
[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc"
|
[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc"
|
||||||
[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc"
|
[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc"
|
||||||
[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc"
|
[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc"
|
||||||
BIN_DIR="build-$MACHINE-$CC-$BUILD"
|
BIN_DIR="$ROOT/build-$MACHINE-$CC-$BUILD"
|
||||||
mkdir -p $BIN_DIR
|
mkdir -p $BIN_DIR
|
||||||
ln -sf $BIN_DIR $BUILD
|
ln -sf $BIN_DIR $BUILD
|
||||||
cd $BIN_DIR
|
|
||||||
|
|
||||||
MACHINE=$(gcc -dumpmachine)
|
MACHINE=$(gcc -dumpmachine)
|
||||||
rm -f CMakeCache.txt
|
rm -f CMakeCache.txt
|
||||||
|
@ -33,8 +33,16 @@ if [ -d $HOME/usr ]; then
|
||||||
PREFIX_PATH=$HOME/usr:$HOME/usr/local:$PREFIX_PATH
|
PREFIX_PATH=$HOME/usr:$HOME/usr/local:$PREFIX_PATH
|
||||||
fi
|
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 .. \
|
cmake .. \
|
||||||
-DCMAKE_MODULE_PATH=$PWD/../cmake/Modules \
|
$ARGS \
|
||||||
|
-DCMAKE_MODULE_PATH=$ROOT/cmake/Modules \
|
||||||
-DCMAKE_BUILD_TYPE=$BUILD \
|
-DCMAKE_BUILD_TYPE=$BUILD \
|
||||||
-DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \
|
-DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \
|
||||||
-DCMAKE_INCLUDE_PATH=$INCLUDE_PATH \
|
-DCMAKE_INCLUDE_PATH=$INCLUDE_PATH \
|
||||||
|
|
2
tolua
2
tolua
|
@ -1 +1 @@
|
||||||
Subproject commit e046e5d05c3ef425b0f43203bae9a77486c74e55
|
Subproject commit 2406516829c6295a7a9add24b9f35d376e7e60ad
|
Loading…
Reference in New Issue