Changeset 53981 in vbox for trunk/src/VBox/Installer

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/src/VBox/Installer

Files:

• darwin/Makefile.kmk (modified) (2 diffs)
• freebsd/Makefile.kmk (modified) (3 diffs)
• freebsd/pkg_plist (modified) (1 diff)
• linux/Makefile.kmk (modified) (1 diff)
• solaris/Makefile.kmk (modified) (2 diffs)
• win/Makefile.kmk (modified) (1 diff)
• win/VBoxMergeApp.wxi (modified) (1 diff)

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

@@ -454 +454 @@
         MacOS/VirtualBoxVM \
         $(if $(VBOX_WITH_WEBSERVICES),MacOS/vboxwebsrv) \
-        MacOS/VirtualBox
+        MacOS/VirtualBox \
+        $(if $(VBOX_WITH_DTRACE),MacOS/VBoxDTrace,)
 
 VBOX_DI_VBAPP_UNIVERSAL_PROGS = \
@@ -880 +881 @@
         $(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxAutostart \
                 '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart "$$@"'
+ifdef VBOX_WITH_DTRACE
+        $(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxDTrace \
+                '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxDTrace "$$@"'
+endif
         @# Set the correct owners and file permissions.
         sudo chmod 0755 $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/*

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

@@ -110 +110 @@
                 VBoxTestOGL \
                 VBoxSharedCrOpenGL.so,) \
-        $(if $(VBOX_WITH_PYTHON),VBoxPython.so,)
+        $(if $(VBOX_WITH_PYTHON),VBoxPython.so,) \
+        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
 
 # Do not remove relocation information of these binaries
@@ -141 +142 @@
                 VBoxManage \
                 VBoxSVC) \
-        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,)
+        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
+        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
 
 # Qt4 GUI
@@ -314 +316 @@
                 -e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \
                 -e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \
+                $(if $(VBOX_WITH_DTRACE),,-e "/VBoxDTrace/d") \
                 --output $@ \
                 $<

trunk/src/VBox/Installer/freebsd/pkg_plist

@@ -53 +53 @@
 bin/VBoxHeadless
 bin/VBoxSDL
+bin/VBoxDTrace
 bin/vboxwebsrv
 @mode 644

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

@@ -173 +173 @@
                 ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNC.so \
                 ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \
+        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)\
         VBoxTunctl \
         helpers/generate_service_file

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

@@ -215 +215 @@
         $(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
         VBoxXPCOMIPCD \
-        $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)
+        $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,) \
+       $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
 
 SOLARIS_DRIVER_BINS = \
@@ -309 +310 @@
         $(if $(VBOX_WITH_HEADLESS),VBoxHeadless,) \
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
-        VBoxManage
+        VBoxManage \
+        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
 
 SOLARIS_COMMON_EXES = \

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

@@ -633 +633 @@
                 -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
+                -E 'VBOX_WITH_DTRACE=$(if $(VBOX_WITH_DTRACE),yes,no)' \
                 -E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
                 -E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \

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

@@ -183 +183 @@
         <File Id="file_VBoxExtPackHelperApp.exe" Name="VBoxExtPackHelperApp.exe"
               Source="$(env.PATH_OUT)\bin\VBoxExtPackHelperApp.exe"/>
+<?endif ?>
+<?if $(env.VBOX_WITH_DTRACE) = "yes" ?>
+        <File Id="file_VBoxDTrace.exe" Name="VBoxDTrace.exe"
+          Source="$(env.PATH_OUT)\bin\VBoxDTrace.exe" />
 <?endif ?>
         <!-- VBox DLL files -->