Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Remove useless NO_EXT_LIB flag

Browse Source
This commit is contained in:
Christophe Romain 2016-11-18 12:25:01 +01:00
parent e69937d93a
commit 45e77ea483
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/jlib.hrl
View File

@ -19,11 +19,7 @@
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
-include("ns.hrl"). -include("ns.hrl").
-ifdef(NO_EXT_LIB).
-include("fxml.hrl"). -include("fxml.hrl").
-else.
-include_lib("fast_xml/include/fxml.hrl").
-endif.
-define(STANZA_ERROR(Code, Type, Condition), -define(STANZA_ERROR(Code, Type, Condition),
#xmlel{name = <<"error">>, #xmlel{name = <<"error">>,

4
include/xmpp.hrl
View File

@ -9,11 +9,7 @@
-include("ns.hrl"). -include("ns.hrl").
-include("jid.hrl"). -include("jid.hrl").
-include("xmpp_codec.hrl"). -include("xmpp_codec.hrl").
-ifdef(NO_EXT_LIB).
-include("fxml.hrl"). -include("fxml.hrl").
-else.
-include_lib("fast_xml/include/fxml.hrl").
-endif.
-type iq_type() :: get | set | result | error. -type iq_type() :: get | set | result | error.
-type message_type() :: chat | error | groupchat | headline | normal. -type message_type() :: chat | error | groupchat | headline | normal.

3
rebar.config
View File

@ -1,4 +1,4 @@
%%%------------------------------------------------------------------- %-------------------------------------------------------------------
%%% @author Evgeniy Khramtsov <ekhramtsov@process-one.net> %%% @author Evgeniy Khramtsov <ekhramtsov@process-one.net>
%%% @copyright (C) 2013-2016, Evgeniy Khramtsov %%% @copyright (C) 2013-2016, Evgeniy Khramtsov
%%% @doc %%% @doc
@ -65,6 +65,7 @@
{erl_first_files, ["src/ejabberd_config.erl", "src/gen_mod.erl"]}. {erl_first_files, ["src/ejabberd_config.erl", "src/gen_mod.erl"]}.
{erl_opts, [nowarn_deprecated_function, {erl_opts, [nowarn_deprecated_function,
{i, "include"}, {i, "deps/fast_xml/include"},
{if_var_false, debug, no_debug_info}, {if_var_false, debug, no_debug_info},
{if_var_true, debug, debug_info}, {if_var_true, debug, debug_info},
{if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}}, {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},

5
src/ext_mod.erl
View File

@ -520,11 +520,8 @@ compile(_Module, _Spec, DestDir) ->
filelib:ensure_dir(filename:join(Ebin, ".")), filelib:ensure_dir(filename:join(Ebin, ".")),
EjabBin = filename:dirname(code:which(ejabberd)), EjabBin = filename:dirname(code:which(ejabberd)),
EjabInc = filename:join(filename:dirname(EjabBin), "include"), EjabInc = filename:join(filename:dirname(EjabBin), "include"),
XmlHrl = filename:join(EjabInc, "fxml.hrl"),
ExtLib = [{d, 'NO_EXT_LIB'} || filelib:is_file(XmlHrl)],
Options = [{outdir, Ebin}, {i, "include"}, {i, EjabInc}, Options = [{outdir, Ebin}, {i, "include"}, {i, EjabInc},
verbose, report_errors, report_warnings] verbose, report_errors, report_warnings],
++ ExtLib,
[file:copy(App, Ebin) || App <- filelib:wildcard("src/*.app")], [file:copy(App, Ebin) || App <- filelib:wildcard("src/*.app")],
%% Compile erlang files %% Compile erlang files