VirtualBox

Changeset 8761

Show
Ignore:
Timestamp:
05/11/08 20:53:32 (5 months ago)
Author:
vboxsync
Message:

The reminder.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Config.kmk

    r8760 r8761  
    3535# Modify the order of the INSTALLS and OTHERS passes. 
    3636DEFAULT_PASSES       := BLDPROGS LIBRARIES DLLS BINARIES INSTALLS OTHERS 
     37# Modify the build types. 
     38## @todo checked and dbgopt 
     39KBUILD_BLD_TYPES = release profile debug kprofile 
    3740 
    3841# Install paths. 
    …… 
    9598# Notify about important kBuild updates. 
    9699ifneq ($(call int-ge,$(KMK_REVISION),1562),1) 
    97  $(error You must update kBuild! KMK_REVISION=$(KMK_REVISION) PATH_KBUILD=$(KBUILD_PATH)) 
     100 $(error You must update kBuild! KMK_REVISION=$(KMK_REVISION) KBUILD_PATH=$(KBUILD_PATH)) 
    98101endif 
    99102 
    …… 
    402405ifneq ($(LOCALCFG),) 
    403406 include $(LOCALCFG) 
    404 endif 
    405  
    406  
    407 # 
    408 # Check the build type. 
    409 # 
    410 VBOX_BUILD_TYPES ?= release profile debug kprofile #todo: checked 
    411 ifn1of ($(KBUILD_TYPE), $(VBOX_BUILD_TYPES)) 
    412  $(error Invalid BUILD_TYPE value '$(KBUILD_TYPE)'. Choose one these: $(VBOX_BUILD_TYPES)) 
    413407endif 
    414408 
    …… 
    722716  L4_LIBDIR := \ 
    723717   $(L4_DIR)/build-$(L4_ARCH)-$(L4_CPU)-$(L4_API)/lib/$(L4_ARCH)_$(L4_CPU)/$(L4_API) 
    724  endif # BUILD_TARGET == l4 
     718 endif # KBUILD_TARGET == l4 
    725719endif # L4_DIR 
    726720 
    …… 
    744738DEFS.darwin.x86 = VBOX_WITH_HYBIRD_32BIT_KERNEL 
    745739DEFS.freebsd = RT_OS_FREEBSD __FREEBSD__ 
    746 DEFS.l4      = RT_OS_L4 __L4__ __L4ENV__ L4API_l4v2 ARCH_$(BUILD_TARGET_ARCH) __NO_CTYPE _FILE_OFFSET_BITS=64 
     740DEFS.l4      = RT_OS_L4 __L4__ __L4ENV__ L4API_l4v2 ARCH_$(KBUILD_TARGET_ARCH) __NO_CTYPE _FILE_OFFSET_BITS=64 
    747741DEFS.linux   = RT_OS_LINUX _FILE_OFFSET_BITS=64 
    748742DEFS.netbsd  = RT_OS_NETBSD 
    …… 
    817811 ARCH_BITS_DEFS := HC_ARCH_BITS=32 GC_ARCH_BITS=32 
    818812else 
    819  error BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH) 
     813 error KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH) 
    820814endif 
    821815 
    …… 
    26702664 
    26712665# 
    2672 # Template for building Linux host tools (only for BUILD_TARGET=l4) 
     2666# Template for building Linux host tools (only for KBUILD_TARGET=l4) 
    26732667# 
    26742668TEMPLATE_VBOXLNXHOSTR3EXE                   = Template for building linux host programs. 
    …… 
    27032697# For the time being, we force 32-bitness onto this and related 
    27042698# templates (via BLD_TRG_ARCH). When we start doing 64-bit guest 
    2705 # however, they will be reverted to follow BUILD_TARGET_ARCH. 
     2699# however, they will be reverted to follow KBUILD_TARGET_ARCH. 
    27062700# So, if someone sees any weirdness happening in a 64-bit build now, 
    2707 # try do a 32-bit cross build (kmk BUILD_TARGET_ARCH=x86) first. It 
     2701# try do a 32-bit cross build (kmk KBUILD_TARGET_ARCH=x86) first. It 
    27082702# 
    27092703TEMPLATE_VBOXGUESTR3EXE           = VBox Guest Program 

  • trunk/Makefile.kmk

    r8760 r8761  
    530530additions-fetch: 
    531531        + $(KMK) -C tools fetch 
    532         + $(KMK) -C tools fetch BUILD_TARGET_ARCH=x86 BUILD_TARGET=linux 
    533 #       + $(KMK) -C tools fetch BUILD_TARGET_ARCH=x86 BUILD_TARGET=os2 
    534         + $(KMK) -C tools fetch BUILD_TARGET_ARCH=x86 BUILD_TARGET=solaris 
    535         + $(KMK) -C tools fetch BUILD_TARGET_ARCH=x86 BUILD_TARGET=win 
     532        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=linux 
     533#       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=os2 
     534        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=solaris 
     535        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=win 
    536536 
    537537 
    …… 
    542542        additions-build-linux.x86 
    543543 
    544 VBOX_ADDITIONS_BUILD = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 BUILD_TYPE=$(KBUILD_TYPE) all packing 
     544VBOX_ADDITIONS_BUILD = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 KBUILD_TYPE=$(KBUILD_TYPE) all packing 
    545545 
    546546additions-build-win.x86: 
    547547ifeq ($(KBUILD_TARGET),win) 
    548         + $(KMK) BUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_WIN32_ONLY=1 $(VBOX_ADDITIONS_BUILD) 
     548        + $(KMK) KBUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_WIN32_ONLY=1 $(VBOX_ADDITIONS_BUILD) 
    549549else 
    550         ssh vbox@192.168.27.5 " cd c:/vbox/add && ./tools/env.sh --no-wine kmk BUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_WIN32_ONLY=1 $(VBOX_ADDITIONS_BUILD) " 
     550        ssh vbox@192.168.27.5 " cd c:/vbox/add && ./tools/env.sh --no-wine kmk KBUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_WIN32_ONLY=1 $(VBOX_ADDITIONS_BUILD) " 
    551551endif 
    552552 
    553553additions-build-solaris.x86: 
    554554ifeq ($(KBUILD_TARGET),solaris) 
    555         + $(KMK) BUILD_TARGET_ARCH=x86 $(VBOX_ADDITIONS_BUILD) 
     555        + $(KMK) KBUILD_TARGET_ARCH=x86 $(VBOX_ADDITIONS_BUILD) 
    556556else 
    557         ssh vbox@192.168.27.4 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk BUILD_TARGET_ARCH=x86 $(VBOX_ADDITIONS_BUILD) " 
     557        ssh vbox@192.168.27.4 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk KBUILD_TARGET_ARCH=x86 $(VBOX_ADDITIONS_BUILD) " 
    558558endif 
    559559 
    560560additions-build-os2.x86: 
    561561#ifeq ($(KBUILD_TARGET),os2) 
    562 #       + $(KMK) BUILD_TARGET_ARCH=x86 
     562#       + $(KMK) KBUILD_TARGET_ARCH=x86 
    563563#else 
    564 #       ssh vbox@192.168.27.3 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk BUILD_TARGET_ARCH=x86 $(VBOX_ADDITIONS_BUILD) " 
     564#       ssh vbox@192.168.27.3 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk KBUILD_TARGET_ARCH=x86 $(VBOX_ADDITIONS_BUILD) " 
    565565#endif 
    566566 
    567567additions-build-linux.x86: 
    568568ifeq ($(KBUILD_TARGET),linux) 
    569         + $(KMK) BUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_LINUX_ONLY=1 $(VBOX_ADDITIONS_BUILD) 
     569        + $(KMK) KBUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_LINUX_ONLY=1 $(VBOX_ADDITIONS_BUILD) 
    570570else 
    571         ssh vbox@192.168.27.2 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk BUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_LINUX_ONLY=1 $(VBOX_ADDITIONS_BUILD) " 
     571        ssh vbox@192.168.27.2 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk KBUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_LINUX_ONLY=1 $(VBOX_ADDITIONS_BUILD) " 
    572572endif 
    573573 

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

    r8760 r8761  
    44# 
    55# Cross building of the additions is generally done by remote building 
    6 # by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting BUILD_TARGET 
     6# by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting KBUILD_TARGET 
    77# to the desired target. 
    88# 
    …… 
    1313# Building the linux additions as part of the l4 build is ok because 
    1414# l4 is built on a linux platform. This is why we have to check if 
    15 # BUILD_TARGET is l4 or linux in some places, though most of the magic 
     15# KBUILD_TARGET is l4 or linux in some places, though most of the magic 
    1616# is done in the templates (Config.kmk). 
    1717# 

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

    r8760 r8761  
    188188        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \ 
    189189                -e "s;_BUILD_;$(shell date);g" \ 
    190                 -e "s;_ARCH_;${BUILD_TARGET_ARCH};g" \ 
     190                -e "s;_ARCH_;${KBUILD_TARGET_ARCH};g" \ 
    191191                < install.sh > $(PATH_TARGET)/install/install.sh 
    192192        $(QUIET)chmod 0744 $(PATH_TARGET)/install/install.sh 

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

    r8760 r8761  
    535535# 
    536536# RuntimeGuestR3 - Guest Additions Runtime (static). 
    537 # (The BUILD_PLATFORM inheritance here is for l4 cross building the linux 
     537# (The KBUILD_HOST inheritance here is for l4 cross building the linux 
    538538# additions, while .x86 is for cross building x86 while targeting amd64.) 
    539539# 
    …… 
    541541RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win) 
    542542RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS)) 
    543 RuntimeGuestR3_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET)) 
     543RuntimeGuestR3_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET)) 
    544544RuntimeGuestR3_DEFS.$(KBUILD_HOST)      := $(RuntimeR3_DEFS.$(KBUILD_HOST)) 
    545545RuntimeGuestR3_INCS                     := $(RuntimeR3_INCS) 
    546 RuntimeGuestR3_INCS.$(KBUILD_TARGET)    := $(RuntimeR3_INCS.$(KBUILD_TARGET)) 
    547 RuntimeGuestR3_INCS.$(KBUILD_HOST)   := $(RuntimeR3_INCS.$(KBUILD_HOST)) 
     546RuntimeGuestR3_INCS.$(KBUILD_TARGET)    := $(RuntimeR3_INCS.$(KBUILD_TARGET)) 
     547RuntimeGuestR3_INCS.$(KBUILD_HOST)      := $(RuntimeR3_INCS.$(KBUILD_HOST)) 
    548548RuntimeGuestR3_SOURCES                  := $(filter-out \ 
    549549        common/time/timesupref.cpp \ 
    …… 
    556556        VBox/logbackdoor.cpp 
    557557RuntimeGuestR3_SOURCES.$(KBUILD_TARGET)  := $(RuntimeR3_SOURCES.$(KBUILD_TARGET)) 
    558 RuntimeGuestR3_SOURCES.$(KBUILD_HOST):= $(RuntimeR3_SOURCES.$(KBUILD_HOST)) 
    559 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) 
    560 RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)) 
     558RuntimeGuestR3_SOURCES.$(KBUILD_HOST)    := $(RuntimeR3_SOURCES.$(KBUILD_HOST)) 
     559RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) 
     560RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)) 
    561561RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).x86 := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).x86) 
    562 RuntimeGuestR3_SOURCES.$(KBUILD_HOST).x86 := $(RuntimeR3_SOURCES.$(KBUILD_HOST).x86) 
     562RuntimeGuestR3_SOURCES.$(KBUILD_HOST).x86   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).x86) 
    563563 
    564564 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy