Skip to content

Luarocks dependencies moved to .rockspec file #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Luarocks dependencies moved to .rockspec file #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ OPM_LIBS = hamishforbes/lua-resty-iputils p0pr0ck5/lua-resty-cookie \
MAKE_LIBS = $(C_LIBS) decode
SO_LIBS = libac.so libinjection.so libhtmlentities.so libdecode.so
RULES = rules
ROCK_DEPS = "lrexlib-pcre 2.7.2-1" busted luafilesystem

LOCAL_LIB_DIR = lib/resty

Expand Down Expand Up @@ -56,11 +55,6 @@ clean-libs:
clean-opm-libs:
$(OPM) --install-dir=$(OPM_LIB_DIR) remove $(OPM_LIBS)

clean-rocks:
for ROCK in $(ROCK_DEPS); do \
$(LUAROCKS) remove $$ROCK; \
done

clean-test:
rm -rf t/servroot*

Expand Down Expand Up @@ -127,16 +121,11 @@ test-fast: all
install-check:
stat lib/*.so > /dev/null

install-deps: install-opm-libs install-rocks
install-deps: install-opm-libs

install-opm-libs:
$(OPM) --install-dir=$(OPM_LIB_DIR) get $(OPM_LIBS)

install-rocks:
for ROCK in $(ROCK_DEPS); do \
$(LUAROCKS) install $$ROCK; \
done

install-link: install-check
$(INSTALL_SOFT) $(PWD)/lib/resty/* $(LUA_LIB_DIR)/resty/
$(INSTALL_SOFT) $(PWD)/lib/*.so $(LUA_LIB_DIR)
Expand Down
5 changes: 4 additions & 1 deletion lua-resty-waf-0.11.1-1.rockspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ description = {
dependencies = {
"lua >= 5.1",
"luarocks-fetch-gitrec",
"lrexlib-pcre",
"busted",
"luafilesystem",
}
build = {
type = "make",
install_target = "install-hard",
install_target = "install",
}