VirtualBox

Changeset 54030 in vbox


Ignore:
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
Files:
1 added
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/debian/lintian-override.in

    r47894 r54030  
    3434%VERPKG%: binary-without-manpage usr/bin/VBox
    3535%VERPKG%: binary-without-manpage usr/bin/VBoxBalloonCtrl
     36%VERPKG%: binary-without-manpage usr/bin/VBoxDTrace
    3637%VERPKG%: binary-without-manpage usr/bin/VBoxHeadless
    3738%VERPKG%: binary-without-manpage usr/bin/VBoxManage
    … …  
    4243%VERPKG%: binary-without-manpage usr/bin/rdesktop-vrdp
    4344%VERPKG%: binary-without-manpage usr/bin/vboxballoonctrl
     45%VERPKG%: binary-without-manpage usr/bin/vboxdtrace
    4446%VERPKG%: binary-without-manpage usr/bin/vboxheadless
    4547%VERPKG%: binary-without-manpage usr/bin/vboxmanage
    … …  
    7577%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDDU.so /usr/lib/virtualbox
    7678%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDbg.so /usr/lib/virtualbox
     79%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDTrace /usr/lib/virtualbox
    7780%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestPropSvc.so /usr/lib/virtualbox
    7881%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestControlSvc.so /usr/lib/virtualbox

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

    r41477 r54030  
    55
    66#
    7 # Copyright (C) 2006-2012 Oracle Corporation
     7# Copyright (C) 2006-2015 Oracle Corporation
    88#
    99# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1818SUB_DEPTH = ../../..
    1919include $(KBUILD_PATH)/subheader.kmk
     20
     21#
     22# Make sure our Config.kmk is included.
     23#
     24ifndef VBOX_INSTALLER_CONFIG_KMK_INCLUDED
     25 include $(PATH_SUB_CURRENT)/Config.kmk
     26endif
    2027
    2128#

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

    r53981 r54030  
    3131  VBOX_PATH_DIST_32 = $(VBOX_PATH_DIST)
    3232  VBOX_PATH_DIST_64 = $(PATH_OUT_BASE)/darwin.amd64/$(KBUILD_TYPE)/dist
     33  VBOX_PATH_DIST_OTHER = $(VBOX_PATH_DIST_64)
    3334 else
    3435  VBOX_PATH_DIST_64 = $(VBOX_PATH_DIST)
    3536  VBOX_PATH_DIST_32 = $(PATH_OUT_BASE)/darwin.x86/$(KBUILD_TYPE)/dist
     37  VBOX_PATH_DIST_OTHER = $(VBOX_PATH_DIST_32)
    3638 endif
    3739 VBOX_DI_FN_DEP_BOTH = $(VBOX_PATH_DIST_32)/$1 $(VBOX_PATH_DIST_64)/$2
    … …  
    4850  VBOX_DI_FN_DEP_32  =
    4951 endif
     52 VBOX_PATH_DIST_OTHER = $(error VBOX_PATH_DIST_OTHER used in a non-combined package deal)
    5053endif
    5154
    … …  
    575578                $(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxautostart.plist \
    576579                $(VBOX_PATH_DI_SRC)/VirtualBox/VBoxAutostartDarwin.sh \
     580               $(if-expr defined(VBOX_WITH_DTRACE), \
     581                $(foreach f, $(VBOXINST_DTRACE_LIB_ARCH_FILES) \
     582                        $(call VBOX_DI_FN_DEP_32,VirtualBox.app/Contents/MacOS/dtrace/lib/x86/$f) \
     583                        $(call VBOX_DI_FN_DEP_64,VirtualBox.app/Contents/MacOS/dtrace/lib/amd64/$f)) \
     584                $(foreach f, $(VBOXINST_DTRACE_TESTCASE_ARCH_FILES) \
     585                        $(call VBOX_DI_FN_DEP_32,VirtualBox.app/Contents/MacOS/dtrace/testcase/x86/$f) \
     586                        $(call VBOX_DI_FN_DEP_64,VirtualBox.app/Contents/MacOS/dtrace/testcase/amd64/$f)) \
     587                $(addprefix $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/dtrace/scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES)) \
     588                 ,) \
    577589                $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
    578590        $(call MSG_TOOL,pkgbuild,,,$@)
    … …  
    743755                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(f)$(NLTAB) )
    744756endif
     757ifdef VBOX_WITH_DTRACE
     758        @# DTrace library, testcases and scripts.
     759       $(MKDIR) -p -m 0755 -- \
     760                $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/dtrace/lib/$(KBUILD_TARGET_ARCH)/ \
     761                $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/dtrace/testcase/$(KBUILD_TARGET_ARCH)/ \
     762                $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/dtrace/scripts/
     763        $(foreach file, $(addprefix lib/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \
     764                        $(addprefix testcase/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \
     765                $(addprefix scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES)) \
     766                ,$(INSTALL) -m 0655 $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/dtrace/$(file) \
     767                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/dtrace/$(file)$(NLTAB))
     768 ifdef VBOX_WITH_COMBINED_PACKAGE
     769       $(MKDIR) -p -m 0755 -- \
     770                $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/dtrace/lib/$(VBOX_CP_OTHER_ARCH)/ \
     771                $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/dtrace/testcase/$(VBOX_CP_OTHER_ARCH)/
     772        $(foreach file, $(addprefix lib/$(VBOX_CP_OTHER_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \
     773                        $(addprefix testcase/$(VBOX_CP_OTHER_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \
     774                ,$(INSTALL) -m 0655 $(VBOX_PATH_DIST_OTHER)/VirtualBox.app/Contents/MacOS/dtrace/$(file) \
     775                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/dtrace/$(file)$(NLTAB)) \
     776 endif
     777endif
     778
    745779        @# Signed the binaries and the application bundle.
    746780        @# Note #1 - We cannot sign the application binary here, since we switch to match the kernel bitness.

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

    r53981 r54030  
    132132# EFI firmware
    133133ifdef VBOX_WITH_EFIFW_PACKING
    134   VBOX_FBSD_NO_STRIP += \
    135         VBoxEFI32.fd \
    136         VBoxEFI64.fd
     134 VBOX_FBSD_NO_STRIP += \
     135        VBoxEFI32.fd \
     136        VBoxEFI64.fd
    137137endif
    138138
    … …  
    214214endif
    215215
     216# DTrace library, testcase and scripts (as the rest of this file, this makes bold
     217# ASSUMPTIONS about VBPX_INST_XXX variable values).
     218ifdef VBOX_WITH_DTRACE
     219 VBOX_FBSD_NO_STRIP += \
     220       $(addprefix dtrace/lib/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \
     221       $(addprefix dtrace/testcase/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \
     222       $(addprefix dtrace/scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES))
     223endif
     224
    216225#
    217226# All the bin files that goes into the archives.
    … …  
    232241#
    233242# The generic installer.
    234 # @todo r=aeichner: Create pkg_plist dynamically based on the available features
     243## @todo r=aeichner: Create pkg_plist dynamically based on the available features
    235244#
    236245$(PATH_STAGE_BIN)/$(VBOX_FBSD_PACKAGE_NAME): \
    … …  
    316325                -e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \
    317326                -e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \
    318                 $(if $(VBOX_WITH_DTRACE),,-e "/VBoxDTrace/d") \
    319327                --output $@ \
    320328                $<
     329ifdef VBOX_WITH_DTRACE
     330        $(QUIET)$(APPEND) -n "$@" "@mode 644" \
     331                $(addprefix lib/virtualbox/dtrace/lib/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \
     332                $(addprefix lib/virtualbox/dtrace/testcase/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \
     333                $(addprefix lib/virtualbox/dtrace/scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES)) \
     334                "@mode 755" \
     335                "bin/VBoxDTrace"
     336endif
    321337
    322338include $(FILE_KBUILD_SUB_FOOTER)

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

    r53981 r54030  
    5353bin/VBoxHeadless
    5454bin/VBoxSDL
    55 bin/VBoxDTrace
    5655bin/vboxwebsrv
    5756@mode 644

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

    r53981 r54030  
    321321endif
    322322
     323# DTrace library and scripts.
     324ifdef VBOX_WITH_DTRACE
     325 VBOX_LNX_NO_STRIP += \
     326        $(addprefix dtrace/lib/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \
     327        $(addprefix dtrace/testcase/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \
     328        $(addprefix dtrace/scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES))
     329endif
     330
     331# Icons
    323332VBOX_MIME_ICONS = \
    324333        $(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\

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

    r48787 r54030  
    11#!/bin/sh
    2 #
     2## @file
    33# Oracle VM VirtualBox startup script, Linux hosts.
    44#
    5 # Copyright (C) 2006-2012 Oracle Corporation
     5
     6#
     7# Copyright (C) 2006-2016 Oracle Corporation
    68#
    79# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    102104        exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
    103105        ;;
     106    VBoxDTrace|vboxdtrace)
     107        exec "$INSTALL_DIR/VBoxDTrace" "$@"
     108        ;;
    104109    vboxwebsrv)
    105110        exec "$INSTALL_DIR/vboxwebsrv" "$@"

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

    r47894 r54030  
    3434%VERPKG%: binary-without-manpage usr/bin/VBox
    3535%VERPKG%: binary-without-manpage usr/bin/VBoxBalloonCtrl
     36%VERPKG%: binary-without-manpage usr/bin/VBoxDTrace
    3637%VERPKG%: binary-without-manpage usr/bin/VBoxHeadless
    3738%VERPKG%: binary-without-manpage usr/bin/VBoxManage
    … …  
    4243%VERPKG%: binary-without-manpage usr/bin/rdesktop-vrdp
    4344%VERPKG%: binary-without-manpage usr/bin/vboxballoonctrl
     45%VERPKG%: binary-without-manpage usr/bin/vboxdtrace
    4446%VERPKG%: binary-without-manpage usr/bin/vboxheadless
    4547%VERPKG%: binary-without-manpage usr/bin/vboxmanage
    … …  
    7577%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDDU.so /usr/lib/virtualbox
    7678%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDbg.so /usr/lib/virtualbox
     79%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDTrace /usr/lib/virtualbox
    7780%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestPropSvc.so /usr/lib/virtualbox
    7881%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestControlSvc.so /usr/lib/virtualbox

  • trunk/src/VBox/Installer/linux/deffiles

    r51294 r54030  
    2727    VBoxDD.so \
    2828    VBoxDD2.so \
     29    VBoxDTrace \
    2930    VBoxKeyboard.so \
    3031    VBoxManage \
    … …  
    8182    components/VBoxXPCOMIPCC.so \
    8283    components/VirtualBox_XPCOM.xpt \
     84    dtrace/lib/amd64/vbox-types.d \
     85    dtrace/lib/amd64/vbox-arch-types.d \
     86    dtrace/lib/amd64/vm.d \
     87    dtrace/lib/amd64/cpumctx.d \
     88    dtrace/lib/amd64/CPUMInternal.d \
     89    dtrace/lib/amd64/x86.d \
     90    dtrace/lib/x86/vbox-types.d \
     91    dtrace/lib/x86/vbox-arch-types.d \
     92    dtrace/lib/x86/vm.d \
     93    dtrace/lib/x86/cpumctx.d \
     94    dtrace/lib/x86/CPUMInternal.d \
     95    dtrace/lib/x86/x86.d \
     96    dtrace/testcase/amd64/vbox-vm-struct-test.d \
     97    dtrace/testcase/x86/vbox-vm-struct-test.d \
    8398    VBox.sh \
    8499    VBox.png \

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

    r51294 r54030  
    109109    check_binary "/usr/bin/VBoxVRDP" "$install_dir" &&
    110110    check_binary "/usr/bin/VBoxHeadless" "$install_dir" &&
     111    check_binary "/usr/bin/VBoxDTrace" "$install_dir" &&
    111112    check_binary "/usr/bin/VBoxBalloonCtrl" "$install_dir" &&
    112113    check_binary "/usr/bin/VBoxAutostart" "$install_dir" &&
    … …  
    406407    ln -sf $INSTALLATION_DIR/vbox-img /usr/bin/vbox-img
    407408    ln -sf $INSTALLATION_DIR/VBox.png /usr/share/pixmaps/VBox.png
     409    if [ -f $INSTALLATION_DIR/VBoxDTrace ]; then
     410        ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxDTrace
     411    fi
    408412    # Unity and Nautilus seem to look here for their icons
    409413    ln -sf $INSTALLATION_DIR/icons/128x128/virtualbox.png /usr/share/pixmaps/virtualbox.png
    … …  
    418422    ln -sf VBoxSDL /usr/bin/vboxsdl > /dev/null 2>&1
    419423    ln -sf VBoxHeadless /usr/bin/vboxheadless > /dev/null 2>&1
     424    if [ -f $INSTALLATION_DIR/VBoxDTrace ]; then
     425        ln -sf VBoxDTrace /usr/bin/vboxdtrace > /dev/null 2>&1
     426    fi
    420427
    421428    # Icons

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

    r51294 r54030  
    116116rmdir icons
    117117mv virtualbox.xml $RPM_BUILD_ROOT/usr/share/mime/packages
    118 for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless VBoxExtPackHelperApp VBoxBalloonCtrl VBoxAutostart vbox-img; do
     118for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless VBoxDTrace VBoxExtPackHelperApp VBoxBalloonCtrl VBoxAutostart vbox-img; do
    119119  mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
    120120if %WEBSVC%; then
    … …  
    190190ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxHeadless
    191191ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxheadless
     192ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxDTrace
     193ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxdtrace
    192194ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxBalloonCtrl
    193195ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxballoonctrl

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

    r51294 r54030  
    9898  /usr/bin/VBoxVRDP \
    9999  /usr/bin/VBoxHeadless \
     100  /usr/bin/VBoxDTrace \
    100101  /usr/bin/VBoxBalloonCtrl \
    101102  /usr/bin/VBoxAutostart \
    … …  
    117118  /usr/bin/vboxsdl \
    118119  /usr/bin/vboxheadless \
     120  /usr/bin/vboxdtrace \
    119121  $PREV_INSTALLATION/components/VBoxVMM.so \
    120122  $PREV_INSTALLATION/components/VBoxREM.so \

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

    r54029 r54030  
    173173        $(SOLARIS_USR_DIR)/share/icons \
    174174        $(SOLARIS_USRSHR_ICONS_DIR) \
    175     $(foreach s,16 20 24 32 48 64 72 96 128 256,\
    176             $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s) \
    177             $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s)/mimetypes)
     175        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
     176                $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s) \
     177                $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s)/mimetypes)
    178178
    179179VBOX_MIME_ICONS = \
    180180        $(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
    181             $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
    182                 $(foreach s,16 20 24 32 48 64 72 96 128 256,\
    183                     virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
     181                $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
     182                        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
     183                                virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
    184184
    185185SOLARIS_COMMON_ICONS = \
    186186        $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
    187             $(foreach s,16 20 24 32 48 64 72 96 128 256,\
    188                 $(s)x$(s)/mimetypes/virtualbox-$(f).png))
     187                $(foreach s,16 20 24 32 48 64 72 96 128 256,\
     188                        $(s)x$(s)/mimetypes/virtualbox-$(f).png))
    189189
    190190
    … …  
    421421        VBoxEFI32.fd \
    422422        VBoxEFI64.fd
     423endif
     424
     425# DTrace library, testcase and scripts (as the rest of this file, this makes bold
     426# ASSUMPTIONS about VBPX_INST_XXX variable values).
     427ifdef VBOX_WITH_DTRACE
     428 SOLARIS_COMMON += \
     429        $(addprefix dtrace/lib/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \
     430        $(addprefix dtrace/testcase/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \
     431       $(addprefix dtrace/scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES))
    423432endif
    424433

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

    r51302 r54030  
    11#!/bin/sh
    2 #
     2## @file
    33# Oracle VM VirtualBox startup script, Solaris hosts.
    44#
    5 # Copyright (C) 2006-2012 Oracle Corporation
     5
     6#
     7# Copyright (C) 2006-2015 Oracle Corporation
    68#
    79# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    4143        exec "$INSTALL_DIR/VBoxAutostart" "$@"
    4244        ;;
     45    VBoxDTrace|vboxdtrace)
     46        exec "$INSTALL_DIR/VBoxDTrace" "$@"
     47        ;;
    4348    vboxwebsrv)
    4449        exec "$INSTALL_DIR/vboxwebsrv" "$@"

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

    r53982 r54030  
    147147                $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixobj \
    148148                $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \
     149        $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
    149150        $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \
    150151        $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \
    151         $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
     152        $(VBOX_WIN_INST_OUT_DIR)/Files_DTrace.wxi \
    152153        $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi
    153154
    … …  
    304305                     '  </File>')
    305306        $(APPEND) $@ '</Include>'
     307
     308$(VBOX_WIN_INST_OUT_DIR)/Files_DTrace.wxi: $(MAKEFILE_CURRENT) $(PATH_SUB_CURRENT)/../Config.kmk | $$(dir $$@)
     309        $(call MSG_GENERATE,,$@,$<)
     310        $(APPEND) -t $@ '<?xml version="1.0" ?>'
     311        $(APPEND) $@ '<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">'
     312ifdef VBOX_WITH_DTRACE
     313        $(APPEND) $@ -n \
     314                $(foreach file, \
     315                        $(addprefix dtrace/lib/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \
     316                        $(addprefix dtrace/testcase/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \
     317                        , '<File Id="file_$(subst /,_,$(file))" Name="$(file)" Vital="yes" Source="$(PATH_STAGE_BIN)/$(file)" />') \
     318                $(foreach file, \
     319                        $(addprefix dtrace/scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES)) \
     320                        , '<File Id="file_$(subst /,_,$(file))" Name="$(file)" Vital="yes" Source="$(PATH_STAGE_BIN)/$(file)" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" />') \
     321                '<File Id="file_VBoxDTrace.exe" Name="VBoxDTrace.exe" Source="$(PATH_STAGE_BIN)/VBoxDTrace.exe" />'
     322endif
     323        $(APPEND) $@ '</Include>'
     324
    306325
    307326$(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi: $(MAKEFILE_CURRENT) | $$(dir $$@)
    … …  
    490509        $(if $(VBOX_WITH_ADDITIONS_PACKING),$(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso)
    491510endif
     511
     512#
     513# A few manual dependencies to make sure everything is rebuilt when they should.
     514#
     515$(PATH_SUB_CURRENT)/VirtualBox.wxs: \
     516        $(PATH_SUB_CURRENT)/Properties.wxi \
     517        $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi
     518
     519$(PATH_SUB_CURRENT)/VBoxMergeApp.wxi: \
     520        $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \
     521        $(VBOX_WIN_INST_OUT_DIR)/Files_DTrace.wxi \
     522        $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \
     523        $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
     524        $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
     525        $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \
     526        $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
    492527
    493528#
    … …  
    592627define def_vbox_compile_msm
    593628$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj: \
    594                         $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxs \
    595                         $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxi \
    596                         $(PATH_SUB_CURRENT)/VBoxMerge$(module)CA.wxi \
    597                         $(PATH_SUB_CURRENT)/VBoxMerge$(module)Seq.wxi \
    598                         $(PATH_SUB_CURRENT)/UserInterface.wxi \
    599                         $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \
    600                         $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
    601                         $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \
    602                         $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
    603                         $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
    604                         $(VBOX_MSI_DEPENDENCIES) \
    605                         $(VBOX_VERSION_STAMP) \
    606                         | $$$$(dir $$$$@)
     629                $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxs \
     630                $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxi \
     631                $(PATH_SUB_CURRENT)/VBoxMerge$(module)CA.wxi \
     632                $(PATH_SUB_CURRENT)/VBoxMerge$(module)Seq.wxi \
     633                $(PATH_SUB_CURRENT)/UserInterface.wxi \
     634                $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \
     635                $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
     636                $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \
     637                $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
     638                $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
     639                $(VBOX_MSI_DEPENDENCIES) \
     640                $(VBOX_VERSION_STAMP) \
     641                | $$$$(dir $$$$@)
    607642        $(QUIET)$(RM) -f $@
    608643        $(REDIRECT) \

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

    r53981 r54030  
    185185<?endif ?>
    186186<?if $(env.VBOX_WITH_DTRACE) = "yes" ?>
    187         <File Id="file_VBoxDTrace.exe" Name="VBoxDTrace.exe"
    188           Source="$(env.PATH_OUT)\bin\VBoxDTrace.exe" />
     187        <!-- Include list of DTrace related files generate by the the maekfile. -->
     188        <?include $(env.PATH_TARGET)\Files_DTrace.wxi ?>
    189189<?endif ?>
    190190        <!-- 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