diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2014-10-30 17:44:04 +0100 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2014-10-30 17:44:04 +0100 |
| commit | 7819986ec0de206af7c777589c34c392a1bea2ef (patch) | |
| tree | d91fb16015a95e7ba05f43431f13dcb05914c06e | |
| parent | don't stop on error if jiffy.so symlink exists #309 (diff) | |
| parent | Merge branch 'master' of github.com:processone/ejabberd (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | rebar.config.script | 32 |
2 files changed, 36 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index c87d1af2..6f48bc0d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -88,6 +88,10 @@ update: rm -rf deps/.built $(REBAR) update-deps && :> deps/.got +xref: all + $(REBAR) skip_deps=true xref + + translations: contrib/extract_translations/prepare-translation.sh -updateall diff --git a/rebar.config.script b/rebar.config.script index 4e2d347f..30d479ea 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -116,6 +116,33 @@ CfgPostHooks = lists:flatmap( [] end, Cfg), +CfgXrefs = lists:flatmap( + fun({mysql, false}) -> + ["(\".*mysql.*\":_/_)"]; + ({pgsql, false}) -> + ["(\".*pgsql.*\":_/_)"]; + ({pam, false}) -> + ["(\"epam\":_/_)"]; + ({riak, false}) -> + ["(\"riak.*\":_/_)"]; + ({riak, true}) -> + % used in map-reduce function called from riak vm + ["(\"riak_object\":_/_)"]; + ({json, false}) -> + ["(\"jiffy\":_/_)"]; + ({zlib, false}) -> + ["(\"ezlib\":_/_)"]; + ({http, false}) -> + ["(\"lhttpc\":_/_)"]; + ({iconv, false}) -> + ["(\"iconv\":_/_)"]; + ({odbc, false}) -> + ["(\"odbc\":_/_)"]; + (_) -> + [] + end, Cfg), + + {ok, Cwd} = file:get_cwd(), Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++ @@ -124,6 +151,11 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++ {keep_build_info, true}, {ct_extra_params, "-include " ++ filename:join([Cwd, "tools"])}, + {xref_warnings, false}, + {xref_checks, []}, + {xref_queries, + [{"(XC - UC) || (XU - X - B - " + ++ string:join(CfgXrefs, " - ") ++ ")", []}]}, {post_hooks, PostHooks ++ CfgPostHooks}, {deps, Deps ++ CfgDeps}], %%io:format("ejabberd configuration:~n ~p~n", [Config]), |