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

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

Browse source 
Ext mod fix greedy include path cont'd
This commit is contained in:
badlop 2025-03-12 10:59:44 +01:00 • committed by GitHub
commit 9c142e5509
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ejabberd_hooks.erl
View file

@ -152,7 +152,7 @@ unsubscribe(Hook, Host, Module, Function, InitArg) ->
-spec run(atom(), list()) -> ok. -spec run(atom(), list()) -> ok.
%% @doc Run the calls (and subscibers) of this hook in order, don't care about function results. %% @doc Run the calls (and subscribers) of this hook in order, don't care about function results.
%% If a call returns stop, no more calls are performed. %% If a call returns stop, no more calls are performed.
run(Hook, Args) -> run(Hook, Args) ->
run(Hook, global, Args). run(Hook, global, Args).
@ -475,7 +475,7 @@ call_subscriber_list([], _Host, _Hook, _CallbackOrArgs, _Event, Result) ->
lists:reverse(Result); lists:reverse(Result);
call_subscriber_list([{Mod, Func, InitArg} | SubscriberList], Host, Hook, CallbackOrArgs, Event, Result) -> call_subscriber_list([{Mod, Func, InitArg} | SubscriberList], Host, Hook, CallbackOrArgs, Event, Result) ->
SubscriberArgs = [InitArg, Event, Host, Hook, CallbackOrArgs], SubscriberArgs = [InitArg, Event, Host, Hook, CallbackOrArgs],
?DEBUG("Running hook subsciber ~p: ~p:~p/~B with event ~p", ?DEBUG("Running hook subscriber ~p: ~p:~p/~B with event ~p",
[Hook, Mod, Func, length(SubscriberArgs), Event]), [Hook, Mod, Func, length(SubscriberArgs), Event]),
try apply(Mod, Func, SubscriberArgs) of try apply(Mod, Func, SubscriberArgs) of
State -> State ->

7
src/ext_mod.erl
View file

@ -601,8 +601,11 @@ 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(DepsDir++"/**/include")], Includes = [ {i, Inc} || Inc <- filelib:wildcard(DepsDir++"/**/include") ],
Options = [{outdir, Bin}, {i, LibDir++"/.."} | Includes ++ compile_options()], Options = [ {outdir, Bin},
{i, LibDir++"/.."},
{i, filename:join(LibDir, "include")}
| Includes ++ compile_options()],
?DEBUG("compile options: ~p", [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*")],