diff options
| author | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
| commit | bf6c2db68257e8ac3a35e2c4e7c18b55313a5bf7 (patch) | |
| tree | 3a37db7b805b1555d08cc61c7938cf512ff35ce0 /makefile | |
| parent | 2940b9c66f4a053dbe2ca038468a3a8791beccd5 (diff) | |
| parent | bd3bd2179be360f86c7db3fcd400dbb168fa8be5 (diff) | |
| download | prosody-bf6c2db68257e8ac3a35e2c4e7c18b55313a5bf7.tar.gz prosody-bf6c2db68257e8ac3a35e2c4e7c18b55313a5bf7.zip | |
Merge 0.11->trunk
Diffstat (limited to 'makefile')
| -rw-r--r-- | makefile | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -19,6 +19,9 @@ INSTALL_EXEC=$(INSTALL) -m755 MKDIR=install -d MKDIR_PRIVATE=$(MKDIR) -m750 +LUACHECK=luacheck +BUSTED=busted + .PHONY: all test clean install all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version @@ -45,9 +48,12 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin $(INSTALL_DATA) util/*.so $(SOURCE)/util $(MKDIR) $(SOURCE)/util/sasl $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl - $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam + $(MKDIR) $(SOURCE)/util/human + $(INSTALL_DATA) util/human/*.lua $(SOURCE)/util/human + $(MKDIR) $(SOURCE)/util/prosodyctl + $(INSTALL_DATA) util/prosodyctl/*.lua $(SOURCE)/util/prosodyctl + $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam $(INSTALL_DATA) plugins/*.lua $(MODULES) - $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc @@ -68,8 +74,13 @@ clean: rm -f prosody.version $(MAKE) clean -C util-src +lint: + $(LUACHECK) -q $$(HGPLAIN= hg files -I '**.lua') prosody prosodyctl + @echo $$(sed -n '/^\tlocal exclude_files/,/^}/p;' .luacheckrc | sed '1d;$d' | wc -l) files ignored + shellcheck configure + test: - busted --lua=$(RUNWITH) + $(BUSTED) --lua=$(RUNWITH) prosody.install: prosody |