mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-20 15:00:08 +01:00
Move cmake related build system to top level
Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
Ralf Habacker
parent
8747c9b5a0
commit
3bf97922bd
14 changed files with 565 additions and 579 deletions
|
|
@ -1,5 +1,6 @@
|
|||
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
|
||||
|
||||
# we do not need to have WIN32 defined
|
||||
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
|
||||
|
|
@ -22,11 +23,11 @@ endif()
|
|||
|
||||
# detect version
|
||||
include(MacrosAutotools)
|
||||
autoinit(../configure.ac)
|
||||
autoinit(configure.ac)
|
||||
autoversion(dbus)
|
||||
|
||||
if(EXISTS ${CMAKE_SOURCE_DIR}/../config.h.in)
|
||||
autoheaderchecks(${CMAKE_SOURCE_DIR}/../config.h.in ${CMAKE_SOURCE_DIR}/ConfigureChecks.cmake ${CMAKE_SOURCE_DIR}/config.h.cmake)
|
||||
if(EXISTS ${CMAKE_SOURCE_DIR}/config.h.in)
|
||||
autoheaderchecks(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_SOURCE_DIR}/cmake/ConfigureChecks.cmake ${CMAKE_SOURCE_DIR}/cmake/config.h.cmake)
|
||||
else()
|
||||
message(STATUS "Generate config.h.in with autogen.sh to enable cmake header difference check.")
|
||||
endif()
|
||||
|
|
@ -147,7 +148,7 @@ endif()
|
|||
add_definitions(-D_GNU_SOURCE)
|
||||
|
||||
# do config checks
|
||||
INCLUDE(ConfigureChecks.cmake)
|
||||
INCLUDE(ConfigureChecks)
|
||||
|
||||
# @TODO: how to remove last dir from ${CMAKE_SOURCE_DIR} ?
|
||||
SET(DBUS_SOURCE_DIR ${CMAKE_SOURCE_DIR}/..)
|
||||
|
|
@ -288,7 +289,7 @@ endif()
|
|||
set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
||||
|
||||
# for including config.h and for includes like <dir/foo.h>
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/.. ${CMAKE_BINARY_DIR} ${CMAKE_INCLUDE_PATH} )
|
||||
include_directories(. ${CMAKE_BINARY_DIR} ${CMAKE_INCLUDE_PATH})
|
||||
|
||||
# linker search directories
|
||||
link_directories(${DBUS_LIB_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} )
|
||||
|
|
@ -511,10 +512,10 @@ set(DBUS_INTERNAL_LIBRARIES dbus-internal)
|
|||
set (DBUS_INTERNAL_ADD_LIBRARY_OPTIONS STATIC)
|
||||
set (DBUS_INTERNAL_CLIENT_DEFINITIONS "-DDBUS_COMPILATION")
|
||||
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
|
||||
configure_file(cmake/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
|
||||
|
||||
if (WIN32)
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-env.bat.cmake ${CMAKE_BINARY_DIR}/bin/dbus-env.bat )
|
||||
configure_file(cmake/dbus-env.bat.cmake ${CMAKE_BINARY_DIR}/bin/dbus-env.bat )
|
||||
install(FILES ${CMAKE_BINARY_DIR}/bin/dbus-env.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -523,11 +524,11 @@ endif()
|
|||
#
|
||||
set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/DBus1)
|
||||
if(WIN32)
|
||||
configure_file(DBus1Config.cmake.in "${CMAKE_BINARY_DIR}/DBus1Config.cmake" @ONLY)
|
||||
configure_file(cmake/DBus1Config.cmake.in "${CMAKE_BINARY_DIR}/DBus1Config.cmake" @ONLY)
|
||||
else()
|
||||
configure_file(DBus1Config.pkgconfig.in "${CMAKE_BINARY_DIR}/DBus1Config.cmake" @ONLY)
|
||||
configure_file(cmake/DBus1Config.pkgconfig.in "${CMAKE_BINARY_DIR}/DBus1Config.cmake" @ONLY)
|
||||
endif()
|
||||
configure_file(DBus1ConfigVersion.cmake.in "${CMAKE_BINARY_DIR}/DBus1ConfigVersion.cmake" @ONLY)
|
||||
configure_file(cmake/DBus1ConfigVersion.cmake.in "${CMAKE_BINARY_DIR}/DBus1ConfigVersion.cmake" @ONLY)
|
||||
install(FILES
|
||||
"${CMAKE_BINARY_DIR}/DBus1Config.cmake"
|
||||
"${CMAKE_BINARY_DIR}/DBus1ConfigVersion.cmake"
|
||||
|
|
@ -657,7 +658,7 @@ endforeach()
|
|||
|
||||
MESSAGE(" ")
|
||||
|
||||
INCLUDE(modules/CPackInstallConfig.cmake)
|
||||
INCLUDE(CPackInstallConfig)
|
||||
|
||||
add_custom_target(help-options
|
||||
cmake -LH
|
||||
|
|
@ -689,7 +690,7 @@ if(UNIX)
|
|||
set(datadir "\${prefix}/${CMAKE_INSTALL_DATADIR}")
|
||||
set(datarootdir "\${prefix}/${CMAKE_INSTALL_DATADIR}")
|
||||
set(dbus_daemondir "\${prefix}/${CMAKE_INSTALL_BINDIR}")
|
||||
configure_file(../dbus-1.pc.in ${CMAKE_BINARY_DIR}/dbus-1.pc @ONLY)
|
||||
configure_file(dbus-1.pc.in ${CMAKE_BINARY_DIR}/dbus-1.pc @ONLY)
|
||||
install(FILES ${CMAKE_BINARY_DIR}/dbus-1.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
endif()
|
||||
endif()
|
||||
23
Makefile.am
23
Makefile.am
|
|
@ -20,21 +20,14 @@ EXTRA_DIST = \
|
|||
README.wince \
|
||||
README.cygwin \
|
||||
README.launchd \
|
||||
cmake/CMakeLists.txt \
|
||||
cmake/ConfigureChecks.cmake \
|
||||
cmake/DBus1Config.cmake.in \
|
||||
cmake/DBus1Config.pkgconfig.in \
|
||||
cmake/DBus1ConfigVersion.cmake.in \
|
||||
cmake/bus \
|
||||
cmake/bus-test.bat.cmake \
|
||||
cmake/config.h.cmake \
|
||||
cmake/dbus \
|
||||
cmake/dbus-env.bat.cmake \
|
||||
cmake/doc \
|
||||
cmake/i686-w64-mingw32.cmake \
|
||||
cmake/modules \
|
||||
cmake/test \
|
||||
cmake/tools \
|
||||
CMakeLists.txt \
|
||||
bus/CMakeLists.txt \
|
||||
dbus/CMakeLists.txt \
|
||||
doc/CMakeLists.txt \
|
||||
test/CMakeLists.txt \
|
||||
test/name-test/CMakeLists.txt \
|
||||
tools/CMakeLists.txt \
|
||||
cmake \
|
||||
$(NULL)
|
||||
|
||||
all-local: Doxyfile
|
||||
|
|
|
|||
10
README.cmake
10
README.cmake
|
|
@ -21,7 +21,7 @@ Win32 MinGW-w64|32
|
|||
5. mkdir dbus-build
|
||||
6. cd dbus-build
|
||||
7. run
|
||||
cmake -G "MinGW Makefiles" [<options, see below>] <dbus-src-root>/cmake
|
||||
cmake -G "MinGW Makefiles" [<options, see below>] <dbus-src-root>
|
||||
mingw32-make
|
||||
mingw32-make install
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ Win32 Microsoft nmake
|
|||
5. mkdir dbus-build
|
||||
6. cd dbus-build
|
||||
7. run
|
||||
cmake -G "NMake Makefiles" [<options, see below>] <dbus-src-root>/cmake
|
||||
cmake -G "NMake Makefiles" [<options, see below>] <dbus-src-root>
|
||||
nmake
|
||||
nmake install
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ Win32 Visual Studio 2010 Express IDE
|
|||
5. mkdir dbus-build
|
||||
6. cd dbus-build
|
||||
7. run
|
||||
cmake -G "Visual Studio 10" [<options, see below>] <dbus-src-root>/cmake
|
||||
cmake -G "Visual Studio 10" [<options, see below>] <dbus-src-root>
|
||||
8a. open IDE with
|
||||
vcexpress dbus.sln
|
||||
8b. for immediate build run
|
||||
|
|
@ -59,7 +59,7 @@ Win32 Visual Studio 2010 Professional IDE
|
|||
5. mkdir dbus-build
|
||||
6. cd dbus-build
|
||||
7. run
|
||||
cmake -G "Visual Studio 10" [<options, see below>] <dbus-src-root>/cmake
|
||||
cmake -G "Visual Studio 10" [<options, see below>] <dbus-src-root>
|
||||
8a. open IDE with
|
||||
devenv dbus.sln
|
||||
8b. for immediate build run
|
||||
|
|
@ -72,7 +72,7 @@ Linux
|
|||
4. mkdir dbus-build
|
||||
5. cd dbus-build
|
||||
6. run
|
||||
cmake -G "<for available targets, see cmake --help for a list>" [<options, see below>] <dbus-src-root>/cmake
|
||||
cmake -G "<for available targets, see cmake --help for a list>" [<options, see below>] <dbus-src-root>
|
||||
make
|
||||
make install
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
add_definitions(-DDBUS_COMPILATION)
|
||||
|
||||
SET(EFENCE "")
|
||||
SET(BUS_DIR ../../bus)
|
||||
|
||||
# config files for installation
|
||||
CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" IMMEDIATE @ONLY)
|
||||
CONFIGURE_FILE( "${BUS_DIR}/legacy-config/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf" IMMEDIATE @ONLY)
|
||||
CONFIGURE_FILE( "session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" IMMEDIATE @ONLY)
|
||||
CONFIGURE_FILE( "legacy-config/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf" IMMEDIATE @ONLY)
|
||||
FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/session.d)
|
||||
|
||||
if(NOT WIN32)
|
||||
CONFIGURE_FILE( "${BUS_DIR}/system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/system.conf" IMMEDIATE @ONLY)
|
||||
CONFIGURE_FILE( "${BUS_DIR}/legacy-config/system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf" IMMEDIATE @ONLY)
|
||||
CONFIGURE_FILE( "system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/system.conf" IMMEDIATE @ONLY)
|
||||
CONFIGURE_FILE( "legacy-config/system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf" IMMEDIATE @ONLY)
|
||||
FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/system.d)
|
||||
endif()
|
||||
|
||||
# copy services for local daemon start to local service dir data/dbus-1/services
|
||||
SET (SERVICE_FILES test/data/valid-service-files)
|
||||
FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../${SERVICE_FILES}/*.service.in" )
|
||||
FILE(GLOB FILES "${SERVICE_FILES}/*.service.in" )
|
||||
FOREACH(FILE ${FILES})
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME_WE)
|
||||
SET (TARGET ${CMAKE_BINARY_DIR}/data/dbus-1/services/${FILENAME}.service)
|
||||
|
|
@ -28,59 +27,59 @@ ENDFOREACH(FILE)
|
|||
|
||||
|
||||
if (DBUS_BUS_ENABLE_INOTIFY)
|
||||
set (DIR_WATCH_SOURCE ${BUS_DIR}/dir-watch-inotify.c)
|
||||
set (DIR_WATCH_SOURCE dir-watch-inotify.c)
|
||||
elseif (DBUS_BUS_ENABLE_KQUEUE)
|
||||
set (DIR_WATCH_SOURCE ${BUS_DIR}/dir-watch-kqueue.c)
|
||||
set (DIR_WATCH_SOURCE dir-watch-kqueue.c)
|
||||
else (DBUS_BUS_ENABLE_INOTIFY)
|
||||
set (DIR_WATCH_SOURCE ${BUS_DIR}/dir-watch-default.c)
|
||||
set (DIR_WATCH_SOURCE dir-watch-default.c)
|
||||
endif (DBUS_BUS_ENABLE_INOTIFY)
|
||||
|
||||
set (BUS_SOURCES
|
||||
${BUS_DIR}/activation.c
|
||||
${BUS_DIR}/activation.h
|
||||
${BUS_DIR}/apparmor.c
|
||||
${BUS_DIR}/apparmor.h
|
||||
${BUS_DIR}/audit.c
|
||||
${BUS_DIR}/audit.h
|
||||
${BUS_DIR}/bus.c
|
||||
${BUS_DIR}/bus.h
|
||||
${BUS_DIR}/config-loader-expat.c
|
||||
${BUS_DIR}/config-parser.c
|
||||
${BUS_DIR}/config-parser.h
|
||||
${BUS_DIR}/config-parser-common.c
|
||||
${BUS_DIR}/config-parser-common.h
|
||||
# ${BUS_DIR}/config-parser-trivial.c
|
||||
${BUS_DIR}/connection.c
|
||||
${BUS_DIR}/connection.h
|
||||
${BUS_DIR}/containers.c
|
||||
${BUS_DIR}/containers.h
|
||||
${BUS_DIR}/desktop-file.c
|
||||
${BUS_DIR}/desktop-file.h
|
||||
${BUS_DIR}/dir-watch.h
|
||||
${BUS_DIR}/dispatch.c
|
||||
${BUS_DIR}/dispatch.h
|
||||
${BUS_DIR}/driver.c
|
||||
${BUS_DIR}/driver.h
|
||||
${BUS_DIR}/expirelist.c
|
||||
${BUS_DIR}/expirelist.h
|
||||
${BUS_DIR}/policy.c
|
||||
${BUS_DIR}/policy.h
|
||||
${BUS_DIR}/selinux.h
|
||||
${BUS_DIR}/selinux.c
|
||||
${BUS_DIR}/services.c
|
||||
${BUS_DIR}/services.h
|
||||
${BUS_DIR}/signals.c
|
||||
${BUS_DIR}/signals.h
|
||||
${BUS_DIR}/test.c
|
||||
${BUS_DIR}/test.h
|
||||
${BUS_DIR}/utils.c
|
||||
${BUS_DIR}/utils.h
|
||||
activation.c
|
||||
activation.h
|
||||
apparmor.c
|
||||
apparmor.h
|
||||
audit.c
|
||||
audit.h
|
||||
bus.c
|
||||
bus.h
|
||||
config-loader-expat.c
|
||||
config-parser.c
|
||||
config-parser.h
|
||||
config-parser-common.c
|
||||
config-parser-common.h
|
||||
# config-parser-trivial.c
|
||||
connection.c
|
||||
connection.h
|
||||
containers.c
|
||||
containers.h
|
||||
desktop-file.c
|
||||
desktop-file.h
|
||||
dir-watch.h
|
||||
dispatch.c
|
||||
dispatch.h
|
||||
driver.c
|
||||
driver.h
|
||||
expirelist.c
|
||||
expirelist.h
|
||||
policy.c
|
||||
policy.h
|
||||
selinux.h
|
||||
selinux.c
|
||||
services.c
|
||||
services.h
|
||||
signals.c
|
||||
signals.h
|
||||
test.c
|
||||
test.h
|
||||
utils.c
|
||||
utils.h
|
||||
${DIR_WATCH_SOURCE}
|
||||
)
|
||||
if(DBUS_ENABLE_STATS)
|
||||
list(APPEND BUS_SOURCES
|
||||
${BUS_DIR}/stats.c
|
||||
${BUS_DIR}/stats.h
|
||||
stats.c
|
||||
stats.h
|
||||
)
|
||||
endif(DBUS_ENABLE_STATS)
|
||||
|
||||
|
|
@ -94,14 +93,14 @@ if(WIN32)
|
|||
set(DBUS_VER_INTERNAL_NAME "dbus-daemon")
|
||||
set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
|
||||
set(DBUS_VER_FILE_TYPE "VFT_APP")
|
||||
configure_file(${CMAKE_SOURCE_DIR}/../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
configure_file(../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
list(APPEND BUS_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
endif()
|
||||
|
||||
add_library(dbus-daemon-internal STATIC ${BUS_SOURCES})
|
||||
target_link_libraries(dbus-daemon-internal ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES})
|
||||
|
||||
add_executable(dbus-daemon ${BUS_DIR}/main.c)
|
||||
add_executable(dbus-daemon main.c)
|
||||
target_link_libraries(dbus-daemon dbus-daemon-internal)
|
||||
set_target_properties(dbus-daemon PROPERTIES OUTPUT_NAME ${DBUS_DAEMON_NAME})
|
||||
set_target_properties(dbus-daemon PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
|
@ -122,16 +121,16 @@ endif()
|
|||
|
||||
if (DBUS_SERVICE)
|
||||
set (dbus_service_SOURCES
|
||||
${BUS_DIR}/bus-service-win.c
|
||||
bus-service-win.c
|
||||
# TODO: add additional files
|
||||
# ${BUS_DIR}/service-main.c
|
||||
# service-main.c
|
||||
# ${BUS_SOURCES}
|
||||
)
|
||||
|
||||
set(DBUS_VER_INTERNAL_NAME "dbus-service")
|
||||
set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
|
||||
set(DBUS_VER_FILE_TYPE "VFT_APP")
|
||||
configure_file(${CMAKE_SOURCE_DIR}/../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
configure_file(../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
list(APPEND dbus_service_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
add_executable(dbus-service ${dbus_service_SOURCES} )
|
||||
target_link_libraries(dbus-service ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES})
|
||||
|
|
@ -140,18 +139,18 @@ if (DBUS_SERVICE)
|
|||
endif (DBUS_SERVICE)
|
||||
|
||||
set(LAUNCH_HELPER_SOURCES
|
||||
${BUS_DIR}/config-loader-expat.c
|
||||
${BUS_DIR}/config-parser-common.c
|
||||
${BUS_DIR}/config-parser-trivial.c
|
||||
${BUS_DIR}/desktop-file.c
|
||||
${BUS_DIR}/utils.c
|
||||
config-loader-expat.c
|
||||
config-parser-common.c
|
||||
config-parser-trivial.c
|
||||
desktop-file.c
|
||||
utils.c
|
||||
)
|
||||
|
||||
if(NOT WIN32)
|
||||
add_library(launch-helper-internal STATIC ${LAUNCH_HELPER_SOURCES})
|
||||
target_link_libraries(launch-helper-internal ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES})
|
||||
|
||||
add_executable(dbus-daemon-launch-helper ${BUS_DIR}/activation-helper.c ${BUS_DIR}/activation-helper-bin.c )
|
||||
add_executable(dbus-daemon-launch-helper activation-helper.c activation-helper-bin.c )
|
||||
target_link_libraries(dbus-daemon-launch-helper launch-helper-internal)
|
||||
endif(NOT WIN32)
|
||||
|
||||
|
|
@ -9,8 +9,8 @@ endif (DBUS_INSTALL_SYSTEM_LIBS)
|
|||
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "D-BUS For Windows")
|
||||
SET(CPACK_PACKAGE_VENDOR "D-BUS Windows Team")
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/../README")
|
||||
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/../COPYING")
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
|
||||
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
|
||||
# duplicated from VERSION
|
||||
SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
|
||||
SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ macro(add_uac_manifest _sources)
|
|||
# 24 is the resource type, RT_MANIFEST
|
||||
# constants are used because of a bug in windres
|
||||
# see https://stackoverflow.com/questions/33000158/embed-manifest-file-to-require-administrator-execution-level-with-mingw32
|
||||
get_filename_component(UAC_FILE ${CMAKE_SOURCE_DIR}/../tools/Win32.Manifest REALPATH)
|
||||
get_filename_component(UAC_FILE ${CMAKE_SOURCE_DIR}/tools/Win32.Manifest REALPATH)
|
||||
set(outfile ${CMAKE_BINARY_DIR}/disable-uac.rc)
|
||||
if(NOT EXISTS outfile)
|
||||
file(WRITE ${outfile} "1 24 \"${UAC_FILE}\"\n")
|
||||
|
|
|
|||
|
|
@ -1,254 +0,0 @@
|
|||
set(TEST_DIR ../../test)
|
||||
|
||||
include_directories(${TEST_DIR})
|
||||
|
||||
add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(DBUS_SESSION_BUS_LISTEN_ADDRESS ${TEST_LISTEN})
|
||||
|
||||
add_library(dbus-testutils STATIC
|
||||
${TEST_DIR}/disable-crash-handling.c
|
||||
${TEST_DIR}/disable-crash-handling.h
|
||||
${TEST_DIR}/test-utils.h
|
||||
${TEST_DIR}/test-utils.c
|
||||
)
|
||||
target_link_libraries(dbus-testutils ${DBUS_INTERNAL_LIBRARIES})
|
||||
|
||||
add_subdirectory( name-test )
|
||||
|
||||
set (manual-dir-iter_SOURCES
|
||||
${TEST_DIR}/manual-dir-iter.c
|
||||
)
|
||||
|
||||
set (test-service_SOURCES
|
||||
${TEST_DIR}/test-service.c
|
||||
)
|
||||
|
||||
set (test-names_SOURCES
|
||||
${TEST_DIR}/test-names.c
|
||||
)
|
||||
|
||||
set (break_loader_SOURCES
|
||||
${TEST_DIR}/break-loader.c
|
||||
)
|
||||
|
||||
set (test-shell-service_SOURCES
|
||||
${TEST_DIR}/test-shell-service.c
|
||||
)
|
||||
|
||||
set (test-shell_SOURCES
|
||||
${TEST_DIR}/shell-test.c
|
||||
)
|
||||
|
||||
set (test-spawn_SOURCES
|
||||
${TEST_DIR}/spawn-test.c
|
||||
)
|
||||
|
||||
set (test-exit_SOURCES
|
||||
${TEST_DIR}/test-exit.c
|
||||
)
|
||||
|
||||
# We have to compile a separate copy of disable-crash-handling.c for
|
||||
# test-segfault rather than using the libdbus-testutils library, because
|
||||
# otherwise it would fail to link when using the AddressSanitizer.
|
||||
set (test-segfault_SOURCES
|
||||
${TEST_DIR}/disable-crash-handling.c
|
||||
${TEST_DIR}/disable-crash-handling.h
|
||||
${TEST_DIR}/test-segfault.c
|
||||
)
|
||||
|
||||
set (test-sleep-forever_SOURCES
|
||||
${TEST_DIR}/test-sleep-forever.c
|
||||
)
|
||||
|
||||
set (manual-tcp_SOURCES
|
||||
${TEST_DIR}/manual-tcp.c
|
||||
)
|
||||
|
||||
set (manual-paths_SOURCES
|
||||
${TEST_DIR}/manual-paths.c
|
||||
)
|
||||
|
||||
add_helper_executable(manual-dir-iter ${manual-dir-iter_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(test-service ${test-service_SOURCES} dbus-testutils)
|
||||
add_helper_executable(test-names ${test-names_SOURCES} dbus-testutils)
|
||||
add_test_executable(test-shell ${test-shell_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_test_executable(test-printf ${TEST_DIR}/internals/printf.c dbus-testutils)
|
||||
add_helper_executable(test-privserver ${TEST_DIR}/test-privserver.c dbus-testutils)
|
||||
add_helper_executable(test-shell-service ${test-shell-service_SOURCES} dbus-testutils)
|
||||
add_helper_executable(test-spawn ${test-spawn_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
if(NOT WINCE)
|
||||
add_test_executable(test-spawn-oom ${TEST_DIR}/internals/spawn-oom.c dbus-testutils)
|
||||
endif()
|
||||
add_helper_executable(test-exit ${test-exit_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
# the second argument of add_helper_executable() is a whitespace-separated
|
||||
# list of source files and the third and subsequent arguments are libraries
|
||||
# to link, hence the quoting here
|
||||
add_helper_executable(test-segfault "${test-segfault_SOURCES}")
|
||||
add_helper_executable(test-sleep-forever ${test-sleep-forever_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(manual-tcp ${manual-tcp_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(manual-backtrace ${TEST_DIR}/manual-backtrace.c dbus-1)
|
||||
if(WIN32)
|
||||
add_helper_executable(manual-paths ${manual-paths_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(DBUS_ENABLE_EMBEDDED_TESTS)
|
||||
add_test_executable(test-hash ${TEST_DIR}/internals/hash.c dbus-testutils)
|
||||
set_target_properties(test-hash PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES ${TEST_DIR}/internals/dbus-marshal-recursive-util.c
|
||||
${TEST_DIR}/internals/dbus-marshal-recursive-util.h
|
||||
${TEST_DIR}/internals/marshal-recursive.c)
|
||||
add_test_executable(test-marshal-recursive "${SOURCES}" dbus-testutils)
|
||||
set_target_properties(test-marshal-recursive PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES ${TEST_DIR}/internals/dbus-marshal-recursive-util.c
|
||||
${TEST_DIR}/internals/dbus-marshal-recursive-util.h
|
||||
${TEST_DIR}/internals/dbus-message-factory.c
|
||||
${TEST_DIR}/internals/dbus-message-factory.h
|
||||
${TEST_DIR}/internals/dbus-message-util.c
|
||||
${TEST_DIR}/internals/dbus-message-util.h
|
||||
${TEST_DIR}/internals/message-internals.c)
|
||||
add_test_executable(test-message-internals "${SOURCES}" dbus-testutils)
|
||||
set_target_properties(test-message-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES ${TEST_DIR}/internals/dbus-auth-script.c
|
||||
${TEST_DIR}/internals/dbus-auth-script.h
|
||||
${TEST_DIR}/internals/dbus-auth-util.c
|
||||
${TEST_DIR}/internals/dbus-credentials-util.c
|
||||
${TEST_DIR}/internals/dbus-marshal-byteswap-util.c
|
||||
${TEST_DIR}/internals/dbus-marshal-recursive-util.c
|
||||
${TEST_DIR}/internals/dbus-marshal-recursive-util.h
|
||||
${TEST_DIR}/internals/dbus-marshal-validate-util.c
|
||||
${TEST_DIR}/internals/dbus-string-util.c
|
||||
${TEST_DIR}/internals/dbus-sysdeps-util.c
|
||||
${TEST_DIR}/internals/misc-internals.c
|
||||
${TEST_DIR}/internals/misc-internals.h)
|
||||
add_test_executable(test-misc-internals "${SOURCES}" dbus-testutils)
|
||||
set_target_properties(test-misc-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES ${TEST_DIR}/bus/main.c)
|
||||
add_test_executable(test-bus "${SOURCES}" dbus-daemon-internal dbus-testutils ${EXPAT_LIBRARIES})
|
||||
set_target_properties(test-bus PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES ${TEST_DIR}/bus/dispatch.c)
|
||||
add_test_executable(test-bus-dispatch "${SOURCES}" dbus-daemon-internal dbus-testutils ${EXPAT_LIBRARIES})
|
||||
set_target_properties(test-bus-dispatch PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES ${TEST_DIR}/bus/dispatch-sha1.c)
|
||||
add_test_executable(test-bus-dispatch-sha1 "${SOURCES}" dbus-daemon-internal dbus-testutils ${EXPAT_LIBRARIES})
|
||||
set_target_properties(test-bus-dispatch-sha1 PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
if(NOT WIN32)
|
||||
add_test_executable(test-bus-system ${TEST_DIR}/bus/system.c launch-helper-internal dbus-testutils)
|
||||
add_test_executable(test-bus-launch-helper-oom ${TEST_DIR}/bus/launch-helper-oom.c launch-helper-internal dbus-testutils)
|
||||
add_helper_executable(dbus-daemon-launch-helper-for-tests ${TEST_DIR}/bus/launch-helper-for-tests.c launch-helper-internal)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(DBUS_WITH_GLIB)
|
||||
message(STATUS "with glib test apps")
|
||||
|
||||
add_library(dbus-testutils-glib STATIC
|
||||
${TEST_DIR}/test-utils-glib.h
|
||||
${TEST_DIR}/test-utils-glib.c
|
||||
)
|
||||
target_link_libraries(dbus-testutils-glib dbus-testutils ${DBUS_INTERNAL_LIBRARIES})
|
||||
|
||||
add_definitions(
|
||||
${GLIB2_DEFINITIONS}
|
||||
)
|
||||
include_directories(
|
||||
${GLIB2_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
set(TEST_LIBRARIES ${DBUS_INTERNAL_LIBRARIES} dbus-testutils dbus-testutils-glib ${GLIB2_LIBRARIES})
|
||||
|
||||
add_test_executable(test-assertions ${TEST_DIR}/internals/assertions.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-corrupt ${TEST_DIR}/corrupt.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-dbus-daemon ${TEST_DIR}/dbus-daemon.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-dbus-daemon-eavesdrop ${TEST_DIR}/dbus-daemon-eavesdrop.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-desktop-file ${TEST_DIR}/internals/desktop-file.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-fdpass ${TEST_DIR}/fdpass.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-loopback ${TEST_DIR}/loopback.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-marshal ${TEST_DIR}/marshal.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-monitor ${TEST_DIR}/monitor.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-refs ${TEST_DIR}/internals/refs.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-relay ${TEST_DIR}/relay.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-server-oom ${TEST_DIR}/internals/server-oom.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-syntax ${TEST_DIR}/syntax.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-sysdeps ${TEST_DIR}/internals/sysdeps.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-syslog ${TEST_DIR}/internals/syslog.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-uid-permissions ${TEST_DIR}/uid-permissions.c ${TEST_LIBRARIES})
|
||||
add_helper_executable(manual-authz ${TEST_DIR}/manual-authz.c ${TEST_LIBRARIES})
|
||||
add_helper_executable(manual-test-thread-blocking ${TEST_DIR}/thread-blocking.c ${TEST_LIBRARIES})
|
||||
endif()
|
||||
|
||||
### keep these in creation order, i.e. uppermost dirs first
|
||||
set (TESTDIRS
|
||||
test/data
|
||||
test/data/invalid-messages
|
||||
test/data/auth
|
||||
test/data/sha-1
|
||||
test/data/systemd-activation
|
||||
test/data/valid-config-files
|
||||
test/data/valid-config-files/basic.d
|
||||
test/data/valid-config-files/session.d
|
||||
test/data/valid-config-files-system
|
||||
test/data/valid-config-files-system/system.d
|
||||
test/data/valid-service-files
|
||||
test/data/valid-service-files-system
|
||||
test/data/invalid-config-files
|
||||
test/data/invalid-config-files-system
|
||||
test/data/invalid-messages
|
||||
test/data/invalid-service-files-system
|
||||
test/data/equiv-config-files
|
||||
test/data/equiv-config-files/basic
|
||||
test/data/equiv-config-files/basic/basic.d
|
||||
test/data/equiv-config-files/entities
|
||||
test/data/equiv-config-files/entities/basic.d
|
||||
)
|
||||
set (CONFIG_VERBOSE 0)
|
||||
|
||||
FOREACH(DIR ${TESTDIRS})
|
||||
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR})
|
||||
ENDFOREACH(DIR)
|
||||
|
||||
### copy tests to builddir so that generated tests and static tests
|
||||
### are all in one place.
|
||||
MESSAGE(STATUS "Copying test files to test directory")
|
||||
FOREACH(FILE_TYPE *.message-raw *.auth-script *.sha1 *.txt *.conf *.service)
|
||||
FOREACH(DIR ${TESTDIRS})
|
||||
FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../${DIR}/${FILE_TYPE}" )
|
||||
FOREACH(FILE ${FILES})
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
|
||||
SET (TARGET ${CMAKE_BINARY_DIR}/${DIR}/${FILENAME})
|
||||
configure_file(${FILE} ${TARGET} COPYONLY)
|
||||
IF (CONFIG_VERBOSE)
|
||||
MESSAGE("${FILE}")
|
||||
ENDIF (CONFIG_VERBOSE)
|
||||
ENDFOREACH(FILE)
|
||||
ENDFOREACH(DIR)
|
||||
ENDFOREACH(FILE_TYPE)
|
||||
|
||||
### generate test files
|
||||
MESSAGE(STATUS "Generating test files from templates into test directory")
|
||||
|
||||
FOREACH(FILE_TYPE *.conf.in *.service.in)
|
||||
FOREACH(DIR ${TESTDIRS})
|
||||
FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../${DIR}/${FILE_TYPE}" )
|
||||
FOREACH(FILE ${FILES})
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
|
||||
STRING(REGEX REPLACE "\\.in$" "" FILENAME ${FILENAME})
|
||||
SET (TARGET ${CMAKE_BINARY_DIR}/${DIR}/${FILENAME})
|
||||
configure_file(${FILE} ${TARGET} @ONLY IMMEDIATE)
|
||||
IF (CONFIG_VERBOSE)
|
||||
MESSAGE("${FILE}")
|
||||
ENDIF (CONFIG_VERBOSE)
|
||||
ENDFOREACH(FILE)
|
||||
ENDFOREACH(DIR)
|
||||
ENDFOREACH(FILE_TYPE)
|
||||
|
||||
MESSAGE(STATUS "Copying generated bus config files to test directory")
|
||||
configure_file("${CMAKE_SOURCE_DIR}/../bus/session.conf.in" ${CMAKE_BINARY_DIR}/test/data/valid-config-files/session.conf @ONLY)
|
||||
configure_file("${CMAKE_SOURCE_DIR}/../bus/system.conf.in" ${CMAKE_BINARY_DIR}/test/data/valid-config-files-system/system.conf @ONLY)
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
if (DBUS_ENABLE_EMBEDDED_TESTS)
|
||||
|
||||
set (NAME_TEST_DIR ../../../test/name-test)
|
||||
|
||||
add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
add_helper_executable(test-autolaunch ${NAME_TEST_DIR}/test-autolaunch.c dbus-testutils)
|
||||
add_helper_executable(test-privserver-client ${NAME_TEST_DIR}/test-privserver-client.c dbus-testutils)
|
||||
|
||||
add_session_test_executable(test-ids ${NAME_TEST_DIR}/test-ids.c ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_session_test_executable(test-pending-call-dispatch ${NAME_TEST_DIR}/test-pending-call-dispatch.c ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_session_test_executable(test-pending-call-timeout ${NAME_TEST_DIR}/test-pending-call-timeout.c ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_session_test_executable(test-shutdown ${NAME_TEST_DIR}/test-shutdown.c dbus-testutils)
|
||||
add_session_test_executable(test-thread-init ${NAME_TEST_DIR}/test-threads-init.c ${DBUS_INTERNAL_LIBRARIES})
|
||||
endif (DBUS_ENABLE_EMBEDDED_TESTS)
|
||||
|
|
@ -1,27 +1,25 @@
|
|||
SET(DBUS_DIR ../../dbus)
|
||||
|
||||
configure_file(${DBUS_DIR}/dbus-arch-deps.h.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h )
|
||||
configure_file(dbus-arch-deps.h.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h )
|
||||
|
||||
add_definitions(-DDBUS_COMPILATION)
|
||||
|
||||
set (dbusinclude_HEADERS
|
||||
${DBUS_DIR}/dbus.h
|
||||
${DBUS_DIR}/dbus-address.h
|
||||
${DBUS_DIR}/dbus-bus.h
|
||||
${DBUS_DIR}/dbus-connection.h
|
||||
${DBUS_DIR}/dbus-errors.h
|
||||
${DBUS_DIR}/dbus-macros.h
|
||||
${DBUS_DIR}/dbus-memory.h
|
||||
${DBUS_DIR}/dbus-message.h
|
||||
${DBUS_DIR}/dbus-misc.h
|
||||
${DBUS_DIR}/dbus-pending-call.h
|
||||
${DBUS_DIR}/dbus-protocol.h
|
||||
${DBUS_DIR}/dbus-server.h
|
||||
${DBUS_DIR}/dbus-shared.h
|
||||
${DBUS_DIR}/dbus-signature.h
|
||||
${DBUS_DIR}/dbus-syntax.h
|
||||
${DBUS_DIR}/dbus-threads.h
|
||||
${DBUS_DIR}/dbus-types.h
|
||||
dbus.h
|
||||
dbus-address.h
|
||||
dbus-bus.h
|
||||
dbus-connection.h
|
||||
dbus-errors.h
|
||||
dbus-macros.h
|
||||
dbus-memory.h
|
||||
dbus-message.h
|
||||
dbus-misc.h
|
||||
dbus-pending-call.h
|
||||
dbus-protocol.h
|
||||
dbus-server.h
|
||||
dbus-shared.h
|
||||
dbus-signature.h
|
||||
dbus-syntax.h
|
||||
dbus-threads.h
|
||||
dbus-types.h
|
||||
)
|
||||
set (dbusinclude_ARCH_HEADERS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h
|
||||
|
|
@ -30,83 +28,83 @@ set (dbusinclude_ARCH_HEADERS
|
|||
### source code that goes in the installed client library
|
||||
### and is specific to library functionality
|
||||
set (DBUS_LIB_SOURCES
|
||||
${DBUS_DIR}/dbus-address.c
|
||||
${DBUS_DIR}/dbus-auth.c
|
||||
${DBUS_DIR}/dbus-bus.c
|
||||
${DBUS_DIR}/dbus-connection.c
|
||||
${DBUS_DIR}/dbus-credentials.c
|
||||
${DBUS_DIR}/dbus-errors.c
|
||||
${DBUS_DIR}/dbus-keyring.c
|
||||
${DBUS_DIR}/dbus-marshal-header.c
|
||||
${DBUS_DIR}/dbus-marshal-byteswap.c
|
||||
${DBUS_DIR}/dbus-marshal-recursive.c
|
||||
${DBUS_DIR}/dbus-marshal-validate.c
|
||||
${DBUS_DIR}/dbus-message.c
|
||||
${DBUS_DIR}/dbus-misc.c
|
||||
${DBUS_DIR}/dbus-nonce.c
|
||||
${DBUS_DIR}/dbus-object-tree.c
|
||||
${DBUS_DIR}/dbus-pending-call.c
|
||||
${DBUS_DIR}/dbus-resources.c
|
||||
${DBUS_DIR}/dbus-server.c
|
||||
${DBUS_DIR}/dbus-server-socket.c
|
||||
${DBUS_DIR}/dbus-server-debug-pipe.c
|
||||
${DBUS_DIR}/dbus-sha.c
|
||||
${DBUS_DIR}/dbus-signature.c
|
||||
${DBUS_DIR}/dbus-syntax.c
|
||||
${DBUS_DIR}/dbus-timeout.c
|
||||
${DBUS_DIR}/dbus-threads.c
|
||||
${DBUS_DIR}/dbus-transport.c
|
||||
${DBUS_DIR}/dbus-transport-socket.c
|
||||
${DBUS_DIR}/dbus-watch.c
|
||||
dbus-address.c
|
||||
dbus-auth.c
|
||||
dbus-bus.c
|
||||
dbus-connection.c
|
||||
dbus-credentials.c
|
||||
dbus-errors.c
|
||||
dbus-keyring.c
|
||||
dbus-marshal-header.c
|
||||
dbus-marshal-byteswap.c
|
||||
dbus-marshal-recursive.c
|
||||
dbus-marshal-validate.c
|
||||
dbus-message.c
|
||||
dbus-misc.c
|
||||
dbus-nonce.c
|
||||
dbus-object-tree.c
|
||||
dbus-pending-call.c
|
||||
dbus-resources.c
|
||||
dbus-server.c
|
||||
dbus-server-socket.c
|
||||
dbus-server-debug-pipe.c
|
||||
dbus-sha.c
|
||||
dbus-signature.c
|
||||
dbus-syntax.c
|
||||
dbus-timeout.c
|
||||
dbus-threads.c
|
||||
dbus-transport.c
|
||||
dbus-transport-socket.c
|
||||
dbus-watch.c
|
||||
)
|
||||
|
||||
|
||||
if(UNIX)
|
||||
set (DBUS_LIB_SOURCES ${DBUS_LIB_SOURCES}
|
||||
${DBUS_DIR}/dbus-transport-unix.c
|
||||
${DBUS_DIR}/dbus-server-unix.c
|
||||
dbus-transport-unix.c
|
||||
dbus-server-unix.c
|
||||
)
|
||||
else(UNIX)
|
||||
set (DBUS_LIB_SOURCES ${DBUS_LIB_SOURCES}
|
||||
${DBUS_DIR}/dbus-transport-win.c
|
||||
${DBUS_DIR}/dbus-server-win.c
|
||||
dbus-transport-win.c
|
||||
dbus-server-win.c
|
||||
)
|
||||
endif(UNIX)
|
||||
|
||||
set (DBUS_LIB_HEADERS
|
||||
${DBUS_DIR}/dbus-auth.h
|
||||
${DBUS_DIR}/dbus-connection-internal.h
|
||||
${DBUS_DIR}/dbus-credentials.h
|
||||
${DBUS_DIR}/dbus-keyring.h
|
||||
${DBUS_DIR}/dbus-marshal-header.h
|
||||
${DBUS_DIR}/dbus-marshal-byteswap.h
|
||||
${DBUS_DIR}/dbus-marshal-recursive.h
|
||||
${DBUS_DIR}/dbus-marshal-validate.h
|
||||
${DBUS_DIR}/dbus-message-internal.h
|
||||
${DBUS_DIR}/dbus-message-private.h
|
||||
${DBUS_DIR}/dbus-misc.h
|
||||
${DBUS_DIR}/dbus-object-tree.h
|
||||
${DBUS_DIR}/dbus-protocol.h
|
||||
${DBUS_DIR}/dbus-resources.h
|
||||
${DBUS_DIR}/dbus-server-debug-pipe.h
|
||||
${DBUS_DIR}/dbus-server-protected.h
|
||||
${DBUS_DIR}/dbus-server-unix.h
|
||||
${DBUS_DIR}/dbus-sha.h
|
||||
${DBUS_DIR}/dbus-timeout.h
|
||||
${DBUS_DIR}/dbus-threads.h
|
||||
${DBUS_DIR}/dbus-threads-internal.h
|
||||
${DBUS_DIR}/dbus-transport.h
|
||||
${DBUS_DIR}/dbus-transport-protected.h
|
||||
${DBUS_DIR}/dbus-watch.h
|
||||
dbus-auth.h
|
||||
dbus-connection-internal.h
|
||||
dbus-credentials.h
|
||||
dbus-keyring.h
|
||||
dbus-marshal-header.h
|
||||
dbus-marshal-byteswap.h
|
||||
dbus-marshal-recursive.h
|
||||
dbus-marshal-validate.h
|
||||
dbus-message-internal.h
|
||||
dbus-message-private.h
|
||||
dbus-misc.h
|
||||
dbus-object-tree.h
|
||||
dbus-protocol.h
|
||||
dbus-resources.h
|
||||
dbus-server-debug-pipe.h
|
||||
dbus-server-protected.h
|
||||
dbus-server-unix.h
|
||||
dbus-sha.h
|
||||
dbus-timeout.h
|
||||
dbus-threads.h
|
||||
dbus-threads-internal.h
|
||||
dbus-transport.h
|
||||
dbus-transport-protected.h
|
||||
dbus-watch.h
|
||||
${CMAKE_BINARY_DIR}/config.h
|
||||
)
|
||||
if(UNIX)
|
||||
set (DBUS_LIB_HEADERS ${DBUS_LIB_HEADERS}
|
||||
${DBUS_DIR}/dbus-transport-unix.h
|
||||
dbus-transport-unix.h
|
||||
)
|
||||
else(UNIX)
|
||||
set (DBUS_LIB_HEADERS ${DBUS_LIB_HEADERS}
|
||||
${DBUS_DIR}/dbus-transport-win.h
|
||||
dbus-transport-win.h
|
||||
)
|
||||
endif(UNIX)
|
||||
|
||||
|
|
@ -116,33 +114,33 @@ endif(UNIX)
|
|||
### daemon or test programs (all symbols in here should
|
||||
### be underscore-prefixed)
|
||||
set (DBUS_SHARED_SOURCES
|
||||
${DBUS_DIR}/dbus-dataslot.c
|
||||
${DBUS_DIR}/dbus-file.c
|
||||
${DBUS_DIR}/dbus-hash.c
|
||||
${DBUS_DIR}/dbus-internals.c
|
||||
${DBUS_DIR}/dbus-list.c
|
||||
${DBUS_DIR}/dbus-marshal-basic.c
|
||||
${DBUS_DIR}/dbus-memory.c
|
||||
${DBUS_DIR}/dbus-mempool.c
|
||||
${DBUS_DIR}/dbus-string.c
|
||||
${DBUS_DIR}/dbus-sysdeps.c
|
||||
${DBUS_DIR}/dbus-pipe.c
|
||||
${DBUS_DIR}/dbus-test-tap.c
|
||||
dbus-dataslot.c
|
||||
dbus-file.c
|
||||
dbus-hash.c
|
||||
dbus-internals.c
|
||||
dbus-list.c
|
||||
dbus-marshal-basic.c
|
||||
dbus-memory.c
|
||||
dbus-mempool.c
|
||||
dbus-string.c
|
||||
dbus-sysdeps.c
|
||||
dbus-pipe.c
|
||||
dbus-test-tap.c
|
||||
)
|
||||
|
||||
set (DBUS_SHARED_HEADERS
|
||||
${DBUS_DIR}/dbus-dataslot.h
|
||||
${DBUS_DIR}/dbus-file.h
|
||||
${DBUS_DIR}/dbus-hash.h
|
||||
${DBUS_DIR}/dbus-internals.h
|
||||
${DBUS_DIR}/dbus-list.h
|
||||
${DBUS_DIR}/dbus-marshal-basic.h
|
||||
${DBUS_DIR}/dbus-mempool.h
|
||||
${DBUS_DIR}/dbus-string.h
|
||||
${DBUS_DIR}/dbus-string-private.h
|
||||
${DBUS_DIR}/dbus-pipe.h
|
||||
${DBUS_DIR}/dbus-sysdeps.h
|
||||
${DBUS_DIR}/dbus-test-tap.h
|
||||
dbus-dataslot.h
|
||||
dbus-file.h
|
||||
dbus-hash.h
|
||||
dbus-internals.h
|
||||
dbus-list.h
|
||||
dbus-marshal-basic.h
|
||||
dbus-mempool.h
|
||||
dbus-string.h
|
||||
dbus-string-private.h
|
||||
dbus-pipe.h
|
||||
dbus-sysdeps.h
|
||||
dbus-test-tap.h
|
||||
)
|
||||
|
||||
### source code that is generic utility functionality used
|
||||
|
|
@ -151,75 +149,75 @@ set (DBUS_SHARED_HEADERS
|
|||
### should be underscore-prefixed but don't really need
|
||||
### to be unless they move to DBUS_SHARED_SOURCES later)
|
||||
set (DBUS_UTIL_SOURCES
|
||||
${DBUS_DIR}/dbus-asv-util.c
|
||||
${DBUS_DIR}/dbus-mainloop.c
|
||||
${DBUS_DIR}/dbus-message-util.c
|
||||
${DBUS_DIR}/dbus-shell.c
|
||||
${DBUS_DIR}/dbus-pollable-set.c
|
||||
${DBUS_DIR}/dbus-pollable-set-poll.c
|
||||
${DBUS_DIR}/dbus-string-util.c
|
||||
${DBUS_DIR}/dbus-sysdeps-util.c
|
||||
dbus-asv-util.c
|
||||
dbus-mainloop.c
|
||||
dbus-message-util.c
|
||||
dbus-shell.c
|
||||
dbus-pollable-set.c
|
||||
dbus-pollable-set-poll.c
|
||||
dbus-string-util.c
|
||||
dbus-sysdeps-util.c
|
||||
)
|
||||
|
||||
set (DBUS_UTIL_HEADERS
|
||||
${DBUS_DIR}/dbus-asv-util.h
|
||||
${DBUS_DIR}/dbus-mainloop.h
|
||||
${DBUS_DIR}/dbus-shell.h
|
||||
${DBUS_DIR}/dbus-pollable-set.h
|
||||
${DBUS_DIR}/dbus-spawn.h
|
||||
${DBUS_DIR}/dbus-test.h
|
||||
dbus-asv-util.h
|
||||
dbus-mainloop.h
|
||||
dbus-shell.h
|
||||
dbus-pollable-set.h
|
||||
dbus-spawn.h
|
||||
dbus-test.h
|
||||
)
|
||||
|
||||
### platform specific settings
|
||||
if (WIN32)
|
||||
set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES}
|
||||
${DBUS_DIR}/dbus-file-win.c
|
||||
${DBUS_DIR}/dbus-init-win.cpp
|
||||
${DBUS_DIR}/dbus-sysdeps-win.c
|
||||
${DBUS_DIR}/dbus-pipe-win.c
|
||||
${DBUS_DIR}/dbus-sysdeps-thread-win.c
|
||||
dbus-file-win.c
|
||||
dbus-init-win.cpp
|
||||
dbus-sysdeps-win.c
|
||||
dbus-pipe-win.c
|
||||
dbus-sysdeps-thread-win.c
|
||||
)
|
||||
set (DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS}
|
||||
${DBUS_DIR}/dbus-sockets-win.h
|
||||
${DBUS_DIR}/dbus-sysdeps-win.h
|
||||
dbus-sockets-win.h
|
||||
dbus-sysdeps-win.h
|
||||
)
|
||||
set (DBUS_UTIL_SOURCES ${DBUS_UTIL_SOURCES}
|
||||
${DBUS_DIR}/dbus-spawn-win.c
|
||||
${DBUS_DIR}/dbus-sysdeps-util-win.c
|
||||
dbus-spawn-win.c
|
||||
dbus-sysdeps-util-win.c
|
||||
)
|
||||
if(WINCE)
|
||||
set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES}
|
||||
${DBUS_DIR}/dbus-sysdeps-wince-glue.c
|
||||
dbus-sysdeps-wince-glue.c
|
||||
)
|
||||
set (DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS}
|
||||
${DBUS_DIR}/dbus-sysdeps-wince-glue.h
|
||||
dbus-sysdeps-wince-glue.h
|
||||
)
|
||||
endif(WINCE)
|
||||
else (WIN32)
|
||||
set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES}
|
||||
${DBUS_DIR}/dbus-file-unix.c
|
||||
${DBUS_DIR}/dbus-pipe-unix.c
|
||||
${DBUS_DIR}/dbus-sysdeps-unix.c
|
||||
${DBUS_DIR}/dbus-sysdeps-pthread.c
|
||||
${DBUS_DIR}/dbus-userdb.c
|
||||
dbus-file-unix.c
|
||||
dbus-pipe-unix.c
|
||||
dbus-sysdeps-unix.c
|
||||
dbus-sysdeps-pthread.c
|
||||
dbus-userdb.c
|
||||
)
|
||||
set (DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS}
|
||||
${DBUS_DIR}/dbus-server-unix.h
|
||||
${DBUS_DIR}/dbus-transport-unix.h
|
||||
${DBUS_DIR}/dbus-sysdeps-unix.h
|
||||
${DBUS_DIR}/dbus-userdb.h
|
||||
dbus-server-unix.h
|
||||
dbus-transport-unix.h
|
||||
dbus-sysdeps-unix.h
|
||||
dbus-userdb.h
|
||||
)
|
||||
set (DBUS_UTIL_SOURCES ${DBUS_UTIL_SOURCES}
|
||||
${DBUS_DIR}/dbus-spawn-unix.c
|
||||
${DBUS_DIR}/dbus-userdb-util.c
|
||||
${DBUS_DIR}/dbus-sysdeps-util-unix.c
|
||||
dbus-spawn-unix.c
|
||||
dbus-userdb-util.c
|
||||
dbus-sysdeps-util-unix.c
|
||||
)
|
||||
endif (WIN32)
|
||||
|
||||
if(DBUS_HAVE_LINUX_EPOLL)
|
||||
set(DBUS_UTIL_SOURCES
|
||||
${DBUS_UTIL_SOURCES}
|
||||
${DBUS_DIR}/dbus-pollable-set-epoll.c
|
||||
dbus-pollable-set-epoll.c
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
@ -241,7 +239,7 @@ if(WIN32)
|
|||
set(DBUS_VER_INTERNAL_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}dbus-1-${DBUS_LIBRARY_MAJOR}")
|
||||
set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||||
set(DBUS_VER_FILE_TYPE "VFT_DLL")
|
||||
configure_file(${DBUS_DIR}/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc)
|
||||
configure_file(versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc)
|
||||
list(APPEND libdbus_SOURCES versioninfo.rc)
|
||||
endif()
|
||||
|
||||
|
|
@ -293,7 +291,7 @@ endif(WIN32)
|
|||
# Assume that Linux has -Wl,--version-script and other platforms do not
|
||||
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
|
||||
set(SOVERSION ${DBUS_LIBRARY_MAJOR})
|
||||
configure_file(${DBUS_DIR}/Version.in ${CMAKE_CURRENT_BINARY_DIR}/Version)
|
||||
configure_file(Version.in ${CMAKE_CURRENT_BINARY_DIR}/Version)
|
||||
set_target_properties(dbus-1 PROPERTIES LINK_FLAGS -Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/Version)
|
||||
endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
|
||||
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
SET(DOC_DIR ${CMAKE_SOURCE_DIR}/../doc)
|
||||
|
||||
#
|
||||
# api documentation
|
||||
#
|
||||
|
|
@ -13,8 +11,8 @@ if(DOXYGEN_EXECUTABLE)
|
|||
endif(DOXYGEN_EXECUTABLE)
|
||||
|
||||
if (DBUS_ENABLE_DOXYGEN_DOCS)
|
||||
set (top_srcdir ${CMAKE_SOURCE_DIR}/..)
|
||||
configure_file(${CMAKE_SOURCE_DIR}/../Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile )
|
||||
set (top_srcdir ${CMAKE_SOURCE_DIR})
|
||||
configure_file(../Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile )
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/api/html/index.html
|
||||
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile
|
||||
|
|
@ -40,8 +38,8 @@ endif()
|
|||
if(DBUS_HAVE_XSLTPROC)
|
||||
add_custom_command(
|
||||
OUTPUT dbus.devhelp2
|
||||
COMMAND ${XSLTPROC_EXECUTABLE} -o dbus.devhelp2 ${DOC_DIR}/doxygen_to_devhelp.xsl api/xml/index.xml
|
||||
DEPENDS ${DOC_DIR}/doxygen_to_devhelp.xsl api/html/index.html
|
||||
COMMAND ${XSLTPROC_EXECUTABLE} -o dbus.devhelp2 ${CMAKE_CURRENT_SOURCE_DIR}/doxygen_to_devhelp.xsl api/xml/index.xml
|
||||
DEPENDS doxygen_to_devhelp.xsl api/html/index.html
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
endif()
|
||||
|
|
@ -99,7 +97,7 @@ endmacro(DOCBOOK)
|
|||
MACRO (COPYDIR _src _type)
|
||||
FOREACH(FILE_TYPE ${_type})
|
||||
FOREACH(DIR ${_src})
|
||||
FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../${DIR}/${FILE_TYPE}" )
|
||||
FILE(GLOB FILES "${DIR}/${FILE_TYPE}" )
|
||||
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR})
|
||||
FOREACH(FILE ${FILES})
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
|
||||
|
|
@ -116,48 +114,48 @@ ENDMACRO (COPYDIR)
|
|||
COPYDIR(doc *.png)
|
||||
COPYDIR(doc *.svg)
|
||||
|
||||
docbook(${DOC_DIR}/dbus-test-plan.xml html)
|
||||
docbook(${DOC_DIR}/dbus-tutorial.xml html)
|
||||
docbook(${DOC_DIR}/dbus-specification.xml html)
|
||||
docbook(${DOC_DIR}/dbus-faq.xml html)
|
||||
docbook(${CMAKE_CURRENT_SOURCE_DIR}/dbus-test-plan.xml html)
|
||||
docbook(${CMAKE_CURRENT_SOURCE_DIR}/dbus-tutorial.xml html)
|
||||
docbook(${CMAKE_CURRENT_SOURCE_DIR}/dbus-specification.xml html)
|
||||
docbook(${CMAKE_CURRENT_SOURCE_DIR}/dbus-faq.xml html)
|
||||
|
||||
configure_file(${DOC_DIR}/dbus-cleanup-sockets.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-cleanup-sockets.1.xml)
|
||||
configure_file(${DOC_DIR}/dbus-daemon.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml)
|
||||
configure_file(${DOC_DIR}/dbus-launch.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml)
|
||||
configure_file(${DOC_DIR}/dbus-monitor.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml)
|
||||
configure_file(${DOC_DIR}/dbus-send.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml)
|
||||
configure_file(${DOC_DIR}/dbus-test-tool.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-test-tool.1.xml)
|
||||
configure_file(${DOC_DIR}/dbus-update-activation-environment.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-update-activation-environment.1.xml)
|
||||
configure_file(${DOC_DIR}/dbus-uuidgen.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml)
|
||||
configure_file(dbus-cleanup-sockets.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-cleanup-sockets.1.xml)
|
||||
configure_file(dbus-daemon.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-daemon.1.xml)
|
||||
configure_file(dbus-launch.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-launch.1.xml)
|
||||
configure_file(dbus-monitor.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-monitor.1.xml)
|
||||
configure_file(dbus-send.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-send.1.xml)
|
||||
configure_file(dbus-test-tool.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-test-tool.1.xml)
|
||||
configure_file(dbus-update-activation-environment.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-update-activation-environment.1.xml)
|
||||
configure_file(dbus-uuidgen.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-uuidgen.1.xml)
|
||||
if(UNIX)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml man)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml man)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml man)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-test-tool.1.xml man)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml man)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml man)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-cleanup-sockets.1.xml man)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-update-activation-environment.1.xml man)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-daemon.1.xml man)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-monitor.1.xml man)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-send.1.xml man)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-test-tool.1.xml man)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-launch.1.xml man)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-uuidgen.1.xml man)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-cleanup-sockets.1.xml man)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-update-activation-environment.1.xml man)
|
||||
endif()
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml html)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml html)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml html)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-test-tool.1.xml html)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml html)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml html)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-cleanup-sockets.1.xml html)
|
||||
docbook(${CMAKE_BINARY_DIR}/doc/dbus-update-activation-environment.1.xml html)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-daemon.1.xml html)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-monitor.1.xml html)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-send.1.xml html)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-test-tool.1.xml html)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-launch.1.xml html)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-uuidgen.1.xml html)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-cleanup-sockets.1.xml html)
|
||||
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-update-activation-environment.1.xml html)
|
||||
|
||||
#
|
||||
# handle html index file
|
||||
#
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/index.html.cmake ${CMAKE_CURRENT_BINARY_DIR}/index.html )
|
||||
configure_file(../cmake/doc/index.html.cmake ${CMAKE_CURRENT_BINARY_DIR}/index.html )
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/index.html DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus)
|
||||
|
||||
set (EXTRA_DIST
|
||||
${DOC_DIR}/busconfig.dtd
|
||||
${DOC_DIR}/introspect.dtd
|
||||
${DOC_DIR}/introspect.xsl
|
||||
busconfig.dtd
|
||||
introspect.dtd
|
||||
introspect.xsl
|
||||
)
|
||||
|
||||
install(FILES ${EXTRA_DIST} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus)
|
||||
253
test/CMakeLists.txt
Normal file
253
test/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,253 @@
|
|||
|
||||
add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
include_directories(.)
|
||||
|
||||
set(DBUS_SESSION_BUS_LISTEN_ADDRESS ${TEST_LISTEN})
|
||||
|
||||
add_library(dbus-testutils STATIC
|
||||
disable-crash-handling.c
|
||||
disable-crash-handling.h
|
||||
test-utils.h
|
||||
test-utils.c
|
||||
)
|
||||
target_link_libraries(dbus-testutils ${DBUS_INTERNAL_LIBRARIES})
|
||||
|
||||
add_subdirectory( name-test )
|
||||
|
||||
set (manual-dir-iter_SOURCES
|
||||
manual-dir-iter.c
|
||||
)
|
||||
|
||||
set (test-service_SOURCES
|
||||
test-service.c
|
||||
)
|
||||
|
||||
set (test-names_SOURCES
|
||||
test-names.c
|
||||
)
|
||||
|
||||
set (break_loader_SOURCES
|
||||
break-loader.c
|
||||
)
|
||||
|
||||
set (test-shell-service_SOURCES
|
||||
test-shell-service.c
|
||||
)
|
||||
|
||||
set (test-shell_SOURCES
|
||||
shell-test.c
|
||||
)
|
||||
|
||||
set (test-spawn_SOURCES
|
||||
spawn-test.c
|
||||
)
|
||||
|
||||
set (test-exit_SOURCES
|
||||
test-exit.c
|
||||
)
|
||||
|
||||
# We have to compile a separate copy of disable-crash-handling.c for
|
||||
# test-segfault rather than using the libdbus-testutils library, because
|
||||
# otherwise it would fail to link when using the AddressSanitizer.
|
||||
set (test-segfault_SOURCES
|
||||
disable-crash-handling.c
|
||||
disable-crash-handling.h
|
||||
test-segfault.c
|
||||
)
|
||||
|
||||
set (test-sleep-forever_SOURCES
|
||||
test-sleep-forever.c
|
||||
)
|
||||
|
||||
set (manual-tcp_SOURCES
|
||||
manual-tcp.c
|
||||
)
|
||||
|
||||
set (manual-paths_SOURCES
|
||||
manual-paths.c
|
||||
)
|
||||
|
||||
add_helper_executable(manual-dir-iter ${manual-dir-iter_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(test-service ${test-service_SOURCES} dbus-testutils)
|
||||
add_helper_executable(test-names ${test-names_SOURCES} dbus-testutils)
|
||||
add_test_executable(test-shell ${test-shell_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_test_executable(test-printf internals/printf.c dbus-testutils)
|
||||
add_helper_executable(test-privserver test-privserver.c dbus-testutils)
|
||||
add_helper_executable(test-shell-service ${test-shell-service_SOURCES} dbus-testutils)
|
||||
add_helper_executable(test-spawn ${test-spawn_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
if(NOT WINCE)
|
||||
add_test_executable(test-spawn-oom internals/spawn-oom.c dbus-testutils)
|
||||
endif()
|
||||
add_helper_executable(test-exit ${test-exit_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
# the second argument of add_helper_executable() is a whitespace-separated
|
||||
# list of source files and the third and subsequent arguments are libraries
|
||||
# to link, hence the quoting here
|
||||
add_helper_executable(test-segfault "${test-segfault_SOURCES}")
|
||||
add_helper_executable(test-sleep-forever ${test-sleep-forever_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(manual-tcp ${manual-tcp_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(manual-backtrace manual-backtrace.c dbus-1)
|
||||
if(WIN32)
|
||||
add_helper_executable(manual-paths ${manual-paths_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(DBUS_ENABLE_EMBEDDED_TESTS)
|
||||
add_test_executable(test-hash internals/hash.c dbus-testutils)
|
||||
set_target_properties(test-hash PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES internals/dbus-marshal-recursive-util.c
|
||||
internals/dbus-marshal-recursive-util.h
|
||||
internals/marshal-recursive.c)
|
||||
add_test_executable(test-marshal-recursive "${SOURCES}" dbus-testutils)
|
||||
set_target_properties(test-marshal-recursive PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES internals/dbus-marshal-recursive-util.c
|
||||
internals/dbus-marshal-recursive-util.h
|
||||
internals/dbus-message-factory.c
|
||||
internals/dbus-message-factory.h
|
||||
internals/dbus-message-util.c
|
||||
internals/dbus-message-util.h
|
||||
internals/message-internals.c)
|
||||
add_test_executable(test-message-internals "${SOURCES}" dbus-testutils)
|
||||
set_target_properties(test-message-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES internals/dbus-auth-script.c
|
||||
internals/dbus-auth-script.h
|
||||
internals/dbus-auth-util.c
|
||||
internals/dbus-credentials-util.c
|
||||
internals/dbus-marshal-byteswap-util.c
|
||||
internals/dbus-marshal-recursive-util.c
|
||||
internals/dbus-marshal-recursive-util.h
|
||||
internals/dbus-marshal-validate-util.c
|
||||
internals/dbus-string-util.c
|
||||
internals/dbus-sysdeps-util.c
|
||||
internals/misc-internals.c
|
||||
internals/misc-internals.h)
|
||||
add_test_executable(test-misc-internals "${SOURCES}" dbus-testutils)
|
||||
set_target_properties(test-misc-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES bus/main.c)
|
||||
add_test_executable(test-bus "${SOURCES}" dbus-daemon-internal dbus-testutils ${EXPAT_LIBRARIES})
|
||||
set_target_properties(test-bus PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES bus/dispatch.c)
|
||||
add_test_executable(test-bus-dispatch "${SOURCES}" dbus-daemon-internal dbus-testutils ${EXPAT_LIBRARIES})
|
||||
set_target_properties(test-bus-dispatch PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
set(SOURCES bus/dispatch-sha1.c)
|
||||
add_test_executable(test-bus-dispatch-sha1 "${SOURCES}" dbus-daemon-internal dbus-testutils ${EXPAT_LIBRARIES})
|
||||
set_target_properties(test-bus-dispatch-sha1 PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
if(NOT WIN32)
|
||||
add_test_executable(test-bus-system bus/system.c launch-helper-internal dbus-testutils)
|
||||
add_test_executable(test-bus-launch-helper-oom bus/launch-helper-oom.c launch-helper-internal dbus-testutils)
|
||||
add_helper_executable(dbus-daemon-launch-helper-for-tests bus/launch-helper-for-tests.c launch-helper-internal)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(DBUS_WITH_GLIB)
|
||||
message(STATUS "with glib test apps")
|
||||
|
||||
add_library(dbus-testutils-glib STATIC
|
||||
test-utils-glib.h
|
||||
test-utils-glib.c
|
||||
)
|
||||
target_link_libraries(dbus-testutils-glib dbus-testutils ${DBUS_INTERNAL_LIBRARIES})
|
||||
|
||||
add_definitions(
|
||||
${GLIB2_DEFINITIONS}
|
||||
)
|
||||
include_directories(
|
||||
${GLIB2_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
set(TEST_LIBRARIES ${DBUS_INTERNAL_LIBRARIES} dbus-testutils dbus-testutils-glib ${GLIB2_LIBRARIES})
|
||||
|
||||
add_test_executable(test-assertions internals/assertions.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-corrupt corrupt.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-dbus-daemon dbus-daemon.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-dbus-daemon-eavesdrop dbus-daemon-eavesdrop.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-desktop-file internals/desktop-file.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-fdpass fdpass.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-loopback loopback.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-marshal marshal.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-monitor monitor.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-refs internals/refs.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-relay relay.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-server-oom internals/server-oom.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-syntax syntax.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-sysdeps internals/sysdeps.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-syslog internals/syslog.c ${TEST_LIBRARIES})
|
||||
add_test_executable(test-uid-permissions uid-permissions.c ${TEST_LIBRARIES})
|
||||
add_helper_executable(manual-authz manual-authz.c ${TEST_LIBRARIES})
|
||||
add_helper_executable(manual-test-thread-blocking thread-blocking.c ${TEST_LIBRARIES})
|
||||
endif()
|
||||
|
||||
### keep these in creation order, i.e. uppermost dirs first
|
||||
set (TESTDIRS
|
||||
data
|
||||
data/invalid-messages
|
||||
data/auth
|
||||
data/sha-1
|
||||
data/systemd-activation
|
||||
data/valid-config-files
|
||||
data/valid-config-files/basic.d
|
||||
data/valid-config-files/session.d
|
||||
data/valid-config-files-system
|
||||
data/valid-config-files-system/system.d
|
||||
data/valid-service-files
|
||||
data/valid-service-files-system
|
||||
data/invalid-config-files
|
||||
data/invalid-config-files-system
|
||||
data/invalid-messages
|
||||
data/invalid-service-files-system
|
||||
data/equiv-config-files
|
||||
data/equiv-config-files/basic
|
||||
data/equiv-config-files/basic/basic.d
|
||||
data/equiv-config-files/entities
|
||||
data/equiv-config-files/entities/basic.d
|
||||
)
|
||||
set (CONFIG_VERBOSE 1)
|
||||
|
||||
FOREACH(DIR ${TESTDIRS})
|
||||
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR})
|
||||
ENDFOREACH(DIR)
|
||||
|
||||
### copy tests to builddir so that generated tests and static tests
|
||||
### are all in one place.
|
||||
MESSAGE(STATUS "Copying test files to test directory")
|
||||
FOREACH(FILE_TYPE *.message-raw *.auth-script *.sha1 *.txt *.conf *.service)
|
||||
FOREACH(DIR ${TESTDIRS})
|
||||
FILE(GLOB FILES "${DIR}/${FILE_TYPE}" )
|
||||
FOREACH(FILE ${FILES})
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
|
||||
SET (TARGET ${CMAKE_CURRENT_BINARY_DIR}/${DIR}/${FILENAME})
|
||||
configure_file(${FILE} ${TARGET} COPYONLY)
|
||||
IF (CONFIG_VERBOSE)
|
||||
MESSAGE("${FILE}")
|
||||
ENDIF (CONFIG_VERBOSE)
|
||||
ENDFOREACH(FILE)
|
||||
ENDFOREACH(DIR)
|
||||
ENDFOREACH(FILE_TYPE)
|
||||
|
||||
### generate test files
|
||||
MESSAGE(STATUS "Generating test files from templates into test directory")
|
||||
|
||||
FOREACH(FILE_TYPE *.conf.in *.service.in)
|
||||
FOREACH(DIR ${TESTDIRS})
|
||||
FILE(GLOB FILES "${DIR}/${FILE_TYPE}" )
|
||||
FOREACH(FILE ${FILES})
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
|
||||
STRING(REGEX REPLACE "\\.in$" "" FILENAME ${FILENAME})
|
||||
SET (TARGET ${CMAKE_CURRENT_BINARY_DIR}/${DIR}/${FILENAME})
|
||||
configure_file(${FILE} ${TARGET} @ONLY IMMEDIATE)
|
||||
IF (CONFIG_VERBOSE)
|
||||
MESSAGE("${FILE}")
|
||||
ENDIF (CONFIG_VERBOSE)
|
||||
ENDFOREACH(FILE)
|
||||
ENDFOREACH(DIR)
|
||||
ENDFOREACH(FILE_TYPE)
|
||||
|
||||
MESSAGE(STATUS "Copying generated bus config files to test directory")
|
||||
configure_file(../bus/session.conf.in ${CMAKE_BINARY_DIR}/test/data/valid-config-files/session.conf @ONLY)
|
||||
configure_file(../bus/system.conf.in ${CMAKE_BINARY_DIR}/test/data/valid-config-files-system/system.conf @ONLY)
|
||||
13
test/name-test/CMakeLists.txt
Normal file
13
test/name-test/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
if (DBUS_ENABLE_EMBEDDED_TESTS)
|
||||
|
||||
add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
||||
|
||||
add_helper_executable(test-autolaunch test-autolaunch.c dbus-testutils)
|
||||
add_helper_executable(test-privserver-client test-privserver-client.c dbus-testutils)
|
||||
|
||||
add_session_test_executable(test-ids test-ids.c ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_session_test_executable(test-pending-call-dispatch test-pending-call-dispatch.c ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_session_test_executable(test-pending-call-timeout test-pending-call-timeout.c ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_session_test_executable(test-shutdown test-shutdown.c dbus-testutils)
|
||||
add_session_test_executable(test-thread-init test-threads-init.c ${DBUS_INTERNAL_LIBRARIES})
|
||||
endif (DBUS_ENABLE_EMBEDDED_TESTS)
|
||||
|
|
@ -1,68 +1,68 @@
|
|||
add_definitions("-DDBUS_COMPILATION")
|
||||
|
||||
set (dbus_send_SOURCES
|
||||
../../tools/dbus-print-message.c
|
||||
../../tools/dbus-print-message.h
|
||||
../../tools/dbus-send.c
|
||||
../../tools/tool-common.c
|
||||
../../tools/tool-common.h
|
||||
dbus-print-message.c
|
||||
dbus-print-message.h
|
||||
dbus-send.c
|
||||
tool-common.c
|
||||
tool-common.h
|
||||
)
|
||||
|
||||
set (dbus_monitor_SOURCES
|
||||
../../tools/dbus-monitor.c
|
||||
../../tools/dbus-print-message.c
|
||||
../../tools/dbus-print-message.h
|
||||
../../tools/tool-common.c
|
||||
../../tools/tool-common.h
|
||||
dbus-monitor.c
|
||||
dbus-print-message.c
|
||||
dbus-print-message.h
|
||||
tool-common.c
|
||||
tool-common.h
|
||||
)
|
||||
|
||||
set (dbus_test_tool_SOURCES
|
||||
../../tools/dbus-echo.c
|
||||
../../tools/dbus-spam.c
|
||||
../../tools/tool-common.c
|
||||
../../tools/tool-common.h
|
||||
../../tools/test-tool.c
|
||||
../../tools/test-tool.h
|
||||
dbus-echo.c
|
||||
dbus-spam.c
|
||||
tool-common.c
|
||||
tool-common.h
|
||||
test-tool.c
|
||||
test-tool.h
|
||||
)
|
||||
|
||||
set (dbus_update_activation_environment_SOURCES
|
||||
../../tools/dbus-update-activation-environment.c
|
||||
../../tools/tool-common.c
|
||||
../../tools/tool-common.h
|
||||
dbus-update-activation-environment.c
|
||||
tool-common.c
|
||||
tool-common.h
|
||||
)
|
||||
|
||||
if (WIN32)
|
||||
set (dbus_launch_SOURCES
|
||||
../../tools/dbus-launch-win.c
|
||||
dbus-launch-win.c
|
||||
)
|
||||
else (WIN32)
|
||||
set (dbus_launch_SOURCES
|
||||
../../tools/dbus-launch.c
|
||||
../../tools/tool-common.c
|
||||
../../tools/tool-common.h
|
||||
dbus-launch.c
|
||||
tool-common.c
|
||||
tool-common.h
|
||||
)
|
||||
endif (WIN32)
|
||||
|
||||
if (DBUS_BUILD_X11)
|
||||
set (dbus_launch_SOURCES
|
||||
${dbus_launch_SOURCES}
|
||||
../../tools/dbus-launch-x11.c
|
||||
dbus-launch-x11.c
|
||||
)
|
||||
endif(DBUS_BUILD_X11)
|
||||
|
||||
set (dbus_cleanup_sockets_SOURCES
|
||||
../../tools/dbus-cleanup-sockets.c
|
||||
dbus-cleanup-sockets.c
|
||||
)
|
||||
|
||||
set (dbus_run_session_SOURCES
|
||||
../../tools/dbus-run-session.c
|
||||
dbus-run-session.c
|
||||
)
|
||||
|
||||
if(WIN32)
|
||||
set(DBUS_VER_INTERNAL_NAME "dbus-send")
|
||||
set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
|
||||
set(DBUS_VER_FILE_TYPE "VFT_APP")
|
||||
configure_file(${CMAKE_SOURCE_DIR}/../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
configure_file(../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
list(APPEND dbus_send_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
endif()
|
||||
|
||||
|
|
@ -74,7 +74,7 @@ if(WIN32)
|
|||
set(DBUS_VER_INTERNAL_NAME "dbus-test-tool")
|
||||
set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
|
||||
set(DBUS_VER_FILE_TYPE "VFT_APP")
|
||||
configure_file(${CMAKE_SOURCE_DIR}/../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
configure_file(../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
list(APPEND dbus_test_tool_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
endif()
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ if(WIN32)
|
|||
set(DBUS_VER_INTERNAL_NAME "dbus-update-activation-environment")
|
||||
set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
|
||||
set(DBUS_VER_FILE_TYPE "VFT_APP")
|
||||
configure_file(${CMAKE_SOURCE_DIR}/../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
configure_file(../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
list(APPEND dbus_update_activation_environment_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
endif()
|
||||
if(WIN32 AND NOT MSVC)
|
||||
|
|
@ -101,7 +101,7 @@ if(WIN32)
|
|||
set(DBUS_VER_INTERNAL_NAME "dbus-launch")
|
||||
set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
|
||||
set(DBUS_VER_FILE_TYPE "VFT_APP")
|
||||
configure_file(${CMAKE_SOURCE_DIR}/../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
configure_file(../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
list(APPEND dbus_launch_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
endif()
|
||||
|
||||
|
|
@ -116,7 +116,7 @@ if(WIN32)
|
|||
set(DBUS_VER_INTERNAL_NAME "dbus-monitor")
|
||||
set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
|
||||
set(DBUS_VER_FILE_TYPE "VFT_APP")
|
||||
configure_file(${CMAKE_SOURCE_DIR}/../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
configure_file(../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
list(APPEND dbus_monitor_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
|
||||
endif()
|
||||
|
||||
|
|
@ -317,7 +317,7 @@ case "$ci_buildsys" in
|
|||
;;
|
||||
esac
|
||||
|
||||
cmake "$@" ../cmake
|
||||
cmake "$@" ..
|
||||
|
||||
${make}
|
||||
# The test coverage for OOM-safety is too verbose to be useful on
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue