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

Merge remote-tracking branch 'origin/develop'

This commit is contained in:
zhanghongtong 2019-06-25 04:17:20 +08:00
parent 411f8a0ec7 13d33985be
commit 7c3e5d765c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -12,7 +12,7 @@ CT_NODE_NAME = emqxct@127.0.0.1
RUN_NODE_NAME = emqxdebug@127.0.0.1 RUN_NODE_NAME = emqxdebug@127.0.0.1
.PHONY: run .PHONY: run
run: run_setup run: run_setup unlock
@rebar3 as test get-deps @rebar3 as test get-deps
@rebar3 as test auto --name $(RUN_NODE_NAME) --script test/run_emqx.escript @rebar3 as test auto --name $(RUN_NODE_NAME) --script test/run_emqx.escript
@ -31,7 +31,8 @@ run_setup:
lists:keyreplace(plugins, 1, Term, {plugins, NewPlugins}) \ lists:keyreplace(plugins, 1, Term, {plugins, NewPlugins}) \
end, \ end, \
ok = file:write_file(FilePath, [io_lib:format(\"~p.\n\", [I]) || I <- NewTerm]); \ ok = file:write_file(FilePath, [io_lib:format(\"~p.\n\", [I]) || I <- NewTerm]); \
_ -> \ _Enoent -> \
os:cmd(\"mkdir -p ~/.config/rebar3/ \"), \
NewTerm=[{plugins, [rebar3_auto]}], \ NewTerm=[{plugins, [rebar3_auto]}], \
ok = file:write_file(FilePath, [io_lib:format(\"~p.\n\", [I]) || I <- NewTerm]) \ ok = file:write_file(FilePath, [io_lib:format(\"~p.\n\", [I]) || I <- NewTerm]) \
end, \ end, \
@ -41,9 +42,12 @@ run_setup:
shell: shell:
@rebar3 as test auto @rebar3 as test auto
compile: compile: unlock
@rebar3 compile @rebar3 compile
unlock:
@rebar3 unlock
clean: distclean clean: distclean
## Cuttlefish escript is built by default when cuttlefish app (as dependency) was built ## Cuttlefish escript is built by default when cuttlefish app (as dependency) was built