Index: /trunk/Config.kmk =================================================================== --- /trunk/Config.kmk (revision 38081) +++ /trunk/Config.kmk (revision 38082) @@ -29,11 +29,20 @@ .SECONDTARGETEXPANSION: -# Enable automatic installation of what's built. -KBUILD_DO_AUTO_INSTALL := 1 -PASSES := $(filter-out PACKING,$(PASSES)) PACKING # temporary hack -# Modify the order of the INSTALLS and OTHERS passes. -DEFAULT_PASSES := BLDPROGS LIBRARIES DLLS BINARIES INSTALLS OTHERS +# Installation and staging changes in the works for kBuild 0.2.0 and VBox 4.1.2. +if $(KMK_REVISION) >= 2475 \ + && $(KBUILD_VERSION_MAJOR) == 0 \ + && ( ($(KBUILD_VERSION_MINOR) == 1 && $(KBUILD_VERSION_PATCH) >= 99) \ + || $(KBUILD_VERSION_MINOR) >= 2) + VBOX_WITH_0_2_0_KBUILD = 1 +endif + +ifndef VBOX_WITH_0_2_0_KBUILD + # Enable automatic installation of what's built. + KBUILD_DO_AUTO_INSTALL := 1 + PASSES := $(filter-out PACKING,$(PASSES)) PACKING # temporary hack + # Modify the order of the INSTALLS and OTHERS passes. + DEFAULT_PASSES := BLDPROGS LIBRARIES DLLS BINARIES INSTALLS OTHERS +endif # Modify the build types. -## @todo checked and dbgopt KBUILD_BLD_TYPES = release profile debug kprofile @@ -75,18 +84,14 @@ # Changes related to this are marked VBOX_WITH_NEW_LAYOUT, while changes marked # VBOX_WITH_0_2_0_KBUILD are for building with current kBuild svn. -if $(KMK_REVISION) >= 2475 \ - && $(KBUILD_VERSION_MAJOR) == 0 \ - && ( ($(KBUILD_VERSION_MINOR) == 1 && $(KBUILD_VERSION_PATCH) >= 99) \ - || $(KBUILD_VERSION_MINOR) >= 2) - VBOX_WITH_0_2_0_KBUILD = 1 -endif ifndef VBOX_WITH_NEW_LAYOUT - PATH_STAGE = $(PATH_OUT) - ifdef VBOX_WITH_0_2_0_KBUILD + ifndef VBOX_WITH_0_2_0_KBUILD + PATH_INS = $(PATH_OUT) + PATH_STAGE = $(PATH_INS) + else PATH_INS = $(PATH_OUT)/dist - else - PATH_INS = $(PATH_OUT) - endif -endif + PATH_STAGE = $(PATH_OUT) + endif +endif + ifeq ($(KBUILD_TARGET),darwin) ifndef VBOX_WITH_NEW_LAYOUT @@ -133,4 +138,6 @@ INST_ADDITIONS_LIB = $(INST_LIB)additions/ endif + +INST_DOC = doc/ INST_EXTPACK = $(INST_BIN)ExtensionPacks/ INST_EXTPACK_CERTS = $(INST_BIN)ExtPackCertificates/ @@ -138,17 +145,20 @@ INST_PACKAGES = packages/ -PATH_BIN = $(patsubst %/,%,$(PATH_INS)/$(INST_BIN)) -PATH_DLL = $(patsubst %/,%,$(PATH_INS)/$(INST_DLL)) -PATH_SYS = $(patsubst %/,%,$(PATH_INS)/$(INST_SYS)) -PATH_LIB = $(patsubst %/,%,$(PATH_INS)/$(INST_LIB)) -PATH_DOC = $(PATH_OUT)/doc -VBOX_PATH_SDK = $(patsubst %/,%,$(PATH_INS)/$(INST_SDK)) -VBOX_PATH_DIST = $(patsubst %/,%,$(PATH_INS)/$(INST_DIST)) -VBOX_PATH_TESTSUITE = $(patsubst %/,%,$(PATH_INS)/$(INST_TESTSUITE)) -VBOX_PATH_ADDITIONS = $(patsubst %/,%,$(PATH_INS)/$(INST_ADDITIONS)) -VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_INS)/$(INST_ADDITIONS_ISO)) -VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_INS)/$(INST_ADDITIONS_LIB)) -VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_INS)/$(INST_EXTPACK_PUEL)) -VBOX_PATH_PACKAGES = $(patsubst %/,%,$(PATH_INS)/$(INST_PACKAGES)) +ifndef VBOX_WITH_0_2_0_KBUILD + PATH_BIN = $(patsubst %/,%,$(PATH_STAGE)/$(INST_BIN)) + PATH_DLL = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DLL)) + PATH_SYS = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SYS)) + PATH_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_LIB)) + PATH_DOC = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DOC)) + $(foreach path, BIN DLL SYS LIB DOC, $(eval PATH_STAGE_$(path) = $(PATH_$(path)))) +endif +VBOX_PATH_SDK = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK)) +VBOX_PATH_DIST = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DIST)) +VBOX_PATH_TESTSUITE = $(patsubst %/,%,$(PATH_STAGE)/$(INST_TESTSUITE)) +VBOX_PATH_ADDITIONS = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS)) +VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO)) +VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB)) +VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL)) +VBOX_PATH_PACKAGES = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES)) @@ -1520,11 +1530,11 @@ # if1of ($(KBUILD_HOST), freebsd linux l4 netbsd openbsd solaris) - export LD_LIBRARY_PATH:=$(PATH_BIN):$(PATH_LIB):$(LD_LIBRARY_PATH) + export LD_LIBRARY_PATH:=$(PATH_STAGE_BIN):$(PATH_STAGE_LIB):$(LD_LIBRARY_PATH) endif ifeq ($(KBUILD_HOST),os2) - #fixme! export BEGINLIBPATH:=$(PATH_BIN);$(PATH_LIB);$(BEGINLIBPATH) + #fixme! export BEGINLIBPATH:=$(PATH_STAGE_BIN);$(PATH_STAGE_LIB);$(BEGINLIBPATH) endif ifeq ($(KBUILD_HOST),win) - export PATH:=$(PATH_BIN);$(PATH_LIB);$(PATH) + export PATH:=$(PATH_STAGE_BIN);$(PATH_STAGE_LIB);$(PATH) endif @@ -1533,56 +1543,56 @@ # ifeq ($(KBUILD_TARGET),darwin) - LIB_RUNTIME = $(PATH_BIN)/VBoxRT.dylib - LIB_RUNTIME_EF = #$(PATH_LIB)/RuntimeEFCPP.a - LIB_KPROFILE = $(PATH_BIN)/kPrf2.dylib - LIB_VMM = $(PATH_BIN)/VBoxVMM.dylib - LIB_VMMGC = $(PATH_BIN)/VMMGC.gc - LIB_REM = $(PATH_LIB)/VBoxREM.dylib - LIB_XPCOM = $(PATH_BIN)/VBoxXPCOM.dylib - LIB_DDU = $(PATH_BIN)/VBoxDDU.dylib + LIB_RUNTIME = $(PATH_STAGE_BIN)/VBoxRT.dylib + LIB_RUNTIME_EF = #$(PATH_STAGE_LIB)/RuntimeEFCPP.a + LIB_KPROFILE = $(PATH_STAGE_BIN)/kPrf2.dylib + LIB_VMM = $(PATH_STAGE_BIN)/VBoxVMM.dylib + LIB_VMMGC = $(PATH_STAGE_BIN)/VMMGC.gc + LIB_REM = $(PATH_STAGE_LIB)/VBoxREM.dylib + LIB_XPCOM = $(PATH_STAGE_BIN)/VBoxXPCOM.dylib + LIB_DDU = $(PATH_STAGE_BIN)/VBoxDDU.dylib endif ifeq ($(KBUILD_TARGET),l4) - LIB_RUNTIME = $(PATH_BIN)/VBoxRT.s.so - LIB_RUNTIME_EF = #$(PATH_LIB)/RuntimeEFCPP.a - LIB_KPROFILE = $(PATH_BIN)/kPrf2.s.so - LIB_VMM = $(PATH_BIN)/VBoxVMM.s.so - LIB_VMMGC = $(PATH_BIN)/VMMGC.gc - LIB_REM = $(PATH_LIB)/VBoxREM.s.so - LIB_XPCOM = $(PATH_BIN)/VBoxXPCOM.s.so - LIB_DDU = $(PATH_BIN)/VBoxDDU.s.so + LIB_RUNTIME = $(PATH_STAGE_BIN)/VBoxRT.s.so + LIB_RUNTIME_EF = #$(PATH_STAGE_LIB)/RuntimeEFCPP.a + LIB_KPROFILE = $(PATH_STAGE_BIN)/kPrf2.s.so + LIB_VMM = $(PATH_STAGE_BIN)/VBoxVMM.s.so + LIB_VMMGC = $(PATH_STAGE_BIN)/VMMGC.gc + LIB_REM = $(PATH_STAGE_LIB)/VBoxREM.s.so + LIB_XPCOM = $(PATH_STAGE_BIN)/VBoxXPCOM.s.so + LIB_DDU = $(PATH_STAGE_BIN)/VBoxDDU.s.so endif if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) - LIB_RUNTIME = $(PATH_BIN)/VBoxRT.so - LIB_RUNTIME_EF = $(PATH_LIB)/RuntimeEFCPP.a - LIB_KPROFILE = $(PATH_BIN)/kPrf2.so - LIB_VMM = $(PATH_BIN)/VBoxVMM.so - LIB_VMMGC = $(PATH_BIN)/VMMGC.gc - LIB_REM = $(PATH_LIB)/VBoxREM.so - LIB_XPCOM = $(PATH_BIN)/VBoxXPCOM.so - LIB_DDU = $(PATH_BIN)/VBoxDDU.so + LIB_RUNTIME = $(PATH_STAGE_BIN)/VBoxRT.so + LIB_RUNTIME_EF = $(PATH_STAGE_LIB)/RuntimeEFCPP.a + LIB_KPROFILE = $(PATH_STAGE_BIN)/kPrf2.so + LIB_VMM = $(PATH_STAGE_BIN)/VBoxVMM.so + LIB_VMMGC = $(PATH_STAGE_BIN)/VMMGC.gc + LIB_REM = $(PATH_STAGE_LIB)/VBoxREM.so + LIB_XPCOM = $(PATH_STAGE_BIN)/VBoxXPCOM.so + LIB_DDU = $(PATH_STAGE_BIN)/VBoxDDU.so endif ifeq ($(KBUILD_TARGET),os2) - LIB_RUNTIME = $(PATH_BIN)/VBoxRT.dll - LIB_RUNTIME_EF = #$(PATH_LIB)/RuntimeEFCPP.a - LIB_KPROFILE = $(PATH_BIN)/kPrf2.dll - LIB_VMM = $(PATH_BIN)/VBoxVMM.dll - LIB_VMMGC = $(PATH_LIB)/VMMRCImp.lib - LIB_REM = $(PATH_LIB)/VBoxREMImp.lib - LIB_XPCOM = $(PATH_BIN)/VBoxXCOM.dll - LIB_DDU = $(PATH_BIN)/VBoxDDU.dll + LIB_RUNTIME = $(PATH_STAGE_BIN)/VBoxRT.dll + LIB_RUNTIME_EF = #$(PATH_STAGE_LIB)/RuntimeEFCPP.a + LIB_KPROFILE = $(PATH_STAGE_BIN)/kPrf2.dll + LIB_VMM = $(PATH_STAGE_BIN)/VBoxVMM.dll + LIB_VMMGC = $(PATH_STAGE_LIB)/VMMRCImp.lib + LIB_REM = $(PATH_STAGE_LIB)/VBoxREMImp.lib + LIB_XPCOM = $(PATH_STAGE_BIN)/VBoxXCOM.dll + LIB_DDU = $(PATH_STAGE_BIN)/VBoxDDU.dll VBOX_OBJ_SYS0 = $(PATH_OBJ)/RuntimeR0/os2/sys0.obj endif ifeq ($(KBUILD_TARGET),win) - LIB_RUNTIME = $(PATH_LIB)/VBoxRT.lib - LIB_RUNTIME_EF = #$(PATH_LIB)/RuntimeEFCPP.lib - LIB_KPROFILE = $(PATH_LIB)/kPrf2.lib - LIB_VMM = $(PATH_LIB)/VBoxVMM.lib + LIB_RUNTIME = $(PATH_STAGE_LIB)/VBoxRT.lib + LIB_RUNTIME_EF = #$(PATH_STAGE_LIB)/RuntimeEFCPP.lib + LIB_KPROFILE = $(PATH_STAGE_LIB)/kPrf2.lib + LIB_VMM = $(PATH_STAGE_LIB)/VBoxVMM.lib LIB_VMMGC = $(PATH_OBJ)/VMMRC/VMMGC.lib - LIB_REM = $(PATH_LIB)/VBoxREMImp.lib - LIB_XPCOM = $(PATH_BIN)/VBoxXPCOM.dll - LIB_DDU = $(PATH_LIB)/VBoxDDU.lib -endif -VBOX_LIB_SUPHARDENED = $(PATH_LIB)/SUPR3HardenedStatic$(VBOX_SUFF_LIB) -VBOX_LIB_RUNTIME_STATIC = $(PATH_LIB)/RuntimeR3$(VBOX_SUFF_LIB) + LIB_REM = $(PATH_STAGE_LIB)/VBoxREMImp.lib + LIB_XPCOM = $(PATH_STAGE_BIN)/VBoxXPCOM.dll + LIB_DDU = $(PATH_STAGE_LIB)/VBoxDDU.lib +endif +VBOX_LIB_SUPHARDENED = $(PATH_STAGE_LIB)/SUPR3HardenedStatic$(VBOX_SUFF_LIB) +VBOX_LIB_RUNTIME_STATIC = $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB) # Python @@ -1720,5 +1730,5 @@ VBOX_WITH_XPCOM = 1 # if updating, also update xpidl_INST var in src/libs/xpcom18a4/Makefile.kmk - VBOX_XPIDL ?= $(PATH_BIN)/xpidl$(HOSTSUFF_EXE) + VBOX_XPIDL ?= $(PATH_STAGE_BIN)/xpidl$(HOSTSUFF_EXE) ifeq ($(KBUILD_TARGET),os2) VBOX_XPIDL_ENV = BEGINLIBPATH="$(dir $(VBOX_XPIDL));$$BEGINLIBPATH"$(SP) @@ -1984,5 +1994,5 @@ else VBOX_LIB_OGL_CRUTIL = $(VBOX_PATH_ADDITIONS)/VBoxOGLcrutil$(VBOX_SUFF_DLL) - VBOX_LIB_OGL_HOSTCRUTIL = $(PATH_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL) + VBOX_LIB_OGL_HOSTCRUTIL = $(PATH_STAGE_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL) endif @@ -2403,5 +2413,5 @@ #if1of ($(KBUILD_TARGET), os2 solaris win) SDK_VBOX_LIBXSLT_INCS ?= $(PATH_ROOT)/src/libs/libxslt-1.1.22 - SDK_VBOX_LIBXSLT_LIBS ?= $(PATH_LIB)/VBox-libxslt$(VBOX_SUFF_LIB) + SDK_VBOX_LIBXSLT_LIBS ?= $(PATH_STAGE_LIB)/VBox-libxslt$(VBOX_SUFF_LIB) SDK_VBOX_LIBXSLT_DEFS ?= SDK_VBOX_LIBXSLT_DEFS.win += WIN32 _WINDOWS _MBCS _REENTRANT @@ -2419,10 +2429,10 @@ SDK_VBOX_LIBPNG = . SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8 -SDK_VBOX_LIBPNG_LIBS ?= $(PATH_LIB)/VBox-libpng$(VBOX_SUFF_LIB) +SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB) SDK_VBOX_ZLIB = . if1of ($(KBUILD_TARGET), os2 win) SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.1 - SDK_VBOX_ZLIB_LIBS ?= $(PATH_LIB)/VBox-zlib$(VBOX_SUFF_LIB) + SDK_VBOX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB) else SDK_VBOX_ZLIB_INCS ?= @@ -2436,6 +2446,6 @@ SDK_VBOX_OPENSSL_ORDERDEPS ?= $(crypto-headers_1_TARGET) SDK_VBOX_OPENSSL_LIBS ?= \ - $(PATH_LIB)/VBox-libssl$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \ # Build entire openssl library, not just the minimal subset. if1of ($(KBUILD_TARGET), linux solaris) @@ -2452,5 +2462,5 @@ SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ - $(PATH_LIB)/VBoxBldProg-libcrypto$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VBoxBldProg-libcrypto$(VBOX_SUFF_LIB) ifdef VBOX_WITH_S3 @@ -2458,5 +2468,5 @@ SDK_VBOX_LIBCURL = . SDK_VBOX_LIBCURL_INCS ?= $(PATH_ROOT)/src/libs/curl-7.19.4/include -SDK_VBOX_LIBCURL_LIBS ?= $(PATH_LIB)/VBox-libcurl$(VBOX_SUFF_LIB) +SDK_VBOX_LIBCURL_LIBS ?= $(PATH_STAGE_LIB)/VBox-libcurl$(VBOX_SUFF_LIB) SDK_VBOX_LIBCURL_DEFS ?= BUILDING_LIBCURL endif @@ -2469,9 +2479,9 @@ $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavformat ifeq ($(KBUILD_TARGET),win) - ## @todo Michael! Where is $(PATH_LIB)/VBoxFFmpegImp$(VBOX_SUFF_LIB) supposed to come from? - #SDK_VBOX_FFMPEG_LIBS ?= $(PATH_LIB)/VBoxFFmpeg.a - SDK_VBOX_FFMPEG_LIBS ?= $(PATH_LIB)/VBoxFFmpegImp.lib + ## @todo Michael! Where is $(PATH_STAGE_LIB)/VBoxFFmpegImp$(VBOX_SUFF_LIB) supposed to come from? + #SDK_VBOX_FFMPEG_LIBS ?= $(PATH_STAGE_LIB)/VBoxFFmpeg.a + SDK_VBOX_FFMPEG_LIBS ?= $(PATH_STAGE_LIB)/VBoxFFmpegImp.lib else - SDK_VBOX_FFMPEG_LIBS ?= $(PATH_BIN)/VBoxFFmpeg$(SUFF_DLL) + SDK_VBOX_FFMPEG_LIBS ?= $(PATH_STAGE_BIN)/VBoxFFmpeg$(SUFF_DLL) endif else @@ -2488,6 +2498,6 @@ # SDK_VBOX_NTDLL = Mini NTDLL import library, required IPRT. -SDK_VBOX_NTDLL_LIBS.x86 ?= $(PATH_LIB)/RuntimeR3NtDll-x86.lib -SDK_VBOX_NTDLL_LIBS.amd64 ?= $(PATH_LIB)/RuntimeR3NtDll-amd64.lib +SDK_VBOX_NTDLL_LIBS.x86 ?= $(PATH_STAGE_LIB)/RuntimeR3NtDll-x86.lib +SDK_VBOX_NTDLL_LIBS.amd64 ?= $(PATH_STAGE_LIB)/RuntimeR3NtDll-amd64.lib # @@ -2603,5 +2613,5 @@ endif TEMPLATE_VBoxRc_LIBS += \ - $(PATH_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB) TEMPLATE_VBoxRc_POST_CMDS = $(VBOX_SIGN_IMAGE_CMDS) endif # pe @@ -2722,5 +2732,5 @@ TEMPLATE_VBoxR0_LDFLAGS = -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Debug TEMPLATE_VBoxR0_LIBS = \ - $(PATH_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB) ifdef VBOX_USE_WINDDK TEMPLATE_VBoxR0_LIBS.x86 = \ @@ -2743,5 +2753,5 @@ TEMPLATE_VBoxR0_LDFLAGS.solaris = -u _init -u _info TEMPLATE_VBoxR0_LIBS.solaris = \ - $(PATH_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB) else TEMPLATE_VBoxR0_LDFLAGS = -nostdlib -Bsymbolic @@ -3674,5 +3684,5 @@ # Add COM/XPCOM stuff TEMPLATE_VBOXMAINEXE_LIBS += \ - $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) ifdef VBOX_WITH_XPCOM ## @todo may be worth creating the VBOX_XPCOM SDK def @@ -3823,11 +3833,11 @@ TEMPLATE_VBoxR3ExtPack_LIBS = \ $(TEMPLATE_LIBS_VBOXR3) \ - $(PATH_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VBoxRTImp$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_LIB) else TEMPLATE_VBoxR3ExtPack_LIBS = \ $(TEMPLATE_LIBS_VBOXR3) \ - $(PATH_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \ - $(PATH_LIB)/VBoxRTImp$(VBOX_SUFF_DLL) + $(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \ + $(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_DLL) endif else @@ -3845,6 +3855,6 @@ if1of ($(VBOX_LDR_FMT), pe lx) TEMPLATE_VBoxR0ExtPack_LIBS = \ - $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) endif @@ -3857,6 +3867,6 @@ if1of ($(VBOX_LDR_FMT32), pe lx) TEMPLATE_VBoxRcExtPack_LIBS = \ - $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VMMRCImp$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB) endif @@ -4096,5 +4106,5 @@ # Add COM/XPCOM stuff TEMPLATE_VBOXQT4GUIEXE_LIBS += \ - $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) ifdef VBOX_WITH_XPCOM ## @todo may be worth creating the VBOX_XPCOM SDK def, or just a SDK_VBOXXPCOM. @@ -4296,5 +4306,5 @@ TEMPLATE_VBoxAdvBldProg_DEFS = $(TEMPLATE_VBOXBLDPROG_DEFS) IN_RT_R3 TEMPLATE_VBoxAdvBldProg_LIBS = \ - $(PATH_LIB)/RuntimeBldProg$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeBldProg$(VBOX_SUFF_LIB) \ $(TEMPLATE_VBOXBLDPROG_LIBS) TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \ @@ -4775,5 +4785,5 @@ License-$(VBOX_LICENSE_VER).html \ $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),License-$(VBOX_LICENSE_VER)-$(f).html) - VBOX_LICENSE_BINS = $(addprefix $(PATH_BIN)/,$(VBOX_LICENSE_FILES)) + VBOX_LICENSE_BINS = $(addprefix $(PATH_STAGE_BIN)/,$(VBOX_LICENSE_FILES)) endif endif Index: /trunk/doc/manual/Makefile.kmk =================================================================== --- /trunk/doc/manual/Makefile.kmk (revision 38081) +++ /trunk/doc/manual/Makefile.kmk (revision 38082) @@ -24,5 +24,5 @@ # -- VirtualBox.chm # -# Both files end up in PATH_BIN. +# Both files end up in PATH_STAGE_BIN. # # Both targets indirectly depend on the XML files in this directory; @@ -82,5 +82,5 @@ ifdef VBOX_WITH_DOCS_CHM - VBOX_PATH_BIN_CHM = $(PATH_BIN)/VirtualBox.chm + VBOX_PATH_BIN_CHM = $(PATH_STAGE_BIN)/VirtualBox.chm else VBOX_PATH_BIN_CHM = @@ -90,8 +90,8 @@ ifndef VBOX_ONLY_SDK VBOX_MANUAL_PACK += \ - $(PATH_BIN)/UserManual.pdf \ + $(PATH_STAGE_BIN)/UserManual.pdf \ $(VBOX_PATH_BIN_CHM) OTHERS += \ - $(PATH_BIN)/UserManual.pdf + $(PATH_STAGE_BIN)/UserManual.pdf OTHERS.win += \ $(VBOX_PATH_BIN_CHM) @@ -101,15 +101,15 @@ ifdef VBOX_WITH_DOCS_TRANSLATIONS OTHERS += \ - $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/UserManual_$(f).pdf) + $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf) ifdef VBOX_WITH_DOCS_CHM OTHERS.win += \ - $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/VirtualBox_$(f).chm) + $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm) OTHERS.linux += \ - $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/VirtualBox_$(f).chm) + $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm) endif endif endif # !VBOX_ONLY_SDK ifdef VBOX_ONLY_DOCS - PACKING += $(PATH_BIN)/VBoxDocumentation.zip + PACKING += $(PATH_STAGE_BIN)/VBoxDocumentation.zip endif @@ -172,5 +172,5 @@ ifdef VBOX_WITH_DOCS_CHM VBOX_MANUAL_PACK += \ - $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/UserManual_$(f).pdf $(PATH_BIN)/VirtualBox_$(f).chm) + $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf $(PATH_STAGE_BIN)/VirtualBox_$(f).chm) endif @@ -192,10 +192,10 @@ $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/UserManual.pdf) \ $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/VirtualBox.chm) \ - $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/UserManual_$(f).pdf) \ - $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/VirtualBox_$(f).chm) \ - $(PATH_BIN)/UserManual.pdf \ - $(PATH_BIN)/VirtualBox.chm \ + $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf) \ + $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm) \ + $(PATH_STAGE_BIN)/UserManual.pdf \ + $(PATH_STAGE_BIN)/VirtualBox.chm \ $(foreach f,en_US,$(VBOX_PATH_MANUAL_OUTBASE)/$f/SDKRef.pdf) \ - $(PATH_BIN)/sdk/docs/SDKRef.pdf \ + $(PATH_STAGE_BIN)/sdk/docs/SDKRef.pdf \ $(wildcard $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/HTMLHelp/*.h*)) \ $(foreach f,$(VBOX_MANUAL_LANGUAGES),\ @@ -234,5 +234,5 @@ DOCBOOKPATH ?= http://docbook.sourceforge.net/release/xsl/current/ endif -VBOXMANAGEPATH ?= $(PATH_BIN)/VBoxManage$(SUFF_EXE) +VBOXMANAGEPATH ?= $(PATH_STAGE_BIN)/VBoxManage$(SUFF_EXE) # PDFLATEX_INTERACTION = errorstopmode - Use this when you wants to figure out build failures @@ -493,10 +493,10 @@ ## @todo INSTALLS target for this! -$(PATH_BIN)/UserManual.pdf: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf | $$(dir $$@) +$(PATH_STAGE_BIN)/UserManual.pdf: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf | $$(dir $$@) $(QUIET)$(CP) $< $@ $(call MSG_L1,Fresh LaTeX-generated PDF is now at $@) -$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/UserManual_$(f).pdf): \ - $(PATH_BIN)/UserManual_%.pdf : $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.pdf +$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf): \ + $(PATH_STAGE_BIN)/UserManual_%.pdf : $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.pdf $(QUIET)$(CP) $< $@ $(call MSG_L1,Fresh LaTeX-generated PDF is now at $@) @@ -594,10 +594,10 @@ ifdef VBOX_WITH_DOCS_CHM -$(PATH_BIN)/VirtualBox.chm: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.chm +$(PATH_STAGE_BIN)/VirtualBox.chm: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.chm $(QUIET)$(CP) $< $@ $(call MSG_L1,Fresh CHM is now at $@) -$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/VirtualBox_$(f).chm): \ - $(PATH_BIN)/VirtualBox_%.chm : $(VBOX_PATH_MANUAL_OUTBASE)/%/VirtualBox.chm +$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm): \ + $(PATH_STAGE_BIN)/VirtualBox_%.chm : $(VBOX_PATH_MANUAL_OUTBASE)/%/VirtualBox.chm $(QUIET)$(CP) $< $@ $(call MSG_L1,Fresh CHM is now at $@) @@ -641,8 +641,8 @@ # Packing the docs into a zip file -$(PATH_BIN)/VBoxDocumentation.zip: $(VBOX_MANUAL_PACK) +$(PATH_STAGE_BIN)/VBoxDocumentation.zip: $(VBOX_MANUAL_PACK) $(call MSG_L1,Packing documentation $@) $(QUIET)$(RM) -f $@ - $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- zip$(HOSTSUFF_EXE) -9 $@ $(notdir $^) + $(QUIET)$(REDIRECT) -C $(PATH_STAGE_BIN) -- zip$(HOSTSUFF_EXE) -9 $@ $(notdir $^) endif # VBOX_WITH_DOCS_CHM Index: /trunk/src/VBox/Additions/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Additions/Makefile.kmk (revision 38082) @@ -154,5 +154,5 @@ # (VBOX_WITHOUT_ADDITIONS_ISO is used by the additions build box, see the root makefile.) ifndef VBOX_WITHOUT_ADDITIONS_ISO - PACKING += $(PATH_BIN)/additions/VBoxGuestAdditions.iso + PACKING += $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso endif endif # !VBOX_ONLY_TESTSUITE Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk (revision 38082) @@ -174,7 +174,7 @@ wined3d_SOURCES.amd64 = vbox/libWineStub/debug.c wined3d_LIBS.x86 = \ - $(PATH_LIB)/libWine$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/libWine$(VBOX_SUFF_LIB) wined3d_SDKS.amd64 = WINDDKWLH - + ifdef VBOX_WITH_WDDM DLLS += wined3dwddm @@ -246,7 +246,7 @@ d3d8/d3d8.def VBoxD3D8_LIBS.x86 = \ - $(PATH_LIB)/libWine$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/libWine$(VBOX_SUFF_LIB) VBoxD3D8_LIBS = \ - $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB) VBoxD3D8_SOURCES.amd64 = vbox/libWineStub/debug.c VBoxD3D8_SDKS.amd64 = WINDDKWLH @@ -287,5 +287,5 @@ d3d9/volume.c \ d3d9/volumetexture.c - + VBoxD3D9_SOURCES.x86 = \ d3d9/d3d9.def @@ -294,7 +294,7 @@ d3d9/d3d9xpdm.def VBoxD3D9_LIBS.x86 = \ - $(PATH_LIB)/libWine$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/libWine$(VBOX_SUFF_LIB) VBoxD3D9_LIBS = \ - $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB) VBoxD3D9_SDKS.amd64 = WINDDKWLH @@ -312,5 +312,5 @@ VBoxD3D9wddm_SOURCES.x86 = $(NO_SUCH_VARIABLE) VBoxD3D9wddm_SOURCES.amd64 = $(NO_SUCH_VARIABLE) -VBoxD3D9wddm_LIBS = $(PATH_LIB)/wined3dwddm$(VBOX_SUFF_LIB) +VBoxD3D9wddm_LIBS = $(PATH_STAGE_LIB)/wined3dwddm$(VBOX_SUFF_LIB) VBoxD3D9wddm_LIBS.x86 = $(NO_SUCH_VARIABLE) VBoxD3D9wddm_SDKS = WINDDKWLH @@ -320,5 +320,5 @@ VBoxD3D9wddm-x86_EXTENDS = VBoxD3D9wddm VBoxD3D9wddm-x86_BLD_TRG_ARCH = x86 -VBoxD3D9wddm-x86_LIBS = $(PATH_LIB)/wined3dwddm-x86$(VBOX_SUFF_LIB) +VBoxD3D9wddm-x86_LIBS = $(PATH_STAGE_LIB)/wined3dwddm-x86$(VBOX_SUFF_LIB) VBoxD3D9wddm-x86_DEFS = $(VBoxD3D9wddm_DEFS) VBOX_WDDM_WOW64 endif @@ -348,5 +348,5 @@ switcher/sw_d3d9xpdm.def d3d9_SDKS.amd64 = WINDDKWLH - + include $(KBUILD_PATH)/subfooter.kmk Index: /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk (revision 38082) @@ -64,50 +64,50 @@ # The installer. # -PACKING += $(PATH_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe +PACKING += $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe OTHER_CLEAN += \ - $(PATH_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe \ - $(PATH_BIN)/additions/VBoxWHQLFake.exe + $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe \ + $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe DRIVER_FILES := \ - $(PATH_BIN)/additions/VBoxGuestDrvInst.exe \ - $(PATH_BIN)/additions/RegCleanup.exe \ - $(PATH_BIN)/additions/VBoxMouse.sys \ - $(PATH_BIN)/additions/VBoxGuest.sys \ - $(PATH_BIN)/additions/VBoxVideo.sys \ - $(PATH_BIN)/additions/VBoxDisp.dll \ - $(PATH_BIN)/additions/VBoxSF.sys \ - $(PATH_BIN)/additions/VBoxMRXNP.dll \ - $(PATH_BIN)/additions/VBoxTray.exe \ - $(PATH_BIN)/additions/VBoxControl.exe \ - $(PATH_BIN)/additions/VBoxWHQLFake.exe \ - $(PATH_BIN)/additions/VBoxService.exe + $(PATH_STAGE_BIN)/additions/VBoxGuestDrvInst.exe \ + $(PATH_STAGE_BIN)/additions/RegCleanup.exe \ + $(PATH_STAGE_BIN)/additions/VBoxMouse.sys \ + $(PATH_STAGE_BIN)/additions/VBoxGuest.sys \ + $(PATH_STAGE_BIN)/additions/VBoxVideo.sys \ + $(PATH_STAGE_BIN)/additions/VBoxDisp.dll \ + $(PATH_STAGE_BIN)/additions/VBoxSF.sys \ + $(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll \ + $(PATH_STAGE_BIN)/additions/VBoxTray.exe \ + $(PATH_STAGE_BIN)/additions/VBoxControl.exe \ + $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe \ + $(PATH_STAGE_BIN)/additions/VBoxService.exe ifeq ($(KBUILD_TARGET_ARCH),x86) DRIVER_FILES += \ - $(PATH_BIN)/additions/VBoxMouseNT.sys \ - $(PATH_BIN)/additions/VBoxGuestNT.sys -endif -DRIVER_FILES += \ - $(PATH_BIN)/additions/VBoxVideo.inf \ - $(PATH_BIN)/additions/VBoxGuest.inf + $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \ + $(PATH_STAGE_BIN)/additions/VBoxGuestNT.sys +endif +DRIVER_FILES += \ + $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \ + $(PATH_STAGE_BIN)/additions/VBoxGuest.inf ifdef VBOX_SIGN_ADDITIONS DRIVER_FILES += \ - $(PATH_BIN)/additions/VBoxVideo.cat \ - $(PATH_BIN)/additions/VBoxGuest.cat + $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \ + $(PATH_STAGE_BIN)/additions/VBoxGuest.cat endif ifdef VBOX_WITH_CROGL DRIVER_FILES += \ - $(PATH_BIN)/additions/VBoxOGLarrayspu.dll \ - $(PATH_BIN)/additions/VBoxOGLcrutil.dll \ - $(PATH_BIN)/additions/VBoxOGLerrorspu.dll \ - $(PATH_BIN)/additions/VBoxOGLpackspu.dll \ - $(PATH_BIN)/additions/VBoxOGLpassthroughspu.dll \ - $(PATH_BIN)/additions/VBoxOGLfeedbackspu.dll \ - $(PATH_BIN)/additions/VBoxOGL.dll \ - $(PATH_BIN)/additions/wined3d.dll \ - $(PATH_BIN)/additions/VBoxD3D9.dll \ - $(PATH_BIN)/additions/VBoxD3D8.dll + $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGL.dll \ + $(PATH_STAGE_BIN)/additions/wined3d.dll \ + $(PATH_STAGE_BIN)/additions/VBoxD3D9.dll \ + $(PATH_STAGE_BIN)/additions/VBoxD3D8.dll ifeq ($(KBUILD_TARGET_ARCH),x86) DRIVER_FILES += \ - $(PATH_BIN)/additions/libWine.dll + $(PATH_STAGE_BIN)/additions/libWine.dll endif ifeq ($(KBUILD_TARGET_ARCH),amd64) @@ -131,30 +131,30 @@ ifdef VBOX_WITH_WDDM DRIVER_FILES += \ - $(PATH_BIN)/additions/VBoxVideoWddm.sys \ - $(PATH_BIN)/additions/VBoxVideoWddm.inf \ - $(PATH_BIN)/additions/VBoxDispD3D.dll + $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.sys \ + $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.inf \ + $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll ifdef VBOX_WITH_CROGL DRIVER_FILES += \ - $(PATH_BIN)/additions/wined3dwddm.dll \ - $(PATH_BIN)/additions/VBoxD3D9wddm.dll + $(PATH_STAGE_BIN)/additions/wined3dwddm.dll \ + $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm.dll endif ifdef VBOX_SIGN_ADDITIONS DRIVER_FILES += \ - $(PATH_BIN)/additions/VBoxVideoWddm.cat + $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat endif ifeq ($(KBUILD_TARGET_ARCH),amd64) DRIVER_FILES += \ - $(PATH_BIN)/additions/VBoxDispD3D-x86.dll + $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll ifdef VBOX_WITH_CROGL DRIVER_FILES += \ - $(PATH_BIN)/additions/wined3dwddm-x86.dll \ - $(PATH_BIN)/additions/VBoxD3D9wddm-x86.dll \ - $(PATH_BIN)/additions/VBoxOGL-x86.dll \ - $(PATH_BIN)/additions/VBoxOGLarrayspu-x86.dll \ - $(PATH_BIN)/additions/VBoxOGLcrutil-x86.dll \ - $(PATH_BIN)/additions/VBoxOGLerrorspu-x86.dll \ - $(PATH_BIN)/additions/VBoxOGLfeedbackspu-x86.dll \ - $(PATH_BIN)/additions/VBoxOGLpackspu-x86.dll \ - $(PATH_BIN)/additions/VBoxOGLpassthroughspu-x86.dll + $(PATH_STAGE_BIN)/additions/wined3dwddm-x86.dll \ + $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm-x86.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGL-x86.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu-x86.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil-x86.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu-x86.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu-x86.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu-x86.dll \ + $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu-x86.dll endif endif @@ -224,14 +224,14 @@ WHQLFAKE := $(PATH_SUB_CURRENT)/VBoxWHQLFake.au3 -$(PATH_BIN)/additions/VBoxWHQLFake.exe: +$(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe: $(call MSG_L1,Creating $@, from $<) $(QUIET)$(EXEC_X86_WIN32) $(VBOX_PATH_AUTOIT3)/Aut2Exe/Aut2exe.exe \ /in $(WHQLFAKE) \ - /out $(PATH_BIN)/additions/VBoxWHQLFake.exe \ + /out $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe \ /icon $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \ /comp 4 \ /unicode -$(PATH_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \ +$(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \ $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \ $(DRIVER_FILES) \ Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/redirector/sys/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/SharedFolders/redirector/sys/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Additions/WINNT/SharedFolders/redirector/sys/Makefile.kmk (revision 38082) @@ -89,5 +89,5 @@ ## rdbss.asm \ -## $(PATH_LIB)/rdbss$(VBOXW32GUEST_SUFF_LIB) +## $(PATH_STAGE_LIB)/rdbss$(VBOXW32GUEST_SUFF_LIB) Index: /trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk (revision 38082) @@ -30,5 +30,5 @@ tstHook_SOURCES = tstHook.cpp tstHook_INCS = ../../include -tstHook_LIBS = $(PATH_LIB)/VBoxHook.lib +tstHook_LIBS = $(PATH_STAGE_LIB)/VBoxHook.lib endif # VBOX_WITH_TESTCASES Index: /trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk (revision 38082) @@ -24,5 +24,5 @@ BLDDIRS += \ $(VBOX_PATH_CROGL_GENFILES)/ - + DLLS.win += \ VBoxOGL \ @@ -199,11 +199,11 @@ $(VBOX_LIB_VBGL_R3_SHARED) \ $(VBOX_LIB_OGL_CRUTIL) \ - $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_LIBS += \ - $(PATH_LIB)/libXcomposite.so \ - $(PATH_LIB)/libXdamage.so \ - $(PATH_LIB)/libXfixes.so \ - $(PATH_LIB)/libXext.so + $(PATH_STAGE_LIB)/libXcomposite.so \ + $(PATH_STAGE_LIB)/libXdamage.so \ + $(PATH_STAGE_LIB)/libXfixes.so \ + $(PATH_STAGE_LIB)/libXext.so ifdef VBoxOGL_FAKEDRI VBoxOGL_LIBS += \ @@ -214,5 +214,5 @@ ifdef VBOX_WITH_WDDM # -# VBoxOGL-x86 - x86 VBoxOGL version built for amd64 build +# VBoxOGL-x86 - x86 VBoxOGL version built for amd64 build # DLLS.win.amd64 += VBoxOGL-x86 @@ -222,5 +222,5 @@ $(VBOX_LIB_VBGL_R3_SHARED_X86) \ $(VBOX_LIB_OGL_CRUTIL_X86) \ - $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) VBoxOGL-x86_SOURCES.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_SOURCES.win)) VBoxOGL-x86_CLEAN.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_CLEAN.win)) @@ -398,6 +398,6 @@ VBoxOGLarrayspu_LIBS = \ $(VBOX_LIB_OGL_CRUTIL) \ - $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) ifdef VBOX_WITH_WDDM @@ -409,6 +409,6 @@ VBoxOGLarrayspu-x86_BLD_TRG_ARCH = x86 VBoxOGLarrayspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \ - $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) VBoxOGLarrayspu-x86_DEFS = $(VBoxOGLarrayspu_DEFS) VBOX_WDDM_WOW64 endif @@ -437,5 +437,5 @@ VBoxOGLpassthroughspu_LIBS = \ $(VBOX_LIB_OGL_CRUTIL) - + ifdef VBOX_WITH_WDDM # @@ -503,7 +503,7 @@ VBoxOGLpackspu_LIBS = \ $(VBOX_LIB_OGL_CRUTIL) \ - $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB) ifdef VBOX_WITH_WDDM @@ -515,7 +515,7 @@ VBoxOGLpackspu-x86_BLD_TRG_ARCH = x86 VBoxOGLpackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \ - $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB) VBoxOGLpackspu-x86_DEFS = $(VBoxOGLpackspu_DEFS) VBOX_WDDM_WOW64 endif @@ -574,7 +574,7 @@ VBoxOGLfeedbackspu_LIBS = \ $(VBOX_LIB_OGL_CRUTIL) \ - $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) - + $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) + ifdef VBOX_WITH_WDDM # @@ -585,6 +585,6 @@ VBoxOGLfeedbackspu-x86_BLD_TRG_ARCH = x86 VBoxOGLfeedbackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \ - $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) VBoxOGLfeedbackspu-x86_DEFS = $(VBoxOGLfeedbackspu_DEFS) VBOX_WDDM_WOW64 endif Index: /trunk/src/VBox/Additions/freebsd/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/freebsd/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Additions/freebsd/Makefile.kmk (revision 38082) @@ -43,5 +43,5 @@ ifndef VBOX_OSE BLDDIRS += $(VBOX_FBSD_ADD_INS_OUT_DIR) $(VBOX_FBSD_ADD_INS_OUT_DIR)/module - PACKING += $(PATH_BIN)/additions/VBoxFreeBSDAdditions.tbz + PACKING += $(PATH_STAGE_BIN)/additions/VBoxFreeBSDAdditions.tbz OTHER_CLEAN += $(PACKING) endif @@ -92,5 +92,5 @@ # pattern rule for copying the debug info from the VBOX_FBSD_ADD_STRIP_BIN files to the installation directory $(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_DBG_SYM_FILES)): \ - $(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym : $(PATH_BIN)/additions/% | $$(dir $$@) + $(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@) $(call MSG_TOOL,copydbg,$<,$@) $(QUIET)objcopy --only-keep-debug $< $@ @@ -98,5 +98,5 @@ # pattern rule for stripping and copying the VBOX_FBSD_ADD_STRIP_BIN files to the installation directory $(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_STRIP_BIN)): \ - $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_BIN)/additions/% \ + $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% \ $(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym \ | $$(dir $$@) @@ -107,5 +107,5 @@ # pattern rule for stripping and copying the VBOX_FBSD_ADD_STRIP_OBJ files to the installation directory $(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_STRIP_OBJ)): \ - $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_BIN)/additions/% | $$(dir $$@) + $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@) $(call MSG_INST_FILE,$<,$@) ifeq ($(VBOX_DO_STRIP),) @@ -119,5 +119,5 @@ # pattern rule for copying the VBOX_FBSD_ADD_MODULES files to the installation directory $(VBOX_FBSD_ADD_INS_MODULES): \ - $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/% : $(PATH_BIN)/additions/src/% | $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/ + $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/% : $(PATH_STAGE_BIN)/additions/src/% | $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/ $(call MSG_INST_FILE,$<,$@) # Remove target directories first, otherwise the behaviour of cp will not be @@ -173,5 +173,5 @@ # we've got everything included. # -$(PATH_BIN)/additions/VBoxFreeBSDAdditions.tbz: \ +$(PATH_STAGE_BIN)/additions/VBoxFreeBSDAdditions.tbz: \ $(INSTARGET_fbsd_add_inst-nobin) \ $(INSTARGET_fbsd_add_inst-bin) \ @@ -179,8 +179,8 @@ $(VBOX_FBSD_ADD_INS_MODULES) \ $(VBOX_FBSD_ADD_INS_OUT_DIR)/install.sh \ - $(wildcard $(PATH_BIN)/additions/src/*) \ - $(wildcard $(PATH_BIN)/additions/src/*/*) \ - $(wildcard $(PATH_BIN)/additions/src/*/*/*) \ - $(wildcard $(PATH_BIN)/additions/src/*/*/*/*) \ + $(wildcard $(PATH_STAGE_BIN)/additions/src/*) \ + $(wildcard $(PATH_STAGE_BIN)/additions/src/*/*) \ + $(wildcard $(PATH_STAGE_BIN)/additions/src/*/*/*) \ + $(wildcard $(PATH_STAGE_BIN)/additions/src/*/*/*/*) \ $(VBOX_VERSION_STAMP) pkg_create \ Index: /trunk/src/VBox/Additions/linux/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/linux/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Additions/linux/Makefile.kmk (revision 38082) @@ -70,5 +70,5 @@ VBOX_LNX_ADD_ARCHIVE.amd64 := $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-amd64-r$(VBOX_SVN_REV).tar.bz2 ifndef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE - VBOX_LNX_ADD_ARCHIVES := $(PATH_BIN)/additions/VBoxGuestAdditions-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV).tar.bz2 + VBOX_LNX_ADD_ARCHIVES := $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV).tar.bz2 else VBOX_LNX_ADD_ARCHIVES := \ @@ -94,7 +94,7 @@ # This will only take effect if you also use VBOX_WITHOUT_ADDITIONS_ISO. PACKING += \ - $(if-expr !defined(VBOX_WITHOUT_LINUX_GUEST_PACKAGE), $(PATH_BIN)/additions/VBoxLinuxAdditions.run,) \ + $(if-expr !defined(VBOX_WITHOUT_LINUX_GUEST_PACKAGE), $(PATH_STAGE_BIN)/additions/VBoxLinuxAdditions.run,) \ $(VBOX_LNX_ADD_ARCHIVES) \ - $(PATH_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2 + $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2 OTHER_CLEAN += \ $(PACKING) \ @@ -203,20 +203,20 @@ # pattern rules for copying the debug info from the VBOX_LNX_ADD_STRIP_* files to the installation directory $(addprefix $(VBOX_LNX_ADD_DBG_BIN_DIR),$(VBOX_LNX_ADD_STRIP_BIN)): \ - $(VBOX_LNX_ADD_DBG_BIN_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@) + $(VBOX_LNX_ADD_DBG_BIN_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@) $(call MSG_TOOL,copydbg,$<,$@) $(QUIET)objcopy --only-keep-debug $< $@ $(addprefix $(VBOX_LNX_ADD_DBG_SBIN_DIR),$(VBOX_LNX_ADD_STRIP_SBIN)): \ - $(VBOX_LNX_ADD_DBG_SBIN_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@) + $(VBOX_LNX_ADD_DBG_SBIN_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@) $(call MSG_TOOL,copydbg,$<,$@) $(QUIET)objcopy --only-keep-debug $< $@ $(addprefix $(VBOX_LNX_ADD_DBG_LIB_DIR),$(VBOX_LNX_ADD_STRIP_LIB)): \ - $(VBOX_LNX_ADD_DBG_LIB_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@) + $(VBOX_LNX_ADD_DBG_LIB_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@) $(call MSG_TOOL,copydbg,$<,$@) $(QUIET)objcopy --only-keep-debug $< $@ $(addprefix $(VBOX_LNX_ADD_DBG_MOD_DIR),$(VBOX_LNX_ADD_STRIP_MOD)): \ - $(VBOX_LNX_ADD_DBG_MOD_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@) + $(VBOX_LNX_ADD_DBG_MOD_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@) $(call MSG_TOOL,copydbg,$<,$@) $(QUIET)objcopy --only-keep-debug $< $@ @@ -224,5 +224,5 @@ # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_BIN files to the installation directory $(addprefix $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_STRIP_BIN)): \ - $(VBOX_LNX_ADD_INST_BIN_DIR)% : $(PATH_BIN)/additions/% \ + $(VBOX_LNX_ADD_INST_BIN_DIR)% : $(PATH_STAGE_BIN)/additions/% \ $(VBOX_LNX_ADD_DBG_BIN_DIR)% \ | $$(dir $$@) @@ -233,5 +233,5 @@ # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_SBIN files to the installation directory $(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),$(VBOX_LNX_ADD_STRIP_SBIN)): \ - $(VBOX_LNX_ADD_INST_SBIN_DIR)% : $(PATH_BIN)/additions/% \ + $(VBOX_LNX_ADD_INST_SBIN_DIR)% : $(PATH_STAGE_BIN)/additions/% \ $(VBOX_LNX_ADD_DBG_SBIN_DIR)% \ | $$(dir $$@) @@ -242,5 +242,5 @@ # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_LIB files to the installation directory $(addprefix $(VBOX_LNX_ADD_INST_LIB_DIR),$(VBOX_LNX_ADD_STRIP_LIB)): \ - $(VBOX_LNX_ADD_INST_LIB_DIR)% : $(PATH_BIN)/additions/% \ + $(VBOX_LNX_ADD_INST_LIB_DIR)% : $(PATH_STAGE_BIN)/additions/% \ $(VBOX_LNX_ADD_DBG_LIB_DIR)% \ | $$(dir $$@) @@ -251,5 +251,5 @@ # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_MOD files to the installation directory $(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_STRIP_MOD)): \ - $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_BIN)/additions/% \ + $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_STAGE_BIN)/additions/% \ $(VBOX_LNX_ADD_DBG_MOD_DIR)% \ | $$(dir $$@) @@ -260,5 +260,5 @@ # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_OBJ files to the installation directory $(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_STRIP_OBJ)): \ - $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@) + $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@) $(call MSG_INST_FILE,$<,$@) ifeq ($(VBOX_DO_STRIP),) @@ -272,5 +272,5 @@ # pattern rule for copying the VBOX_LNX_ADD_KMOD files to the installation directory $(addprefix $(VBOX_LNX_ADD_INST_KMOD_DIR),$(VBOX_LNX_ADD_KMOD)): \ - $(VBOX_LNX_ADD_INST_KMOD_DIR_MOD)% : $(PATH_BIN)/additions/src/% | $$(dir $$@) + $(VBOX_LNX_ADD_INST_KMOD_DIR_MOD)% : $(PATH_STAGE_BIN)/additions/src/% | $$(dir $$@) $(call MSG_INST_DIR,$<,$@) $(QUIET)$(RM) -Rf $@ @@ -279,5 +279,5 @@ # pattern rule for copying the VBOX_LNX_ADD_INIT files to the installation directory $(addprefix $(VBOX_LNX_ADD_INST_INIT_DIR),$(VBOX_LNX_ADD_INIT)): \ - $(VBOX_LNX_ADD_INST_INIT_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@) + $(VBOX_LNX_ADD_INST_INIT_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@) $(call MSG_INST_FILE,$<,$@) # Remove target directories first, otherwise the behaviour of cp will not be @@ -288,5 +288,5 @@ # pattern rule for copying the VBOX_LNX_ADD_INIT files to the module directory $(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_INIT)): \ - $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@) + $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@) $(call MSG_INST_FILE,$<,$@) # Remove target directories first, otherwise the behaviour of cp will not be @@ -426,5 +426,5 @@ # .tar.bz2 containing the debug information # -$(PATH_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2: \ +$(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2: \ $(VBOX_LNX_ADD_DBG_FILES) \ $(VBOX_LNX_ADD_INST_DEP_ON_MAKEFILE) @@ -451,5 +451,5 @@ # any references should be made via variables assigned a know value via := . # -$(PATH_BIN)/additions/VBoxLinuxAdditions.run: \ +$(PATH_STAGE_BIN)/additions/VBoxLinuxAdditions.run: \ $(VBOX_LNX_ADD_ARCHIVES) \ $(VBOX_LNX_ADD_INST_STAGE_DIR)install.sh \ Index: /trunk/src/VBox/Additions/solaris/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/solaris/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Additions/solaris/Makefile.kmk (revision 38082) @@ -94,5 +94,5 @@ INSTALLS += solaris-addcommon solaris-addcommonbins PROGRAMS += VBoxAddISAExec -PACKING += $(PATH_BIN)/additions/$(PKGFILENAME) +PACKING += $(PATH_STAGE_BIN)/additions/$(PKGFILENAME) OTHER_CLEAN += $(PACKING) $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME) @@ -107,5 +107,5 @@ # -# Install to $(PATH_BIN)/additions/ files from various source paths (to pack them using rules) +# Install to $(PATH_STAGE_BIN)/additions/ files from various source paths (to pack them using rules) # solaris-addcommonbins_INST = bin/additions/ @@ -263,5 +263,5 @@ # -$(PATH_BIN)/additions/$(PKGFILENAME): \ +$(PATH_STAGE_BIN)/additions/$(PKGFILENAME): \ $(VBOX_VERSION_STAMP) \ $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/makepackage.sh \ @@ -316,5 +316,5 @@ endif $(QUIET)$(SOLARIS_ADDINST_OUT_DIR)/makepackage.sh $(SOLARIS_ADDINST_OUT_DIR) $(PKGFILENAME) $(VBOX_SVN_REV) - $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME) $(PATH_BIN)/additions/$(PKGFILENAME) + $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME) $(PATH_STAGE_BIN)/additions/$(PKGFILENAME) $(QUIET)$(RM) -f $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME) Index: /trunk/src/VBox/Debugger/Makefile.kmk =================================================================== --- /trunk/src/VBox/Debugger/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Debugger/Makefile.kmk (revision 38082) @@ -124,8 +124,8 @@ ifeq ($(KBUILD_TARGET),win) tstVBoxDbg_LIBS += \ - $(PATH_LIB)/VBoxDbg.lib + $(PATH_STAGE_LIB)/VBoxDbg.lib else tstVBoxDbg_LIBS += \ - $(PATH_BIN)/VBoxDbg$(VBOX_SUFF_DLL) + $(PATH_STAGE_BIN)/VBoxDbg$(VBOX_SUFF_DLL) endif endif # TESTCASES Index: /trunk/src/VBox/Devices/Makefile.kmk =================================================================== --- /trunk/src/VBox/Devices/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Devices/Makefile.kmk (revision 38082) @@ -81,10 +81,10 @@ VBoxDDU_LIBS = \ $(LIB_RUNTIME) \ - $(PATH_LIB)/StorageLib$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/StorageLib$(VBOX_SUFF_LIB) ifdef VBOX_WITH_USB VBoxDDU_LIBS += \ - $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/USBLib$(VBOX_SUFF_LIB) VBoxDDU_LIBS.win += \ - $(PATH_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) endif ifeq ($(KBUILD_TARGET),l4) @@ -171,7 +171,7 @@ VBoxDD_LIBS = \ - $(PATH_LIB)/DevicesR3$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/Drivers$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VgaDefBiosLogo$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/DevicesR3$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/Drivers$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VgaDefBiosLogo$(VBOX_SUFF_LIB) \ $(LIB_VMM) \ $(LIB_RUNTIME) @@ -179,5 +179,5 @@ VBoxDD_LIBS += \ $(LIB_DDU) \ - $(PATH_LIB)/VBoxDD2.lib \ + $(PATH_STAGE_LIB)/VBoxDD2.lib \ $(PATH_SDK_DXSDK_LIB)/dxguid.lib else @@ -193,13 +193,13 @@ ifdef VBOX_WITH_HGSMI VBoxDD_LIBS += \ - $(PATH_LIB)/HGSMIHostR3Lib$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/HGSMIHostR3Lib$(VBOX_SUFF_LIB) endif ifdef VBOX_WITH_NETFLT - VBoxDD_LIBS.win += $(PATH_LIB)/WinNetConfig.lib + VBoxDD_LIBS.win += $(PATH_STAGE_LIB)/WinNetConfig.lib endif ifdef VBOX_WITH_EFI - VBoxDD_LIBS += $(PATH_LIB)/EfiThunkBin$(VBOX_SUFF_LIB) + VBoxDD_LIBS += $(PATH_STAGE_LIB)/EfiThunkBin$(VBOX_SUFF_LIB) endif @@ -243,7 +243,7 @@ PC/DevLPC.cpp VBoxDD2_LIBS = \ - $(PATH_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \ - $(if $(VBOX_WITH_PXE_ROM),$(PATH_LIB)/NetBiosBin$(VBOX_SUFF_LIB),) \ + $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \ + $(if $(VBOX_WITH_PXE_ROM),$(PATH_STAGE_LIB)/NetBiosBin$(VBOX_SUFF_LIB),) \ $(LIB_VMM) \ $(LIB_RUNTIME) @@ -640,6 +640,6 @@ if1of ($(VBOX_LDR_FMT32), pe lx) VBoxDDGC_LIBS = \ - $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VMMRCImp$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB) endif endif # VBOX_WITH_RAW_MODE @@ -720,5 +720,5 @@ if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) - VBoxDDR0_SOURCES += + VBoxDDR0_SOURCES += Bus/DevPciRaw.cpp endif @@ -752,6 +752,6 @@ if1of ($(VBOX_LDR_FMT), pe lx) VBoxDDR0_LIBS = \ - $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) endif @@ -770,6 +770,6 @@ if1of ($(VBOX_LDR_FMT32), pe lx) VBoxDD2GC_LIBS = \ - $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VMMRCImp$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB) endif endif @@ -789,6 +789,6 @@ if1of ($(VBOX_LDR_FMT), pe lx) VBoxDD2R0_LIBS = \ - $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) endif @@ -1229,5 +1229,5 @@ VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel VBoxPciRawR0_SOURCES = Bus/DevPciRaw.cpp - + Bus/DevPciRaw.cpp_INCS = Bus endif Index: /trunk/src/VBox/Disassembler/Makefile.kmk =================================================================== --- /trunk/src/VBox/Disassembler/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Disassembler/Makefile.kmk (revision 38082) @@ -74,5 +74,5 @@ tstDisasm_SOURCES = DisasmTest.cpp DisasmTestA.asm tstDisasm_LIBS = \ - $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \ $(LIB_RUNTIME) @@ -82,5 +82,5 @@ tstDisasmCore_SOURCES = DisasmTestCore.cpp tstDisasmCore_LIBS = \ - $(PATH_LIB)/DisasmCoreR3$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/DisasmCoreR3$(VBOX_SUFF_LIB) \ $(LIB_RUNTIME) endif # VBOX_WITH_TESTCASES Index: /trunk/src/VBox/Disassembler/testcase/Makefile.kmk =================================================================== --- /trunk/src/VBox/Disassembler/testcase/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Disassembler/testcase/Makefile.kmk (revision 38082) @@ -26,5 +26,5 @@ tstDisasm-2.cpp tstDisasm-2_LIBS = \ - $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \ $(LIB_RUNTIME) @@ -58,5 +58,5 @@ tstBin-5.bin \ tstBin-6.bin -# $(PATH_BIN)/testcase/tstDisasm-2$(SUFF_EXEC) +# $(PATH_STAGE_BIN)/testcase/tstDisasm-2$(SUFF_EXEC) endif Index: /trunk/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk (revision 38082) @@ -21,6 +21,6 @@ if1of ($(KBUILD_TARGET), freebsd linux openbsd netbsd solaris) # X11 DLLS += VBoxKeyboard - OTHERS += $(PATH_BIN)/vboxkeyboard.tar.bz2 - OTHER_CLEAN += $(PATH_BIN)/vboxkeyboard.tar.bz2 + OTHERS += $(PATH_STAGE_BIN)/vboxkeyboard.tar.bz2 + OTHER_CLEAN += $(PATH_STAGE_BIN)/vboxkeyboard.tar.bz2 endif @@ -45,13 +45,13 @@ # but wtf, it's not like we're even trying to be FHS compliant). # -## @todo this should be tar'ed down into the output directory and installed using an install target. VBOX_KEYBOARD_STAGE_DIR = $(PATH_TARGET)/VBoxKeyboard/install VBOX_KEYBOARD_DEST_DIR = $(VBOX_KEYBOARD_STAGE_DIR)/VBoxKeyboard/ +## @todo kBuild need support for copying files into _1_OUTDIR. INSTALLS += VBoxKeyboard-Files - -VBoxKeyboard-Files_INST = $(subst $(PATH_TARGET),obj,$(VBOX_KEYBOARD_DEST_DIR)) -VBoxKeyboard-Files_MODE = a+rx,u+w -VBoxKeyboard-Files_SOURCES = \ +VBoxKeyboard-Files_INSTTYPE = stage +VBoxKeyboard-Files_INST = misc-staging/VBoxKeyboard/ +VBoxKeyboard-Files_MODE = a+r,u+w +VBoxKeyboard-Files_SOURCES = \ COPYING.LIB \ keyboard.c \ @@ -63,18 +63,28 @@ ../../../../../include/VBox/VBoxKeyboard.h=>VBox/VBoxKeyboard.h -$(PATH_BIN)/vboxkeyboard.tar.bz2: \ - $(INSTARGET_VBoxKeyboard-Files) \ - $(MAKEFILE_CURRENT) +INSTALLS += VBoxKeyboard-Tarball +VBoxKeyboard-Tarball_INST = $(INST_BIN) +VBoxKeyboard-Tarball_MODE = a+r,u+w +VBoxKeyboard-Tarball_SOURCES = $(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2 +VBoxKeyboard-Tarball_CLEAN = $(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2 + +$$(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2: \ + $$(INSTARGET_VBoxKeyboard-Files) \ + $(MAKEFILE_CURRENT) \ + | $$(dir $$@) $(call MSG_L1,Packing $@) $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@) - $(QUIET)$(MKDIR) -p $(@D) ifdef VBOX_GTAR $(QUIET)$(VBOX_GTAR) --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ - -C $(VBOX_KEYBOARD_STAGE_DIR) VBoxKeyboard + -C $(PATH_STAGE)/$(VBoxKeyboard-Files_INST).. VBoxKeyboard else $(QUIET)tar -cjf $@ \ - -C $(VBOX_KEYBOARD_STAGE_DIR) VBoxKeyboard + -C $(PATH_STAGE)/$(VBoxKeyboard-Files_INST).. VBoxKeyboard endif $(QUIET)$(CHMOD) 0644 $@ + + include $(KBUILD_PATH)/subfooter.kmk + + Index: /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk (revision 38082) @@ -82,5 +82,5 @@ ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11 VBoxSDL_LIBS += \ - $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \ + $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \ $(VBOX_XCURSOR_LIBS) \ X11 Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 38082) @@ -252,5 +252,5 @@ $(PATH_SDK_DXSDK_LIB)/dxguid.lib if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11 - VirtualBox_LIBS += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) + VirtualBox_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) endif Index: /trunk/src/VBox/HostDrivers/Support/Makefile.kmk =================================================================== --- /trunk/src/VBox/HostDrivers/Support/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/HostDrivers/Support/Makefile.kmk (revision 38082) @@ -200,5 +200,5 @@ $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ - $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) @@ -245,5 +245,5 @@ $(PATH_SUB_CURRENT) \ $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux -vboxdrv_LIBS = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) +vboxdrv_LIBS = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) vboxdrv_LIBS.debug = $(vboxdrv_LIBS) $(VBOX_GCC_LIBGCC) vboxdrv_SOURCES = \ @@ -320,5 +320,5 @@ VBoxDrv_DEFS.debug = DEBUG_DARWIN_GIP VBoxDrv_INCS = . $(VBoxDrv_0_OUTDIR) -VBoxDrv_LIBS = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) +VBoxDrv_LIBS = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) #VBoxDrv_LDFLAGS = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded VBoxDrv_SOURCES = \ @@ -379,5 +379,5 @@ VBoxDrv_LIBS = \ $(VBoxDrvLib_1_TARGET) \ - $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \ $(VBOX_GCC_LIBGCC) \ end @@ -405,5 +405,5 @@ vboxdrv_DEFS = IN_RT_R0 IN_SUP_R0 SUPDRV_WITH_RELEASE_LOGGER VBOX_SVN_REV=$(VBOX_SVN_REV) vboxdrv_INCS := $(PATH_SUB_CURRENT) -vboxdrv_LIBS = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) +vboxdrv_LIBS = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) vboxdrv_SOURCES := \ $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).c \ @@ -451,5 +451,5 @@ vboxdrv_DEPS += $(VBOX_SVN_REV_KMK) vboxdrv_INCS := $(PATH_SUB_CURRENT) -vboxdrv_LIBS = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) +vboxdrv_LIBS = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) vboxdrv_SOURCES = \ $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).c \ Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk (revision 38082) @@ -57,5 +57,5 @@ # VBoxNetAdp.c VBoxNetAdp_LIBS += \ - $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) endif endif Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (revision 38082) @@ -61,7 +61,7 @@ $(PATH_SDK_WINDDKWLH_LIB)/hal.lib \ $(PATH_SDK_WINDDKWLH_LIB)/ndis.lib \ - $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) VBoxNetFlt_LIBS = \ - $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) darwin/VBoxNetFlt-darwin.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV) @@ -279,7 +279,7 @@ $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ $(PATH_SDK_W2K3DDK_LIB)/ndis.lib \ - $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) VBoxNetAdp_LIBS = \ - $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) @@ -333,8 +333,8 @@ vboxnetflt_LDFLAGS.solaris += -N drv/vboxdrv -N misc/ctf vboxnetflt_LIBS = \ - $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) ## @todo vboxflt should resolves all the IPRT bits from vboxdrv. #vboxnetflt_LIBS += \ -# $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) +# $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) vboxnetflt_SOURCES.linux = linux/VBoxNetFlt-linux.c vboxnetflt_SOURCES.solaris = solaris/VBoxNetFlt-solaris.c @@ -351,5 +351,5 @@ vboxnetbow_LDFLAGS += -N drv/vboxdrv -N drv/vnic -N misc/mac -N misc/dls vboxnetbow_LIBS = \ - $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) vboxnetbow_SOURCES.solaris = solaris/VBoxNetFltBow-solaris.c vboxnetbow_SOURCES = VBoxNetFlt.c Index: /trunk/src/VBox/HostDrivers/VBoxPci/Makefile.kmk =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxPci/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/HostDrivers/VBoxPci/Makefile.kmk (revision 38082) @@ -22,5 +22,5 @@ VBoxPci_SOURCES = VBoxPci_LIBS += \ - $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) endif Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk (revision 38082) @@ -52,5 +52,5 @@ $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ - $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \ $(usbd_1_TARGET) @@ -84,5 +84,5 @@ $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ - $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \ $(usbd_1_TARGET) @@ -100,5 +100,5 @@ $(PATH_SDK_W2K3DDK_LIB)/newdev.lib \ $(LIB_RUNTIME) \ - $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB) \ $(VBoxDrvCfg_1_TARGET) @@ -117,5 +117,5 @@ $(PATH_SDK_W2K3DDK_LIB)/newdev.lib \ $(LIB_RUNTIME) \ - $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB) \ $(VBoxDrvCfg_1_TARGET) @@ -133,5 +133,5 @@ $(PATH_SDK_W2K3DDK_LIB)/newdev.lib \ $(LIB_RUNTIME) \ - $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB) \ $(VBoxDrvCfg_1_TARGET) Index: /trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk =================================================================== --- /trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk (revision 38082) @@ -65,11 +65,11 @@ VBoxSharedCrOpenGL_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxSharedCrOpenGL.dylib VBoxSharedCrOpenGL_LIBS = \ - $(PATH_LIB)/VBoxOGLcrserverlib$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VBoxOGLcrunpacker$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBoxOGLcrserverlib$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBoxOGLcrunpacker$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \ $(VBOX_LIB_OGL_HOSTCRUTIL) \ - $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \ $(LIB_RUNTIME) \ $(LIB_VMM) @@ -82,5 +82,5 @@ else VBoxSharedCrOpenGL_LIBS += \ - $(PATH_BIN)/VBoxOGLrenderspu$(VBOX_SUFF_DLL) + $(PATH_STAGE_BIN)/VBoxOGLrenderspu$(VBOX_SUFF_DLL) endif ifdef VBOX_WITH_XPCOM @@ -259,5 +259,5 @@ VBoxOGLrenderspu_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLrenderspu.dylib VBoxOGLrenderspu_LIBS = \ - $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \ $(VBOX_LIB_OGL_HOSTCRUTIL) \ $(LIB_RUNTIME) Index: /trunk/src/VBox/Installer/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Installer/Makefile.kmk (revision 38082) @@ -46,16 +46,16 @@ # Package the VirtualBox SDK. # - VBOX_SDK_ZIP = $(PATH_BIN)/VirtualBoxSDK-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).zip + VBOX_SDK_ZIP = $(PATH_STAGE_BIN)/VirtualBoxSDK-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).zip PACKING += $(VBOX_SDK_ZIP) OTHER_CLEANS += $(VBOX_SDK_ZIP) \ - $(wildcard $(PATH_BIN)/VirtualBoxSDK-*-r*.zip) + $(wildcard $(PATH_STAGE_BIN)/VirtualBoxSDK-*-r*.zip) VBOX_ZIP ?= zip # @todo: wrong, it must depend on everything included in SDK $(VBOX_SDK_ZIP): \ - $(PATH_BIN)/sdk \ + $(PATH_STAGE_BIN)/sdk \ $(VBOX_VERSION_STAMP) $(call MSG_L1,Making SDK delivery $@) - $(QUIET)$(REDIRECT) $(if $(QUIET),-wo /dev/null,) -C $(PATH_BIN) -- $(VBOX_ZIP) -r9 $@ sdk + $(QUIET)$(REDIRECT) $(if $(QUIET),-wo /dev/null,) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -r9 $@ sdk endif Index: /trunk/src/VBox/Installer/freebsd/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/freebsd/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Installer/freebsd/Makefile.kmk (revision 38082) @@ -43,5 +43,5 @@ BLDDIRS += $(VBOX_FBSD_INST_OUT_DIR) $(VBOX_FBSD_INST_STAGE_DIR) -PACKING += $(PATH_BIN)/$(VBOX_FBSD_PACKAGE_NAME) +PACKING += $(PATH_STAGE_BIN)/$(VBOX_FBSD_PACKAGE_NAME) OTHER_CLEAN += \ @@ -154,5 +154,5 @@ VBOX_FBSD_NO_STRIP += \ $(VBOX_LICENSE_FILES) \ - $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_BIN)/lib*VBox*)),) \ + $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \ $(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \ $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) @@ -231,8 +231,8 @@ # The module source archive # -$(PATH_BIN)/vboxdrv.tar.gz: \ +$(PATH_STAGE_BIN)/vboxdrv.tar.gz: \ src $(call MSG_TOOL, export_modules,,$@) - $(QUIET)$(PATH_BIN)/export_modules $@ + $(QUIET)$(PATH_STAGE_BIN)/export_modules $@ # @@ -240,5 +240,5 @@ # @todo r=aeichner: Create pkg_plist dynamically based on the available features # -$(PATH_BIN)/$(VBOX_FBSD_PACKAGE_NAME): \ +$(PATH_STAGE_BIN)/$(VBOX_FBSD_PACKAGE_NAME): \ $(VBOX_VERSION_STAMP) \ $(VBOX_FBSD_INST_OUT_DIR)/pkg_plist \ @@ -264,5 +264,5 @@ $(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_STRIP_BIN)): \ - $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_BIN)/% + $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/% $(call MSG_INST_FILE,$<,$@) $(QUIET)$(INSTALL) -d $(dir $@) @@ -271,5 +271,5 @@ # pattern rule for striping and copying the VBOX_FBSD_STRIP_OBJ files to install/lib/virtualbox $(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_STRIP_OBJ)): \ - $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_BIN)/% + $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/% $(call MSG_INST_FILE,$<,$@) $(QUIET)$(INSTALL) -d $(dir $@) @@ -284,5 +284,5 @@ # pattern rule for linking the VBOX_FBSD_NO_STRIP into lib/virtualbox/ $(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_NO_STRIP)): \ - $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_BIN)/% + $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/% $(call MSG_INST_FILE,$<,$@) $(QUIET)$(INSTALL) -d $(dir $@) @@ -292,5 +292,5 @@ # pattern rule for symlinking the VBOX_FBSD_SYMLINKS into bin/ $(addprefix $(VBOX_FBSD_INST_BIN_DIR)/,$(VBOX_FBSD_SYMLINKS)): \ - $(VBOX_FBSD_INST_BIN_DIR)/% : $(PATH_BIN)/% + $(VBOX_FBSD_INST_BIN_DIR)/% : $(PATH_STAGE_BIN)/% $(call MSG_INST_SYM,$<,$@) $(QUIET)$(INSTALL) -d $(dir $@) @@ -300,5 +300,5 @@ # pattern rule for copying the VBOX_FBSD_DESKTOP_FILE into share/applications/ $(addprefix $(VBOX_FBSD_INST_SHAREAPP_DIR)/,$(VBOX_FBSD_DESKTOP_FILE)): \ - $(VBOX_FBSD_INST_SHAREAPP_DIR)/% : $(PATH_BIN)/% + $(VBOX_FBSD_INST_SHAREAPP_DIR)/% : $(PATH_STAGE_BIN)/% $(call MSG_INST_FILE,$<,$@) $(QUIET)$(INSTALL) -d $(dir $@) @@ -308,5 +308,5 @@ # pattern rule for copying the VBOX_FBSD_ICON_FILE into share/pixmaps/ $(addprefix $(VBOX_FBSD_INST_SHAREICON_DIR)/,$(VBOX_FBSD_ICON_FILE)): \ - $(VBOX_FBSD_INST_SHAREICON_DIR)/% : $(PATH_BIN)/% + $(VBOX_FBSD_INST_SHAREICON_DIR)/% : $(PATH_STAGE_BIN)/% $(call MSG_INST_FILE,$<,$@) $(QUIET)$(INSTALL) -d $(dir $@) Index: /trunk/src/VBox/Installer/linux/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/linux/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Installer/linux/Makefile.kmk (revision 38082) @@ -41,8 +41,8 @@ BLDDIRS += $(VBOX_LNX_INST_OUT_DIR) $(VBOX_LNX_INST_STAGE_DIR) -PACKING += $(PATH_BIN)/VirtualBox.tar.bz2 +PACKING += $(PATH_STAGE_BIN)/VirtualBox.tar.bz2 if !defined(VBOX_NO_LINUX_RUN_INSTALLER) - PACKING += $(PATH_BIN)/$(VBOX_LNX_PACKAGE_NAME) \ - $(PATH_BIN)/VirtualBox-dbg.tar.bz2 + PACKING += $(PATH_STAGE_BIN)/$(VBOX_LNX_PACKAGE_NAME) \ + $(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2 endif @@ -142,5 +142,5 @@ VBoxTestOGL \ VBoxSharedCrOpenGL.so,) \ - $(if $(VBOX_WITH_PYTHON),$(notdir $(wildcard $(PATH_BIN)/VBoxPython*.so)),) \ + $(if $(VBOX_WITH_PYTHON),$(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*.so)),) \ $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \ VBoxTunctl @@ -184,5 +184,5 @@ virtualbox.xml \ $(VBOX_LICENSE_FILES) \ - $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_BIN)/lib*VBox*)),) \ + $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \ $(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \ $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) \ @@ -234,5 +234,5 @@ ifdef VBOX_WITH_PYTHON VBOX_LNX_NO_STRIP += \ - $(foreach f,$(notdir $(wildcard $(PATH_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \ + $(foreach f,$(notdir $(wildcard $(PATH_STAGE_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \ sdk/bindings/xpcom/python/xpcom/client/__init__.py \ sdk/bindings/xpcom/python/xpcom/server/__init__.py \ @@ -305,5 +305,5 @@ # The generic installer. # -$(PATH_BIN)/$(VBOX_LNX_PACKAGE_NAME): \ +$(PATH_STAGE_BIN)/$(VBOX_LNX_PACKAGE_NAME): \ $(VBOX_LNX_INST_STAGE_DIR)/VirtualBox.tar.bz2 \ $(VBOX_VERSION_STAMP) \ @@ -319,5 +319,5 @@ $(VBOX_PATH_LNX_INST_SRC)/uninstall.sh $(call MSG_TOOL,makeself,,$@) - $(QUIET)$(RM) -f $(wildcard $(PATH_BIN)/VirtualBox-*.run) + $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/VirtualBox-*.run) $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LNX_INST_SRC)/routines.sh $(VBOX_LNX_INST_STAGE_DIR)/ $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LNX_INST_SRC)/deffiles $(VBOX_LNX_INST_STAGE_DIR)/ @@ -383,8 +383,8 @@ $(VBOX_LNX_INST_DEP_ON_MAKEFILE) \ $(VBOX_VERSION_STAMP) \ - $(wildcard $(PATH_BIN)/src/*) \ - $(wildcard $(PATH_BIN)/src/*/*) \ - $(wildcard $(PATH_BIN)/src/*/*/*) \ - $(wildcard $(PATH_BIN)/src/*/*/*/*) + $(wildcard $(PATH_STAGE_BIN)/src/*) \ + $(wildcard $(PATH_STAGE_BIN)/src/*/*) \ + $(wildcard $(PATH_STAGE_BIN)/src/*/*/*) \ + $(wildcard $(PATH_STAGE_BIN)/src/*/*/*/*) @@ -407,5 +407,5 @@ # .tar.bz2 for distribution with the files under VirtualBox-/. # -$(PATH_BIN)/VirtualBox.tar.bz2: $(VBOX_LNX_INST_ARCH_DEPS) +$(PATH_STAGE_BIN)/VirtualBox.tar.bz2: $(VBOX_LNX_INST_ARCH_DEPS) $(call MSG_L1,Packing $@) $(QUIET)$(RM) -f -- $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING) $@ $(patsubst %.bz2,%,$@) @@ -424,5 +424,5 @@ # pattern rule for stripping and copying the VBOX_LNX_STRIP_BIN files to archive/ $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_BIN)): \ - $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_BIN)/% \ + $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% \ $(if $(VBOX_NO_LINUX_RUN_INSTALLER),,\ $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/%) \ @@ -434,5 +434,5 @@ # pattern rule for striping and copying the VBOX_LNX_STRIP_OBJ files to archive/ $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_OBJ)): \ - $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_BIN)/% | $$(dir $$@) + $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% | $$(dir $$@) $(call MSG_INST_FILE,$<,$@) ifeq ($(VBOX_DO_STRIP),) @@ -445,5 +445,5 @@ # special rule for the kernel modules -$(VBOX_LNX_INST_OUT_DIR)/archive/src: $(PATH_BIN)/src | $(dir $@) +$(VBOX_LNX_INST_OUT_DIR)/archive/src: $(PATH_STAGE_BIN)/src | $(dir $@) $(call MSG_INST_SYM,$<,$@) $(QUIET)$(RM) -Rf $@ @@ -453,5 +453,5 @@ # pattern rule for linking the VBOX_LNX_NO_STRIP into archive/ $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_NO_STRIP)): \ - $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_BIN)/% | $$(dir $$@) + $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% | $$(dir $$@) $(call MSG_INST_SYM,$<,$@) $(QUIET)$(RM) -f $@ @@ -480,5 +480,5 @@ # .tar.bz2 for with the debug info. # -$(PATH_BIN)/VirtualBox-dbg.tar.bz2: \ +$(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2: \ $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/, $(VBOX_LNX_STRIP_BIN)) $(call MSG_L1,Packing $@) @@ -495,5 +495,5 @@ # pattern rule for copying the debug info from the VBOX_LNX_STRIP_BIN files into archive-dbg/$(VBOX_LNX_DBG_PATH)/ $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN)): \ - $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/% : $(PATH_BIN)/% | $$(dir $$@) + $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@) $(call MSG_TOOL,copydbg,$<,$@) $(QUIET)objcopy --only-keep-debug $< $@ Index: /trunk/src/VBox/Installer/solaris/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/solaris/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Installer/solaris/Makefile.kmk (revision 38082) @@ -57,5 +57,5 @@ SOLARIS_OUT_BIN_64 := $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin SOLARIS_OUT_BIN_32 := $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin -SOLARIS_OUT_BIN := $(PATH_BIN) +SOLARIS_OUT_BIN := $(PATH_STAGE_BIN) SOLARIS_DBG_DIR := $(PATH_TARGET)/Installer/DebugPkg @@ -121,5 +121,5 @@ ) -PACKING += $(PATH_BIN)/$(PKG_FILENAME).tar.gz $(PATH_BIN)/$(DBG_ARCHIVE) +PACKING += $(PATH_STAGE_BIN)/$(PKG_FILENAME).tar.gz $(PATH_STAGE_BIN)/$(DBG_ARCHIVE) OTHER_CLEAN += $(addprefix $(SOLARIS_BASEINST_DIR)/,\ @@ -308,5 +308,5 @@ $(if $(VBOX_WITH_WEBSERVICES),smf-vboxwebsrv.sh,) -# Things packed explicitly, not from $(PATH_BIN), track these to clean-up properly +# Things packed explicitly, not from $(PATH_STAGE_BIN), track these to clean-up properly SOLARIS_EXTRAS = \ LICENSE \ @@ -352,5 +352,5 @@ ifdef VBOX_WITH_PYTHON SOLARIS_COMMON += \ - $(foreach f,$(notdir $(wildcard $(PATH_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \ + $(foreach f,$(notdir $(wildcard $(PATH_STAGE_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \ sdk/bindings/xpcom/python/xpcom/client/__init__.py \ sdk/bindings/xpcom/python/xpcom/server/__init__.py \ @@ -536,5 +536,5 @@ # invoking $(MAKE) vbox_copy_sdk_files (or similar) to do the copying after $(RM) -Rf the # directory tree. -$(PATH_BIN)/$(PKG_FILENAME).tar.gz: \ +$(PATH_STAGE_BIN)/$(PKG_FILENAME).tar.gz: \ $(VBOX_VERSION_STAMP) \ $(VBOX_PATH_SOL_INST_SRC)/makepackage.sh \ @@ -552,13 +552,13 @@ $(if $(VBOX_WITH_SOLARIS_VBI),$(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg,) \ $(VBOX_BRAND_LICENSE_TXT) \ - $(PATH_BIN)/LICENSE \ + $(PATH_STAGE_BIN)/LICENSE \ $(if $(and $(VBOX_LICENSE_BINS),$(VBOX_WITH_QTGUI)),$(VBOX_LICENSE_BINS),) \ $(if $(VBOX_WITH_NETADP),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0,) \ $(if $(not $(VBOX_WITH_NETFLT))$(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh,) \ $(if $(not $(VBOX_WITH_NETFLT))$(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh,) \ - $(addprefix $(PATH_BIN)/,$(filter-out $(SOLARIS_EXTRAS) $(SOLARIS_QTLIBS),$(SOLARIS_ARCH_FILES))) \ + $(addprefix $(PATH_STAGE_BIN)/,$(filter-out $(SOLARIS_EXTRAS) $(SOLARIS_QTLIBS),$(SOLARIS_ARCH_FILES))) \ VBoxISAExec \ $(SOLARIS_ARCH_DEPFILES) - $(QUIET)$(RM) -f $(wildcard $(PATH_BIN)/VirtualBox-*-r*.tar.gz) + $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/VirtualBox-*-r*.tar.gz) $(call MSG_L1,Installing binaries $(SOLARIS_VBOXINST_DIR)) ifdef VBOX_WITH_COMBINED_PACKAGE @@ -586,8 +586,8 @@ $(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_PIXMAPS_DIR) $(QUIET)$(if $(VBOX_WITH_NETADP),$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0 $(SOLARIS_ETC_DIR)/hostname.vboxnet0,) - $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE $(SOLARIS_VBOXINST_DIR)/LICENSE + $(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE $(SOLARIS_VBOXINST_DIR)/LICENSE # don't display the license on package install, since 4.0 - #$(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE $(SOLARIS_BASEINST_DIR)/vbox.copyright - $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE $(SOLARIS_BASEINST_DIR)/LICENSE + #$(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE $(SOLARIS_BASEINST_DIR)/vbox.copyright + $(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE $(SOLARIS_BASEINST_DIR)/LICENSE ifdef VBOX_WITH_COMBINED_PACKAGE ifndef VBOX_OSE @@ -630,5 +630,5 @@ -e "s/_HARDENED_/$(if $(VBOX_WITH_HARDENED),hardened,)/" \ --output $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh.tmp \ - $(PATH_BIN)/vboxconfig.sh + $(PATH_STAGE_BIN)/vboxconfig.sh $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh.tmp $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh $(QUIET)$(RM) -f $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh.tmp @@ -759,20 +759,20 @@ # $(addprefix $(SOLARIS_VBOXINST_DIR)/,$(SOLARIS_COMMON)): \ - $(SOLARIS_VBOXINST_DIR)/% : $(PATH_BIN)/% | $$(dir $$@) + $(SOLARIS_VBOXINST_DIR)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@) $(INSTALL) -m 0644 $< $@ # Driver configuration files $(addprefix $(SOLARIS_DRIVERINST_DIR)/,$(SOLARIS_DRIVER_CONFS)): \ - $(SOLARIS_DRIVERINST_DIR)/% : $(PATH_BIN)/% | $$(dir $$@) + $(SOLARIS_DRIVERINST_DIR)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@) $(INSTALL) -m 0644 $< $@ # Common executables $(addprefix $(SOLARIS_VBOXINST_DIR)/,$(SOLARIS_COMMON_EXES)): \ - $(SOLARIS_VBOXINST_DIR)/% : $(PATH_BIN)/% | $$(dir $$@) + $(SOLARIS_VBOXINST_DIR)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@) $(INSTALL) -m 0755 $< $@ # Common MIME icons $(addprefix $(SOLARIS_USRSHR_ICONS_DIR)/,$(SOLARIS_COMMON_ICONS)): \ - $(SOLARIS_USRSHR_ICONS_DIR)/% : $(PATH_BIN)/icons/% | $$(dir $$@) + $(SOLARIS_USRSHR_ICONS_DIR)/% : $(PATH_STAGE_BIN)/icons/% | $$(dir $$@) $(INSTALL) -m 0644 $< $@ @@ -782,5 +782,5 @@ # Common (relative symlinks to /opt/VirtualBox/ from /usr/bin/) # Some symlinks are created manually in the prepackage steps above (eg. VBoxQtconfig) -# as those binaries do not originate from $(PATH_BIN) +# as those binaries do not originate from $(PATH_STAGE_BIN) # $(addprefix $(SOLARIS_USRBIN_DIR)/,$(SOLARIS_USRBIN_LINKS)): \ @@ -796,5 +796,5 @@ $(VBOX_VERSION_STAMP) \ $(VBOX_BRAND_LICENSE_TXT) \ - $(PATH_BIN)/LICENSE \ + $(PATH_STAGE_BIN)/LICENSE \ $(VBOX_PATH_SOL_INST_SRC)/vbi/vboxkern.pkginfo \ $(VBOX_PATH_SOL_INST_SRC)/vbi/makepackage.sh \ @@ -817,5 +817,5 @@ $(VBOX_PATH_SOL_INST_SRC)/vbi/vboxkern.pkginfo # don't display the license on package install, since 4.0 - #$(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE $(SOLARIS_VBI_DIR)/vbox.copyright + #$(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE $(SOLARIS_VBI_DIR)/vbox.copyright $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/vbi/makepackage.sh $(SOLARIS_VBI_DIR)/makepackage.sh $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/vbi/preremove.sh $(SOLARIS_VBI_DIR)/preremove.sh @@ -828,5 +828,5 @@ # -=-=-=-=-=-=-=- Debug package -=-=-=-=-=-=-=- # -$(PATH_BIN)/$(DBG_ARCHIVE): \ +$(PATH_STAGE_BIN)/$(DBG_ARCHIVE): \ $(VBOX_VERSION_STAMP) \ $(VBOX_PATH_SOL_INST_SRC)/Makefile.kmk \ @@ -834,5 +834,5 @@ $(call MSG_L1,Installing debug binaries $(SOLARIS_DBG_DIR)) $(call MSG_L1,Packing $@) - $(QUIET)/usr/sfw/bin/gtar --owner 0 --group 0 -cjRhf $(PATH_BIN)/$(DBG_ARCHIVE) -C $(SOLARIS_DBG_DIR) $(SOLARIS_DBG_DEPFILES) + $(QUIET)/usr/sfw/bin/gtar --owner 0 --group 0 -cjRhf $(PATH_STAGE_BIN)/$(DBG_ARCHIVE) -C $(SOLARIS_DBG_DIR) $(SOLARIS_DBG_DEPFILES) $(QUIET)$(CHMOD) 0644 $@ Index: /trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk (revision 38082) @@ -38,6 +38,6 @@ ifdef VBOX_WITH_NETFLT VBoxInstallHelper_LIBS += \ - $(PATH_LIB)/WinNetConfig.lib \ - $(PATH_LIB)/VBoxDrvCfg.lib \ + $(PATH_STAGE_LIB)/WinNetConfig.lib \ + $(PATH_STAGE_LIB)/VBoxDrvCfg.lib \ $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \ $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib Index: /trunk/src/VBox/Installer/win/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/win/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Installer/win/Makefile.kmk (revision 38082) @@ -70,5 +70,5 @@ PACKAGE_BASE := VirtualBox-$(VBOX_VERSION_STRING) PACKAGE_NAME_LANG := $(PACKAGE_BASE)-r$(VBOX_SVN_REV) -PACKAGE_NAME_FINAL := $(PATH_BIN)/$(PACKAGE_NAME_LANG).msi +PACKAGE_NAME_FINAL := $(PATH_STAGE_BIN)/$(PACKAGE_NAME_LANG).msi ifdef VBOX_WITH_COMBINED_PACKAGE @@ -85,5 +85,5 @@ PACKING += $(PACKAGE_NAME_FINAL) ifeq ($(KBUILD_TARGET_ARCH),x86) - PACKING += $(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) + PACKING += $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) endif else @@ -113,5 +113,5 @@ ifeq ($(KBUILD_TARGET_ARCH),x86) OTHER_CLEAN += \ - $(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \ + $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \ $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \ $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.am64) \ @@ -138,6 +138,6 @@ endif - VBOX_PATH_PACK_BUNDLE_TMP = $(PATH_BIN)/VBoxWinBundleInstaller - VBOX_PATH_PACK_BUNDLE_ZIP = $(PATH_BIN)/VBoxWinBundleInstaller-$(KBUILD_TARGET_ARCH).zip + VBOX_PATH_PACK_BUNDLE_TMP = $(PATH_STAGE_BIN)/VBoxWinBundleInstaller + VBOX_PATH_PACK_BUNDLE_ZIP = $(PATH_STAGE_BIN)/VBoxWinBundleInstaller-$(KBUILD_TARGET_ARCH).zip VBOX_BRAND_WIN_INST_NAME.x86 = $(PACKAGE_BASE)-Win_x86$(VBOX_BRAND_WIN_INST_EXT).msi @@ -220,7 +220,7 @@ $(APPEND) $@ '' ifdef VBOX_WITH_DOCS_CHM - $(APPEND) $@ ' ' + $(APPEND) $@ ' ' $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \ - ' ') + ' ') endif $(APPEND) $@ '' @@ -230,8 +230,8 @@ $(APPEND) -t $@ '' $(APPEND) $@ '' - $(APPEND) $@ ' ' + $(APPEND) $@ ' ' $(APPEND) $@ ' ' $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \ - ' ' \ + ' ' \ ' ') $(APPEND) $@ '' @@ -288,5 +288,5 @@ $(VBOX_WIN_INST_OUT_DIR)/Languages/Language_$(lang).wxl \ $(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl \ - $(PATH_BIN)/VBoxInstallHelper.dll \ + $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \ $(MAKEFILE_CURRENT) \ | $$$$(dir $$$$@) @@ -551,5 +551,5 @@ $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst) \ | $$(dir $$@) - $(QUIET)$(RM) -f $(wildcard $(PATH_BIN)/$(PACKAGE_BASE)-r*.msi) + $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/$(PACKAGE_BASE)-r*.msi) $(REDIRECT) -C $(@D) -- \ wscript.exe $(VBOX_PATH_WISUMINFO) $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_en_US.msi $(VBOX_INS_PROD_LANG) @@ -564,5 +564,5 @@ # need to do this once; so do it on x86 only. # -$(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL): \ +$(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL): \ $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \ $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64) @@ -574,5 +574,5 @@ -target-amd64 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64) \ -target-all $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB) \ - -stub $(PATH_BIN)/VBoxStub.exe + -stub $(PATH_STAGE_BIN)/VBoxStub.exe $(call VBOX_SIGN_FILE_FN,$@) endif @@ -585,7 +585,7 @@ $(PACKAGE_NAME_FINAL) \ $(if-expr "$(KBUILD_TARGET_ARCH)" == "x86", \ - $(PATH_BIN)/VBoxBundleMachine.exe \ - $(if $(VBOX_BRAND_WIN_AS_MENU), $(PATH_BIN)/AutoStartMenu.exe) \ - $(if $(VBOX_WITH_COMBINED_PACKAGE), $(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)),) + $(PATH_STAGE_BIN)/VBoxBundleMachine.exe \ + $(if $(VBOX_BRAND_WIN_AS_MENU), $(PATH_STAGE_BIN)/AutoStartMenu.exe) \ + $(if $(VBOX_WITH_COMBINED_PACKAGE), $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)),) $(RM) -Rf -- $(VBOX_PATH_PACK_BUNDLE_TMP)/ $(MKDIR) -p $(VBOX_PATH_PACK_BUNDLE_TMP)/ @@ -595,8 +595,8 @@ ifeq ($(KBUILD_TARGET_ARCH),x86) ifdef VBOX_WITH_COMBINED_PACKAGE - $(CP) $(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) $(VBOX_PATH_PACK_BUNDLE_TMP)/$(PACKAGE_NAME_MULTIARCH_FINAL) - endif - $(CP) $(PATH_BIN)/VBoxBundleMachine.exe $(VBOX_PATH_PACK_BUNDLE_TMP)/ - $(CP) $(PATH_BIN)/AutoStartMenu.exe $(VBOX_PATH_PACK_BUNDLE_TMP)/ + $(CP) $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) $(VBOX_PATH_PACK_BUNDLE_TMP)/$(PACKAGE_NAME_MULTIARCH_FINAL) + endif + $(CP) $(PATH_STAGE_BIN)/VBoxBundleMachine.exe $(VBOX_PATH_PACK_BUNDLE_TMP)/ + $(CP) $(PATH_STAGE_BIN)/AutoStartMenu.exe $(VBOX_PATH_PACK_BUNDLE_TMP)/ ifdef VBOX_BRAND_WIN_AS_MENU $(MKDIR) -p $(VBOX_PATH_PACK_BUNDLE_TMP)/Menu/Graphics/ Index: /trunk/src/VBox/Main/Makefile.kmk =================================================================== --- /trunk/src/VBox/Main/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Main/Makefile.kmk (revision 38082) @@ -37,5 +37,5 @@ # I'm Evil! Dr. Evil. VBoxCOM_0_OUTDIR = $(PATH_TARGET)/VBoxCOM - BLDDIRS += $(VBoxCOM_0_OUTDIR) $(PATH_BIN)/components + BLDDIRS += $(VBoxCOM_0_OUTDIR) $(PATH_STAGE_BIN)/components include $(KBUILD_PATH)/tools/VCC70.kmk include $(KBUILD_PATH)/sdks/WINPSDK.kmk @@ -71,5 +71,5 @@ VBOX_IDL_FILE.XPCOM = $(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl -VBOX_IDL_TYPELIB.XPCOM = $(PATH_BIN)/components/VirtualBox_XPCOM.xpt +VBOX_IDL_TYPELIB.XPCOM = $(PATH_STAGE_BIN)/components/VirtualBox_XPCOM.xpt VBOX_IDL_HEADER.XPCOM = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h @@ -258,5 +258,5 @@ VBoxSVC_LIBS += \ - $(PATH_LIB)/SSMStandalone$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/SSMStandalone$(VBOX_SUFF_LIB) \ $(LIB_DDU) VBoxSVC_SDKS = VBOX_LIBPNG VBOX_ZLIB @@ -504,7 +504,7 @@ VBoxTestOGL_LIBS = \ $(if $(VBOX_WITH_CROGL), \ - $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \ $(VBOX_LIB_OGL_HOSTCRUTIL),) \ - $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \ + $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \ $(LIB_RUNTIME) VBoxTestOGL_DEFS += \ Index: /trunk/src/VBox/Main/webservice/Makefile.kmk =================================================================== --- /trunk/src/VBox/Main/webservice/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Main/webservice/Makefile.kmk (revision 38082) @@ -280,5 +280,5 @@ endif vboxwebsrv_LIBS += \ - $(PATH_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ $(VBOX_GSOAP_CXX_LIBS) vboxwebsrv_LIBS.solaris += socket nsl @@ -377,5 +377,5 @@ . webtest_LIBS += \ - $(PATH_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ $(VBOX_GSOAP_CXX_LIBS) webtest_LIBS.solaris += nsl Index: /trunk/src/VBox/RDP/client/Makefile.kmk =================================================================== --- /trunk/src/VBox/RDP/client/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/RDP/client/Makefile.kmk (revision 38082) @@ -130,28 +130,34 @@ # The source tarball (further down). # -## @todo change this to an INSTALLS target. -OTHERS += $(PATH_BIN)/rdesktop-vrdp.tar.gz -OTHER_CLEAN += $(OTHERS) - INSTALLS += rdesktop-bin -rdesktop-bin_INST = obj/rdesktop-src/$(VBOX_RDESKTOP_SRC_SUBDIR)/ -rdesktop-bin_MODE = a+rx,u+w -rdesktop-bin_SOURCES = \ +rdesktop-bin_INSTTYPE = stage +rdesktop-bin_INST = misc-staging/$(VBOX_RDESKTOP_SRC_SUBDIR)/ +rdesktop-bin_MODE = a+rx,u+w +rdesktop-bin_SOURCES = \ configure \ config.sub \ config.guess \ bootstrap \ - install-sh + install-sh \ + keymaps/convert-map=>keymaps/convert-map INSTALLS += rdesktop-nonbin -rdesktop-nonbin_INST = obj/rdesktop-src/$(VBOX_RDESKTOP_SRC_SUBDIR)/ -rdesktop-nonbin_MODE = a+r,u+w +rdesktop-nonbin_INSTTYPE = stage +rdesktop-nonbin_INST = $(rdesktop-bin_INST) +rdesktop-nonbin_MODE = a+r,u+w +## @todo move the content of files_rdesktop-vrdp here. There is no call for a separate file in this case. include $(PATH_SUB_CURRENT)/files_rdesktop-vrdp -$(PATH_BIN)/rdesktop-vrdp.tar.gz: \ +INSTALLS += rdesktop-tarball +rdesktop-tarball_INST = $(INST_BIN) +rdesktop-tarball_MODE = a+r,u+w +rdesktop-tarball_SOURCES = $(rdesktop-tarball_0_OUTDIR)/rdesktop-vrdp.tar.gz +rdesktop-tarball_CLEAN = $(rdesktop-tarball_0_OUTDIR)/rdesktop-vrdp.tar.gz +$$(rdesktop-tarball_0_OUTDIR)/rdesktop-vrdp.tar.gz: \ $$(rdesktop-bin_1_TARGET) \ - $$(rdesktop-nonbin_1_TARGET) + $$(rdesktop-nonbin_1_TARGET) \ + | $$(dir $$@) $(call MSG_TOOL,tar/gzip,,$@) - $(QUIET)cd $(PATH_INS)/obj/rdesktop-src/ && tar -cf - $(VBOX_RDESKTOP_SRC_SUBDIR)/ | gzip - > $@ + $(QUIET)cd $(PATH_STAGE)/$(rdesktop-bin_INST).. && tar -cf - $(VBOX_RDESKTOP_SRC_SUBDIR)/ | gzip - > $@ Index: /trunk/src/VBox/RDP/client/files_rdesktop-vrdp =================================================================== --- /trunk/src/VBox/RDP/client/files_rdesktop-vrdp (revision 38081) +++ /trunk/src/VBox/RDP/client/files_rdesktop-vrdp (revision 38082) @@ -122,5 +122,4 @@ $(PATH_ROOT)/src/VBox/RDP/client/keymaps/en-us=>keymaps/en-us \ $(PATH_ROOT)/src/VBox/RDP/client/keymaps/et=>keymaps/et \ - $(PATH_ROOT)/src/VBox/RDP/client/keymaps/convert-map=>keymaps/convert-map \ $(PATH_ROOT)/src/VBox/RDP/client/keymaps/en-dv=>keymaps/en-dv \ $(PATH_ROOT)/src/VBox/RDP/client/keymaps/mk=>keymaps/mk \ Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 38082) @@ -1262,22 +1262,22 @@ VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) VBoxRT_LIBS = \ - $(PATH_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \ $(SDK_VBOX_ZLIB_LIBS) if1of ($(KBUILD_TARGET_ARCH), amd64 x86) VBoxRT_LIBS += \ - $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB) endif ifdef IPRT_WITH_KSTUFF VBoxRT_LIBS += \ - $(PATH_LIB)/VBox-kStuff$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VBox-kStuff$(VBOX_SUFF_LIB) endif ifndef SDK_VBOX_LIBXML2_LIBS VBoxRT_LIBS += \ - $(PATH_LIB)/VBox-libxml2$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VBox-libxml2$(VBOX_SUFF_LIB) endif ifndef SDK_VBOX_OPENSSL_LIBS VBoxRT_LIBS += \ - $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VBox-libssl$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB) endif ifdef IPRT_WITH_LZO @@ -1307,5 +1307,5 @@ VBoxRT_LDFLAGS.l4 = \ -Wl,-whole-archive \ - $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \ -Wl,-no-whole-archive ifeq ($(KBUILD_TARGET),l4) @@ -1315,5 +1315,5 @@ endif VBoxRT_LIBS.l4 = \ - $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) if1of ($(DLLS), VBoxRT) @@ -1339,9 +1339,9 @@ VBoxRTDummy_TEMPLATE = VBOXR3 VBoxRTDummy_NOINST = true -VBoxRTDummy_LIBS = $(PATH_BIN)/VBoxRT.so -VBoxRTDummy_CLEAN= $(PATH_BIN)/VBoxRT.so -BLDDIRS += $(PATH_BIN) - -$(PATH_BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@) +VBoxRTDummy_LIBS = $(PATH_STAGE_BIN)/VBoxRT.so +VBoxRTDummy_CLEAN= $(PATH_STAGE_BIN)/VBoxRT.so +BLDDIRS += $(PATH_STAGE_BIN) + +$(PATH_STAGE_BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@) $(INSTALL) $< $@ chcon -t texrel_shlib_t $@ || true Index: /trunk/src/VBox/Runtime/testcase/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/testcase/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Runtime/testcase/Makefile.kmk (revision 38082) @@ -279,5 +279,5 @@ tstLdr-2_DEFS = IN_DIS tstLdr-2_LIBS = \ - $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) ifdef VBOX_WITH_RAW_MODE @@ -291,9 +291,9 @@ endif tstLdrObj_LIBS = \ - $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB) ifeq ($(VBOX_LDR_FMT32),pe) tstLdrObj_LIBS += \ - $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) endif # PE ifeq ($(VBOX_LDR_FMT32),elf) @@ -302,5 +302,5 @@ ifeq ($(VBOX_LDR_FMT32),lx) tstLdrObj_LIBS += \ - $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) endif endif # VBOX_WITH_RAW_MODE @@ -309,5 +309,5 @@ tstLdr-3_DEFS = IN_DIS tstLdr-3_LIBS = \ - $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) tstLdr-4Imp_TEMPLATE = VBoxR0 @@ -330,9 +330,9 @@ endif tstLdrObjR0_LIBS = \ - $(PATH_LIB)/DisasmR0$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) ifeq ($(VBOX_LDR_FMT),pe) tstLdrObjR0_LIBS += \ - $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \ $(TARGET_tstLdr-4Imp) endif @@ -342,5 +342,5 @@ ifeq ($(VBOX_LDR_FMT),lx) tstLdrObjR0_LIBS += \ - $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \ $(TARGET_tstLdr-4Imp) endif @@ -349,5 +349,5 @@ tstLdr-4_DEFS = IN_DIS tstLdr-4_LIBS = \ - $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) tstLdrLoad_SOURCES = tstLdrLoad.cpp @@ -528,7 +528,7 @@ tstRTR0MemUserKernel_SYSSUFF = .r0 tstRTR0MemUserKernel_SOURCES = tstRTR0MemUserKernel.cpp -tstRTR0MemUserKernel_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB) +tstRTR0MemUserKernel_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) if1of ($(VBOX_LDR_FMT), pe lx) - tstRTR0MemUserKernel_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) + tstRTR0MemUserKernel_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) endif tstRTR0MemUserKernelDriver_TEMPLATE = VBOXR3TSTEXE @@ -541,7 +541,7 @@ tstRTR0SemMutex_SYSSUFF = .r0 tstRTR0SemMutex_SOURCES = tstRTR0SemMutex.cpp -tstRTR0SemMutex_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB) +tstRTR0SemMutex_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) if1of ($(VBOX_LDR_FMT), pe lx) - tstRTR0SemMutex_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) + tstRTR0SemMutex_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) endif tstRTR0SemMutexDriver_TEMPLATE = VBOXR3TSTEXE @@ -554,7 +554,7 @@ tstRTR0Timer_SYSSUFF = .r0 tstRTR0Timer_SOURCES = tstRTR0Timer.cpp -tstRTR0Timer_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB) +tstRTR0Timer_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) if1of ($(VBOX_LDR_FMT), pe lx) - tstRTR0Timer_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) + tstRTR0Timer_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) endif tstRTR0TimerDriver_TEMPLATE = VBOXR3TSTEXE @@ -567,7 +567,7 @@ tstR0ThreadPreemption_SYSSUFF = .r0 tstR0ThreadPreemption_SOURCES = tstR0ThreadPreemption.cpp -tstR0ThreadPreemption_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB) +tstR0ThreadPreemption_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) if1of ($(VBOX_LDR_FMT), pe lx) - tstR0ThreadPreemption_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) + tstR0ThreadPreemption_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) endif tstR0ThreadPreemptionDriver_TEMPLATE = VBOXR3TSTEXE Index: /trunk/src/VBox/Storage/testcase/Makefile.kmk =================================================================== --- /trunk/src/VBox/Storage/testcase/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/Storage/testcase/Makefile.kmk (revision 38082) @@ -86,9 +86,9 @@ if1of ($(KBUILD_TARGET),os2 win) vbox-img_LIBS += \ - $(PATH_LIB)/VBox-liblzf-static$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VBox-liblzf-static$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB) else vbox-img_LIBS += \ - $(PATH_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \ $(SDK_VBOX_ZLIB_LIBS) endif Index: /trunk/src/VBox/VMM/Makefile.kmk =================================================================== --- /trunk/src/VBox/VMM/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/VMM/Makefile.kmk (revision 38082) @@ -236,9 +236,9 @@ VBoxVMM_LIBS = \ - $(PATH_LIB)/VMMR3$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMR3$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) ifdef VBOX_WITH_DEBUGGER VBoxVMM_LIBS += \ - $(PATH_LIB)/Debugger$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/Debugger$(VBOX_SUFF_LIB) endif VBoxVMM_LIBS += \ @@ -361,9 +361,9 @@ VMMRC_LIBS = \ - $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB) ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),) VMMRC_LIBS += \ - $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) endif @@ -529,10 +529,10 @@ VMMR0_LIBS = \ - $(PATH_LIB)/ServicesR0$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/DisasmR0$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/ServicesR0$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB) ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),) VMMR0_LIBS += \ - $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) endif endif # !VBOX_ONLY_EXTPACKS Index: /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 38081) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 38082) @@ -2458,6 +2458,8 @@ if (PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage)) { +#if 0 /* DONT COMMIT THIS!!!!!!!! It needs fixing! */ AssertMsgFailed(("%R[pgmpage] - we don't set PGM_PTFLAGS_TRACK_DIRTY for these pages\n", pPage)); Assert(!PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage)); +#endif /* Assuming write handlers here as the PTE is present (otherwise we wouldn't be here). */ SHW_PTE_SET_RO(PteDst); Index: /trunk/src/VBox/VMM/testcase/Makefile.kmk =================================================================== --- /trunk/src/VBox/VMM/testcase/Makefile.kmk (revision 38081) +++ /trunk/src/VBox/VMM/testcase/Makefile.kmk (revision 38082) @@ -272,9 +272,9 @@ tstMicroRC_SYSSUFF = .gc tstMicroRC_LIBS = \ - $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ - $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB) ifeq ($(filter-out pe lx,$(VBOX_LDR_FMT32)),) tstMicroRC_LIBS += \ - $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \ $(LIB_VMMGC) endif Index: /trunk/src/libs/xpcom18a4/Makefile.kmk =================================================================== --- /trunk/src/libs/xpcom18a4/Makefile.kmk (revision 38081) +++ /trunk/src/libs/xpcom18a4/Makefile.kmk (revision 38082) @@ -1312,5 +1312,5 @@ $(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt: $$(VBOX_XPTFILES) | $$(xpt_link_1_TARGET) $(PATH_TARGET)/VBox-xpcom-xpt-files/ $(call MSG_LINK,XPCOM_TYPELIB,$@) - $(QUIET)$(MKDIR) -p -- $(PATH_BIN)/components + $(QUIET)$(MKDIR) -p -- $(PATH_STAGE_BIN)/components $(QUIET)$(xpt_link_1_TARGET) $@ $^ @@ -1356,5 +1356,5 @@ # INSTARGET_xpidl which is the one in bin/. # -$(VBOX_XPIDL): $(PATH_TARGET)/VBox-xpcom-idl-timestamp +$(VBOX_XPIDL): | $(PATH_TARGET)/VBox-xpcom-idl-timestamp Index: /trunk/src/libs/xpcom18a4/java/Makefile.kmk =================================================================== --- /trunk/src/libs/xpcom18a4/java/Makefile.kmk (revision 38081) +++ /trunk/src/libs/xpcom18a4/java/Makefile.kmk (revision 38082) @@ -58,6 +58,6 @@ src/nsJavaInterfaces.cpp VBoxJXpcom_LIBS = \ - $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \ - $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) + $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) #VBoxJXpcom_ORDERDEPS = $(VBOX_JXPCOM_GENH) Index: /trunk/src/libs/xpcom18a4/python/Makefile.kmk =================================================================== --- /trunk/src/libs/xpcom18a4/python/Makefile.kmk (revision 38081) +++ /trunk/src/libs/xpcom18a4/python/Makefile.kmk (revision 38082) @@ -73,6 +73,6 @@ src/VariantUtils.cpp VBoxPythonBase_LIBS = \ - $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \ - $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) + $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \ + $(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) Index: /trunk/src/recompiler/Makefile.kmk =================================================================== --- /trunk/src/recompiler/Makefile.kmk (revision 38081) +++ /trunk/src/recompiler/Makefile.kmk (revision 38082) @@ -129,5 +129,5 @@ VBoxRemPrimary_SYSSUFF = .rel VBoxRemPrimary_LIBS = \ - $(PATH_LIB)/RuntimeR3NoCRTGCC$(VBOX_SUFF_LIB) + $(PATH_STAGE_LIB)/RuntimeR3NoCRTGCC$(VBOX_SUFF_LIB) VBoxRemPrimary_POST_CMDS = $(NO_SUCH_VARIABLE) VBOX_REM_WRAPPER = 2