Changeset 22562 in vbox for trunk/src/VBox/Main

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/Main

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• ConsoleImpl2.cpp (modified) (4 diffs)
• Makefile.kmk (modified) (3 diffs)
• VirtualBoxImpl.cpp (modified) (3 diffs)
• include/Version.h (deleted)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -62 +62 @@
 #include "ConsoleVRDPServer.h"
 #include "VMMDev.h"
-#include "Version.h"
 #include "package-generated.h"
 
@@ -72 +71 @@
 #include <VBox/com/array.h>
 
+#include <iprt/asm.h>
+#include <iprt/buildconfig.h>
+#include <iprt/cpputils.h>
+#include <iprt/dir.h>
+#include <iprt/file.h>
+#include <iprt/ldr.h>
+#include <iprt/path.h>
+#include <iprt/process.h>
 #include <iprt/string.h>
-#include <iprt/asm.h>
-#include <iprt/file.h>
-#include <iprt/path.h>
-#include <iprt/dir.h>
-#include <iprt/process.h>
-#include <iprt/ldr.h>
-#include <iprt/cpputils.h>
 #include <iprt/system.h>
 
@@ -4607 +4607 @@
         RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp));
         RTLogRelLogger(loggerRelease, 0, ~0U,
-                       "VirtualBox %s r%d %s (%s %s) release log\n"
+                       "VirtualBox %s r%u %s (%s %s) release log\n"
 #ifdef VBOX_BLEEDING_EDGE
                        "EXPERIMENTAL build " VBOX_BLEEDING_EDGE "\n"
 #endif
                        "Log opened %s\n",
-                       VBOX_VERSION_STRING, VBoxSVNRev (), VBOX_BUILD_TARGET,
+                       VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
                        __DATE__, __TIME__, szTmp);
 
@@ -6682 +6682 @@
      * exact build was used to produce the core. */
     static char saBuildID[40];
-    RTStrPrintf(saBuildID, sizeof(saBuildID), "%s%s%s%s VirtualBox %s r%d %s%s%s%s",
-                "BU", "IL", "DI", "D", VBOX_VERSION_STRING, VBoxSVNRev (), "BU", "IL", "DI", "D");
+    RTStrPrintf(saBuildID, sizeof(saBuildID), "%s%s%s%s VirtualBox %s r%u %s%s%s%s",
+                "BU", "IL", "DI", "D", VBOX_VERSION_STRING, RTBldCfgRevision(), "BU", "IL", "DI", "D");
 
     ComObjPtr<Console> console = task->mConsole;

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -30 +30 @@
 #include "ConsoleImpl.h"
 #include "DisplayImpl.h"
-#include "Version.h"
 #include "VMMDev.h"
 
@@ -38 +37 @@
 #include "Logging.h"
 
+#include <iprt/buildconfig.h>
 #include <iprt/string.h>
 #include <iprt/path.h>
@@ -44 +44 @@
 #if 0 /* enable to play with lots of memory. */
 # include <iprt/env.h>
-# include <iprt/string.h>
 #endif
 
@@ -2890 +2889 @@
         /* Set the VBox SVN revision as a guest property */
         configSetProperty(pConsole->mVMMDev, "/VirtualBox/HostInfo/VBoxRev",
-                          VBoxSVNRevString(), "TRANSIENT, RDONLYGUEST");
+                          RTBldCfgRevisionStr(), "TRANSIENT, RDONLYGUEST");
         /* Initialize the remote execution properties for ready-on access by
          * the guest */

trunk/src/VBox/Main/Makefile.kmk

@@ -313 +313 @@
         SystemPropertiesImpl.cpp \
         BIOSSettingsImpl.cpp \
-        Version.cpp \
         HostPower.cpp \
         $(if $(VBOX_WITH_VRDP),VRDPServerImpl.cpp,) \
@@ -585 +584 @@
         AutoLock.cpp \
         VBoxDll.cpp \
-        Version.cpp \
         USBDeviceImpl.cpp \
         RemoteUSBDeviceImpl.cpp \
@@ -642 +640 @@
 
 
-Version.cpp_DEFS  = VBOX_SVN_REV=$(VBOX_SVN_REV)
-Version.cpp_DEPS  = $(VBOX_SVN_REV_KMK)
-
 win/VBoxC.rc_DEPS = $(PATH_VBoxC)/VBoxC.rgs $(PATH_VBoxCOM)/VirtualBox.tlb
 VBoxC_CLEAN.win  += $(PATH_VBoxC)/VBoxC.rgs

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -21 +21 @@
  */
 
+#include <iprt/buildconfig.h>
+#include <iprt/cpputils.h>
+#include <iprt/dir.h>
+#include <iprt/env.h>
+#include <iprt/file.h>
 #include <iprt/path.h>
-#include <iprt/dir.h>
-#include <iprt/file.h>
+#include <iprt/process.h>
 #include <iprt/string.h>
-#include <iprt/uuid.h>
 #include <iprt/stream.h>
 #include <iprt/thread.h>
-#include <iprt/process.h>
-#include <iprt/env.h>
-#include <iprt/cpputils.h>
+#include <iprt/uuid.h>
 #include <iprt/xml_cpp.h>
 
@@ -62 +63 @@
 #include "SystemPropertiesImpl.h"
 #include "GuestOSTypeImpl.h"
-#include "Version.h"
 #include "DHCPServerRunner.h"
 #include "DHCPServerImpl.h"
@@ -141 +141 @@
     if (sVersion.isNull())
         sVersion = VBOX_VERSION_STRING;
-    sRevision = VBoxSVNRev();
+    sRevision = RTBldCfgRevision();
     if (sPackageType.isNull())
         sPackageType = VBOX_PACKAGE_STRING;