Changeset 32712 in vbox for trunk/src/VBox

Timestamp:

Sep 23, 2010 12:16:51 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage: forgot the help for guestproperty and guestcontrol; enable the latter for VBOX_ONLY_DOCS=1

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxManage.h (modified) (1 diff)
• VBoxManageGuestCtrl.cpp (modified) (4 diffs)
• VBoxManageGuestProp.cpp (modified) (3 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)

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

@@ -25 +25 @@
  VBoxManage_SOURCES = \
         VBoxManage.cpp \
-        VBoxManageHelp.cpp
+        VBoxManageHelp.cpp \
+        $(if $(VBOX_WITH_GUEST_PROPS),VBoxManageGuestProp.cpp) \
+        $(if $(VBOX_WITH_GUEST_CONTROL),VBoxManageGuestCtrl.cpp)
  VBoxManage_LIBS      += $(LIB_RUNTIME)
 else # !VBOX_ONLY_DOCS
  VBoxManage_TEMPLATE   = VBOXMAINCLIENTEXE
- VBoxManage_DEFS      += \
-        $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
-        $(if $(VBOX_WITH_VRDP), VBOX_WITH_VRDP) \
-        $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
-        $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
-        $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
-        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
-        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
-        $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
-        $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
-        $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
-        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
-        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
-        $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
-        $(if $(VBOX_WITH_VDE), VBOX_WITH_VDE) \
-        $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM)
  VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
  ifdef VBOX_DYNAMIC_NET_ATTACH
@@ -75 +61 @@
         VBoxManageUSB.cpp
 endif # !VBOX_ONLY_DOCS
+
+VBoxManage_DEFS      += \
+        $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
+        $(if $(VBOX_WITH_VRDP), VBOX_WITH_VRDP) \
+        $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
+        $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
+        $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
+        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
+        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
+        $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
+        $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
+        $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
+        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
+        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
+        $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
+        $(if $(VBOX_WITH_VDE), VBOX_WITH_VDE) \
+        $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM)
+
 ifneq ($(KBUILD_TARGET),win)
  # Workaround for buggy gcc-4.3 compilers, see

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -167 +167 @@
 
 /* VBoxManageGuestProp.cpp */
-extern void usageGuestProperty(void);
-#ifndef VBOX_ONLY_DOCS
+extern void usageGuestProperty(PRTSTREAM pStrm);
+
+/* VBoxManageGuestCtrl.cpp */
+extern void usageGuestControl(PRTSTREAM pStrm);
+
+#ifndef VBOX_ONLY_DOCS
+/* VBoxManageGuestProp.cpp */
 extern int handleGuestProperty(HandlerArg *a);
 
 /* VBoxManageGuestCtrl.cpp */
 extern int handleGuestControl(HandlerArg *a);
-extern void usageGuestControl(void);
 
 /* VBoxManageVMInfo.cpp */

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

@@ -22 +22 @@
 #include "VBoxManage.h"
 
+#ifndef VBOX_ONLY_DOCS
+
 #include <VBox/com/com.h>
 #include <VBox/com/string.h>
@@ -63 +65 @@
 static volatile bool    g_fExecCanceled = false;
 
-void usageGuestControl(void)
+#endif /* VBOX_ONLY_DOCS */
+
+void usageGuestControl(PRTSTREAM pStrm)
 {
-    RTStrmPrintf(g_pStdErr,
+    RTStrmPrintf(pStrm,
                  "VBoxManage guestcontrol     execute <vmname>|<uuid>\n"
                  "                            <path to program>\n"
@@ -75 +79 @@
                  "\n");
 }
+
+#ifndef VBOX_ONLY_DOCS
 
 /**
@@ -539 +545 @@
     return errorSyntax(USAGE_GUESTCONTROL, "Incorrect parameters");
 }
+
+#endif /* !VBOX_ONLY_DOCS */

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

@@ -22 +22 @@
 #include "VBoxManage.h"
 
+#ifndef VBOX_ONLY_DOCS
+
 #include <VBox/com/com.h>
 #include <VBox/com/string.h>
@@ -49 +51 @@
 using namespace com;
 
-void usageGuestProperty(void)
-{
-    RTStrmPrintf(g_pStdErr,
+#endif /* !VBOX_ONLY_DOCS */
+
+void usageGuestProperty(PRTSTREAM pStrm)
+{
+    RTStrmPrintf(pStrm,
                  "VBoxManage guestproperty    get <vmname>|<uuid>\n"
                  "                            <property> [--verbose]\n"
                  "\n");
-    RTStrmPrintf(g_pStdErr,
+    RTStrmPrintf(pStrm,
                  "VBoxManage guestproperty    set <vmname>|<uuid>\n"
                  "                            <property> [<value> [--flags <flags>]]\n"
                  "\n");
-    RTStrmPrintf(g_pStdErr,
+    RTStrmPrintf(pStrm,
                  "VBoxManage guestproperty    enumerate <vmname>|<uuid>\n"
                  "                            [--patterns <patterns>]\n"
                  "\n");
-    RTStrmPrintf(g_pStdErr,
+    RTStrmPrintf(pStrm,
                  "VBoxManage guestproperty    wait <vmname>|<uuid> <patterns>\n"
                  "                            [--timeout <msec>] [--fail-on-timeout]\n"
                  "\n");
 }
+
+#ifndef VBOX_ONLY_DOCS
 
 static int handleGetGuestProperty(HandlerArg *a)
@@ -396 +402 @@
     return errorSyntax(USAGE_GUESTPROPERTY, "Incorrect parameters");
 }
+
+#endif /* !VBOX_ONLY_DOCS */

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

@@ -672 +672 @@
 #ifdef VBOX_WITH_GUEST_PROPS
     if (u64Cmd & USAGE_GUESTPROPERTY)
-        usageGuestProperty();
+        usageGuestProperty(pStrm);
 #endif /* VBOX_WITH_GUEST_PROPS defined */
 
 #ifdef VBOX_WITH_GUEST_CONTROL
     if (u64Cmd & USAGE_GUESTCONTROL)
-        usageGuestControl();
+        usageGuestControl(pStrm);
 #endif /* VBOX_WITH_GUEST_CONTROL defined */