Use -include_lib instead of -include for esip and p1_xml
-include_lib is used in order to find deps. Rebar include magic is not required anymore. Rebar uses deps as library directory.
This commit is contained in:
parent
76ebebf2a0
commit
50a73d1188
|
@ -19,7 +19,7 @@
|
||||||
%%%----------------------------------------------------------------------
|
%%%----------------------------------------------------------------------
|
||||||
|
|
||||||
-include("ns.hrl").
|
-include("ns.hrl").
|
||||||
-include("xml.hrl").
|
-include_lib("p1_xml/include/xml.hrl").
|
||||||
|
|
||||||
-define(STANZA_ERROR(Code, Type, Condition),
|
-define(STANZA_ERROR(Code, Type, Condition),
|
||||||
#xmlel{name = <<"error">>,
|
#xmlel{name = <<"error">>,
|
||||||
|
|
|
@ -42,11 +42,6 @@ HiPE = case lists:keysearch(hipe, 1, Cfg) of
|
||||||
[]
|
[]
|
||||||
end,
|
end,
|
||||||
|
|
||||||
Includes = [{i, "include"},
|
|
||||||
{i, filename:join(["deps", "esip", "include"])},
|
|
||||||
{i, filename:join(["deps", "p1_stun", "include"])},
|
|
||||||
{i, filename:join(["deps", "p1_xml", "include"])}],
|
|
||||||
|
|
||||||
SrcDirs = lists:foldl(
|
SrcDirs = lists:foldl(
|
||||||
fun({tools, true}, Acc) ->
|
fun({tools, true}, Acc) ->
|
||||||
[tools|Acc];
|
[tools|Acc];
|
||||||
|
@ -121,13 +116,12 @@ CfgPostHooks = lists:flatmap(
|
||||||
|
|
||||||
{ok, Cwd} = file:get_cwd(),
|
{ok, Cwd} = file:get_cwd(),
|
||||||
|
|
||||||
Config = [{erl_opts, Includes ++ Macros ++ HiPE ++ DebugInfo ++
|
Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++
|
||||||
[{src_dirs, [asn1, src | SrcDirs]}]},
|
[{src_dirs, [asn1, src | SrcDirs]}]},
|
||||||
{sub_dirs, ["rel"]},
|
{sub_dirs, ["rel"]},
|
||||||
{keep_build_info, true},
|
{keep_build_info, true},
|
||||||
{ct_extra_params, "-include "
|
{ct_extra_params, "-include "
|
||||||
++ filename:join([Cwd, "tools"]) ++ " "
|
++ filename:join([Cwd, "tools"])},
|
||||||
++ filename:join([Cwd, "deps", "p1_xml", "include"])},
|
|
||||||
{post_hooks, PostHooks ++ CfgPostHooks},
|
{post_hooks, PostHooks ++ CfgPostHooks},
|
||||||
{deps, Deps ++ CfgDeps}],
|
{deps, Deps ++ CfgDeps}],
|
||||||
%%io:format("ejabberd configuration:~n ~p~n", [Config]),
|
%%io:format("ejabberd configuration:~n ~p~n", [Config]),
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("logger.hrl").
|
-include("logger.hrl").
|
||||||
-include("esip.hrl").
|
-include_lib("esip/include/esip.hrl").
|
||||||
|
|
||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
%%% API
|
%%% API
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("logger.hrl").
|
-include("logger.hrl").
|
||||||
-include("esip.hrl").
|
-include_lib("esip/include/esip.hrl").
|
||||||
|
|
||||||
-define(SIGN_LIFETIME, 300). %% in seconds.
|
-define(SIGN_LIFETIME, 300). %% in seconds.
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("logger.hrl").
|
-include("logger.hrl").
|
||||||
-include("esip.hrl").
|
-include_lib("esip/include/esip.hrl").
|
||||||
|
|
||||||
-define(CALL_TIMEOUT, timer:seconds(30)).
|
-define(CALL_TIMEOUT, timer:seconds(30)).
|
||||||
-define(DEFAULT_EXPIRES, 3600).
|
-define(DEFAULT_EXPIRES, 3600).
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
-include_lib("common_test/include/ct.hrl").
|
-include_lib("common_test/include/ct.hrl").
|
||||||
-include("xml.hrl").
|
-include_lib("p1_xml/include/xml.hrl").
|
||||||
-include("ns.hrl").
|
-include("ns.hrl").
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("mod_proxy65.hrl").
|
-include("mod_proxy65.hrl").
|
||||||
|
|
Loading…
Reference in New Issue