Comparison

GNUmakefile @ 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 11121:2d38242a08dd
comparison
equal deleted inserted replaced
11119:68df52bf08d5 11120:b2331f3dfeea
19 MKDIR=install -d 19 MKDIR=install -d
20 MKDIR_PRIVATE=$(MKDIR) -m750 20 MKDIR_PRIVATE=$(MKDIR) -m750
21 21
22 LUACHECK=luacheck 22 LUACHECK=luacheck
23 BUSTED=busted 23 BUSTED=busted
24 SCANSION=scansion
24 25
25 .PHONY: all test coverage clean install 26 .PHONY: all test coverage clean install
26 27
27 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version 28 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
28 $(MAKE) -C util-src install 29 $(MAKE) -C util-src install
46 $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket 47 $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
47 $(INSTALL_DATA) util/*.lua $(SOURCE)/util 48 $(INSTALL_DATA) util/*.lua $(SOURCE)/util
48 $(INSTALL_DATA) util/*.so $(SOURCE)/util 49 $(INSTALL_DATA) util/*.so $(SOURCE)/util
49 $(MKDIR) $(SOURCE)/util/sasl 50 $(MKDIR) $(SOURCE)/util/sasl
50 $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl 51 $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
51 $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam 52 $(MKDIR) $(SOURCE)/util/human
53 $(INSTALL_DATA) util/human/*.lua $(SOURCE)/util/human
54 $(MKDIR) $(SOURCE)/util/prosodyctl
55 $(INSTALL_DATA) util/prosodyctl/*.lua $(SOURCE)/util/prosodyctl
56 $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
52 $(INSTALL_DATA) plugins/*.lua $(MODULES) 57 $(INSTALL_DATA) plugins/*.lua $(MODULES)
53 $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
54 $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub 58 $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
55 $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc 59 $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
56 $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc 60 $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
57 $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam 61 $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
58 $(INSTALL_DATA) certs/* $(CONFIG)/certs 62 $(INSTALL_DATA) certs/* $(CONFIG)/certs
68 rm -f prosody.version 72 rm -f prosody.version
69 $(MAKE) clean -C util-src 73 $(MAKE) clean -C util-src
70 74
71 test: 75 test:
72 $(BUSTED) --lua=$(RUNWITH) 76 $(BUSTED) --lua=$(RUNWITH)
77
78 integration-test: all
79 $(MKDIR) data
80 $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua start
81 $(SCANSION) -d ./spec/scansion; R=$$? \
82 $(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua stop \
83 exit $$R
73 84
74 coverage: 85 coverage:
75 -rm -- luacov.* 86 -rm -- luacov.*
76 $(BUSTED) --lua=$(RUNWITH) -c 87 $(BUSTED) --lua=$(RUNWITH) -c
77 luacov 88 luacov