Changeset 22562 in vbox for trunk/src/VBox/Additions/common/VBoxControl

Timestamp:

Aug 28, 2009 5:58:24 PM (16 years ago)

Author:

vboxsync

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

51589

Message:

Main,VBoxControl,VBoxManage,VBoxNetDHCP,VBoxNetNAT: Use RTBldCfg for getting the svn revision and/or VirtualBox version.

Location:

trunk/src/VBox/Additions/common/VBoxControl

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxControl.cpp (modified) (4 diffs)
• VBoxControl.h (deleted)
• VBoxControlSVN.cpp (deleted)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/tstVBoxControl.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk

@@ -39 +39 @@
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS VBOX_WITH_HGCM,)
 VBoxControl_SOURCES = \
-        VBoxControl.cpp \
-        VBoxControlSVN.cpp
+        VBoxControl.cpp
 VBoxControl_SOURCES.win = \
         VBoxControl.rc
@@ -48 +47 @@
         $(VBOX_LIB_IPRT_GUEST_R3)
 
-# VBoxControlSVN.cpp uses VBOX_SVN_REV.
-VBoxControlSVN.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
-VBoxControlSVN.cpp_DEPS = $(VBOX_SVN_REV_KMK)
-
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -1 @@
-/** $Id$ */
+/* $Id$ */
 /** @file
  * VBoxControl - Guest Additions Command Line Management Interface.
@@ -25 +25 @@
 #include <iprt/alloca.h>
 #include <iprt/autores.h>
+#include <iprt/buildconfig.h>
 #include <iprt/initterm.h>
 #include <iprt/mem.h>
@@ -39 +40 @@
 # include <VBox/HostServices/GuestPropertySvc.h>
 #endif
-#include "VBoxControl.h"
 
 /*******************************************************************************
@@ -1312 +1312 @@
             {
                 /* Print version number, and do nothing else. */
-                RTPrintf("%sr%d\n", VBOX_VERSION_STRING, VBoxSVNRev ());
+                RTPrintf("%sr%u\n", VBOX_VERSION_STRING, RTBldCfgRevision());
                 onlyinfo = true;
                 showlogo = false;

trunk/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk

@@ -31 +31 @@
 tstVBoxControl_TEMPLATE = VBOXR3TSTEXE
 tstVBoxControl_DEFS     = VBOX_CONTROL_TEST
-tstVBoxControl_SOURCES  = tstVBoxControl.cpp ../VBoxControl.cpp ../VBoxControlSVN.cpp
+tstVBoxControl_SOURCES  = tstVBoxControl.cpp ../VBoxControl.cpp
 tstVBoxControl_LIBS     = $(LIB_RUNTIME)
 tstVBoxControl_DEFS    += \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS VBOX_WITH_HGCM,)
-
-# VBoxControlSVN.cpp uses VBOX_SVN_REV.
-tstVBoxControl_DEFS    += VBOX_SVN_REV=$(VBOX_SVN_REV)
-tstVBoxControl_DEPS     = $(VBOX_SVN_REV_KMK)
 
 endif # VBOX_WITH_TESTCASES

trunk/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp

@@ -1 @@
-/** $Id$ */
+/* $Id$ */
 /** @file
  * VBoxControl - Guest Additions Command Line Management Interface, test case