From: Romain Pokrzywka Date: Tue, 2 Feb 2010 20:31:31 +0000 (-0800) Subject: now fix the build for the tests; turns out we need another set of exports, since... X-Git-Tag: dbus-1.3.1~120^2~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbd1c9fe826e780cbd251af2654ab05752a96f92;p=thirdparty%2Fdbus.git now fix the build for the tests; turns out we need another set of exports, since some tests are compiled in the client lib and some are in the internal lib... --- diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index 101d6aefa..b798a4167 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -250,9 +250,11 @@ endif(MSVC_IDE) ### Client library if(WIN32) - file(READ "${DBUS_DIR}/dbus-1-clientsymbols.def.in" DBUS_CLIENT_EXPORTS) + file(READ "${DBUS_DIR}/dbus-1-symbols.def.in" DBUS_CLIENT_EXPORTS) if (DBUS_BUILD_TESTS) - file(READ "${DBUS_DIR}/dbus-1-testsymbols.def.in" DBUS_TEST_EXPORTS) + file(READ "${DBUS_DIR}/dbus-1-testsymbols.def.in" DBUS_CLIENT_TEST_EXPORTS) + else(DBUS_BUILD_TESTS) + set(DBUS_CLIENT_TEST_EXPORTS ) endif(DBUS_BUILD_TESTS) set(DBUS_LIB_DEF "${CMAKE_BINARY_DIR}/dbus-1.def") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dbus-1.def.cmake" ${DBUS_LIB_DEF}) @@ -272,18 +274,21 @@ endif(WIN32) install_targets(/lib dbus-1 ) install_files(/include/dbus FILES ${dbusinclude_HEADERS}) -if(WIN32 and NOT MSVC) +if(WIN32 AND NOT MSVC) install_files(/lib FILES ${DBUS_LIB_DEF}) -endif(WIN32 and NOT MSVC) +endif(WIN32 AND NOT MSVC) ### Internal library, used for the daemon, tools and tests, compiled statically. if(WIN32) - set(DBUS_CLIENT_EXPORTS ) - set(DBUS_TEST_EXPORTS ) - file(READ "${DBUS_DIR}/dbus-1-utilsymbols.def.in" DBUS_UTIL_EXPORTS) + file(READ "${DBUS_DIR}/dbus-internal-symbols.def.in" DBUS_INTERNAL_EXPORTS) + if (DBUS_BUILD_TESTS) + file(READ "${DBUS_DIR}/dbus-internal-testsymbols.def.in" DBUS_INTERNAL_TEST_EXPORTS) + else(DBUS_BUILD_TESTS) + set(DBUS_INTERNAL_TEST_EXPORTS ) + endif(DBUS_BUILD_TESTS) set(DBUS_INTERNAL_DEF "${CMAKE_BINARY_DIR}/dbus-internal.def") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dbus-1.def.cmake" ${DBUS_INTERNAL_DEF}) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dbus-internal.def.cmake" ${DBUS_INTERNAL_DEF}) if(MSVC) list(APPEND DBUS_UTIL_SOURCES ${DBUS_INTERNAL_DEF}) endif(MSVC) diff --git a/cmake/dbus/dbus-internal.def.cmake b/cmake/dbus/dbus-internal.def.cmake new file mode 100644 index 000000000..da4ed89b8 --- /dev/null +++ b/cmake/dbus/dbus-internal.def.cmake @@ -0,0 +1,3 @@ +EXPORTS +@DBUS_INTERNAL_EXPORTS@ +@DBUS_INTERNAL_TEST_EXPORTS@ diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index a84bfd1cb..1ef151864 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -10,6 +10,8 @@ project(test) # QT_SUBDIR=qt #endif +set(DBUS_LIBRARIES dbus-1 dbus-internal) + add_subdirectory( name-test ) #SUBDIRS=name-test $(GLIB_SUBDIR) $(PYTHON_SUBDIR) $(QT_SUBDIR) @@ -81,32 +83,32 @@ set (decode_gcov_SOURCES ) add_executable(test-service ${test-service_SOURCES}) -target_link_libraries(test-service ${DBUS_1}) +target_link_libraries(test-service ${DBUS_LIBRARIES}) add_executable(test-names ${test-names_SOURCES}) -target_link_libraries(test-names ${DBUS_1}) +target_link_libraries(test-names ${DBUS_LIBRARIES}) add_executable(shell-test ${shell-test_SOURCES}) -target_link_libraries(shell-test ${DBUS_1}) +target_link_libraries(shell-test ${DBUS_LIBRARIES}) ADD_TEST(shell-test ${EXECUTABLE_OUTPUT_PATH}/shell-test${EXT}) add_executable(test-shell-service ${test-shell-service_SOURCES}) -target_link_libraries(test-shell-service ${DBUS_1}) +target_link_libraries(test-shell-service ${DBUS_LIBRARIES}) add_executable(spawn-test ${spawn-test_SOURCES}) -target_link_libraries(spawn-test ${DBUS_1}) +target_link_libraries(spawn-test ${DBUS_LIBRARIES}) add_executable(test-exit ${test-exit_SOURCES}) -target_link_libraries(test-exit ${DBUS_1}) +target_link_libraries(test-exit ${DBUS_LIBRARIES}) add_executable(test-segfault ${test-segfault_SOURCES}) -target_link_libraries(test-segfault ${DBUS_1}) +target_link_libraries(test-segfault ${DBUS_LIBRARIES}) add_executable(test-sleep-forever ${test-sleep-forever_SOURCES}) -target_link_libraries(test-sleep-forever ${DBUS_1}) +target_link_libraries(test-sleep-forever ${DBUS_LIBRARIES}) #add_executable(decode-gcov ${decode_gcov_SOURCES}) -#target_link_libraries(decode-gcov ${DBUS_1}) +#target_link_libraries(decode-gcov ${DBUS_LIBRARIES}) #EXTRA_DIST= # diff --git a/cmake/test/name-test/CMakeLists.txt b/cmake/test/name-test/CMakeLists.txt index 45683a730..3c4d2a08a 100644 --- a/cmake/test/name-test/CMakeLists.txt +++ b/cmake/test/name-test/CMakeLists.txt @@ -6,16 +6,16 @@ add_definitions(-DDBUS_COMPILATION) # there is also a test-names executable, don't know if this is the same add_executable(test-names2 ${NAMEtest-DIR}/test-names.c) -target_link_libraries(test-names2 ${DBUS_1}) +target_link_libraries(test-names2 ${DBUS_LIBRARIES}) ADD_TEST(test-names2 ${EXECUTABLE_OUTPUT_PATH}/test-names2) add_executable(test-pending-call-dispatch ${NAMEtest-DIR}/test-pending-call-dispatch.c) -target_link_libraries(test-pending-call-dispatch ${DBUS_1}) +target_link_libraries(test-pending-call-dispatch ${DBUS_LIBRARIES}) #install_targets(/bin test-pending-call-dispatch) ADD_TEST(test-pending-call-dispatch ${EXECUTABLE_OUTPUT_PATH}/test-pending-call-dispatch) add_executable(test-thread-init ${NAMEtest-DIR}/test-threads-init.c) -target_link_libraries(test-thread-init ${DBUS_1}) +target_link_libraries(test-thread-init ${DBUS_LIBRARIES}) #install_targets(/bin test-thread-init) ADD_TEST(test-thread-init ${EXECUTABLE_OUTPUT_PATH}/test-thread-init) diff --git a/dbus/dbus-1-clientsymbols.def.in b/dbus/dbus-1-symbols.def.in similarity index 99% rename from dbus/dbus-1-clientsymbols.def.in rename to dbus/dbus-1-symbols.def.in index a114128b3..a2de2ddc6 100644 --- a/dbus/dbus-1-clientsymbols.def.in +++ b/dbus/dbus-1-symbols.def.in @@ -314,7 +314,7 @@ _dbus_read_uuid_file _dbus_real_assert _dbus_real_assert_not_reached _dbus_register_shutdown_func -_dbus_return_if_fail_warning_format DATA +_dbus_return_if_fail_warning_format _dbus_send_credentials_socket _dbus_server_add_timeout _dbus_server_add_watch @@ -613,6 +613,7 @@ dbus_message_append_args dbus_message_append_args_valist dbus_message_copy dbus_message_demarshal +dbus_message_demarshal_bytes_needed dbus_message_free_data_slot dbus_message_get_args dbus_message_get_args_valist @@ -654,6 +655,7 @@ dbus_message_iter_init_append dbus_message_iter_next dbus_message_iter_open_container dbus_message_iter_recurse +dbus_message_lock dbus_message_marshal dbus_message_new dbus_message_new_error @@ -672,6 +674,7 @@ dbus_message_set_no_reply dbus_message_set_path dbus_message_set_reply_serial dbus_message_set_sender +dbus_message_set_serial dbus_message_type_from_string dbus_message_type_to_string dbus_message_unref diff --git a/dbus/dbus-1-testsymbols.def.in b/dbus/dbus-1-testsymbols.def.in index 5619ba8ce..ce7731bf2 100644 --- a/dbus/dbus-1-testsymbols.def.in +++ b/dbus/dbus-1-testsymbols.def.in @@ -1,9 +1,7 @@ _dbus_address_test _dbus_auth_script_run -_dbus_auth_test _dbus_connection_queue_received_message _dbus_connection_test_get_locks -_dbus_credentials_test _dbus_data_slot_test _dbus_decrement_fail_alloc_counter _dbus_disable_mem_pools @@ -23,18 +21,11 @@ _dbus_keyring_test _dbus_list_insert_before _dbus_list_pop_last_link _dbus_list_test -_dbus_marshal_byteswap_test -_dbus_marshal_recursive_test -_dbus_marshal_validate_test _dbus_marshal_header_test _dbus_marshal_read_fixed_multi _dbus_marshal_test _dbus_mem_pool_test _dbus_memory_test -_dbus_message_data_free -_dbus_message_data_iter_get_and_next -_dbus_message_data_iter_init -_dbus_message_test _dbus_misc_test _dbus_object_tree_test _dbus_pending_call_test @@ -45,11 +36,11 @@ _dbus_set_fail_alloc_counter _dbus_set_fail_alloc_failures _dbus_sha_test _dbus_signature_test -_dbus_spawn_test _dbus_string_append_4_aligned _dbus_string_append_8_aligned _dbus_string_append_double _dbus_string_append_unichar +_dbus_string_compact _dbus_string_copy_data_len _dbus_string_delete_first_word _dbus_string_delete_leading_blanks @@ -58,16 +49,7 @@ _dbus_string_lock _dbus_string_parse_double _dbus_string_starts_with_c_str _dbus_string_steal_data_len -_dbus_string_test -_dbus_sysdeps_test _dbus_test_oom_handling _dbus_threads_init_debug _dbus_transport_debug_pipe_new _dbus_transport_open_debug_pipe -_dbus_type_reader_equal_values -dbus_internal_do_not_use_foreach_message_file -dbus_internal_do_not_use_generate_bodies -dbus_internal_do_not_use_load_message_file -dbus_internal_do_not_use_run_tests -dbus_internal_do_not_use_try_message_data -dbus_internal_do_not_use_try_message_file diff --git a/dbus/dbus-1.def.cmake b/dbus/dbus-1.def.cmake index 7dc7310c5..78220e352 100644 --- a/dbus/dbus-1.def.cmake +++ b/dbus/dbus-1.def.cmake @@ -1,4 +1,3 @@ EXPORTS @DBUS_CLIENT_EXPORTS@ -@DBUS_UTIL_EXPORTS@ -@DBUS_TEST_EXPORTS@ +@DBUS_CLIENT_TEST_EXPORTS@ diff --git a/dbus/dbus-1-utilsymbols.def.in b/dbus/dbus-internal-symbols.def.in similarity index 100% rename from dbus/dbus-1-utilsymbols.def.in rename to dbus/dbus-internal-symbols.def.in diff --git a/dbus/dbus-internal-testsymbols.def.in b/dbus/dbus-internal-testsymbols.def.in new file mode 100644 index 000000000..05dd4e666 --- /dev/null +++ b/dbus/dbus-internal-testsymbols.def.in @@ -0,0 +1,19 @@ +_dbus_auth_test +_dbus_credentials_test +_dbus_marshal_byteswap_test +_dbus_marshal_recursive_test +_dbus_marshal_validate_test +_dbus_message_data_free +_dbus_message_data_iter_get_and_next +_dbus_message_data_iter_init +_dbus_message_test +_dbus_spawn_test +_dbus_string_test +_dbus_sysdeps_test +_dbus_type_reader_equal_values +dbus_internal_do_not_use_foreach_message_file +dbus_internal_do_not_use_generate_bodies +dbus_internal_do_not_use_load_message_file +dbus_internal_do_not_use_run_tests +dbus_internal_do_not_use_try_message_data +dbus_internal_do_not_use_try_message_file