From 4e2e9f037bf78b650f8952470d8116ba46f8ec87 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 25 Jul 2019 20:29:20 +1000 Subject: [PATCH] Drop the ratbagctl.devel sha bus name We already have a separate name for the devel bus anyway, the git sha doesn't give us a huge amount of benefits but makes manual debugging a major PITA. Signed-off-by: Peter Hutterer --- dbus/org.freedesktop.ratbag_devel1.conf.in | 10 +++++----- meson.build | 13 +++---------- tools/ratbag-git-sha.sh | 10 ---------- tools/ratbagctl.test.in | 7 ++----- tools/toolbox.py | 8 ++++---- 5 files changed, 14 insertions(+), 34 deletions(-) delete mode 100755 tools/ratbag-git-sha.sh diff --git a/dbus/org.freedesktop.ratbag_devel1.conf.in b/dbus/org.freedesktop.ratbag_devel1.conf.in index 1d8550dd..51f5e629 100644 --- a/dbus/org.freedesktop.ratbag_devel1.conf.in +++ b/dbus/org.freedesktop.ratbag_devel1.conf.in @@ -12,15 +12,15 @@ - - - + + + - - + + diff --git a/meson.build b/meson.build index 066d8786..5e61ce80 100644 --- a/meson.build +++ b/meson.build @@ -6,10 +6,6 @@ project('libratbag', 'c', libratbag_version = meson.project_version().split('.') -git = find_program('git') -r = run_command('tools/ratbag-git-sha.sh') -ratbagd_sha = r.stdout().strip() - # We use libtool-version numbers because it's easier to understand. # Before making a release, the libratbag_so_* and liblur_so_* # numbers should be modified. The components are of the form C:R:A. @@ -422,9 +418,8 @@ install_man('ratbagd/ratbagd.8') #### ratbagd_devel #### # -# A development ratbagd server that owns a different name on the bus (named -# after the git sha). Do not use directly, this server is used by -# ratbagdctl.devel +# A development ratbagd server that owns a different name on the bus +# (org.freedesktop.ratbag_devel1). This server is used by ratbagdctl.devel. # executable('ratbagd.devel', @@ -432,12 +427,11 @@ executable('ratbagd.devel', dependencies : deps_ratbagd, include_directories : include_directories('src'), install : false, - c_args : ['-DRATBAG_DBUS_INTERFACE="ratbag_devel1_@0@"'.format(ratbagd_sha), + c_args : ['-DRATBAG_DBUS_INTERFACE="ratbag_devel1"', '-DDISABLE_COREDUMP=1'], ) config_ratbagd_devel = configuration_data() -config_ratbagd_devel.set('ratbagd_sha', ratbagd_sha) configure_file(input : 'dbus/org.freedesktop.ratbag_devel1.conf.in', output : 'org.freedesktop.ratbag_devel1.conf', configuration : config_ratbagd_devel) @@ -535,7 +529,6 @@ man_ratbagctl = configure_file ( ) config_ratbagctl_devel = configuration_data() -config_ratbagctl_devel.set('ratbagd_sha', ratbagd_sha) config_ratbagctl_devel.set('MESON_BUILD_ROOT', meson.build_root()) config_ratbagctl_devel.set('LIBRATBAG_DATA_DIR', libratbag_data_dir_devel) diff --git a/tools/ratbag-git-sha.sh b/tools/ratbag-git-sha.sh deleted file mode 100755 index f762db30..00000000 --- a/tools/ratbag-git-sha.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -GIT_DIR="$MESON_SOURCE_ROOT/.git" -export GIT_DIR - -git log --format="format:%h" -1 2>/dev/null - -if test $? -ne 0; then - echo "unknown" -fi diff --git a/tools/ratbagctl.test.in b/tools/ratbagctl.test.in index 75b285e5..7a94f867 100755 --- a/tools/ratbagctl.test.in +++ b/tools/ratbagctl.test.in @@ -50,7 +50,7 @@ class TestRatbagCtl(unittest.TestCase): stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, - env={"RATBAGCTL_DEVEL": "org.freedesktop.ratbag_devel1_@ratbagd_sha@"}) + env={"RATBAGCTL_DEVEL": "org.freedesktop.ratbag_devel1"}) (stdout, stderr) = ratbagctl.communicate() return (ratbagctl.returncode, @@ -608,13 +608,10 @@ def setUpModule(): # - copy the org.freedesktop.ratbag_devel1.conf to # /etc/dbus-1/system.d # - start builddir/ratbagd.devel (in gdb if need be) - # - set RATBAGCTL_DEVEL to org.freesktop.ratbag_devel1_<8-digit-git-sha> + # - set RATBAGCTL_DEVEL to org.freesktop.ratbag_devel1 # - run builddir/ratbagctl.test # Note that the .conf will be overwritten if you run the test normally # and you have to re-copy it. - # Note that the git sha will obviously change and you have to re-do all - # this. - # # Yes, this is a bit insane. ratbagd_process = None if not os.environ.get('RATBAGCTL_DEVEL'): diff --git a/tools/toolbox.py b/tools/toolbox.py index 5a1289cc..539f8244 100644 --- a/tools/toolbox.py +++ b/tools/toolbox.py @@ -88,15 +88,15 @@ def start_ratbagd(verbosity=0): proxy = Gio.DBusProxy.new_sync(dbus, Gio.DBusProxyFlags.NONE, None, - "org.freedesktop.ratbag_devel1_@ratbagd_sha@", - "/org/freedesktop/ratbag_devel1_@ratbagd_sha@", - "org.freedesktop.ratbag_devel1_@ratbagd_sha@.Manager", + "org.freedesktop.ratbag_devel1", + "/org/freedesktop/ratbag_devel1", + "org.freedesktop.ratbag_devel1.Manager", None) name_owner = proxy.get_name_owner() if name_owner is None: time.sleep(0.2) - os.environ['RATBAGCTL_DEVEL'] = "org.freedesktop.ratbag_devel1_@ratbagd_sha@" + os.environ['RATBAGCTL_DEVEL'] = "org.freedesktop.ratbag_devel1" if name_owner is None or ratbagd_process.poll() is not None: return None