update Makefile for macosX installation about using luajit building deps #217
Conversation
|
|
|
I will add a macosx .travis soon to check this. |
Makefile
Outdated
| @@ -52,13 +54,13 @@ init: | |||
| run: | |||
| mkdir -p logs | |||
| mkdir -p /tmp/cores/ | |||
| $$(which openresty) -p $$PWD/ | |||
| $(OR_EXEC) -p $$PWD/ | |||
There was a problem hiding this comment.
we need to specified fully path for config file, eg: -c $$PWD/conf/nginx.conf.
There was a problem hiding this comment.
fixed already: 5fccb78
please rebase to master.
There was a problem hiding this comment.
yes, -c is needed under Mac OSX. I have add a travis for it, and all check passed. Let's merge it alright?
|
https://travis-ci.org/iresty/apisix/jobs/555975598 There are a lot of error logs on travis, please fix them at first. We must check the execution status of the command in travis. It is dangerous to hide the fault, which means we have no test system. |
utils/travis_runner.sh
Outdated
| } | ||
|
|
||
| do_install() { | ||
| if [ $TRAVIS_OS_NAME = osx ]; then |
There was a problem hiding this comment.
I think it's more convenient for different systems to use separate scripts.
how about: ***_mac.sh, ***_linux.sh ?
There was a problem hiding this comment.
if using like ***_mac.sh, ***_linux.sh things, the control logic about to using which one will need to write in .travis.yaml, I think it's so ugly.
There was a problem hiding this comment.
how about this way in travis: bash utils/travis_$TRAVIS_OS_NAME.sh
| @@ -4,6 +4,8 @@ INST_LUADIR ?= $(INST_PREFIX)/share/lua/5.1 | |||
| INST_BINDIR ?= /usr/bin | |||
| INSTALL ?= install | |||
| UNAME ?= $(shell uname) | |||
| OR_EXEC ?= $(shell which openresty) | |||
| LUA_JIT_DIR ?= $(shell TMP='./v_tmp' && $(OR_EXEC) -V &>$${TMP} && cat $${TMP} | grep prefix | grep -Eo 'prefix=(.*?)/nginx' | grep -Eo '/.*/' && rm $${TMP})luajit | |||
There was a problem hiding this comment.
'./v_tmp' -> '/tmp/v_tmp', how about this?
There was a problem hiding this comment.
it doesn't make any sense, the v_tmp file will been clean immediately at the end of this command.
utils/travis_runner.sh
Outdated
| script() { | ||
| export_or_prefix | ||
| export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH | ||
| if [ $TRAVIS_OS_NAME = osx ]; then |
There was a problem hiding this comment.
I prefer this style:
# mac os
if [ $TRAVIS_OS_NAME = osx ]; then
...
return
fi
# default linux
...
|
Code coverage check seems to have failed, but I can not sure for this. @moonming pls take a look at this.
|
No description provided.