43 lines
2.0 KiB
Diff
43 lines
2.0 KiB
Diff
From: John (J5) Palmieri <johnp@redhat.com>
|
|
To: Timo Hoenig <thoenig@suse.de>
|
|
Subject: Re: GLib bindings in build environment
|
|
Date: Tue, 01 Aug 2006 13:48:41 -0400 (19:48 CEST)
|
|
|
|
The system should be running a system bus in the split but there are
|
|
cases where the system bus wouldn't be the same version so it was a bit
|
|
of a mistake. The solution is to not generate on the fly.
|
|
|
|
On Tue, 2006-08-01 at 19:32 +0200, Timo Hoenig wrote:
|
|
> Hey John,
|
|
>
|
|
> Has there been a particular reason to use the system bus -- and not a
|
|
> session bus as before -- for buildings ./tools of the GLib bindings?
|
|
>
|
|
> Timo
|
|
|
|
|
|
--- tools/Makefile.am_org 2006-08-01 21:04:47.000000000 +0200
|
|
+++ tools/Makefile.am 2006-08-01 21:06:09.000000000 +0200
|
|
@@ -8,8 +8,8 @@
|
|
|
|
BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
|
|
|
|
-dbus-bus-introspect.xml:
|
|
- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
|
|
+dbus-bus-introspect.xml:
|
|
+ DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
|
|
|
|
EXTRA_DIST = run-with-tmp-session-bus.sh
|
|
|
|
--- tools/run-with-tmp-session-bus.sh_org 2006-08-01 21:39:00.000000000 +0200
|
|
+++ tools/run-with-tmp-session-bus.sh 2006-08-01 21:39:30.000000000 +0200
|
|
@@ -27,7 +27,7 @@
|
|
echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
|
|
|
|
## create a configuration file based on the standard session.conf
|
|
-cat $DBUS_TOP_BUILDDIR/tools/session.conf | \
|
|
+cat /etc/dbus-1/session.conf | \
|
|
sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
|
|
sed -e 's/<include.*$//g' \
|
|
> $CONFIG_FILE
|