yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove neotoma plugin, build cuttlefish script in sub-dir

This commit is contained in:
spring2maz 2018-10-27 14:07:47 +02:00
parent ae743ad1f0
commit 28c8f2dd5c
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -74,8 +74,10 @@ etc/gen.emqx.conf: bbmustache etc/emqx.conf
ok = file:write_file('etc/gen.emqx.conf', Targ), \
halt(0)."
app.config: cuttlefish etc/gen.emqx.conf
$(verbose) ./cuttlefish -l info -e etc/ -c etc/gen.emqx.conf -i priv/emqx.schema -d data/
CUTTLEFISH_SCRIPT = _build/default/lib/cuttlefish/cuttlefish
app.config: $(CUTTLEFISH_SCRIPT) etc/gen.emqx.conf
$(verbose) $(CUTTLEFISH_SCRIPT) -l info -e etc/ -c etc/gen.emqx.conf -i priv/emqx.schema -d data/
ct: app.config
@ -86,11 +88,8 @@ coveralls:
@rebar3 coveralls send
cuttlefish: rebar-deps
@if [ ! -f cuttlefish ]; then \
make -C _build/default/lib/cuttlefish; \
mv _build/default/lib/cuttlefish/cuttlefish ./cuttlefish; \
fi
$(CUTTLEFISH_SCRIPT): rebar-deps
@if [ ! -f cuttlefish ]; then make -C _build/default/lib/cuttlefish; fi
rebar-xref:
@rebar3 xref
@ -98,7 +97,7 @@ rebar-xref:
rebar-deps:
@rebar3 get-deps
rebar-eunit: cuttlefish
rebar-eunit: $(CUTTLEFISH_SCRIPT)
@rebar3 eunit
rebar-compile:

3
rebar.config
View File

@ -29,6 +29,5 @@
{cover_opts, [verbose]}.
{cover_export_enabled, true}.
%% rebar3_neotoma_plugin is needed to compile the .peg file for cuttlefish
{plugins, [coveralls, rebar3_neotoma_plugin]}.
{plugins, [coveralls]}.