From 11a85bde0893629f708a8f8c049e645db36ddba4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Date: Wed, 9 Jun 2021 11:25:36 -0400 Subject: [PATCH] dring: Rename to jamid. Likewise for ringcli. 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 --- .gitignore | 3 +-- bin/Makefile.am | 24 ++++++++++++------------ bin/dbus/cx.ring.Ring.service.in | 2 +- src/manager.cpp | 3 +-- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 0b74c7ced7..9a2aed39b8 100644 --- a/.gitignore +++ b/.gitignore @@ -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__ diff --git a/bin/Makefile.am b/bin/Makefile.am index c85c965697..254cdb9586 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -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 diff --git a/bin/dbus/cx.ring.Ring.service.in b/bin/dbus/cx.ring.Ring.service.in index a1f7fa5020..e150e1c841 100644 --- a/bin/dbus/cx.ring.Ring.service.in +++ b/bin/dbus/cx.ring.Ring.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=cx.ring.Ring -Exec=@libexec@/dring +Exec=@libexec@/jamid diff --git a/src/manager.cpp b/src/manager.cpp index b5c3bf97e9..cd4608a52c 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -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 -- GitLab