VirtualBox

Changeset 89669 in vbox


Ignore:
Timestamp:
Jun 14, 2021 8:57:18 AM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
145115
Message:

Audio/ValKit: More guest/host installer tweaking for shipping VKAT (now as VBoxAudioTest, to not clutter up files / naming conventions). bugref:10008

Location:
trunk/src/VBox
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r85401 r89669  
    6969        $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe \
    7070        $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe
     71
     72## @todo r=andy Rename DRIVER_FILES to INST_FILES or something, as those files are not strictly driver-related files.
    7173
    7274DRIVER_FILES := \
    … …  
    130132 endif
    131133endif
     134
     135ifdef env.VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
     136 DRIVER_FILES += \
     137  $(VBOX_PATH_VALIDATIONKIT_BIN)/VBoxAudioTest.exe
     138endif
     139
    132140VB_WIN_ADD_NSIS_ENV := \
    133141        -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \
    … …  
    150158        -E 'VBOX_WITH_GUEST_INSTALL_HELPER=$(if $(VBOX_WITH_GUEST_INSTALL_HELPER),1,0)' \
    151159        -E 'VBOX_WITH_GUEST_INSTALLER_UNICODE=$(if $(VBOX_WITH_GUEST_INSTALLER_UNICODE),1,0)' \
     160        -E 'VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST=$(if $(VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST),1,0)' \
    152161        -E 'VBOX_WITH_LICENSE_INSTALL_RTF=$(if $(VBOX_BRAND_LICENSE_RTF),1,0)' \
    153162        -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),1,0)' \
    … …  
    336345
    337346include $(FILE_KBUILD_SUB_FOOTER)
    338 

  • trunk/src/VBox/Additions/linux/Makefile.kmk

    r89657 r89669  
    119119ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
    120120 VBOX_LNX_ADD_STRIP_BIN += \
    121         vkat
     121        VBoxAudioTest
    122122endif
    123123

  • trunk/src/VBox/Additions/solaris/Makefile.kmk

    r82968 r89669  
    167167        vboxmslnk \
    168168        $(if ($VBOX_WITH_PAM),pam_vbox.so,) \
    169         $(if $(VBOX_OSE),,vboxfs_s10)
     169        $(if $(VBOX_OSE),,vboxfs_s10) \
     170        $(if $(VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST),VBoxAudioTest,)
    170171
    171172SOLARIS_ADD_DRIVERS = \

  • trunk/src/VBox/Installer/darwin/DiskImage/VirtualBox_Uninstall.tool

    r82968 r89669  
    8484test -f /usr/bin/VBoxAutostart                     && my_files+=("/usr/bin/VBoxAutostart")
    8585test -f /usr/bin/VBoxDTrace                        && my_files+=("/usr/bin/VBoxDTrace")
     86test -f /usr/bin/VBoxAudioTest                     && my_files+=("/usr/bin/VBoxAudioTest")
    8687test -f /usr/bin/vbox-img                          && my_files+=("/usr/bin/vbox-img")
    8788test -f /usr/local/bin/VirtualBox                  && my_files+=("/usr/local/bin/VirtualBox")
    … …  
    9596test -f /usr/local/bin/VBoxAutostart               && my_files+=("/usr/local/bin/VBoxAutostart")
    9697test -f /usr/local/bin/VBoxDTrace                  && my_files+=("/usr/local/bin/VBoxDTrace")
     98test -f /usr/local/bin/VBoxAudioTest               && my_files+=("/usr/local/bin/VBoxAudioTest")
    9799test -f /usr/local/bin/vbox-img                    && my_files+=("/usr/local/bin/vbox-img")
    98100test -d /Library/Receipts/VirtualBoxCLI.pkg/       && my_directories+=("/Library/Receipts/VirtualBoxCLI.pkg/")

  • trunk/src/VBox/Installer/darwin/Makefile.kmk

    r89020 r89669  
    387387        MacOS/VBoxAutostart \
    388388        $(if $(VBOX_WITH_WEBSERVICES),MacOS/vboxwebsrv) \
    389         $(if $(VBOX_WITH_DTRACE),MacOS/VBoxDTrace,)
     389        $(if $(VBOX_WITH_DTRACE),MacOS/VBoxDTrace,) \
     390        $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),MacOS/VBoxAudioTest,)
    390391ifdef VBOX_WITH_QTGUI
    391392 VBOX_DI_VBAPP_PROGS += \
    … …  
    957958                '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxDTrace "$$@"'
    958959endif
     960ifdef VBOX_WITH_HOST_SHIPPING_AUDIO_TEST
     961        $(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxAudioTest \
     962                '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxAudioTest "$$@"'
     963endif
    959964        @# Set the correct owners and file permissions.
    960965        sudo chmod 0755 $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/*

  • trunk/src/VBox/Installer/freebsd/Makefile.kmk

    r84450 r89669  
    103103                VBoxTestOGL \
    104104        $(if $(VBOX_WITH_PYTHON),VBoxPython.so,) \
    105         $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
     105        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \
     106        $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),VBoxAudioTest,)
    106107
    107108# Do not remove relocation information of these binaries
    … …  
    133134                VBoxSVC) \
    134135        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
    135         $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
     136        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \
     137        $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),VBoxAudioTest,)
    136138
    137139# Qt GUI

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r89659 r89669  
    176176                ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \
    177177        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)\
    178         $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),vkat,) \
     178        $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),VBoxAudioTest,) \
    179179        VBoxTunctl
    180180

  • trunk/src/VBox/Installer/linux/VBox.sh

    r82968 r89669  
    135135        exec "$INSTALL_DIR/VBoxDTrace" "$@"
    136136        ;;
     137    VBoxAudioTest|vboxaudiotest|vkat)
     138        exec "$INSTALL_DIR/VBoxAudioTest" "$@"
     139        ;;
    137140    vboxwebsrv)
    138141        exec "$INSTALL_DIR/vboxwebsrv" "$@"

  • trunk/src/VBox/Installer/linux/debian/lintian-override.in

    r84450 r89669  
    2828%VERPKG%: binary-without-manpage usr/bin/VBoxBalloonCtrl
    2929%VERPKG%: binary-without-manpage usr/bin/VBoxDTrace
     30%VERPKG%: binary-without-manpage usr/bin/VBoxAudioTest
    3031%VERPKG%: binary-without-manpage usr/bin/VBoxHeadless
    3132%VERPKG%: binary-without-manpage usr/bin/VBoxManage
    … …  
    3839%VERPKG%: binary-without-manpage usr/bin/vboxballoonctrl
    3940%VERPKG%: binary-without-manpage usr/bin/vboxdtrace
     41%VERPKG%: binary-without-manpage usr/bin/audiotest
    4042%VERPKG%: binary-without-manpage usr/bin/vboxheadless
    4143%VERPKG%: binary-without-manpage usr/bin/vboxmanage
    … …  
    7072%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDbg.so /usr/lib/virtualbox
    7173%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDTrace /usr/lib/virtualbox
     74%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxAudioTest /usr/lib/virtualbox
    7275%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestPropSvc.so /usr/lib/virtualbox
    7376%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestControlSvc.so /usr/lib/virtualbox

  • trunk/src/VBox/Installer/linux/install.sh

    r88319 r89669  
    333333        ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxDTrace
    334334    fi
     335    if [ -f $INSTALLATION_DIR/VBoxAudioTest ]; then
     336        ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxAudioTest
     337    fi
    335338    # Unity and Nautilus seem to look here for their icons
    336339    ln -sf $INSTALLATION_DIR/icons/128x128/virtualbox.png /usr/share/pixmaps/virtualbox.png
    … …  
    351354    if [ -f $INSTALLATION_DIR/VBoxDTrace ]; then
    352355        ln -sf VBoxDTrace /usr/bin/vboxdtrace > /dev/null 2>&1
     356    fi
     357    if [ -f $INSTALLATION_DIR/VBoxAudioTest ]; then
     358        ln -sf VBoxDTrace /usr/bin/vboxaudiotest > /dev/null 2>&1
    353359    fi
    354360

  • trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

    r89486 r89669  
    175175ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxheadless
    176176ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxDTrace
     177ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxAudioTest
    177178ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxdtrace
     179ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxaudiotest
    178180ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxBugReport
    179181ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxbugreport

  • trunk/src/VBox/Installer/linux/uninstall.sh

    r82968 r89669  
    7272  /usr/bin/VBoxHeadless \
    7373  /usr/bin/VBoxDTrace \
     74  /usr/bin/VBoxAudioTest \
    7475  /usr/bin/VBoxBugReport \
    7576  /usr/bin/VBoxBalloonCtrl \
    … …  
    9596  /usr/bin/vboxheadless \
    9697  /usr/bin/vboxdtrace \
     98  /usr/bin/vboxaudiotest \
    9799  /usr/bin/vboxbugreport \
    98100  $PREV_INSTALLATION/components/VBoxVMM.so \

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r89486 r89669  
    322322        VBoxXPCOMIPCD \
    323323        $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,) \
    324         $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
     324        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \
     325        $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),VBoxAudioTest,)
    325326
    326327## @def SOLARIS_STRIP_BINS
    … …  
    432433        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
    433434        VBoxManage \
    434         $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
     435        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \
     436        $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),VBoxAudioTest,)
    435437
    436438SOLARIS_COMMON_EXES += \

  • trunk/src/VBox/Installer/solaris/VBox.sh

    r82968 r89669  
    5252        exec "$INSTALL_DIR/VBoxDTrace" "$@"
    5353        ;;
     54    VBoxAudioTest|vboxaudiotest|vkat)
     55        exec "$INSTALL_DIR/VBoxAudioTest" "$@"
     56        ;;
    5457    vboxwebsrv)
    5558        exec "$INSTALL_DIR/vboxwebsrv" "$@"

  • trunk/src/VBox/Installer/win/Makefile.kmk

    r88304 r89669  
    664664                -E 'VBOX_WITH_DRAG_AND_DROP=$(if $(VBOX_WITH_DRAG_AND_DROP),yes,no)' \
    665665                -E 'VBOX_WITH_DTRACE=$(if $(VBOX_WITH_DTRACE),yes,no)' \
     666                -E 'VBOX_WITH_HOST_SHIPPING_AUDIO_TEST=$(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),yes,no)' \
    666667                -E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
    667668                -E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \
    … …  
    824825                -E 'VBOX_WITH_DRAG_AND_DROP=$(if $(VBOX_WITH_DRAG_AND_DROP),yes,no)' \
    825826                -E 'VBOX_WITH_DTRACE=$(if $(VBOX_WITH_DTRACE),yes,no)' \
     827                -E 'VBOX_WITH_HOST_SHIPPING_AUDIO_TEST=$(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),yes,no)' \
    826828                -E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
    827829                -E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \

  • trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

    r88399 r89669  
    279279        <File Id="file_VBoxVMM.dll" Name="VBoxVMM.dll"
    280280              Source="$(env.PATH_OUT)\bin\VBoxVMM.dll" />
     281<?if $(env.VBOX_WITH_HOST_SHIPPING_AUDIO_TEST) = "yes" ?>
     282        <File Id="file_VBoxAudioTest.exe" Name="VBoxAudioTest.exe"
     283              Source="$(env.PATH_OUT)\bin\VBoxAudioTest.exe" />
     284<?endif ?>
    281285<?if $(env.VBOX_WITH_VRDP) = "yes" ?>
    282286        <File Id="file_VBoxVRDP.dll" Name="VBoxVRDP.dll"

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

    r89662 r89669  
    146146# The additions variant of the audio test utility.
    147147#
     148# We name it VBoxAudioTest though, to not clutter up Guest Additions installations
     149# (all VBox binaries have the VBox prefix).
     150#
    148151vkatadd_EXTENDS        = vkat
    149152vkatadd_EXTENDS_BY     = appending
    150 vkatadd_NAME           = vkat
     153vkatadd_NAME           = VBoxAudioTest
    151154vkatadd_TEMPLATE       = VBoxGuestR3Exe
    152155vkatadd_SDKS           = VBOX_ZLIB_STATIC
    … …  
    157160#
    158161# Copy the valkit vkat to bin so it can be shipped with the host installer too.
     162# We name it VBoxAudioTest though, to not clutter up host installations.
    159163#
    160164ifdef VBOX_WITH_HOST_SHIPPING_AUDIO_TEST
    161165 INSTALLS += vkathost
    162166 vkathost_TEMPLATE = VBOXR3EXE
    163  vkathost_SOURCES  = $(vkat_1_TARGET)
     167 vkathost_SOURCES  = $(vkat_1_TARGET)=>VBoxAudioTest
    164168endif
    165169
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette