yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 01:39:35 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4360 from sstrigler/ext_mod-fix-greedy-include-path

Browse source 
fix greedy include path (fixes #4359)
This commit is contained in:
badlop 2025-03-11 19:28:52 +01:00 • committed by GitHub
commit 67ee0de7e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/ext_mod.erl
View file

@ -573,7 +573,7 @@ compile_and_install(Module, Spec, Config) ->
true -> true ->
case compile_deps(SrcDir) of case compile_deps(SrcDir) of
ok -> ok ->
case compile(SrcDir) of case compile(SrcDir, filename:join(SrcDir, "deps")) of
ok -> install(Module, Spec, SrcDir, LibDir, Config); ok -> install(Module, Spec, SrcDir, LibDir, Config);
Error -> Error Error -> Error
end; end;
@ -589,25 +589,28 @@ compile_and_install(Module, Spec, Config) ->
end. end.
compile_deps(LibDir) -> compile_deps(LibDir) ->
Deps = filename:join(LibDir, "deps"), DepsDir = filename:join(LibDir, "deps"),
case filelib:is_dir(Deps) of case filelib:is_dir(DepsDir) of
true -> ok; % assume deps are included true -> ok; % assume deps are included
false -> fetch_rebar_deps(LibDir) false -> fetch_rebar_deps(LibDir)
end, end,
Rs = [compile(Dep) || Dep <- filelib:wildcard(filename:join(Deps, "*"))], Rs = [compile(Dep, DepsDir) || Dep <- filelib:wildcard(filename:join(DepsDir, "*"))],
compile_result(Rs). compile_result(Rs).
compile(LibDir) -> compile(LibDir, DepsDir) ->
Bin = filename:join(LibDir, "ebin"), Bin = filename:join(LibDir, "ebin"),
Lib = filename:join(LibDir, "lib"), Lib = filename:join(LibDir, "lib"),
Src = filename:join(LibDir, "src"), Src = filename:join(LibDir, "src"),
Includes = [{i, Inc} || Inc <- filelib:wildcard(LibDir++"/../../**/include")], Includes = [{i, Inc} || Inc <- filelib:wildcard(DepsDir++"/**/include")],
Options = [{outdir, Bin}, {i, LibDir++"/.."} | Includes ++ compile_options()], Options = [{outdir, Bin}, {i, LibDir++"/.."} | Includes ++ compile_options()],
?DEBUG("compile options: ~p", [Options]),
filelib:ensure_dir(filename:join(Bin, ".")), filelib:ensure_dir(filename:join(Bin, ".")),
[copy(App, filename:join(Bin, filename:basename(App, ".src"))) || App <- filelib:wildcard(Src++"/*.app*")], [copy(App, filename:join(Bin, filename:basename(App, ".src"))) || App <- filelib:wildcard(Src++"/*.app*")],
compile_c_files(LibDir), compile_c_files(LibDir),
ErlFiles = filelib:wildcard(Src++"/**/*.erl"),
?DEBUG("erl files to compile: ~p", [ErlFiles]),
Er = [compile_erlang_file(Bin, File, Options) Er = [compile_erlang_file(Bin, File, Options)
|| File <- filelib:wildcard(Src++"/**/*.erl")], || File <- ErlFiles],
Ex = compile_elixir_files(Bin, filelib:wildcard(Lib ++ "/**/*.ex")), Ex = compile_elixir_files(Bin, filelib:wildcard(Lib ++ "/**/*.ex")),
compile_result(lists:flatten([Er, Ex])). compile_result(lists:flatten([Er, Ex])).