VirtualBox

Changeset 8759

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

BUILD_TYPE -> KBUILD_TYPE.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Config.kmk

    r8758 r8759  
    222222#VBOX_WITH_VBOXFB = 1 
    223223# Enable the debugger. 
    224 ifneq ($(BUILD_TYPE),release) 
     224ifneq ($(KBUILD_TYPE),release) 
    225225 VBOX_WITH_DEBUGGER = 1 
    226226 # Enable the debugger GUI. 
    …… 
    271271VBOX_WITH_INTEL_PXE = 1 
    272272# Strip binaries of release and profile builds 
    273 VBOX_DO_STRIP = $(if $(filter release profile,$(BUILD_TYPE)),1,) 
     273VBOX_DO_STRIP = $(if $(filter release profile,$(KBUILD_TYPE)),1,) 
    274274# Strip R0/GC modules (current requirement for our loader) 
    275275VBOX_DO_STRIP_MODULES = 1 
    …… 
    409409# 
    410410VBOX_BUILD_TYPES ?= release profile debug kprofile #todo: checked 
    411 ifn1of ($(BUILD_TYPE), $(VBOX_BUILD_TYPES)) 
    412  $(error Invalid BUILD_TYPE value '$(BUILD_TYPE)'. Choose one these: $(VBOX_BUILD_TYPES)) 
     411ifn1of ($(KBUILD_TYPE), $(VBOX_BUILD_TYPES)) 
     412 $(error Invalid BUILD_TYPE value '$(KBUILD_TYPE)'. Choose one these: $(VBOX_BUILD_TYPES)) 
    413413endif 
    414414 
    …… 
    726726 
    727727# Produce debugging information that the Fiasco kernel debugger can read. 
    728 ifeq ($(KBUILD_TARGET).$(BUILD_TYPE),l4.debug) 
     728ifeq ($(KBUILD_TARGET).$(KBUILD_TYPE),l4.debug) 
    729729 DEBUG_L4 = -gstabs+ 
    730730endif 
    …… 
    779779# Compiler optimization flags. 
    780780# 
    781 ifeq ($(BUILD_TYPE),debug) 
     781ifeq ($(KBUILD_TYPE),debug) 
    782782 VBOX_GCC_FP  ?= -fno-omit-frame-pointer 
    783783 VBOX_GCC_OPT ?= -O0 
    …… 
    894894 
    895895# The kprofile build automagically links with kProfile. 
    896 ifeq ($(BUILD_TYPE),kprofile) 
     896ifeq ($(KBUILD_TYPE),kprofile) 
    897897 LIB_RUNTIME    += $(LIB_KPROFILE) 
    898898endif 
    …… 
    27642764TEMPLATE_VBOXGUESTR3XF86MOD         = VBox Guest Program with C++ library dependencies 
    27652765TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBOXGUESTR3EXE 
    2766 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(BUILD_TYPE)      = $(NO_SUCH_VARIABLE) 
     2766TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE)      = $(NO_SUCH_VARIABLE) 
    27672767TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE) 
    27682768TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.linux              = $(NO_SUCH_VARIABLE) 
    27692769TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 
    2770 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(BUILD_TYPE)   = $(NO_SUCH_VARIABLE) 
     2770TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE)   = $(NO_SUCH_VARIABLE) 
    27712771TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux           = $(NO_SUCH_VARIABLE) 
    27722772TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS                 = -r 
    …… 
    27902790TEMPLATE_VBOXGUESTR3XORGMOD         = VBox Guest Program with C++ library dependencies 
    27912791TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL 
    2792 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(BUILD_TYPE)      = $(NO_SUCH_VARIABLE) 
     2792TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE)      = $(NO_SUCH_VARIABLE) 
    27932793TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE) 
    27942794TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.linux              = $(NO_SUCH_VARIABLE) 

  • trunk/Makefile.kmk

    r8758 r8759  
    542542        additions-build-linux.x86 
    543543 
    544 VBOX_ADDITIONS_BUILD = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 BUILD_TYPE=$(BUILD_TYPE) all packing 
     544VBOX_ADDITIONS_BUILD = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 BUILD_TYPE=$(KBUILD_TYPE) all packing 
    545545 
    546546additions-build-win.x86: 

  • trunk/src/Makefile.kmk

    r8155 r8759  
    3030 ifdef VBOX_IPC_RELEASE_LOG 
    3131  SUBDIRS = VBox/Runtime 
    32  else ifneq ($(BUILD_TYPE),release) 
     32 else ifneq ($(KBUILD_TYPE),release) 
    3333  SUBDIRS = VBox/Runtime 
    3434 else 

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

    r8758 r8759  
    9494ifdef VBOX_WITH_ADDITIONS_ISO.win.x86 
    9595 ifdef VBOX_ONLY_ADDITIONS 
    96   VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$(BUILD_TYPE)/bin/additions 
     96  VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/bin/additions 
    9797 else 
    9898  # 32-only hack 
    …… 
    130130ifdef VBOX_WITH_ADDITIONS_ISO.os2.x86 
    131131 ifdef VBOX_ONLY_ADDITIONS 
    132   VBOX_PATH_ADDITIONS.os2.x86 = $(PATH_OUT_BASE)/os2.x86/$(BUILD_TYPE)/bin/additions 
     132  VBOX_PATH_ADDITIONS.os2.x86 = $(PATH_OUT_BASE)/os2.x86/$(KBUILD_TYPE)/bin/additions 
    133133 else 
    134134  VBOX_PATH_ADDITIONS.os2.x86 = $(VBOX_PATH_ADDITIONS) 
    …… 
    156156ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86 
    157157 ifdef VBOX_ONLY_ADDITIONS 
    158   VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(BUILD_TYPE)/bin/additions 
     158  VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions 
    159159 else 
    160160  # 32-bit only hack 
    …… 
    171171ifdef VBOX_WITH_ADDITIONS_ISO.solaris.x86 
    172172 ifdef VBOX_ONLY_ADDITIONS 
    173   VBOX_PATH_ADDITIONS.solaris.x86 = $(PATH_OUT_BASE)/solaris.x86/$(BUILD_TYPE)/bin/additions 
     173  VBOX_PATH_ADDITIONS.solaris.x86 = $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions 
    174174 else 
    175175  # 32-bit only hack 
    …… 
    185185ifdef VBOX_WITH_ADDITIONS_ISO.freebsd.x86 
    186186 ifdef VBOX_ONLY_ADDITIONS 
    187   VBOX_PATH_ADDITIONS.freebsd.x86 = $(PATH_OUT_BASE)/freebsd.x86/$(BUILD_TYPE)/bin/additions 
     187  VBOX_PATH_ADDITIONS.freebsd.x86 = $(PATH_OUT_BASE)/freebsd.x86/$(KBUILD_TYPE)/bin/additions 
    188188 else 
    189189  # 32-bit only hack 

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

    r8757 r8759  
    3636FREEBSDINSTDIR := $(PATH_TARGET)/install 
    3737 
    38 ifeq ($(BUILD_TYPE),debug) 
     38ifeq ($(KBUILD_TYPE),debug) 
    3939 BIN_COPY         := $(CP) -f 
    4040 BIN_COPY_SYMBOLS := $(CP) -f 

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

    r8758 r8759  
    4343include $(PATH_KBUILD)/subfooter.kmk 
    4444 
    45 ifeq ($(BUILD_TYPE),debug) 
     45ifeq ($(KBUILD_TYPE),debug) 
    4646 BIN_COPY         = $(CP) -f 
    4747 BIN_COPY_SYMBOLS = $(CP) -f 
    …… 
    107107                | $(SED) "s;_BUILD_;$(shell date);g" \ 
    108108                | $(SED) "s;_OSE_;$(VBOX_OSE);g" \ 
    109                 | $(SED) "s;_BUILDTYPE_;$(BUILD_TYPE);g" \ 
     109                | $(SED) "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \ 
    110110                > $(PATH_TARGET)/install/install_.sh 
    111111        $(QUIET)$(INSTALL) -m 0755 $(PATH_TARGET)/install/install_.sh $(PATH_TARGET)/install/install.sh 

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

    r8757 r8759  
    3939SOLARISTEMPDIR := $(PATH_TARGET)/tempinstall 
    4040 
    41 ifeq ($(BUILD_TYPE),debug) 
     41ifeq ($(KBUILD_TYPE),debug) 
    4242 BIN_COPY         := $(CP) -f 
    4343 BIN_COPY_SYMBOLS := $(CP) -f 

  • trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

    r8732 r8759  
    8080$(PATH_TARGET)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $(PATH_TARGET)/vbetables.h 
    8181        $(call MSG_TOOL,cpp,VgaBiosBin,$<,$@) 
    82         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -DVBOX -DVBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" -DVBE -DVGABIOS_DATE="''" $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) -o $@ $< 
     82        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -DVBOX -DVBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" -DVBE -DVGABIOS_DATE="''" $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) -o $@ $< 
    8383 
    8484# 3. compile - tempfile clashes, so make sure it's built in solitude. 

  • trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

    r8155 r8759  
    6868                $(PATH_SUB_CURRENT)/../DevPcBios.h $(PATH_ROOT)/include/VBox/bioslogo.h | $(call DIRDEP,$(TARGET_PATH)) 
    6969        $(call MSG_TOOL,cpp,PcBiosBin,$<,$@) 
    70         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) -P -o $@ $< 
     70        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) -P -o $@ $< 
    7171 
    7272# 2. compile to intermediate asm file - tempfile clashes, make sure it's built alone. 

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r8758 r8759  
    336336 VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER 
    337337endif 
    338 ifneq ($(BUILD_TYPE),release) 
     338ifneq ($(KBUILD_TYPE),release) 
    339339 # non-release builds has some extra features. 
    340340 VirtualBox_DEFS.win     += VBOX_GUI_USE_DDRAW 
    …… 
    370370 
    371371 
    372 ifeq ($(BUILD_TYPE),release) 
     372ifeq ($(KBUILD_TYPE),release) 
    373373 VirtualBox_LDFLAGS.win  += /SUBSYSTEM:windows 
    374374else 

  • trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

    r8758 r8759  
    574574 VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER 
    575575endif 
    576 ifneq ($(BUILD_TYPE),release) 
     576ifneq ($(KBUILD_TYPE),release) 
    577577 # non-release builds has some extra features. 
    578578 VirtualBox_DEFS.win     += VBOX_GUI_USE_DDRAW 
    …… 
    608608 
    609609 
    610 ifeq ($(BUILD_TYPE),release) 
     610ifeq ($(KBUILD_TYPE),release) 
    611611 VirtualBox_LDFLAGS.win  += /SUBSYSTEM:windows 
    612612else 

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

    r8758 r8759  
    249249 
    250250VBoxSVC_LDFLAGS.darwin  = -framework IOKit 
    251 ifeq ($(BUILD_TYPE),debug) 
     251ifeq ($(KBUILD_TYPE),debug) 
    252252VBoxSVC_LDFLAGS.linux  += -rdynamic # for backtrace_symbols() 
    253253endif 

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

    r8758 r8759  
    654654endif 
    655655VBoxRT_DEFS                    = $(RuntimeR3_DEFS) IN_SUP_R3 IN_SUP_R3 
    656 VBoxRT_DEFS.$(BUILD_TYPE)      = $(RuntimeR3_DEFS.$(BUILD_TYPE)) 
     656VBoxRT_DEFS.$(KBUILD_TYPE)      = $(RuntimeR3_DEFS.$(KBUILD_TYPE)) 
    657657VBoxRT_SOURCES                 = \ 
    658658        VBox/VBoxRTDeps.cpp \ 

  • trunk/src/VBox/VMM/testcase/Makefile.kmk

    r8758 r8759  
    216216                $(addprefix -D, \ 
    217217                        $(DEFS) \ 
    218                         $(DEFS.$(BUILD_TYPE)) \ 
     218                        $(DEFS.$(KBUILD_TYPE)) \ 
    219219                        $(DEFS.$(KBUILD_TARGET)) \ 
    220220                        IN_RING3 \ 

  • trunk/src/libs/xpcom18a4/Makefile.kmk

    r8758 r8759  
    11421142ifdef VBOX_IPC_RELEASE_LOG 
    11431143IPC_LOGGING = 1 
    1144 else ifneq ($(BUILD_TYPE),release) 
     1144else ifneq ($(KBUILD_TYPE),release) 
    11451145IPC_LOGGING = 1 
    11461146endif 

  • trunk/src/recompiler/Makefile.kmk

    r8758 r8759  
    357357        -S -s \ 
    358358        $(filter-out -g -O0, \ 
    359                 $($(REM_MOD)_CFLAGS) $($(REM_MOD)_CFLAGS.$(BUILD_TYPE)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \ 
     359                $($(REM_MOD)_CFLAGS) $($(REM_MOD)_CFLAGS.$(KBUILD_TYPE)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \ 
    360360                $(target-i386/op.c_CFLAGS) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET_ARCH)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \ 
    361361                ) \ 
    …… 
    365365                ) \ 
    366366        $(addprefix -D, \ 
    367                 $($(REM_MOD)_CDEFS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CDEFS.$(KBUILD_TARGET)) $($(REM_MOD)_CDEFS) $(CDEFS.$(KBUILD_TARGET)) $(CDEFS.$(KBUILD_TARGET_ARCH)) $(CDEFS.$(BUILD_TYPE)) $(CDEFS) \ 
    368                 $($(REM_MOD)_DEFS.$(KBUILD_TARGET_ARCH))  $($(REM_MOD)_DEFS.$(KBUILD_TARGET))  $($(REM_MOD)_DEFS)  $(DEFS.$(KBUILD_TARGET))  $(DEFS.$(KBUILD_TARGET_ARCH))  $(DEFS.$(BUILD_TYPE))  $(DEFS) \ 
     367                $($(REM_MOD)_CDEFS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CDEFS.$(KBUILD_TARGET)) $($(REM_MOD)_CDEFS) $(CDEFS.$(KBUILD_TARGET)) $(CDEFS.$(KBUILD_TARGET_ARCH)) $(CDEFS.$(KBUILD_TYPE)) $(CDEFS) \ 
     368                $($(REM_MOD)_DEFS.$(KBUILD_TARGET_ARCH))  $($(REM_MOD)_DEFS.$(KBUILD_TARGET))  $($(REM_MOD)_DEFS)  $(DEFS.$(KBUILD_TARGET))  $(DEFS.$(KBUILD_TARGET_ARCH))  $(DEFS.$(KBUILD_TYPE))  $(DEFS) \ 
    369369                ) \ 
    370370        -Wp,-MD,$(PATH_$(REM_MOD))/op.S.dep \ 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy