Changeset 22823 in vbox

Timestamp:

Sep 7, 2009 7:52:08 PM (15 years ago)

Author:

vboxsync

Message:

replaced VBOX_SVN_REV by RTBldCfgRevision[Str]()

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (1 diff)
• Devices/PC/DevPcBios.cpp (modified) (2 diffs)
• Devices/VMMDev/VMMDev.cpp (modified) (2 diffs)
• Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxSelectorWnd.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/main.cpp (modified) (3 diffs)
• VMM/Makefile.kmk (modified) (1 diff)
• VMM/VMMAll/VMMAll.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -463 +463 @@
 Graphics/DevVGA.cpp_DEPS = $(PATH_VgaBiosBin)/vbetables.h
 
-# Reporting it to the guest.
-VMMDev/VMMDev.cpp_DEFS   = VBOX_SVN_REV=$(VBOX_SVN_REV)
-VMMDev/VMMDev.cpp_DEPS   = $(VBOX_SVN_REV_KMK)
-PC/DevPcBios.cpp_DEFS    = VBOX_SVN_REV=$(VBOX_SVN_REV)
-PC/DevPcBios.cpp_DEPS    = $(VBOX_SVN_REV_KMK)
-
 
 #

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -29 +29 @@
 
 #include <VBox/log.h>
-#include <VBox/version.h>
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
+#include <iprt/buildconfig.h>
 #include <iprt/file.h>
 #include <iprt/string.h>
@@ -1151 +1151 @@
     char* pszVBoxVer, *pszVBoxRev;
     RTStrAPrintf(&pszVBoxVer, "vboxVer_%d.%d.%d",
-                  VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD);
-    RTStrAPrintf(&pszVBoxRev, "vboxRev_%ld", VBOX_SVN_REV);
+                  RTBldCfgVersionMajor(), RTBldCfgVersionMinor(), RTBldCfgVersionBuild());
+    RTStrAPrintf(&pszVBoxRev, "vboxRev_%ld", RTBldCfgRevision());
     READCFGSTR("DmiOEMVBoxVer", pszDmiOEMVBoxVer, pszVBoxVer);
     READCFGSTR("DmiOEMVBoxRev", pszDmiOEMVBoxRev, pszVBoxRev);

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -35 +35 @@
 #include <VBox/err.h>
 #include <VBox/vm.h> /* for VM_IS_EMT */
-#include <VBox/version.h>
 
 #include <iprt/assert.h>
+#include <iprt/buildconfig.h>
 #include <iprt/string.h>
 #include <iprt/time.h>
@@ -1632 +1632 @@
                                pRequestHeader->rc = VERR_INVALID_PARAMETER);
             VMMDevReqHostVersion *pReqHostVer = (VMMDevReqHostVersion*)pRequestHeader;
-            pReqHostVer->major = VBOX_VERSION_MAJOR;
-            pReqHostVer->minor = VBOX_VERSION_MINOR;
-            pReqHostVer->build = VBOX_VERSION_BUILD;
-            pReqHostVer->revision = VBOX_SVN_REV;
+            pReqHostVer->major = RTBldCfgVersionMajor();
+            pReqHostVer->minor = RTBldCfgVersionMinor();
+            pReqHostVer->build = RTBldCfgVersionBuild();
+            pReqHostVer->revision = RTBldCfgRevision();
             pReqHostVer->features = VMMDEV_HVF_HGCM_PHYS_PAGE_LIST;
             pReqHostVer->header.rc = VINF_SUCCESS;

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -193 +193 @@
 endif
 
-VirtualBox_src/main.cpp_DEFS += VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\"
-VirtualBox_src/main.cpp_DEPS += $(VBOX_VERSION_MK)
-
 ifdef VBOX_BLEEDING_EDGE
 VirtualBox_src/VBoxConsoleWnd.cpp_DEFS += \
-    VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" \
-    VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \
     VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
 VirtualBox_src/VBoxSelectorWnd.cpp_DEFS += \
-    VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" \
-    VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \
     VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
 VirtualBox_src/VBoxAboutDlg.cpp_DEFS += \
@@ -209 +202 @@
 VirtualBox_src/main.cpp_DEFS += \
     VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
-VirtualBox_src/VBoxConsoleWnd.cpp_DEPS += $(VBOX_VERSION_MK) $(VBOX_SVN_REV_KMK)
-VirtualBox_src/VBoxSelectorWnd.cpp_DEPS += $(VBOX_VERSION_MK) $(VBOX_SVN_REV_KMK)
 endif
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -72 +72 @@
 #endif
 
+#include <iprt/buildconfig.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
@@ -1647 +1648 @@
 
 #ifdef VBOX_BLEEDING_EDGE
-    caption_prefix += QString(" EXPERIMENTAL build "VBOX_VERSION_STRING" r"VBOX_SVN_REV" - "VBOX_BLEEDING_EDGE);
+    caption_prefix += QString(" EXPERIMENTAL build ")
+                   + QString(RTBldCfgVersion())
+                   + QString("r")
+                   + QString(RTBldCfgRevisionStr()) 
+                   + QString(" - "VBOX_BLEEDING_EDGE);
 #endif
     /*

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -49 +49 @@
 #include <QDesktopWidget>
 #include <QToolButton>
+
+#include <iprt/buildconfig.h>
 
 // VBoxVMDetailsView class
@@ -1292 +1294 @@
 
 #ifdef VBOX_BLEEDING_EDGE
-    title += QString(" EXPERIMENTAL build "VBOX_VERSION_STRING" r"VBOX_SVN_REV" - "VBOX_BLEEDING_EDGE);
+    title += QString(" EXPERIMENTAL build ")
+          +  QString(RTBldCfgVersion())
+          +  QString(" r")
+          +  QString(RTBldCfgRevisionStr())
+          +  QString(" - "VBOX_BLEEDING_EDGE);
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -50 +50 @@
 #endif
 
+#include <iprt/buildconfig.h>
 #include <iprt/err.h>
 #include <iprt/initterm.h>
@@ -241 +242 @@
 #endif
 
-    RTPrintf("Sun VirtualBox Graphical User Interface "VBOX_VERSION_STRING"\n"
+    RTPrintf("Sun VirtualBox Graphical User Interface %s\n"
             "(C) 2005-2009 Sun Microsystems, Inc.\n"
             "All rights reserved.\n"
@@ -263 +264 @@
 # endif
             "\n",
+            RTBldCfgVersion(),
             mode.toLatin1().constData(),
             dflt.toLatin1().constData());

trunk/src/VBox/VMM/Makefile.kmk

@@ -514 +514 @@
 endif
 
-#
-# For vmmGetSvnRev.
-#
-VMMAll/VMMAll.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

@@ -31 +31 @@
 #include <VBox/param.h>
 #include <VBox/hwaccm.h>
+#include <iprt/buildconfig.h>
 
 
@@ -139 +140 @@
 VMMDECL(uint32_t) VMMGetSvnRev(void)
 {
-    return VBOX_SVN_REV;
+    return RTBldCfgRevision();
 }