Changeset 89656 in vbox

Timestamp:

Jun 13, 2021 10:57:27 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk,src/VBox/Makefile.kmk,ValKit/AudioTest: Added config variables VBOX_WITH_HOST_SHIPPING_AUDIO_TEST and VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST for controlling whether we ship the audio test with the host and GA installers. Copy vkat to bin if we need it on the host. bugref:10008

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Makefile.kmk (modified) (2 diffs)
• src/VBox/ValidationKit/utils/audio/Makefile.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -737 +737 @@
 # Build the Validation Kit.
 VBOX_WITH_VALIDATIONKIT = 1
+# Set if we should ship the audio test from the Validation Kit with the host installer.
+VBOX_WITH_HOST_SHIPPING_AUDIO_TEST = 1
+# Set if we should ship the audio test from the Validation Kit with the guest additions.
+VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST = 1
 # Build the testcases.
 VBOX_WITH_TESTCASES = 1

trunk/src/VBox/Makefile.kmk

@@ -29 +29 @@
  include $(PATH_SUB_CURRENT)/Additions/Makefile.kmk
 
- ifdef VBOX_WITH_VALIDATIONKIT # For including VKAT with the Guest Additions.
+ ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
   include $(PATH_SUB_CURRENT)/ValidationKit/utils/audio/Makefile.kmk
  endif
@@ -102 +102 @@
  ifdef VBOX_WITH_VALIDATIONKIT
   include $(PATH_SUB_CURRENT)/ValidationKit/Makefile.kmk
+ else ifdef VBOX_WITH_HOST_SHIPPING_AUDIO_TEST
+  include $(PATH_SUB_CURRENT)/ValidationKit/utils/audio/Makefile.kmk
  endif
  include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk

trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk

@@ -36 +36 @@
 endif
 
+
 #
 # Append what we build here to PROGRAMS (at the top because it's a bit messy).
@@ -43 +44 @@
   PROGRAMS += vkat
  endif
- if defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_BUILD)
-  ifndef VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER
-   ifdef VBOX_WITH_ADDITIONS
-    PROGRAMS += vkatadd
+ ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
+  if defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_BUILD)
+   ifndef VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER
+    ifdef VBOX_WITH_ADDITIONS
+     PROGRAMS += vkatadd
+    endif
    endif
   endif
  endif
 endif
+
 
 #
@@ -62 +66 @@
   WinMM.Lib
 endif
+
 
 #
@@ -149 +154 @@
 
 
+#
+# Copy the valkit vkat to bin so it can be shipped with the host installer too.
+#
+ifdef VBOX_WITH_HOST_SHIPPING_AUDIO_TEST
+ INSTALLS += vkathost
+ vkathost_TEMPLATE = VBOXR3EXE
+ vkathost_SOURCES  = $(vkat_1_TARGET)
+endif
+
 include $(FILE_KBUILD_SUB_FOOTER)