Skip to content

Commit

Permalink
Revert "Add workaround so rebar2 can use Elixir 1.12.0"
Browse files Browse the repository at this point in the history
This reverts commit 937e1c2.
  • Loading branch information
prefiks committed Jul 22, 2021
1 parent cf72c5e commit c96de09
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 46 deletions.
14 changes: 1 addition & 13 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ ifeq "$(IS_REBAR)" "3"
EBINDIR=$(DEPSDIR)/ejabberd/ebin
REBARREL=$(REBAR) as prod tar
REBARDEV=REBAR_PROFILE=dev $(REBAR) release
ELIXIR_WARNING="\033[32m===>\033[00m If you get \033[1;91mDependency failure: source for elixir...\033[00m, please run \033[4;37mmake\033[00m again"
else
SKIPDEPS=skip_deps=true
LISTDEPS=-q list-deps
Expand All @@ -143,23 +142,12 @@ else
EBINDIR=ebin
REBARREL=$(REBAR) generate
REBARDEV=
ELIXIR_WARNING="\033[32m===>\033[00m If you get \033[1;91mERROR: Dependency dir .../elixir failed...\033[00m, please run \033[4;37mmake\033[00m again"
endif
endif

all: deps src

deps: elixir-rebar $(DEPSDIR)/.got

elixir-rebar:
@[ @elixir@ = true ] \
&& ( [ ! -d $(DEPSDIR)/elixir/ ] \
&& echo $(ELIXIR_WARNING) \
|| ( [ ! -f $(DEPSDIR)/elixir/rebar.config ] \
&& { mkdir $(DEPSDIR)/elixir/src ; \
cp lib/elixir.app.src $(DEPSDIR)/elixir/src/ ; \
cp lib/rebar.config $(DEPSDIR)/elixir/ ; } \
|| true ) ) || true
deps: $(DEPSDIR)/.got

$(DEPSDIR)/.got:
rm -rf $(DEPSDIR)/.got
Expand Down
11 changes: 0 additions & 11 deletions lib/elixir.app.src

This file was deleted.

21 changes: 0 additions & 21 deletions lib/rebar.config

This file was deleted.

2 changes: 1 addition & 1 deletion rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{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.12.0"}}}},
{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.12"}}}},
{if_var_true, redis,
Expand Down

0 comments on commit c96de09

Please sign in to comment.