Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00
Code Releases Activity

Miscellaneous rebar3 fixes

Browse Source 
Correct Makefile clean targets

Fix a few more include() -> include_lib() for depedency includes

Use project_app_dirs to reference elixir app from rebar3 (lib_dirs is
no longer supported)
This commit is contained in:
Stu Tomlinson 2020-09-23 15:52:21 +01:00
parent 0fc1aea379
commit 714bc2d329
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -334,8 +334,8 @@ uninstall-all: uninstall-binary
rm -rf $(LOGDIR) rm -rf $(LOGDIR)
clean: clean:
rm -rf deps/.got rm -rf $(DEPSDIR)/.got
rm -rf deps/.built rm -rf $(DEPSDIR)/.built
rm -rf test/*.beam rm -rf test/*.beam
$(REBAR) clean $(REBAR) clean
@ -346,8 +346,8 @@ distclean: clean clean-rel
rm -f config.status rm -f config.status
rm -f config.log rm -f config.log
rm -rf autom4te.cache rm -rf autom4te.cache
rm -rf deps rm -rf $(EBINDIR)
rm -rf ebin rm -rf $(DEPSBASE)
rm -f Makefile rm -f Makefile
rm -f vars.config rm -f vars.config
rm -f src/ejabberd.app.src rm -f src/ejabberd.app.src

7
rebar.config
View File

@ -121,7 +121,7 @@
]}}. ]}}.
{if_rebar3, {if_var_true, elixir, {if_rebar3, {if_var_true, elixir,
{lib_dirs, ["_build/default/lib/elixir/lib"]}}}. {project_app_dirs, [".", "elixir/lib"]}}}.
{if_not_rebar3, {if_var_true, elixir, {if_not_rebar3, {if_var_true, elixir,
{lib_dirs, ["deps/elixir/lib"]}}}. {lib_dirs, ["deps/elixir/lib"]}}}.
{if_var_true, elixir, {if_var_true, elixir,
@ -149,10 +149,7 @@
{if_var_false, zlib, "(\"ezlib\":_/_)"}]}. {if_var_false, zlib, "(\"ezlib\":_/_)"}]}.
{eunit_compile_opts, [{i, "tools"}, {eunit_compile_opts, [{i, "tools"},
{i, "include"}, {i, "include"}]}.
{i, "deps/fast_xml/include"},
{i, "deps/p1_utils/include"},
{i, "deps/xmpp/include"}]}.
{cover_enabled, true}. {cover_enabled, true}.
{cover_export_enabled, true}. {cover_export_enabled, true}.

1
test/muc_tests.erl
View File

@ -31,7 +31,6 @@
disconnect/1, put_event/2, get_event/1, peer_muc_jid/1, disconnect/1, put_event/2, get_event/1, peer_muc_jid/1,
my_muc_jid/1, get_features/2, set_opt/3]). my_muc_jid/1, get_features/2, set_opt/3]).
-include("suite.hrl"). -include("suite.hrl").
-include("jid.hrl").
%%%=================================================================== %%%===================================================================
%%% API %%% API

5
test/suite.hrl
View File

@ -1,8 +1,9 @@
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").
-include_lib("fast_xml/include/fxml.hrl"). -include_lib("fast_xml/include/fxml.hrl").
-include("ns.hrl"). -include_lib("xmpp/include/jid.hrl").
-include_lib("xmpp/include/ns.hrl").
-include_lib("xmpp/include/xmpp_codec.hrl").
-include("mod_proxy65.hrl"). -include("mod_proxy65.hrl").
-include("xmpp_codec.hrl").
-define(STREAM_TRAILER, <<"</stream:stream>">>). -define(STREAM_TRAILER, <<"</stream:stream>">>).