This is an automated email from the ASF dual-hosted git repository. membphis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push: new 910ff21 change: use `make deps` to install dependencies. (#835) 910ff21 is described below commit 910ff21f540de617687c37c53874e0dc3a857cc3 Author: YuanSheng Wang <membp...@gmail.com> AuthorDate: Tue Nov 12 16:38:23 2019 +0800 change: use `make deps` to install dependencies. (#835) --- .travis/osx_openresty_runner.sh | 2 +- Makefile | 20 ++++++++------------ doc/dev-manual-cn.md | 6 +++--- doc/dev-manual.md | 6 +++--- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.travis/osx_openresty_runner.sh b/.travis/osx_openresty_runner.sh index 59fe862..8b91e62 100755 --- a/.travis/osx_openresty_runner.sh +++ b/.travis/osx_openresty_runner.sh @@ -38,7 +38,7 @@ before_install() { do_install() { export_or_prefix - make dev + make deps git clone https://github.com/iresty/test-nginx.git test-nginx git clone https://github.com/iresty/grpc_server_example.git grpc_server_example diff --git a/Makefile b/Makefile index e58f2e1..b5d1785 100644 --- a/Makefile +++ b/Makefile @@ -39,9 +39,9 @@ help: @grep -E '^### [-A-Za-z0-9_]+:' Makefile | sed 's/###/ /' -### dev: Create a development ENV -.PHONY: dev -dev: +### deps: Installation dependencies +.PHONY: deps +deps: ifeq ($(UNAME),Darwin) luarocks install --lua-dir=$(LUA_JIT_DIR) rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local else ifneq ($(LUAROCKS_VER),'luarocks 3.') @@ -49,6 +49,11 @@ else ifneq ($(LUAROCKS_VER),'luarocks 3.') else luarocks install --lua-dir=/usr/local/openresty/luajit rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local endif + + +### utils: Installation tools +.PHONY: utils +utils: ifeq ($(lj-releng-exist), not_exist) wget -O utils/lj-releng https://raw.githubusercontent.com/iresty/openresty-devel-utils/iresty/lj-releng chmod a+x utils/lj-releng @@ -118,15 +123,6 @@ endif ### install: Install the apisix .PHONY: install install: -ifneq ($(WITHOUT_DASHBOARD),1) - $(INSTALL) -d /usr/local/apisix/dashboard - cd `mktemp -d /tmp/apisix.XXXXXX` && \ - git clone https://github.com/apache/incubator-apisix.git apisix --recursive && \ - cd apisix && \ - cp -r dashboard/* /usr/local/apisix/dashboard - chmod -R 755 /usr/local/apisix/dashboard -endif - $(INSTALL) -d /usr/local/apisix/logs/ $(INSTALL) -d /usr/local/apisix/conf/cert $(INSTALL) conf/mime.types /usr/local/apisix/conf/mime.types diff --git a/doc/dev-manual-cn.md b/doc/dev-manual-cn.md index e5b628a..5675968 100644 --- a/doc/dev-manual-cn.md +++ b/doc/dev-manual-cn.md @@ -34,7 +34,7 @@ cd apisix git submodule update --init --recursive # install dependency -make dev +make deps ``` 如果一切顺利,你会在最后看到这样的信息: @@ -101,12 +101,12 @@ $ make help Makefile rules: help: Show Makefile rules. - dev: Create a development ENV + deps: Installation dependencies + utils: Installation utils check: Check Lua source code init: Initialize the runtime environment run: Start the apisix server stop: Stop the apisix server - restart: restart the apisix server clean: Remove generated files reload: Reload the apisix server install: Install the apisix diff --git a/doc/dev-manual.md b/doc/dev-manual.md index 8bef6f2..a423d9d 100644 --- a/doc/dev-manual.md +++ b/doc/dev-manual.md @@ -33,7 +33,7 @@ cd apisix git submodule update --init --recursive # install dependency -make dev +make deps ``` If all goes well, you will see this message at the end: @@ -101,12 +101,12 @@ $ make help Makefile rules: help: Show Makefile rules. - dev: Create a development ENV + deps: Installation dependencies + utils: Installation utils check: Check Lua source code init: Initialize the runtime environment run: Start the apisix server stop: Stop the apisix server - restart: restart the apisix server clean: Remove generated files reload: Reload the apisix server install: Install the apisix