Changeset 105436 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 22, 2024 9:44:06 PM (4 months ago)

Author:

vboxsync

Message:

Main/Recording,testcase: Reduce tstRecording dependencies; fixed/documented other dependencies in the testcase makefile. bugref:10718

Location:

trunk/src/VBox/Main

Files:

• include/Recording.h (modified) (2 diffs)
• src-client/Recording.cpp (modified) (1 diff)
• testcase/Makefile.kmk (modified) (7 diffs)

trunk/src/VBox/Main/include/Recording.h

@@ -36 +36 @@
 
 #include "RecordingStream.h"
-#include "ProgressImpl.h"
 
 class Console;
+class Progress;
 
 /** No flags specified. */
@@ -189 +189 @@
     int progressCreate(const settings::RecordingSettings &Settings, ComObjPtr<Progress> &pProgress);
     int progressNotifyComplete(HRESULT hrc = S_OK, IVirtualBoxErrorInfo *pErrorInfo = NULL);
-    int progressSet(uint32_t uOp, const Bstr &strDesc);
+    int progressSet(uint32_t uOp, const com::Bstr &strDesc);
     int progressSet(uint64_t msTimestamp);
 

trunk/src/VBox/Main/src-client/Recording.cpp

@@ -56 +56 @@
 
 #include "ConsoleImpl.h"
+#include "ProgressImpl.h"
 #include "Recording.h"
 #include "RecordingInternals.h"

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -194 +194 @@
 # Note! VBOX_MAIN_APIWRAPPER_GEN_HDRS is only defined if kmk is executed a
 #       parent directory.  Since the rules for generating the files listed by
-#       the variable lives in the parent makefile, this is not a problem.
+#       the variable lives in the parent makefile, as does the rules for making
+#       VirtualBox.h, so it's not really a problem.
 #
 tstCollector_TEMPLATE = VBoxMainClientTstExe
@@ -213 +214 @@
 # tstGuestCtrlContextID
 #
+# Note! See notes on tstCollector.
+#
 tstGuestCtrlContextID_TEMPLATE = VBoxMainClientTstExe
-tstGuestCtrlContextID_INTERMEDIATES   = $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
+tstGuestCtrlContextID_INTERMEDIATES = $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
 tstGuestCtrlContextID_DEFS    += VBOX_WITH_HGCM VBOX_WITH_GUEST_CONTROL VBOX_GUESTCTRL_TEST_CASE
 tstGuestCtrlContextID_SOURCES  = \
@@ -226 +229 @@
 # tstGuestCtrlParseBuffer
 #
+# Note! See notes on tstCollector.
+#
 tstGuestCtrlParseBuffer_TEMPLATE = VBoxMainClientTstExe
-tstGuestCtrlParseBuffer_INTERMEDIATES   = $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
+tstGuestCtrlParseBuffer_INTERMEDIATES = $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
 tstGuestCtrlParseBuffer_DEFS    += VBOX_WITH_HGCM VBOX_WITH_GSTCTL_TOOLBOX_SUPPORT VBOX_WITH_GUEST_CONTROL VBOX_GUESTCTRL_TEST_CASE
 tstGuestCtrlParseBuffer_SOURCES  = \
@@ -238 +243 @@
 #
 # tstGuestCtrlPaths
+#
+# Note! See notes on tstCollector.
 #
 tstGuestCtrlPaths_TEMPLATE       = VBoxMainClientTstExe
@@ -258 +265 @@
 #
 # tstUSBProxyLinux
+#
+# Note! See notes on tstCollector.
 #
 tstUSBProxyLinux_TEMPLATE  = VBoxMainClientTstExe
@@ -305 +314 @@
         ../src-client/RecordingUtils.cpp
 tstRecording_INCS     = \
-        ../include \
-        $(VBOX_MAIN_APIWRAPPER_INCS)
+        ../include
 
 #
 # tstSettings
 #
+# Note! See notes on tstCollector.
+#
 tstSettings_TEMPLATE = VBoxMainClientTstExe
+tstSettings_INTERMEDIATES = \
+        $(VBOX_MAIN_APIWRAPPER_GEN_HDRS) \
+        $(VBOX_XML_SCHEMADEFS_H)
 tstSettings_INCS     = \
         ../include \
@@ -337 +350 @@
 #
 # tstUnattendedScript
+#
+# Note! See notes on tstCollector.
 #
 tstUnattendedScript_TEMPLATE = VBoxMainClientTstExe