From f3302673612829286c23b849b27f3a4118cd7bfa Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 20 Dec 2023 12:46:09 +0100 Subject: [PATCH] Rebar/Rebar3: Remove Elixir as a rebar dependency Elixir is standalone since years ago. When Elixir support is required, better simply install Elixir and use Mix as build tool. Or install Elixir and use the experimental Rebar3 support to compile Elixir files and dependencies. --- configure.ac | 2 +- rebar.config | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 33913d181..434f0e9f3 100644 --- a/configure.ac +++ b/configure.ac @@ -84,7 +84,7 @@ AC_ARG_ENABLE(debug, esac],[if test "x$debug" = "x"; then debug=true; fi]) AC_ARG_ENABLE(elixir, -[AS_HELP_STRING([--enable-elixir],[enable Elixir support (default: no)])], +[AS_HELP_STRING([--enable-elixir],[enable Elixir support in Rebar3 (default: no)])], [case "${enableval}" in yes) elixir=true ;; no) elixir=false ;; diff --git a/rebar.config b/rebar.config index 23bfc8b1e..b2157c774 100644 --- a/rebar.config +++ b/rebar.config @@ -27,8 +27,6 @@ {eimp, ".*", {git, "https://github.com/processone/eimp", {tag, "1.0.22"}}}, {if_var_true, tools, {ejabberd_po, ".*", {git, "https://github.com/processone/ejabberd-po", {branch, "main"}}}}, - {if_var_true, elixir, - {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.4.4"}}}}, {if_var_true, pam, {epam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.14"}}}}, {if_var_true, redis, @@ -69,9 +67,6 @@ {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {tag, "1.1.23"}}}}, {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.25"}}}, {pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.9"}}}, - {if_not_rebar3, %% Needed because modules are not fully migrated to new structure and mix - {if_var_true, elixir, - {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}}, {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3", {tag, "1.1.14"}}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.29"}}}, @@ -146,24 +141,14 @@ {if_var_true, stun, {d, 'STUN'}}, {src_dirs, [src, {if_rebar3, sql}, - {if_var_true, tools, tools}, - {if_var_true, elixir, include}]}]}. + {if_var_true, tools, tools}]}]}. {if_rebar3, {plugins, [rebar3_hex, {provider_asn1, "0.2.0"}]}}. {if_rebar3, {project_plugins, [configure_deps]}}. {if_not_rebar3, {plugins, [ - deps_erl_opts, override_deps_versions2, override_opts, configure_deps, - {if_var_true, elixir, rebar_elixir_compiler}, - {if_var_true, elixir, rebar_exunit} + deps_erl_opts, override_deps_versions2, override_opts, configure_deps ]}}. -{if_rebar3, {if_var_true, elixir, - {project_app_dirs, [".", "elixir/lib"]}}}. -{if_not_rebar3, {if_var_true, elixir, - {lib_dirs, ["deps/elixir/lib"]}}}. -{if_var_true, elixir, - {src_dirs, ["include"]}}. - {sub_dirs, ["rel"]}. {keep_build_info, true}.