From 64b7335fd7d557dd269a74be95bbe375a096e335 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 4 Dec 2018 16:19:08 +0000 Subject: makefile: Add lint target (to match GNUMakefile) --- makefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'makefile') diff --git a/makefile b/makefile index d19ec24d..1b8e99b5 100644 --- a/makefile +++ b/makefile @@ -19,6 +19,8 @@ INSTALL_EXEC=$(INSTALL) -m755 MKDIR=install -d MKDIR_PRIVATE=$(MKDIR) -m750 +LUACHECK=luacheck + .PHONY: all test clean install all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version @@ -68,6 +70,11 @@ 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) -- cgit v1.2.3 From bd19b153479f2f54ce4357398091a8513afd8506 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 4 Dec 2018 16:19:58 +0000 Subject: makefile: Allow configuring path to busted (to match GNUMakefile) --- makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'makefile') diff --git a/makefile b/makefile index 1b8e99b5..0b1c8788 100644 --- a/makefile +++ b/makefile @@ -20,6 +20,7 @@ MKDIR=install -d MKDIR_PRIVATE=$(MKDIR) -m750 LUACHECK=luacheck +BUSTED=busted .PHONY: all test clean install @@ -76,7 +77,7 @@ lint: shellcheck configure test: - busted --lua=$(RUNWITH) + $(BUSTED) --lua=$(RUNWITH) prosody.install: prosody -- cgit v1.2.3 From 0a200a4ce312d7953f7a5d124e7debcdd3cae82c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 3 Jun 2020 19:00:02 +0200 Subject: makefile: Remove installation of mod_s2s dir Already removed from the GNUmakeflie. --- makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 0b1c8788..18d24312 100644 --- a/makefile +++ b/makefile @@ -48,9 +48,8 @@ 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) $(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 -- cgit v1.2.3 From 5fc5fe64ee3bf260981a652f2abece5004899548 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 3 Jun 2020 19:01:46 +0200 Subject: GNUmakefile: Install util.human.* --- makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'makefile') diff --git a/makefile b/makefile index 18d24312..a0e13f25 100644 --- a/makefile +++ b/makefile @@ -48,6 +48,8 @@ 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) $(SOURCE)/util/human + $(INSTALL_DATA) util/human/*.lua $(SOURCE)/util/human $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam $(INSTALL_DATA) plugins/*.lua $(MODULES) $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub -- cgit v1.2.3 From 1deae0e925edc5b83e1ca509be2d72bc1d686130 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 3 Jun 2020 19:10:42 +0200 Subject: GNUmakefile: Install the new util/prosodyctl/* too (thanks pascal.pascher) --- makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'makefile') diff --git a/makefile b/makefile index a0e13f25..c0aabb81 100644 --- a/makefile +++ b/makefile @@ -50,6 +50,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl $(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_pubsub/*.lua $(MODULES)/mod_pubsub -- cgit v1.2.3