jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

dring: Rename to jamid. Likewise for ringcli.

Browse Source 
This change renames the dring binary to jamid on GNU/Linux, and from
ringcli to jamid on the other Windows/Mac platforms.

* .gitignore: Ignore bin/jamid instead of bin/dring.
* bin/Makefile.am (bin_PROGRAMS)[HAVE_WIN32]: Replace ringcli by
jamid.
(ringcli_SOURCES)[HAVE_WIN32]: Rename to jamid_SOURCES.
(ringcli_CXXFLAGS)[HAVE_WIN32]: Rename to jamid_CXXFLAGS.
(ringcli_LDADD)[HAVE_WIN32]: Rename to jamid_LDADD.
[HAVE_OXS]: Likewise for each of the above 4 variables.
(bin_PROGRAMS): Replace dring by jamid.
(dring_SOURCES, dring_CXXFLAGS, dring_LDADD): Replace the 'dring'
Automake variables prefix by 'jamid'.
* bin/dbus/cx.ring.Ring.service.in (Exec)<dring>: Rename to 'jamid'.

Change-Id: I3f41846a38e74e2f3c6f687a46e1a208f0083ca2
This commit is contained in:
Maxim Cournoyer
2021-06-09 11:25:36 -04:00
committed by Adrien Béraud
parent 7d75409910
commit 11a85bde08
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -118,8 +118,7 @@ build-aux/
configure
bin/dbus/*.adaptor.h
bin/dbus/cx.ring.Ring.service
bin/dring
bin/ringcli
bin/jamid
doltcompile
doltlibtool
__pycache__

24
bin/Makefile.am
View File

@ -1,21 +1,21 @@
if HAVE_WIN32
libexec_PROGRAMS = ringcli
ringcli_SOURCES = winmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \
libexec_PROGRAMS = jamid
jamid_SOURCES = winmain.cpp
jamid_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/dring \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
$(AM_CXXFLAGS)
ringcli_LDADD = $(top_builddir)/src/libring.la
jamid_LDADD = $(top_builddir)/src/libring.la
endif
if HAVE_OSX
libexec_PROGRAMS = ringcli
ringcli_SOURCES = osxmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \
libexec_PROGRAMS = jamid
jamid_SOURCES = osxmain.cpp
jamid_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/dring \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
$(AM_CXXFLAGS)
ringcli_LDADD = $(top_builddir)/src/libring.la
jamid_LDADD = $(top_builddir)/src/libring.la
endif
SUBDIRS=
@ -23,15 +23,15 @@ SUBDIRS=
if RING_DBUS
SUBDIRS+=dbus
libexec_PROGRAMS = dring
libexec_PROGRAMS = jamid
dring_SOURCES = main.cpp
jamid_SOURCES = main.cpp
dring_CXXFLAGS= -I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
jamid_CXXFLAGS= -I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
-I$(top_srcdir)/src/dring \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
dring_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la -ldl
jamid_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la -ldl
endif
if ENABLE_NODEJS

2
bin/dbus/cx.ring.Ring.service.in
View File

@ -1,3 +1,3 @@
[D-BUS Service]
Name=cx.ring.Ring
Exec=@libexec@/dring
Exec=@libexec@/jamid

3
src/manager.cpp
View File

@ -583,8 +583,7 @@ Manager::ManagerPimpl::processRemainingParticipants(Conference& conf)
std::string
Manager::ManagerPimpl::retrieveConfigPath() const
{
static const char* const PROGNAME = "dring";
return fileutils::get_config_dir() + DIR_SEPARATOR_STR + PROGNAME + ".yml";
return fileutils::get_config_dir() + DIR_SEPARATOR_STR + "dring.yml";
}
void