Changeset 22823 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

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

Author:

vboxsync

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

52044

Message:

replaced VBOX_SVN_REV by RTBldCfgRevision[Str]()

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (2 diffs)
• src/main.cpp (modified) (3 diffs)

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());