Commit graph

126 commits

Author SHA1 Message Date
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
Ralf Habacker
f7e976540b Determine docbook.xsl path on windows from meinproc4 executable. 2010-03-29 21:28:47 +02:00
Ralf Habacker
1d0076b500 Keep cmake build system in sync with commit d47154c28b. 2010-03-22 22:33:02 +01:00
Ralf Habacker
a96fc838b9 Removed unused cmake packages. 2010-03-22 17:28:57 +01:00
Ralf Habacker
a8dad42954 Added signal.h and locale.h detection for cmake build system. 2010-03-22 17:28:56 +01:00
Ralf Habacker
e183399391 Additional fixes for 2154acb349 2010-03-22 10:58:53 +01:00
unknown
2154acb349 Make the windows binaries and build match the linux one with cmake buildsystem.
This is performed by including the files from the client lib in the internal one
and by removing the linking to dbus-1 for targets using the internal library.
2010-03-22 10:41:06 +01:00
Ralf Habacker
1fb6d3faf6 Removed def file support for cmake build system. 2010-03-22 10:41:06 +01:00
Ralf Habacker
d999abdaa8 CMake dbus libraries usage cleanup.
Renamed DBUS_LIBRARIES to DBUS_INTERNAL_LIBRARIES and moved to top level CMakeLists.txt.
Removed obsolate references of dbus-internal library.
Added DBUS_LIBRARIES definition which contains only the dbus library.
2010-03-20 22:33:58 +01:00
Ralf Habacker
96958b238f fixed def file usage for cmake mingw builds 2010-03-19 21:33:57 +01:00
Ralf Habacker
acbc751e28 Decorated public exported functions with DBUS_EXPORT macro, reviewed by Colin Walters. 2010-03-16 09:33:39 +01:00
Ralf Habacker
76919f681c fixed bus-test sha1 connection address on unix with cmake build system 2010-03-08 15:56:56 +01:00
Ralf Habacker
e469239284 fixed backtrace printing on unix with cmake build system 2010-03-08 15:55:46 +01:00
Ralf Habacker
984b372fd2 Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus 2010-02-12 08:46:10 +01:00
Ralf Habacker
0793857c92 added some docs for windows and updated the documentation index 2010-02-10 13:03:19 +01:00
Ralf Habacker
a931e61763 fixed xml doc generating for cmake build system - supported docbook generator is currently kde's meinproc4, xmlto may also work but need still some checks 2010-02-10 09:26:52 +01:00
Ralf Habacker
31d9f4d655 Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus 2010-02-09 19:44:12 +01:00
Romain Pokrzywka
27a46ea9cb variable name fix (DBUS_DAEMON_NAME instead of DAEMON_NAME) 2010-02-07 00:32:51 +01:00
Romain Pokrzywka
deb7e5a9aa apply remaining unapplied parts of eeedba5b2f5b008819619764943caddd52441adf in dbus4win 2010-02-07 00:32:50 +01:00
Romain Pokrzywka
3f05abb3ad not needed anymore. Builds fine without for both msvc and mingw 2010-02-07 00:32:49 +01:00
Romain Pokrzywka
e750a52a4d move dbus-1.def.cmake to the cmake subdir, as it's cmake specific 2010-02-07 00:32:48 +01:00
Romain Pokrzywka
18d6f550d4 add the LIBRARY header in the .def file, but for mingw only, msvc doesn't support it anymore. It's still needed when creating a .lib from a mingw-built dll 2010-02-07 00:32:47 +01:00
Romain Pokrzywka
1cd84d8258 remove DBUS_DAEMON_EXECUTABLE_NAME, we already have DBUS_DAEMON_NAME, and use the specified name for the executable when building with cmake 2010-02-07 00:32:46 +01:00
Romain Pokrzywka
196b310dd1 remove the debug postfix for the executables, it only makes sense for the lib 2010-02-07 00:32:45 +01:00
Romain Pokrzywka
83c70d45a8 and another .def.in for the verbose mode handling 2010-02-07 00:32:44 +01:00
Romain Pokrzywka
b0e0cd03e8 commented bits cleanup 2010-02-07 00:32:44 +01:00
Romain Pokrzywka
3de7453714 disable cmake options that don't apply (for cmake-gui) 2010-02-07 00:32:43 +01:00
Romain Pokrzywka
7cda0ff030 fixed the TODO, the if block didn't make sense indeed. Also make it clearer which dirs in the summary are installation dirs 2010-02-07 00:32:42 +01:00