Commit graph

3135 commits

Author SHA1 Message Date
Ralf Habacker
443b8ec3da Merge branch 'dbus-1.4'
Conflicts:
	cmake/CMakeLists.txt
2011-09-22 21:26:43 +02:00
Ralf Habacker
1767840160 Added cmake 'help-options' target to print out all available configure options
cherry-picked 5a0c5663eb
2011-09-22 20:32:42 +02:00
Ralf Habacker
37a81fc981 fixed cmake error: doc says CACHE needs type *and* doc string
cherry-picked aba867f242
2011-09-22 20:27:59 +02:00
Ralf Habacker
2f3403c37b Limit batch file creating to windows
cherry-picked 84b03cae58
2011-09-22 20:27:58 +02:00
Ralf Habacker
b49e278667 Fixed cmake buildsystem - option command only supports boolean values
Conflicts:

	cmake/CMakeLists.txt

cherry picked 4ee7b07b20 from master
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22 20:03:48 +02:00
Ralf Habacker
e41d163083 cmake fix: generate build timestamp
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41029
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22 19:55:13 +02:00
Ralf Habacker
692baa9d6a Simplified cmake xml parser dependencies.
Find either expat or libxml2 xml parser libraries, depending on -DDBUS_USE_EXPAT=ON|OFF

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41027
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22 19:33:32 +02:00
Simon McVittie
8acd2e2148 Micro version 2011-09-21 19:39:18 +01:00
Simon McVittie
e24b3f1dba Prepare version 1.5.8 2011-09-21 18:26:29 +01:00
Simon McVittie
6bded84c40 Merge branch 'dbus-1.4'
Conflicts:
	NEWS
	configure.ac
2011-09-21 18:21:09 +01:00
Simon McVittie
337d9432f2 Micro version 2011-09-21 18:14:39 +01:00
Simon McVittie
7dbfa45153 Prepare version 1.4.16 2011-09-21 15:26:53 +01:00
Simon McVittie
cc5404cfa6 Enable more compiler warnings by default
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:56:28 +01:00
Simon McVittie
0db406cb19 refs test: fix unused variable
This one was added since my more-unused-39231 branch.
2011-09-21 11:56:28 +01:00
Simon McVittie
87d37f0867 Fix compilation of syslog test in master 2011-09-21 11:56:28 +01:00
Simon McVittie
b3b9fc03da Merge branch 'more-unused-39231'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:45:13 +01:00
Simon McVittie
44f2531016 Merge branch 'remove-stub-tests-41012'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41012
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:44:38 +01:00
Simon McVittie
bf3d8259ac Merge branch 'dbus-1.4'
Conflicts:
	NEWS
2011-09-21 11:39:32 +01:00
Simon McVittie
bdfec55054 NEWS 2011-09-21 11:38:22 +01:00
Simon McVittie
423ab7cdd0 update_desktop_file_entry: initialize return value properly, and actually return it
Since 1.4.4 (commit 75cfd97f) this function always returned FALSE. As far
as I can see this was actually harmless, because both of its callers
ignore any error that is not NoMemory (and treat it the same as success).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:34:31 +01:00
Simon McVittie
c38e9823da update_desktop_file_entry: if the service name already existed, set error
If we're going to return FALSE for this (which has apparently always
been the case), then we should set an error properly.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:34:07 +01:00
Simon McVittie
9e93d82862 update_desktop_file_entry: don't leak file_path on one particular OOM
Revenge of #33126: most, but not all, temporary variables were freed on
this code path.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:33:38 +01:00
Simon McVittie
4dd6abc953 NEWS 2011-09-21 11:25:48 +01:00
Simon McVittie
dc632829db If --enable-tests=yes, require Python modules for complete test coverage
The two relevant tests already exit 0 with a message if importing those
modules fails.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Simon McVittie
3f1af382a1 Only ask pkg-config for the systemd unit directory if both are installed
pkg-config is not a hard dependency, and this check avoids errors in a
minimal build environment:

./configure: line 21777: --variable=systemdsystemunitdir: command not found

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Simon McVittie
d55b3efbde Give better diagnostics if --enable-tests=yes is given
We want to indicate why it's a problem that GLib, dbus-glib are missing.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Simon McVittie
5defa43b6f Check for Python; skip Python tests if not found
As with the optional test-dependencies on GLib and dbus-glib, we make this
a hard dependency if --enable-tests[=yes], but not if --enable-tests=auto.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Simon McVittie
7fc9c02666 Cope with platforms whose vsnprintf violates both POSIX and C99
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=11668
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Simon McVittie
029ecdf402 Add a semi-automatic test for _dbus_system_log
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39987
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Simon McVittie
a4e9dc6780 Cope with Unixes that don't have LOG_PERROR, like Solaris 10
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39987
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Simon McVittie
14ed371845 Make "make -C test clean" idempotent
Previously, it'd fail when done twice, because you can't rmdir a
nonexistent directory.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40004
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Simon McVittie
9708294c05 On Solaris, define CMSG_ALIGN, CMSG_LEN, CMSG_SPACE if undefined
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40235
Tested-by: Dagobert Michelsen <dam@opencsw.org>
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Simon McVittie
f4c02e7829 Fix maintainer-upload-docs target to work out-of-tree
The STATIC_DOCS, DTDS and all dist_ files except XMLTO_OUTPUT are in the
source tree. The XMLTO_OUTPUT and the man2html output are in the build
tree, and the BONUS_FILES already have $(srcdir) in their names.

Also change the rules that generate the dbus-docs directory so that if
they fail, they leave behind a temporary directory, rather than leaving
behind a dbus-docs directory that causes make to not run those rules
if re-run; and change the rules to scp files to the server, to put a
trailing "/" on paths, ensuring that the tarball won't be uploaded as
"www" if the www directory doesn't already exist.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41047
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21 11:25:48 +01:00
Ralf Habacker
c1989c1a4f Merge branch 'dbus-1.4' 2011-09-20 19:37:39 +02:00
Ralf Habacker
70b0ffd501 cmake fix: install version string
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40905
2011-09-20 19:34:38 +02:00
Simon McVittie
9c9d66c1a0 _dbus_pending_call_test: remove stub 2011-09-19 15:05:40 +01:00
Simon McVittie
f5d0b12866 _dbus_marshal_header_test: remove stub 2011-09-19 15:05:39 +01:00
Simon McVittie
c0aff8f86a bus_policy_test: remove stub 2011-09-19 15:05:39 +01:00
Simon McVittie
2829a59951 dbus-internals: make sure function-like macros expand to something non-empty
This avoids sometimes-surprising semantics, and also compiler warnings
when they're the only statement in an "if" or "else" clause, without {}.
2011-09-19 13:50:38 +01:00
Simon McVittie
86b0ba0278 Use {}, not semicolon, when the statement of an "if" does nothing
The uses in bus/activation.c are also probably wrong because they ignore
the result of the test, but that's orthogonal.
(<https://bugs.freedesktop.org/show_bug.cgi?id=39858>)
2011-09-19 13:50:38 +01:00
Simon McVittie
d1756a7e4c Fix an assortment of variables that aren't used when not checking/asserting 2011-09-19 13:50:38 +01:00
Simon McVittie
2c1ad79c0c BusConnections: don't assert about BusConnectionData in functions that don't need it 2011-09-19 13:50:38 +01:00
Simon McVittie
420c6840a3 bus_driver_handle_message: remove unused label 2011-09-19 13:50:38 +01:00
Simon McVittie
0d9a7a0f97 activation helper: remove unused variable when not being verbose 2011-09-19 13:50:38 +01:00
Simon McVittie
eaa1f25746 bus_registry_acquire_service: remove unnecessary variable 2011-09-19 13:50:38 +01:00
Simon McVittie
0f309ae984 Don't refcount TimeoutCallback
It turns out that timeout_callback_ref() is no longer called anywhere.
2011-09-19 13:50:38 +01:00
Simon McVittie
e91bbcbcb4 Remove a never-used callback 2011-09-19 13:50:37 +01:00
Simon McVittie
bf2a1b169f Remove more never-used variables 2011-09-19 13:50:37 +01:00
Simon McVittie
775f77c719 Merge branch 'dbus-1.4' 2011-08-26 15:07:41 +01:00
Simon McVittie
2f183ac576 Don't build any of the reload-pipe code on non-Unix
In commit ab7b3f9, Ralf notes that handle_reload_watch() is (in principle)
cross-platform. However, there's no way to trigger it on Windows, because
nothing ever writes to the pipe. Make the entire pipe-to-self trick
Unix-specific instead.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40002
2011-08-26 15:02:30 +01:00