Skip to content

Commit 96a8fc5

Browse files
committed
Makefile.in: Add "make relivectl" similar to relive but using ejabberdctl
"make relive" was presented in https://www.process-one.net/blog/ejabberd-22-05/#new-make-relive Documentation mentions it in: https://docs.ejabberd.im/admin/install/source/#start Comparison "make relive" <--> "make relivectl" - Starts ejabberd using: Rebar3/Mix tools <--> ejabberdctl script - Compiles ejabberd before start? Yes! <--> No - Recompiles source code at runtime? Yes! using Sync/ExSync <--> No - Reads ejabberdctl.cfg? No <--> Yes! In summary: - relive: preferable when developing: recompiles source code automatically - relivectl: preferable when testing: uses ejabberdctl script and ejabberdctl.cfg Example usage: ./autogen.sh && ./configure && make && make relivectl
1 parent a22c88a commit 96a8fc5

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

Makefile.in

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ ifeq "$(REBAR_VER)" "6"
145145
REBARREL=MIX_ENV=prod $(REBAR) release --overwrite
146146
REBARDEV=MIX_ENV=dev $(REBAR) release --overwrite
147147
RELIVECMD=$(ESCRIPT) rel/relive.escript && MIX_ENV=dev RELIVE=true $(MAYBE) $(IEX) --name ejabberd@localhost -S mix run
148+
RELIVECTLCMD=$(ESCRIPT) rel/relive.escript && _build/relive/ejabberdctl live
148149
REL_LIB_DIR = _build/dev/rel/ejabberd/lib
149150
COPY_REL_TARGET = dev
150151
GET_DEPS_TRANSLATIONS=MIX_ENV=translations $(REBAR) $(GET_DEPS)
@@ -176,6 +177,7 @@ endif
176177
REBARREL=$(REBAR) as prod tar
177178
REBARDEV=$(REBAR) as dev release
178179
RELIVECMD=$(REBAR) as dev relive
180+
RELIVECTLCMD=$(ESCRIPT) rel/relive.escript && _build/relive/ejabberdctl live
179181
REL_LIB_DIR = _build/dev/rel/ejabberd/lib
180182
COPY_REL_TARGET = dev
181183
GET_DEPS_TRANSLATIONS=$(REBAR) as translations $(GET_DEPS)
@@ -197,6 +199,8 @@ else
197199
\nTry: make prod, or: ./configure --with-rebar=rebar3 ; make dev"
198200
RELIVECMD=@echo "Rebar2 detected... relive not supported.\
199201
\nTry: ./configure --with-rebar=rebar3 ; make relive"
202+
RELIVECTLCMD=@echo "Rebar2 detected... relivectl not supported.\
203+
\nTry: ./configure --with-rebar=rebar3 ; make relivectl"
200204
REL_LIB_DIR = rel/ejabberd/lib
201205
COPY_REL_TARGET = rel
202206
endif
@@ -396,6 +400,10 @@ relive:
396400
$(EXPLICIT_ELIXIR_COMPILE_DEV)
397401
$(RELIVECMD)
398402

403+
relivectl:
404+
$(EXPLICIT_ELIXIR_COMPILE_DEV)
405+
$(RELIVECTLCMD)
406+
399407
relivelibdir=$(shell pwd)/$(DEPSDIR)
400408
relivedir=$(shell pwd)/_build/relive
401409
CONFIG_DIR = ${relivedir}/conf
@@ -710,7 +718,8 @@ help:
710718
@echo ""
711719
@echo " prod Build a production release"
712720
@echo " dev Build a development release"
713-
@echo " relive Start a live ejabberd in _build/relive/"
721+
@echo " relive Start live using rebar3/mix tools"
722+
@echo " relivectl Start live using ejabberdctl script"
714723
@echo ""
715724
@echo " doap Generate DOAP file"
716725
@echo " edoc Generate EDoc documentation [mix]"

0 commit comments

Comments
 (0)