Changeset 22562 in vbox for trunk/src/VBox/NetworkServices/DHCP

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/NetworkServices/DHCP

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxNetDHCP.cpp (modified) (4 diffs)

trunk/src/VBox/NetworkServices/DHCP/Makefile.kmk

@@ -47 +47 @@
 VBoxNetDHCP_TEMPLATE =
 VBoxNetDHCP_TEMPLATE := VBOXR3$(if-expr defined(VBOX_WITH_HARDENING),,EXE)
-VBoxNetDHCP_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
 VBoxNetDHCP_SOURCES = \
         VBoxNetDHCP.cpp \

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <iprt/net.h>
+#include <iprt/alloca.h>
+#include <iprt/buildconfig.h>
+#include <iprt/err.h>
+#include <iprt/net.h>                   /* must come before getopt */
+#include <iprt/getopt.h>
 #include <iprt/initterm.h>
-#include <iprt/alloca.h>
-#include <iprt/err.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
+#include <iprt/stream.h>
 #include <iprt/time.h>
-#include <iprt/stream.h>
-#include <iprt/path.h>
-#include <iprt/param.h>
-#include <iprt/getopt.h>
 #include <iprt/string.h>
 
@@ -43 +44 @@
 #include <VBox/intnet.h>
 #include <VBox/vmm.h>
-#include <VBox/version.h>
 
 #include "../NetLib/VBoxNetLib.h"
@@ -817 +817 @@
 
             case 'V':
-                RTPrintf("%sr%d\n", VBOX_VERSION_STRING, VBOX_SVN_REV);
+                RTPrintf("%sr%u\n", RTBldCfgVersion(), RTBldCfgRevision());
                 return 0;
 
@@ -828 +828 @@
                          "\n"
                          "Options:\n",
-                         VBOX_VERSION_STRING);
+                         RTBldCfgVersion());
                 for (size_t i = 0; i < RT_ELEMENTS(s_aOptionDefs); i++)
                     RTPrintf("    -%c, %s\n", s_aOptionDefs[i].iShort, s_aOptionDefs[i].pszLong);