Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use luarocks

This commit is contained in:
Enno Rehling 2020-04-20 20:58:52 +02:00 committed by Enno Rehling
parent 17e5d6ab78
commit 614209492f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
s/build
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
ROOT=$(git rev-parse --show-toplevel) ROOT=$(git rev-parse --show-toplevel)
eval $(luarocks path)
[ -z "$BUILD" ] && BUILD=Debug [ -z "$BUILD" ] && BUILD=Debug
if [ -z "$JOBS" ] ; then if [ -z "$JOBS" ] ; then
if [ -e /usr/sbin/sysctl ]; then if [ -e /usr/sbin/sysctl ]; then

3
s/cmake-init
View File

@ -6,6 +6,7 @@ pkg-config --exists sqlite3 && ERESSEA_DB=sqlite
GETOPT=getopt GETOPT=getopt
GETOPT_LONG=1 GETOPT_LONG=1
luarocks install lunitx --local
if [ "Darwin" = "$(uname)" ] ; then if [ "Darwin" = "$(uname)" ] ; then
if [ -x "/usr/local/opt/gnu-getopt/bin/getopt" ] ; then if [ -x "/usr/local/opt/gnu-getopt/bin/getopt" ] ; then
GETOPT="/usr/local/opt/gnu-getopt/bin/getopt" GETOPT="/usr/local/opt/gnu-getopt/bin/getopt"
@ -74,8 +75,6 @@ fi
DEST=$(dirname $ROOT)/server DEST=$(dirname $ROOT)/server
git submodule update --init
LUA_VERSION="5.2" LUA_VERSION="5.2"
LUA_INCLUDE=/usr/include LUA_INCLUDE=/usr/include
LUA_DIR=/usr LUA_DIR=/usr