From a302af77703d66a440461b929899b4ac0dd1c55b Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Sun, 7 Jul 2013 03:10:35 +1000 Subject: [PATCH] Do not build p1_logger if lager is enabled --- rebar.config.script | 5 +++-- rel/reltool.config.script | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rebar.config.script b/rebar.config.script index 42ad6542e..27029020a 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -52,8 +52,7 @@ SrcDirs = lists:foldl( Acc end, [], Cfg), -Deps = [{p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}}, - {p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}}, +Deps = [{p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}}, {p1_tls, ".*", {git, "git://github.com/processone/tls"}}, {p1_stringprep, ".*", {git, "git://github.com/processone/stringprep"}}, {p1_xml, ".*", {git, "git://github.com/processone/xml"}}, @@ -98,6 +97,8 @@ CfgDeps = lists:flatmap( {lhttpc, ".*", {git, "git://github.com/esl/lhttpc"}}]; ({lager, true}) -> [{lager, ".*", {git, "git://github.com/basho/lager"}}]; + ({lager, false}) -> + [{p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}}]; (_) -> [] end, Cfg), diff --git a/rel/reltool.config.script b/rel/reltool.config.script index 7ca9fe590..517258660 100644 --- a/rel/reltool.config.script +++ b/rel/reltool.config.script @@ -28,7 +28,7 @@ ConfiguredOTPApps = lists:flatmap( OTPApps = RequiredOTPApps ++ ConfiguredOTPApps, -DepRequiredApps = [p1_logger, p1_cache_tab, p1_tls, p1_stringprep, p1_xml, xmlrpc], +DepRequiredApps = [p1_cache_tab, p1_tls, p1_stringprep, p1_xml, xmlrpc], DepConfiguredApps = lists:flatmap( fun({mysql, true}) -> [p1_mysql]; @@ -40,6 +40,7 @@ DepConfiguredApps = lists:flatmap( ({iconv, true}) -> [p1_iconv]; ({http, true}) -> [ibrowse, lhttpc]; ({lager, true}) -> [lager]; + ({lager, false}) -> [p1_logger]; (_) -> [] end, Vars),