Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Rebar3: Provide proper path to iex

Browse Source 
We can't use iex variable, because rebar3/relx_overlay.erl already uses
all existing app names as variables.
This commit is contained in:
Badlop 2023-12-20 15:32:37 +01:00
parent 65ff45e202
commit e1f14aca9b
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -295,7 +295,6 @@ relive:
relivelibdir=$(shell pwd)/$(DEPSDIR) relivelibdir=$(shell pwd)/$(DEPSDIR)
relivedir=$(shell pwd)/_build/relive relivedir=$(shell pwd)/_build/relive
iexpath=$(shell which iex)
CONFIG_DIR = ${relivedir}/conf CONFIG_DIR = ${relivedir}/conf
SPOOL_DIR = ${relivedir}/database SPOOL_DIR = ${relivedir}/database
LOGS_DIR = ${relivedir}/logs LOGS_DIR = ${relivedir}/logs
@ -305,9 +304,9 @@ ejabberdctl.relive:
-e "s*{{config_dir}}*${CONFIG_DIR}*g" \ -e "s*{{config_dir}}*${CONFIG_DIR}*g" \
-e "s*{{logs_dir}}*${LOGS_DIR}*g" \ -e "s*{{logs_dir}}*${LOGS_DIR}*g" \
-e "s*{{spool_dir}}*${SPOOL_DIR}*g" \ -e "s*{{spool_dir}}*${SPOOL_DIR}*g" \
-e "s*{{bindir}}/iex*$(iexpath)*g" \
-e "s*{{bindir}}*@bindir@*g" \ -e "s*{{bindir}}*@bindir@*g" \
-e "s*{{libdir}}*${relivelibdir}${ELIXIR_LIBDIR}*g" \ -e "s*{{libdir}}*${relivelibdir}${ELIXIR_LIBDIR}*g" \
-e "s*{{iexpath}}*@IEX@*g" \
-e "s*{{erl}}*@ERL@*g" \ -e "s*{{erl}}*@ERL@*g" \
-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \ -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
> ejabberdctl.relive > ejabberdctl.relive
@ -331,6 +330,7 @@ ejabberdctl.example: vars.config
-e "s*{{spool_dir}}*${SPOOLDIR}*g" \ -e "s*{{spool_dir}}*${SPOOLDIR}*g" \
-e "s*{{bindir}}*@bindir@*g" \ -e "s*{{bindir}}*@bindir@*g" \
-e "s*{{libdir}}*@libdir@${ELIXIR_LIBDIR}*g" \ -e "s*{{libdir}}*@libdir@${ELIXIR_LIBDIR}*g" \
-e "s*{{iexpath}}*@IEX@*g" \
-e "s*{{erl}}*@ERL@*g" \ -e "s*{{erl}}*@ERL@*g" \
-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \ -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
> ejabberdctl.example > ejabberdctl.example

1
configure.ac
View File

@ -39,6 +39,7 @@ fi
AC_PATH_TOOL(ERL, erl, , [${extra_erl_path}$PATH]) AC_PATH_TOOL(ERL, erl, , [${extra_erl_path}$PATH])
AC_PATH_TOOL(ERLC, erlc, , [${extra_erl_path}$PATH]) AC_PATH_TOOL(ERLC, erlc, , [${extra_erl_path}$PATH])
AC_PATH_TOOL(EPMD, epmd, , [${extra_erl_path}$PATH]) AC_PATH_TOOL(EPMD, epmd, , [${extra_erl_path}$PATH])
AC_PATH_TOOL(IEX, iex, , [${extra_erl_path}$PATH])
AC_ERLANG_NEED_ERL AC_ERLANG_NEED_ERL
AC_ERLANG_NEED_ERLC AC_ERLANG_NEED_ERLC

2
ejabberdctl.template
View File

@ -15,8 +15,8 @@ SCRIPT_DIR="$(cd "$(dirname "$SCRIPT")" && pwd -P)"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
ERTS_VSN="{{erts_vsn}}" ERTS_VSN="{{erts_vsn}}"
ERL="{{erl}}" ERL="{{erl}}"
IEX="{{bindir}}/iex"
EPMD="{{epmd}}" EPMD="{{epmd}}"
IEX="{{iexpath}}"
INSTALLUSER="{{installuser}}" INSTALLUSER="{{installuser}}"
# check the proper system user is used # check the proper system user is used

2
mix.exs
View File

@ -250,7 +250,7 @@ defmodule Ejabberd.MixProject do
logs_dir: config(:logs_dir), logs_dir: config(:logs_dir),
spool_dir: config(:spool_dir), spool_dir: config(:spool_dir),
vsn: config(:vsn), vsn: config(:vsn),
iex: config(:iex), iexpath: config(:iexpath),
erl: config(:erl), erl: config(:erl),
epmd: config(:epmd), epmd: config(:epmd),
bindir: Path.join([config(:release_dir), "releases", version()]), bindir: Path.join([config(:release_dir), "releases", version()]),

2
vars.config.in
View File

@ -53,9 +53,9 @@
{sysconfdir, "{{release_dir}}/etc"}. {sysconfdir, "{{release_dir}}/etc"}.
{erts_dir, "{{release_dir}}/erts-${ERTS_VSN#erts-}"}. {erts_dir, "{{release_dir}}/erts-${ERTS_VSN#erts-}"}.
{installuser, "@INSTALLUSER@"}. {installuser, "@INSTALLUSER@"}.
{iex, "{{release_dir}}/releases/{{vsn}}/iex"}.
{erl, "{{erts_dir}}/bin/erl"}. {erl, "{{erts_dir}}/bin/erl"}.
{epmd, "{{erts_dir}}/bin/epmd"}. {epmd, "{{erts_dir}}/bin/epmd"}.
{iexpath, "{{release_dir}}/releases/{{vsn}}/iex"}.
{localstatedir, "{{release_dir}}/var"}. {localstatedir, "{{release_dir}}/var"}.
{libdir, "{{release_dir}}/lib"}. {libdir, "{{release_dir}}/lib"}.
{docdir, "{{release_dir}}/doc"}. {docdir, "{{release_dir}}/doc"}.