From a7e7105cda8c52bdb61895978a7e125c22827dfb Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 9 Jun 2021 11:51:06 -0400
Subject: [PATCH] Rename dring to jamid, ring to jami.
Automated via the following command:
$ git grep -l dring | grep -v '.ts$' | xargs sed -i
's/dring/jamid/g'
$ git ls-files | xargs sed -i 's,bin/jamid.lib,bin/jami.lib,g'
$ git ls-files | xargs sed -i 's,src/jamid,src/jami,g'
$ git ls-files | xargs sed -i 's,-mutejamid,-mutejami,g'
$ git checkout docker
Change-Id: I030209b60817372f866055daadb4d0a1c1e2e9df
---
CMakeLists.txt | 2 +-
INSTALL.md | 2 +-
compile_tests.sh | 2 +-
doc/jami-qt.1 | 2 +-
make-client.py | 14 +++++++-------
src/DaemonReconnectWindow.qml | 4 ++--
src/constant/JamiStrings.qml | 4 ++--
tests/qml/main.cpp | 4 ++--
tests/unittests/main_unittest.cpp | 4 ++--
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4afcb941..c045f0c57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,7 @@ if(MSVC)
# daemon
set(DRING_SRC_PATH ${DRING}/contrib/msvc/include)
- set(DRING_LIB ${DRING}/build/x64/ReleaseLib_win32/bin/dring.lib)
+ set(DRING_LIB ${DRING}/build/x64/ReleaseLib_win32/bin/jami.lib)
set(GNUTLS_LIB ${DRING}/contrib/msvc/lib/x64/libgnutls.lib)
# ReleaseCompile config
diff --git a/INSTALL.md b/INSTALL.md
index 7dabb8a45..031a8c3f3 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -34,7 +34,7 @@ Then, you can build daemon, lrc and client-qt with:
./build.py --install --qt
```
-And you will have the daemon in `daemon/bin/dring` and the client in `client-qt/build-local/jami-qt`. You also can run it with
+And you will have the daemon in `daemon/bin/jamid` and the client in `client-qt/build-local/jami-qt`. You also can run it with
If you use a Qt version that is not wide-system installed you need to specify its path after the `--qt` flag, i. e., `./build.py --install --qt /home/<username>/Qt/5.15.0/gcc_64
diff --git a/compile_tests.sh b/compile_tests.sh
index 26c5759f4..e8c6457d7 100755
--- a/compile_tests.sh
+++ b/compile_tests.sh
@@ -19,7 +19,7 @@ mkdir -p build
cd build
echo "Building lrc in "$PWD
cmake .. -DCMAKE_INSTALL_PREFIX=$installDir/lrc \
- -DRING_INCLUDE_DIR=$daemonDir/src/dring \
+ -DRING_INCLUDE_DIR=$daemonDir/src/jami \
-DRING_XML_INTERFACES_DIR=$daemonDir/bin/dbus
make -j${cpuCount}
make install
diff --git a/doc/jami-qt.1 b/doc/jami-qt.1
index e616b1044..9e4f4c0df 100644
--- a/doc/jami-qt.1
+++ b/doc/jami-qt.1
@@ -16,6 +16,6 @@ Enable debug.
.B \-h, \-\-help
Display help text and exit.
.SH SEE ALSO
-dring(1)
+jamid(1)
.SH AUTHOR
Alexandre Viau (alexandre.viau@savoirfairelinux.net)
diff --git a/make-client.py b/make-client.py
index 30800e75a..2caa851ea 100644
--- a/make-client.py
+++ b/make-client.py
@@ -297,14 +297,14 @@ def build_tests_projects(arch, config_str, msbuild, vs_env_vars, toolset,
msbuild_args = getMSBuildArgs(arch, config_str, toolset)
build_project(msbuild, msbuild_args, project, vs_env_vars)
-def run_tests(mute_dring, output_to_files):
+def run_tests(mute_jamid, output_to_files):
print('Running client tests')
test_exe_command_list = [qml_test_exe, unit_test_exe]
- if mute_dring:
- test_exe_command_list[0] += ' -mutedring'
- test_exe_command_list[1] += ' -mutedring'
+ if mute_jamid:
+ test_exe_command_list[0] += ' -mutejami'
+ test_exe_command_list[1] += ' -mutejami'
if output_to_files:
test_exe_command_list[0] += ' -o ' + this_dir + '\\x64\\test\\qml_tests.txt'
test_exe_command_list[1] += ' > ' + this_dir + '\\x64\\test\\unittests.txt'
@@ -359,8 +359,8 @@ def parse_args():
run_test = subparser.add_parser('runtests')
run_test.add_argument(
- '-md', '--mutedring', action='store_true', default=False,
- help='Avoid dring logs')
+ '-md', '--mutejami', action='store_true', default=False,
+ help='Avoid jamid logs')
run_test.add_argument(
'-o', '--outputtofiles', action='store_true', default=False,
help='Output tests log into files')
@@ -391,7 +391,7 @@ def main():
enable_test = True
if parsed_args.subparser_name == 'runtests':
- run_tests(parsed_args.mutedring, parsed_args.outputtofiles)
+ run_tests(parsed_args.mutejamid, parsed_args.outputtofiles)
if parsed_args.deps:
deps(parsed_args.arch, parsed_args.toolset, parsed_args.qtver)
diff --git a/src/DaemonReconnectWindow.qml b/src/DaemonReconnectWindow.qml
index 8d7a64755..fa1eb907c 100644
--- a/src/DaemonReconnectWindow.qml
+++ b/src/DaemonReconnectWindow.qml
@@ -95,8 +95,8 @@ ApplicationWindow {
Layout.topMargin: preferredMargin
text: connectionFailed ?
- qsTr("Could not re-connect to the Jami daemon (dring).\nJami will now quit.") :
- qsTr("Trying to reconnect to the Jami daemon (dring)…")
+ qsTr("Could not re-connect to the Jami daemon (jamid).\nJami will now quit.") :
+ qsTr("Trying to reconnect to the Jami daemon (jamid)…")
font.pointSize: 11
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index 21bf7865c..5a98bf3a3 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -478,8 +478,8 @@ Item {
property string removeDefaultModerator: qsTr("Remove default moderator")
// Daemon reconnection
- property string reconnectDaemon: qsTr("Trying to reconnect to the Jami daemon (dring)…")
- property string reconnectionFailed: qsTr("Could not re-connect to the Jami daemon (dring).\nJami will now quit.")
+ property string reconnectDaemon: qsTr("Trying to reconnect to the Jami daemon (jamid)…")
+ property string reconnectionFailed: qsTr("Could not re-connect to the Jami daemon (jamid).\nJami will now quit.")
// Is Swarm
property string isSwarm: qsTr("Is swarm:")
diff --git a/tests/qml/main.cpp b/tests/qml/main.cpp
index c99c569ba..cf8e17c84 100644
--- a/tests/qml/main.cpp
+++ b/tests/qml/main.cpp
@@ -182,10 +182,10 @@ main(int argc, char** argv)
{
bool muteDring {false};
- // Remove "-mutedring" from argv, as quick_test_main_with_setup() will
+ // Remove "-mutejami" from argv, as quick_test_main_with_setup() will
// fail if given an invalid command-line argument.
auto end = std::remove_if(argv + 1, argv + argc, [](char* argv) {
- return (strcmp(argv, "-mutedring") == 0);
+ return (strcmp(argv, "-mutejami") == 0);
});
if (end != argv + argc) {
diff --git a/tests/unittests/main_unittest.cpp b/tests/unittests/main_unittest.cpp
index 1d477c15d..2c6380b47 100644
--- a/tests/unittests/main_unittest.cpp
+++ b/tests/unittests/main_unittest.cpp
@@ -27,10 +27,10 @@ TestEnvironment globalEnv;
int
main(int argc, char* argv[])
{
- // Remove "-mutedring" from argv, as quick_test_main_with_setup() will
+ // Remove "-mutejami" from argv, as quick_test_main_with_setup() will
// fail if given an invalid command-line argument.
auto end = std::remove_if(argv + 1, argv + argc, [](char* argv) {
- return (strcmp(argv, "-mutedring") == 0);
+ return (strcmp(argv, "-mutejami") == 0);
});
if (end != argv + argc) {
--
GitLab