mirror of
https://git.jami.net/savoirfairelinux/jami-daemon.git
synced 2025-08-12 22:09:25 +08:00
daemon: Rename dring occurrences in code and file names to jamid.
Automated using the following commands: $ mv src/{dring,jami} $ git grep -l src/dring | xargs sed -i 's,src/dring,src/jami,g' $ git grep -l '#include "dring/' | \ xargs sed -i 's,#include "dring/,#include "jami/,g' $ git grep -l 'dring.h' | xargs sed -i 's,dring.h,jami.h,g' And finally, $ git grep -l 'dring' | xargs sed -i 's,dring,jami,g' $ files=$(find -name '*dring*' | sort) $ for f in $files; do mkdir -p "$(dirname "$f")"; \ mv "$f" "$(echo $f | sed 's/dring/jami/g')"; done To resolve a bad renaming favorably: $ git grep -l -i AlsaCarjami | \ xargs sed -i -E 's/([Aa])lsaCarjami/\1lsaCardRingtone/g' The above renaming command is not perfect, so some hand-tuning was required to complete it. * src/manager.cpp (Manager::ManagerPimpl::retrieveConfigPath): Preserve the dring.yml configuration file name, until we add something to migrate (rename) it to jami.yml. * man/dring.pod: Delete. * bin/dbus/jamid.pod: Move to ... * man/jamid.pod: here. * bin/dbus/meson.build (jamid_targets): Normalize man section to the pre-existing 1 and adjust accordingly. * src/jami/def.h (dring_EXPORTS): Rename to ... (jami_EXPORTS): ... this. change-Id: I9828be6da9c711ab2f22c4d1b9539fea89d7b6fb
This commit is contained in:

committed by
Maxim Cournoyer

parent
86a21e0640
commit
ba3a411ca3
@ -202,12 +202,12 @@ AC_COMPILE_IFELSE(
|
||||
AC_MSG_RESULT([$CLANG])
|
||||
|
||||
dnl define DRING_BUILD because we are building libring, not using it
|
||||
dnl if building shared library, define dring_EXPORTS
|
||||
dnl if building shared library, define jami_EXPORTS
|
||||
AC_MSG_CHECKING([if compiling shared library])
|
||||
DAEMONCPPFLAGS+=" -fvisibility=hidden -DDRING_BUILD"
|
||||
AS_IF([test "x$enable_shared" == "xyes"],
|
||||
[RING_SHARED=yes
|
||||
DAEMONCPPFLAGS+=" -Ddring_EXPORTS"],
|
||||
DAEMONCPPFLAGS+=" -Djami_EXPORTS"],
|
||||
[RING_SHARED=no])
|
||||
AC_MSG_RESULT([$RING_SHARED])
|
||||
|
||||
|
Reference in New Issue
Block a user