Changeset 23819 in vbox

Timestamp:

Oct 16, 2009 12:24:52 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53568

Message:

VBoxClient:

Location:

trunk/src/VBox

Files:

• Additions/x11/VBoxClient/Makefile.kmk (modified) (1 diff)
• Additions/x11/VBoxClient/VBoxClient.h (modified) (1 diff)
• Additions/x11/VBoxClient/main.cpp (modified) (3 diffs)
• Main/Makefile.kmk (modified) (2 diffs)
• Main/linux/HostHardwareLinux.cpp (modified) (4 diffs)
• Main/linux/vbox-dbus.cpp (deleted)
• Main/testcase/Makefile.kmk (modified) (1 diff)
• Runtime/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -58 +58 @@
         seamless-x11.cpp \
         thread.cpp \
-        display.cpp
+        display.cpp \
+        hostversion.cpp
  VBoxClient_LIBS += \
         Xext Xmu

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -46 +46 @@
 extern Service *GetSeamlessService();
 extern Service *GetDisplayService();
+extern Service *GetHostVersionService();
 
 extern void CleanUp();

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -136 +136 @@
     RTPrintf("Start the VirtualBox X Window System guest services.\n\n");
     RTPrintf("Options:\n");
+    RTPrintf("  --checkhostversion      checks for a new VirtualBox host version\n");
     RTPrintf("  --clipboard      start the shared clipboard service\n");
     RTPrintf("  --display     start the display management service\n");
@@ -190 +191 @@
                 fSuccess = false;
         }
+        else if (!strcmp(argv[i], "--checkhostversion"))
+        {
+            if (g_pService == NULL)
+                g_pService = VBoxClient::GetHostVersionService();
+            else
+                fSuccess = false;
+        }
         else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
         {
@@ -235 +243 @@
     }
     /* Initialise the guest library. */
-    if (RT_FAILURE(VbglR3InitUser()))
+ /*   if (RT_FAILURE(VbglR3InitUser()))
     {
         RTPrintf("Failed to connect to the VirtualBox kernel service\n");
         Log(("Failed to connect to the VirtualBox kernel service\n"));
         return 1;
-    }
+    }*/
     if (g_pszPidFile && RT_FAILURE(VbglR3PidFile(g_pszPidFile, &g_hPidFile)))
     {

trunk/src/VBox/Main/Makefile.kmk

@@ -44 +44 @@
  # I'm Evil! Dr. Evil.
  include $(KBUILD_PATH)/tools/VCC70.kmk
- include $(KBUILD_PATH)/sdks/WINPSDK.kmk
+ include $(KBUILD_PATH)/sdks/WINPSDK.kmk/
 endif #!VBOX_ONLY_SDK
 
@@ -336 +336 @@
         linux/HostHardwareLinux.cpp
 
-ifdef VBOX_WITH_DBUS
- VBoxSVC_SOURCES.linux += linux/vbox-dbus.cpp
-endif
-
 VBoxSVC_SOURCES.solaris = \
         linux/vbox-libhal.cpp \

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -31 +31 @@
 
 #include <VBox/log.h>
+# ifdef VBOX_WITH_DBUS
+#  include <VBox/dbus.h>
+# endif
 
 #include <iprt/dir.h>
@@ -54 +57 @@
 # include <linux/fd.h>
 # include <linux/major.h>
-# ifdef VBOX_WITH_DBUS
-#  include <vbox-dbus.h>
-# endif
 # include <errno.h>
 # include <scsi/scsi.h>
@@ -1025 +1025 @@
 #ifdef VBOX_WITH_DBUS
         if (   RT_SUCCESS(rc)
-            && RT_SUCCESS(VBoxLoadDBusLib())
+            && RT_SUCCESS(RTDBusLoadLib())
             && (!success || testing()))
             rc = getUSBDeviceInfoFromHal(&mDeviceList, &halSuccess);
@@ -1070 +1070 @@
 
     mContext = new Context;
-    if (RT_SUCCESS(VBoxLoadDBusLib()))
+    if (RT_SUCCESS(RTDBusLoadLib()))
     {
         for (unsigned i = 0; RT_SUCCESS(rc) && i < 5 && !mContext->mConnection; ++i)

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -125 +125 @@
 tstHostHardwareLinux_SOURCES   = \
         tstHostHardwareLinux.cpp \
-        ../linux/HostHardwareLinux.cpp \
-        ../linux/vbox-dbus.cpp
+        ../linux/HostHardwareLinux.cpp
 tstHostHardwareLinux_INCS      = . ../include
 tstHostHardwareLinux_DEFS      = \

trunk/src/VBox/Runtime/Makefile.kmk

@@ -372 +372 @@
         common/err/errmsgxpcom.cpp
 endif
+ifeq ($(KBUILD_TARGET),linux)
+RuntimeR3_SOURCES += \
+        $(if $(VBOX_WITH_DBUS),VBox/dbus.cpp,)
+endif
 
 RuntimeR3_SOURCES.win = \