Commit 87448fed authored by Simon McVittie's avatar Simon McVittie Committed by Ralf Habacker

Make various system-bus-related things Unix-only

There is no system bus on Windows, and there won't be until/unless
it can be secure.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83583Reviewed-by: Ralf Habacker's avatarRalf Habacker <ralf.habacker@freenet.de>
parent 3765075c
...@@ -33,9 +33,11 @@ CONFIG_IN_FILES= \ ...@@ -33,9 +33,11 @@ CONFIG_IN_FILES= \
system.conf.in \ system.conf.in \
org.freedesktop.dbus-session.plist.in org.freedesktop.dbus-session.plist.in
config_DATA= \ config_DATA = session.conf
session.conf \
system.conf if DBUS_UNIX
config_DATA += system.conf
endif
if DBUS_ENABLE_LAUNCHD if DBUS_ENABLE_LAUNCHD
agentdir=$(LAUNCHD_AGENT_DIR) agentdir=$(LAUNCHD_AGENT_DIR)
...@@ -169,11 +171,11 @@ if DBUS_ENABLE_EMBEDDED_TESTS ...@@ -169,11 +171,11 @@ if DBUS_ENABLE_EMBEDDED_TESTS
## even when not doing "make check" ## even when not doing "make check"
# run as a test by test/Makefile.am # run as a test by test/Makefile.am
noinst_PROGRAMS += test-bus test-bus-system noinst_PROGRAMS += test-bus
if DBUS_UNIX if DBUS_UNIX
# run as a test by test/Makefile.am # run as a test by test/Makefile.am
noinst_PROGRAMS += test-bus-launch-helper noinst_PROGRAMS += test-bus-launch-helper test-bus-system
# this is used by the tests but is not,itself, a test # this is used by the tests but is not,itself, a test
noinst_PROGRAMS += dbus-daemon-launch-helper-test noinst_PROGRAMS += dbus-daemon-launch-helper-test
endif DBUS_UNIX endif DBUS_UNIX
...@@ -203,11 +205,13 @@ clean-local: ...@@ -203,11 +205,13 @@ clean-local:
/bin/rm *.bb *.bbg *.da *.gcov || true /bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook: install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
if DBUS_UNIX
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
endif
if HAVE_SYSTEMD if HAVE_SYSTEMD
# Install dbus.socket as default implementation of a D-Bus stack. # Install dbus.socket as default implementation of a D-Bus stack.
# Deliberately not using $(LN_S) here: ln -fs is not universally portable, # Deliberately not using $(LN_S) here: ln -fs is not universally portable,
......
...@@ -400,13 +400,8 @@ endif (MSVC_IDE) ...@@ -400,13 +400,8 @@ endif (MSVC_IDE)
endif (NOT $ENV{TEMP} STREQUAL "") endif (NOT $ENV{TEMP} STREQUAL "")
endif (NOT $ENV{TMPDIR} STREQUAL "") endif (NOT $ENV{TMPDIR} STREQUAL "")
# TODO: fix redhet # Not used on Windows, where there is no system bus
if (WIN32) set (DBUS_SYSTEM_PID_FILE ${EXPANDED_LOCALSTATEDIR}/run/dbus/pid)
# bus-test expects a non empty string
set (DBUS_SYSTEM_PID_FILE "/dbus-pid")
else (WIN32)
set (DBUS_SYSTEM_PID_FILE ${EXPANDED_LOCALSTATEDIR}/run/dbus/pid)
endif (WIN32)
if (WIN32) if (WIN32)
set (DBUS_CONSOLE_AUTH_DIR "") set (DBUS_CONSOLE_AUTH_DIR "")
......
...@@ -75,12 +75,12 @@ TEST_BINARIES = \ ...@@ -75,12 +75,12 @@ TEST_BINARIES = \
## since they depend on stuff from this directory ## since they depend on stuff from this directory
TESTS = \ TESTS = \
../bus/test-bus$(EXEEXT) \ ../bus/test-bus$(EXEEXT) \
../bus/test-bus-system$(EXEEXT) \
../dbus/test-dbus$(EXEEXT) \ ../dbus/test-dbus$(EXEEXT) \
$(NULL) $(NULL)
if DBUS_UNIX if DBUS_UNIX
TESTS += ../bus/test-bus-launch-helper$(EXEEXT) TESTS += ../bus/test-bus-launch-helper$(EXEEXT)
TESTS += ../bus/test-bus-system$(EXEEXT)
endif endif
else !DBUS_ENABLE_EMBEDDED_TESTS else !DBUS_ENABLE_EMBEDDED_TESTS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment