VirtualBox

Changeset 53981 in vbox


Ignore:
Timestamp:
Jan 27, 2015 6:58:32 PM (10 years ago)
Author:
vboxsync
Message:

Adding the VBoxDTrace wrapper binary to the installers. Fixing extpack build break. Simplified VBOX_WITH_DTRACE* test in the makefiles.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r53979 r53981  
    12431243 VBOX_GUI_USE_QGL=
    12441244endif
     1245
     1246# Collection macro mainly for deciding whether VBoxDTrace needs shipping.
     1247VBOX_WITH_DTRACE := $(if-expr defined(VBOX_WITH_DTRACE_R0) || defined(VBOX_WITH_DTRACE_R0DRV) \
     1248                            || defined(VBOX_WITH_DTRACE_R3) || defined(VBOX_WITH_DTRACE_RC),1,)
     1249
    12451250
    12461251#

  • trunk/src/VBox/ExtPacks/Makefile.kmk

    r53979 r53981  
    2222 include $(PATH_SUB_CURRENT)/Puel/Makefile.kmk
    2323endif
    24 if    defined(VBOX_WITH_EXTPACK_VBOXDTRACE) \
    25    || defined(VBOX_WITH_DTRACE) \
    26    || defined(VBOX_WITH_DTRACE_R3) \
    27    || defined(VBOX_WITH_DTRACE_R0) \
    28    || defined(VBOX_WITH_DTRACE_R0DRV) \
    29    || defined(VBOX_WITH_DTRACE_RC)
     24if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) || defined(VBOX_WITH_DTRACE)
    3025 include $(PATH_SUB_CURRENT)/VBoxDTrace/Makefile.kmk
    3126endif

  • trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

    r53979 r53981  
    3131
    3232
    33 #
    34 # The generic wrapper that selects native or extpack dtrace cmd and adds our
    35 # library path to the command line.
    36 #
    37 # Note! This is not installed as part of the extension pack, but always shipped
    38 #       with the base VBox installation.
    39 #
    40 PROGRAMS += VBoxDTrace
    41 VBoxDTrace_TEMPLATE := VBOXR3EXE
    42 VBoxDTrace_SOURCES := VBoxDTraceWrapper.cpp
    43 VBoxDTrace_LIBS = $(LIB_RUNTIME)
     33ifndef VBOX_ONLY_ADDITIONS
     34 #
     35 # The generic wrapper that selects native or extpack dtrace cmd and adds our
     36 # library path to the command line.
     37 #
     38 # Note! This is not installed as part of the extension pack, but always shipped
     39 #       with the base VBox installation.
     40 #
     41 PROGRAMS += VBoxDTrace
     42 VBoxDTrace_TEMPLATE := VBOXR3EXE
     43 VBoxDTrace_SOURCES := VBoxDTraceWrapper.cpp
     44 VBoxDTrace_LIBS = $(LIB_RUNTIME)
     45endif
    4446
    4547

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

    r53745 r53981  
    454454        MacOS/VirtualBoxVM \
    455455        $(if $(VBOX_WITH_WEBSERVICES),MacOS/vboxwebsrv) \
    456         MacOS/VirtualBox
     456        MacOS/VirtualBox \
     457        $(if $(VBOX_WITH_DTRACE),MacOS/VBoxDTrace,)
    457458
    458459VBOX_DI_VBAPP_UNIVERSAL_PROGS = \
    … …  
    880881        $(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxAutostart \
    881882                '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart "$$@"'
     883ifdef VBOX_WITH_DTRACE
     884        $(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxDTrace \
     885                '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxDTrace "$$@"'
     886endif
    882887        @# Set the correct owners and file permissions.
    883888        sudo chmod 0755 $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/*

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

    r51386 r53981  
    110110                VBoxTestOGL \
    111111                VBoxSharedCrOpenGL.so,) \
    112         $(if $(VBOX_WITH_PYTHON),VBoxPython.so,)
     112        $(if $(VBOX_WITH_PYTHON),VBoxPython.so,) \
     113        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
    113114
    114115# Do not remove relocation information of these binaries
    … …  
    141142                VBoxManage \
    142143                VBoxSVC) \
    143         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,)
     144        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
     145        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
    144146
    145147# Qt4 GUI
    … …  
    314316                -e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \
    315317                -e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \
     318                $(if $(VBOX_WITH_DTRACE),,-e "/VBoxDTrace/d") \
    316319                --output $@ \
    317320                $<

  • trunk/src/VBox/Installer/freebsd/pkg_plist

    r44580 r53981  
    5353bin/VBoxHeadless
    5454bin/VBoxSDL
     55bin/VBoxDTrace
    5556bin/vboxwebsrv
    5657@mode 644

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

    r53980 r53981  
    173173                ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNC.so \
    174174                ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \
     175        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)\
    175176        VBoxTunctl \
    176177        helpers/generate_service_file

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

    r51386 r53981  
    215215        $(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
    216216        VBoxXPCOMIPCD \
    217         $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)
     217        $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,) \
     218       $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
    218219
    219220SOLARIS_DRIVER_BINS = \
    … …  
    309310        $(if $(VBOX_WITH_HEADLESS),VBoxHeadless,) \
    310311        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
    311         VBoxManage
     312        VBoxManage \
     313        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
    312314
    313315SOLARIS_COMMON_EXES = \

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

    r52910 r53981  
    633633                -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
    634634                -E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
     635                -E 'VBOX_WITH_DTRACE=$(if $(VBOX_WITH_DTRACE),yes,no)' \
    635636                -E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
    636637                -E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \

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

    r52828 r53981  
    183183        <File Id="file_VBoxExtPackHelperApp.exe" Name="VBoxExtPackHelperApp.exe"
    184184              Source="$(env.PATH_OUT)\bin\VBoxExtPackHelperApp.exe"/>
     185<?endif ?>
     186<?if $(env.VBOX_WITH_DTRACE) = "yes" ?>
     187        <File Id="file_VBoxDTrace.exe" Name="VBoxDTrace.exe"
     188          Source="$(env.PATH_OUT)\bin\VBoxDTrace.exe" />
    185189<?endif ?>
    186190        <!-- VBox DLL files -->
Note: See TracChangeset for help on using the changeset viewer.

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