Changeset 3730 in vbox

Timestamp:

Jul 20, 2007 12:12:22 PM (18 years ago)

Author:

vboxsync

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

23036

Message:

Fix field used to determine svn revision. Implement VirtualBox -v,
printing just the version number.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (3 diffs)

trunk/Config.kmk

@@ -2518 +2518 @@
         $(QUIET)$(MKDIR) -p $(@D)
  ifneq ($(VBOX_SVN_DEP),)
-        $(QUIET)$(APPEND) $@ "export VBOX_SVN_REV=$(shell $(SVN) info $(PATH_ROOT) | $(SED) -e '/^Revision/!d'  -e "s/Revision\: *//")"
+        $(QUIET)$(APPEND) $@ "export VBOX_SVN_REV=$(shell $(SVN) info $(PATH_ROOT) | $(SED) -e '/^Last Changed Rev/!d'  -e "s/Last Changed Rev\: *//")"
  else
         $(QUIET)$(APPEND) $@ "export VBOX_SVN_REV=$(VBOX_SVN_REV_FALLBACK)"

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

@@ -49 +49 @@
         $(PATH_BIN)/VBoxXML$(VBOX_SUFF_DLL)
 endif
+# VBoxManage.cpp uses VBOX_SVN_REV.
+VBoxManage.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
+VBoxManage.cpp_DEPS = $(VBOX_SVN_REV_KMK)
 
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -262 +262 @@
     if (u64Cmd == USAGE_ALL)
     {
+        RTPrintf("VBoxManage [-v|-version]    print version number and exit\n");
         RTPrintf("VBoxManage -nologo ...      suppress the logo\n"
                  "\n");
@@ -316 +317 @@
                  "                            [-ioapic on|off]\n"
                  "                            [-hwvirtex on|off|default]\n"
-                 "                            [-monitorcount <number>\n"
+                 "                            [-monitorcount <number>]\n"
                  "                            [-bioslogofadein on|off]\n"
                  "                            [-bioslogofadeout on|off]\n"
@@ -6310 +6311 @@
             return 0;
         }
+        else if (   strcmp(argv[i], "-v") == 0
+                 || strcmp(argv[i], "-version") == 0
+                 || strcmp(argv[i], "-Version") == 0
+                 || strcmp(argv[i], "--version") == 0)
+        {
+            /* Print version number, and do nothing else. */
+            RTPrintf("%sr%d\n", VBOX_VERSION_STRING, VBOX_SVN_REV);
+            exit(0);
+        }
         else if (strcmp(argv[i], "-nologo") == 0)
         {