summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2007-06-01 22:27:47 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2007-06-01 22:27:47 +0000
commitdada2583bff1a30afc8a5c54a6c7122c4c0a469d (patch)
tree32883d8b656d4e6dfd92839febc16a78571267bc
parent081b2cd68e3bbbcffc4f005e55ddbb7aced8727b (diff)
* tools/dbus-launch-win.c: new file, replaces script wrapper on win32.
* cmake/dbus-launch.bat.cmake: removed obsolate file
-rw-r--r--ChangeLog2
-rw-r--r--cmake/dbus-launch.bat.cmake26
2 files changed, 2 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index bbdd7ef8..d77d5527 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* tools/dbus-launch-win.c: new file, replaces script wrapper on win32.
+ * cmake/dbus-launch.bat.cmake: removed obsolate file
+
2007-05-31 Ralf Habacker <ralf.habacker@freenet.de>
* bus/main.c (main): uses _dbus_get_config_file_name() to detect
diff --git a/cmake/dbus-launch.bat.cmake b/cmake/dbus-launch.bat.cmake
deleted file mode 100644
index ef08b5ac..00000000
--- a/cmake/dbus-launch.bat.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-:: environment setting for dbus clients
-@echo off
-
-:: session bus address
-set DBUS_SESSION_BUS_ADDRESS=@DBUS_SESSION_BUS_DEFAULT_ADDRESS@
-
-:: system bus address
-set DBUS_SYSTEM_BUS_DEFAULT_ADDRESS=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
-
-if exist bus\session.conf (
- @echo starting local dbus daemon
- start "D-Bus daemon" "bin\dbus-daemon" "--config-file=bus\session.conf"
-) else (
- if not "%DBUSDIR%"=="" (
- @echo starting dbus daemon identified by DBUSDIR=%DBUSDIR%
- start "D-Bus daemon" "%DBUSDIR%\bin\dbus-daemon" "--session"
- pause
- ) else (
- if exist "%ProgramFiles%\dbus\bin\dbus-daemon.exe" (
- @echo starting global dbus daemon located in %ProgramFiles%\dbus
- start "D-Bus daemon" "%ProgramFiles%\dbus\bin\dbus-daemon" "--session"
- ) else (
- @echo please set DBUSDIR to your DBUS installation dir and restart this script
- )
- )
-)