Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00
Code Releases Activity

Elixir: Fix compiling ejabberd as a dependency (4128)

Browse Source
This commit is contained in:
Badlop 2023-12-25 22:18:53 +01:00
parent b2df22469b
commit 4daeb41f0e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mix.exs
View File

@ -68,7 +68,7 @@ defmodule Ejabberd.MixProject do
defp erlc_options do defp erlc_options do
# Use our own includes + includes from all dependencies # Use our own includes + includes from all dependencies
includes = ["include"] ++ deps_include(["fast_xml", "xmpp", "p1_utils"]) includes = ["include", deps_include()]
result = [{:d, :ELIXIR_ENABLED}] ++ result = [{:d, :ELIXIR_ENABLED}] ++
cond_options() ++ cond_options() ++
Enum.map(includes, fn (path) -> {:i, path} end) ++ Enum.map(includes, fn (path) -> {:i, path} end) ++
@ -119,8 +119,8 @@ defmodule Ejabberd.MixProject do
++ cond_deps() ++ cond_deps()
end end
defp deps_include(deps) do defp deps_include() do
base = if Mix.Project.umbrella?() do if Mix.Project.umbrella?() do
"../../deps" "../../deps"
else else
case Mix.Project.deps_paths()[:ejabberd] do case Mix.Project.deps_paths()[:ejabberd] do
@ -128,7 +128,6 @@ defmodule Ejabberd.MixProject do
_ -> ".." _ -> ".."
end end
end end
Enum.map(deps, fn dep -> base<>"/#{dep}/include" end)
end end
defp cond_deps do defp cond_deps do