Comparison

makefile @ 11120:b2331f3dfeea

Merge 0.11->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 30 Sep 2020 09:50:33 +0100
parent 10882:1999bb052d49
child 11750:a8760562a096
comparison
equal deleted inserted replaced
11119:68df52bf08d5 11120:b2331f3dfeea
16 INSTALL=install -p 16 INSTALL=install -p
17 INSTALL_DATA=$(INSTALL) -m644 17 INSTALL_DATA=$(INSTALL) -m644
18 INSTALL_EXEC=$(INSTALL) -m755 18 INSTALL_EXEC=$(INSTALL) -m755
19 MKDIR=install -d 19 MKDIR=install -d
20 MKDIR_PRIVATE=$(MKDIR) -m750 20 MKDIR_PRIVATE=$(MKDIR) -m750
21
22 LUACHECK=luacheck
23 BUSTED=busted
21 24
22 .PHONY: all test clean install 25 .PHONY: all test clean install
23 26
24 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version 27 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
25 $(MAKE) -C util-src install 28 $(MAKE) -C util-src install
43 $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket 46 $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
44 $(INSTALL_DATA) util/*.lua $(SOURCE)/util 47 $(INSTALL_DATA) util/*.lua $(SOURCE)/util
45 $(INSTALL_DATA) util/*.so $(SOURCE)/util 48 $(INSTALL_DATA) util/*.so $(SOURCE)/util
46 $(MKDIR) $(SOURCE)/util/sasl 49 $(MKDIR) $(SOURCE)/util/sasl
47 $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl 50 $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
48 $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam 51 $(MKDIR) $(SOURCE)/util/human
52 $(INSTALL_DATA) util/human/*.lua $(SOURCE)/util/human
53 $(MKDIR) $(SOURCE)/util/prosodyctl
54 $(INSTALL_DATA) util/prosodyctl/*.lua $(SOURCE)/util/prosodyctl
55 $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
49 $(INSTALL_DATA) plugins/*.lua $(MODULES) 56 $(INSTALL_DATA) plugins/*.lua $(MODULES)
50 $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
51 $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub 57 $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
52 $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc 58 $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
53 $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc 59 $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
54 $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam 60 $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
55 .if $(EXCERTS) == "yes" 61 .if $(EXCERTS) == "yes"
66 rm -f prosodyctl.install 72 rm -f prosodyctl.install
67 rm -f prosody.cfg.lua.install 73 rm -f prosody.cfg.lua.install
68 rm -f prosody.version 74 rm -f prosody.version
69 $(MAKE) clean -C util-src 75 $(MAKE) clean -C util-src
70 76
77 lint:
78 $(LUACHECK) -q $$(HGPLAIN= hg files -I '**.lua') prosody prosodyctl
79 @echo $$(sed -n '/^\tlocal exclude_files/,/^}/p;' .luacheckrc | sed '1d;$d' | wc -l) files ignored
80 shellcheck configure
81
71 test: 82 test:
72 busted --lua=$(RUNWITH) 83 $(BUSTED) --lua=$(RUNWITH)
73 84
74 85
75 prosody.install: prosody 86 prosody.install: prosody
76 sed "1s| lua$$| $(RUNWITH)|; \ 87 sed "1s| lua$$| $(RUNWITH)|; \
77 s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ 88 s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \