test/apisix
1
0
Fork 0
mirror of https://gitee.com/iresty/apisix.git synced 2024-12-02 12:07:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

change: use make deps to install dependencies. (#835)

Browse Source
This commit is contained in:
YuanSheng Wang 2019-11-12 16:38:23 +08:00 committed by GitHub
parent bb2876627a
commit 910ff21f54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/osx_openresty_runner.sh
View File

@ -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

20
Makefile
View File

@ -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

6
doc/dev-manual-cn.md
View File

@ -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

6
doc/dev-manual.md
View File

@ -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