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

@@ -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

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
 

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

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)

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)

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

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:")

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) {

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) {