Commit graph

153 commits

Author SHA1 Message Date
Simon McVittie
c83287898c Merge branch 'dbus-1.4' 2011-06-10 18:52:07 +01:00
Simon McVittie
90f36efbc3 Add support for building "modular" tests, which require GLib and dbus-glib
For the moment, the CMake build system only knows about the existing
"embedded tests"; make it define both symbols, though.

We use GLib because it has GTester (and life's too short to write yet another
JUnit clone), and dbus-glib for the main-loop integration only (see
fd.o #31515 for thoughts on incorporating just those two functions in a
separate library in the dbus tarball).

I'm not using DBusLoop for the main loop because I specifically don't
want to use non-public API or ABI of libdbus in the modular tests. If we make
sure they work against a shared libdbus, we can use them to test the
installed system, with "make installcheck".

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570
2011-06-10 18:31:31 +01:00
Ralf Habacker
b1e28fba0b Fixes for Visual Studio 2010 cmake generator - reported by Ray Satiro. 2011-05-28 14:02:15 +02:00
Ralf Habacker
6d2b67fc03 Fixed cmake syntax errors. 2011-05-28 14:02:14 +02:00
Simon McVittie
fd99c3a1c1 Merge branch 'dbus-1.4' 2011-05-25 17:39:34 +01:00
Simon McVittie
cea055514a Check for X even if X11 autolaunching is disabled
DBUS_ENABLE_X11_AUTOLAUNCH obviously requires DBUS_BUILD_X11. However,
the converse is not true.

If DBUS_BUILD_X11 is defined, dbus-launch will be able to connect to
the X server to determine when the session ends; most distributors will
want this, but it can be disabled with the standard Autoconf option
--without-x.

If DBUS_ENABLE_X11_AUTOLAUNCH is *also* defined, dbus-launch and libdbus
will be willing to perform autolaunch. Again, most distributors will want
this, but it can be disabled with --disable-x11-autolaunch.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19997
Reviewed-by: Colin Walters <walters@verbum.org>
2011-05-25 17:38:44 +01:00
Ralf Habacker
0c47090d0e Definition is obsolate with commit e0fc90bdf2 2011-05-25 16:08:19 +01:00
Ralf Habacker
45de11f029 To avoid double dbus version definitions take values from configure.ac. 2011-05-25 16:08:16 +01:00
Ralf Habacker
5a0c5663eb Added cmake 'help-options' target to print out all available configure options 2011-05-22 23:01:13 +02:00
Ralf Habacker
fb909f7e0e Cleaned public cmake option naming. 2011-05-22 22:54:49 +02:00
Ralf Habacker
7665196531 Definition is obsolate with commit e0fc90bdf2 2011-05-22 16:53:48 +02:00
Ralf Habacker
39703607e4 To avoid double dbus version definitions take values from configure.ac. 2011-05-22 13:02:34 +02:00
Simon McVittie
f04e52a2e5 Allow X11 autolaunch to be disabled even if the headers/libraries are there
In an embedded system where the D-Bus session is a core part of the
environment, like Maemo, accidentally auto-launching a second session bus
(for instance for a concurrent ssh session) is a bad idea - it can lead
to a "split brain" situation where half the applications in the GUI are
using a different bus. In these controlled environments, it'd be useful
to prevent autolaunch from ever happening.

(As a side benefit, the changes to configure.in also mean that packagers
can explicitly --enable-x11-autolaunch, to make sure that failure to find
X will make compilation fail cleanly.)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19997
Bug-NB: NB#219964
2011-02-24 18:58:18 +00:00
Simon McVittie
9a97f82079 Import compiler.m4 and lcov.am from telepathy-glib, and use them to replace gcov
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10887
2011-02-17 17:07:12 +00:00
Simon McVittie
f8d0012ab1 Remove references to dbus-md5, which hasn't been used for at least 8 years
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34292
2011-02-17 16:16:12 +00:00
Simon McVittie
297919ae61 cmake/cross-compile.sh: use mktemp(1) to avoid a symlink attack in /tmp 2011-01-05 19:10:43 +00:00
Ralf Habacker
02d973686a Use absolute session service dir path in bus-test on windows. 2010-12-29 14:43:24 +01:00
Ralf Habacker
79026cee36 Keep in sync with autotools. 2010-12-29 14:42:45 +01:00
Ralf Habacker
34ef61645c Keep in sync with automake. 2010-12-21 08:24:00 +01:00
Ralf Habacker
1d2f5607b4 Fix bus-test failure with cmake on unix.
SHA1 connection tests needs an non debug-pipe transport for the activation bus.
2010-12-07 22:51:00 +01:00
Ralf Habacker
37619035de Keep in sync with automake. 2010-12-04 23:05:56 +01:00
Ralf Habacker
a8810a7940 Service dir related bug fix on windows.
The code for accessing services requires absolute pathes, which are based
on DBUS_DATADIR. DBUS_DATADIR on windows is defined relative. This patch
makes sure that those pathes are absolute.
2010-10-29 11:55:27 +02:00
Ralf Habacker
30213f4b7d Cleaned up windows related README's. 2010-10-12 14:45:12 +02:00
Ralf Habacker
d0da9218de Fixed reference to cmake configure options. 2010-10-12 13:50:10 +02:00
Ralf Habacker
1332dba1a2 keep version in sync with automake 2010-10-12 00:20:21 +02:00
Ralf Habacker
f6a67597dc Extended autolaunch protocol with scope attribute. 2010-09-27 21:53:32 +02:00
Ralf Habacker
80f851416f Unix compile fix. 2010-09-08 09:13:42 +02:00
Will Thompson
a44d08711c Revert "Bug 28460 - Refactored dbus configuration access."
This reverts commit 6f9077ee87, which
broke the build on Unix (see previous patch) and introduced a bunch of
warnings.
2010-06-17 15:14:22 +01:00
Ralf Habacker
6f9077ee87 Bug 28460 - Refactored dbus configuration access.
Libdbus uses several config variables. On unix these settings are read from
environment variables by using _dbus_getenv.

On other platforms like wince there are no environment variables available and
_dbus_getenv needs an emulation for those plattforms (see
dbus/dbus-sysdeps-wince-glue.c)

To cleanup this emulation the appended patch adds a config api by adding
_dbus_config_... functions.

Also having all client config related functions listed in one header file
provides a good overview about which config attributes  are available.

The default implementation retrieves the config values from environment
variables. For other os this could be easily extended or replaced by.
2010-06-14 18:27:04 +02:00
Ralf Habacker
8cd61621ce Keep cmake default session and system bus address setup in sync with autotools. 2010-06-11 10:48:10 +02:00
Ralf Habacker
e66dd0eeb5 Keep in sync with autotools. 2010-06-07 14:23:44 +02:00
Ralf Habacker
4d3fefc7f7 Keep in sync with autotools. 2010-06-07 13:59:21 +02:00
Romain Pokrzywka
3222b64d4a fix {u}intptr_t usage on wince with msvc 2010-05-05 07:57:28 +02:00
Fridrich Štrba
c096c5cb9a Don't truncate pointers on Windows x64 platform 2010-05-03 10:48:38 +02:00
Ralf Habacker
04ddf2e3aa Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus 2010-04-27 11:22:32 +02:00
Ralf Habacker
e50c57c787 Minor name spelling fix. 2010-04-27 11:19:56 +02:00
Ralf Habacker
dfd525d602 Added cmake cross compile wrapper. 2010-04-22 11:51:23 +02:00
Ralf Habacker
14cc116254 Removed obsolate file. 2010-04-16 08:04:26 +02:00
Marcus Brinkmann
abb81eb446 Fix warnings on Windows CE target. 2010-04-14 08:26:47 +02:00
Ralf Habacker
280cdc2ad8 Added missing test libraries and tools to keep in sync with autotools. 2010-04-13 21:18:41 +02:00
Ralf Habacker
ae9edf9b0d Keep defines for dbus test in sync with autotools. 2010-04-13 21:17:46 +02:00
Ralf Habacker
e828d41e3e Keep test file directories in sync with autotools 2010-04-13 21:17:31 +02:00
Ralf Habacker
9ba1517315 Defined DBUS_CMAKE in config.h to have a way for detecting the currently used buildsystem. 2010-04-13 21:15:29 +02:00
Romain Pokrzywka
9e034bd5b3 add missing HAVE_ macros to cmake 2010-04-13 20:17:14 +02:00
Romain Pokrzywka
c60c9601f5 update WinCE cmake support 2010-04-13 15:42:10 +02:00
Ralf Habacker
4d8dcd5561 Cmake build system cleanup.
Converted tabs to spaces and removed trailing spaces in test dir.
2010-04-11 11:53:56 +02:00
Ralf Habacker
0ed7d779b7 Cmake support for cross plattform usable test files.
Recent test configuration files contains 'unix:...'
bus adresses which do not work on windows.
For cross plattform usable test files the whole
listen tag entry has to be set by the build system,
which is available with a new build system variable
named TEST_LISTEN.
To have the client client side definition in sync,
TEST_CONNECTION has been moved from c file into cmake
build system.
2010-04-11 11:49:46 +02:00
Ralf Habacker
2279457cbc Fixed meinproc4 docbook generator detection for cmake buildsystem. 2010-04-10 01:20:45 +02:00
Ralf Habacker
19251c52de Simplified cmake specific test file generating.
If there is a *.cmake test file available for
a related *.in file, take the *.cmake test file
instead of the *.in file as test file source.
Also added some messages.
2010-04-09 23:07:11 +02:00
Ralf Habacker
a9d68b7d9d Fixed xmlto usage on unix for cmake build system. 2010-03-30 08:31:49 +02:00