ext_mod: switch to fast_xml and remove old p1_logger reference
This commit is contained in:
parent
10d6c330a5
commit
44978ce978
|
@ -509,12 +509,11 @@ 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, "xml.hrl"),
|
XmlHrl = filename:join(EjabInc, "fxml.hrl"),
|
||||||
Logger = [{d, 'P1LOGGER'} || code:is_loaded(lager)==false],
|
|
||||||
ExtLib = [{d, 'NO_EXT_LIB'} || filelib:is_file(XmlHrl)],
|
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]
|
||||||
++ Logger ++ ExtLib,
|
++ ExtLib,
|
||||||
[file:copy(App, Ebin) || App <- filelib:wildcard("src/*.app")],
|
[file:copy(App, Ebin) || App <- filelib:wildcard("src/*.app")],
|
||||||
Result = [case compile:file(File, Options) of
|
Result = [case compile:file(File, Options) of
|
||||||
{ok, _} -> ok;
|
{ok, _} -> ok;
|
||||||
|
|
Loading…
Reference in New Issue