Skip to content

Commit

Permalink
luarocks: used luarocks make to install development ENV. (#271)
Browse files Browse the repository at this point in the history
* luarocks: code style.
  • Loading branch information
membphis authored Jul 18, 2019
1 parent a0678ff commit a836156
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .travis/linux_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ do_install() {

export_or_prefix

sudo luarocks install --lua-dir=${OPENRESTY_PREFIX}luajit rockspec/apisix-dev-0.rockspec --tree=deps --only-deps --local
sudo luarocks make --lua-dir=${OPENRESTY_PREFIX}luajit rockspec/apisix-dev-0.rockspec --tree=deps --only-deps --local

git clone https://github.com/openresty/test-nginx.git test-nginx
}
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ help:
.PHONY: dev
dev:
ifeq ($(UNAME),Darwin)
luarocks install --lua-dir=$(LUA_JIT_DIR) rockspec/apisix-dev-0.rockspec --tree=deps --only-deps --local
luarocks make --lua-dir=$(LUA_JIT_DIR) rockspec/apisix-dev-0.rockspec --tree=deps --only-deps --local
else ifneq ($(LUAROCKS_VER),'luarocks 3.')
luarocks install rockspec/apisix-dev-0.rockspec --tree=deps --only-deps --local
luarocks make rockspec/apisix-dev-0.rockspec --tree=deps --only-deps --local
else
luarocks install --lua-dir=/usr/local/openresty/luajit rockspec/apisix-dev-0.rockspec --tree=deps --only-deps --local
luarocks make --lua-dir=/usr/local/openresty/luajit rockspec/apisix-dev-0.rockspec --tree=deps --only-deps --local
endif


Expand Down
30 changes: 15 additions & 15 deletions rockspec/apisix-0.5-0.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@ version = "0.5-0"
supported_platforms = {"linux", "macosx"}

source = {
url = "git://github.com/iresty/apisix",
tag = "v0.5",
url = "git://github.com/iresty/apisix",
tag = "v0.5",
}

description = {
summary = "APISIX is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
homepage = "https://github.com/iresty/apisix",
license = "Apache License 2.0",
maintainer = "Yuansheng Wang <membphis@gmail.com>"
summary = "APISIX is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
homepage = "https://github.com/iresty/apisix",
license = "Apache License 2.0",
maintainer = "Yuansheng Wang <membphis@gmail.com>"
}

dependencies = {
"lua-resty-libr3 = 0.6",
"lua-resty-template = 1.9-1",
"lua-resty-etcd = 0.5",
"lua-resty-balancer = 0.02rc5",
"lua-resty-ngxvar = 0.3",
"lua-resty-jit-uuid = 0.0.7",
"rapidjson = 0.6.0-1",
"lua-resty-libr3 = 0.6",
"lua-resty-template = 1.9-1",
"lua-resty-etcd = 0.5",
"lua-resty-balancer = 0.02rc5",
"lua-resty-ngxvar = 0.3",
"lua-resty-jit-uuid = 0.0.7",
"rapidjson = 0.6.0-1",
}

build = {
type = "make",
build_variables = {
type = "make",
build_variables = {
CFLAGS="$(CFLAGS)",
LIBFLAG="$(LIBFLAG)",
LUA_LIBDIR="$(LUA_LIBDIR)",
Expand Down
28 changes: 14 additions & 14 deletions rockspec/apisix-dev-0.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@ source = {
}

description = {
summary = "APISIX is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
homepage = "https://github.com/iresty/apisix",
license = "Apache License 2.0",
maintainer = "Yuansheng Wang <membphis@gmail.com>"
summary = "APISIX is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
homepage = "https://github.com/iresty/apisix",
license = "Apache License 2.0",
maintainer = "Yuansheng Wang <membphis@gmail.com>"
}

dependencies = {
"lua-resty-libr3 = 0.7",
"lua-resty-template = 1.9-1",
"lua-resty-etcd = 0.5",
"lua-resty-balancer = 0.02rc5",
"lua-resty-ngxvar = 0.3",
"lua-resty-jit-uuid = 0.0.7",
"rapidjson = 0.6.0-1",
"lua-resty-healthcheck-iresty = 1.0.0",
"lua-resty-libr3 = 0.7",
"lua-resty-template = 1.9-1",
"lua-resty-etcd = 0.5",
"lua-resty-balancer = 0.02rc5",
"lua-resty-ngxvar = 0.3",
"lua-resty-jit-uuid = 0.0.7",
"rapidjson = 0.6.0-1",
"lua-resty-healthcheck-iresty = 1.0.0",
}

build = {
type = "make",
build_variables = {
type = "make",
build_variables = {
CFLAGS="$(CFLAGS)",
LIBFLAG="$(LIBFLAG)",
LUA_LIBDIR="$(LUA_LIBDIR)",
Expand Down

0 comments on commit a836156

Please sign in to comment.