Changeset 54030 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Jan 29, 2015 5:31:47 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97946

Message:

Install VBoxDTrace scripts/libs/testcases.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• VBox.sh (modified) (2 diffs)

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

@@ -173 +173 @@
         $(SOLARIS_USR_DIR)/share/icons \
         $(SOLARIS_USRSHR_ICONS_DIR) \
-    $(foreach s,16 20 24 32 48 64 72 96 128 256,\
-            $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s) \
-            $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s)/mimetypes)
+        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
+                $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s) \
+                $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s)/mimetypes)
 
 VBOX_MIME_ICONS = \
         $(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
-            $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-                $(foreach s,16 20 24 32 48 64 72 96 128 256,\
-                    virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
+                $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
+                        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
+                                virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
 
 SOLARIS_COMMON_ICONS = \
         $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-            $(foreach s,16 20 24 32 48 64 72 96 128 256,\
-                $(s)x$(s)/mimetypes/virtualbox-$(f).png))
+                $(foreach s,16 20 24 32 48 64 72 96 128 256,\
+                        $(s)x$(s)/mimetypes/virtualbox-$(f).png))
 
 
@@ -421 +421 @@
         VBoxEFI32.fd \
         VBoxEFI64.fd
+endif
+
+# DTrace library, testcase and scripts (as the rest of this file, this makes bold
+# ASSUMPTIONS about VBPX_INST_XXX variable values).
+ifdef VBOX_WITH_DTRACE
+ SOLARIS_COMMON += \
+        $(addprefix dtrace/lib/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \
+        $(addprefix dtrace/testcase/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \
+       $(addprefix dtrace/scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES))
 endif
 

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

@@ -1 +1 @@
 #!/bin/sh
-#
+## @file
 # Oracle VM VirtualBox startup script, Solaris hosts.
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+
+#
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -41 +43 @@
         exec "$INSTALL_DIR/VBoxAutostart" "$@"
         ;;
+    VBoxDTrace|vboxdtrace)
+        exec "$INSTALL_DIR/VBoxDTrace" "$@"
+        ;;
     vboxwebsrv)
         exec "$INSTALL_DIR/vboxwebsrv" "$@"