VirtualBox

Changeset 2084 in kBuild


Ignore:
Timestamp:
Nov 19, 2008 2:35:03 AM (16 years ago)
Author:
bird
Message:

Added a new target type MISCBINS for linking together objs and libs into whatever you want.

Location:
trunk/kBuild
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/footer.kmk

    r2080 r2084  
    5151_ALL_PROGRAMS    := $(PROGRAMS)    $(PROGRAMS.$(KBUILD_TARGET))      $(PROGRAMS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))        $(PROGRAMS.$(KBUILD_TARGET_ARCH))    $(PROGRAMS.$(KBUILD_TARGET_CPU))     $(PROGRAMS.$(KBUILD_TYPE))
    5252_ALL_SYSMODS     := $(SYSMODS)     $(SYSMODS.$(KBUILD_TARGET))       $(SYSMODS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))         $(SYSMODS.$(KBUILD_TARGET_ARCH))     $(SYSMODS.$(KBUILD_TARGET_CPU))      $(SYSMODS.$(KBUILD_TYPE))
     53_ALL_MISCBINS    := $(MISCBINS)    $(MISCBINS.$(KBUILD_TARGET))      $(MISCBINS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))        $(MISCBINS.$(KBUILD_TARGET_ARCH))    $(MISCBINS.$(KBUILD_TARGET_CPU))     $(MISCBINS.$(KBUILD_TYPE))
    5354_ALL_OTHERS      := $(OTHERS)      $(OTHERS.$(KBUILD_TARGET))        $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))          $(OTHERS.$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_CPU))       $(OTHERS.$(KBUILD_TYPE))
    5455_ALL_INSTALLS    := $(INSTALLS)    $(INSTALLS.$(KBUILD_TARGET))      $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))        $(INSTALLS.$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_CPU))     $(INSTALLS.$(KBUILD_TYPE))
    … …  
    6667        $(_ALL_PROGRAMS) \
    6768        $(_ALL_SYSMODS) \
     69        $(_ALL_MISCBINS) \
    6870        $(_ALL_INSTALLS) \
    6971        $(_ALL_OTHERS)
    … …  
    7880        $(_ALL_PROGRAMS) \
    7981        $(_ALL_SYSMODS) \
     82        $(_ALL_MISCBINS) \
    8083        $(_ALL_INSTALLS) \
    8184        $(_ALL_OTHERS)
    … …  
    117120_PROGRAMS :=
    118121_SYSMODS  :=
     122_MISCBINS :=
    119123_INSTALLS :=
    120124_INSTALLS_FILES :=
    … …  
    916920properties_deferred := $(PROPS_SYSMODS_DEFERRED)
    917921$(foreach trg, $(_ALL_SYSMODS),$(evalval def_inherit))
     922
     923# Misc binaries.
     924properties          := $(PROPS_MISCBINS_SINGLE)
     925properties_now_l    := $(PROPS_MISCBINS_ACCUMULATE_L)
     926properties_now_r    := $(PROPS_MISCBINS_ACCUMULATE_R)
     927properties_deferred := $(PROPS_MISCBINS_DEFERRED)
     928$(foreach trg, $(_ALL_MISCBINS),$(evalval def_inherit))
    918929
    919930# Installs.
    … …  
    15351546bld_trg_base_var := TARGET
    15361547$(foreach target, $(_ALL_SYSMODS), \
     1548        $(evalval def_pass1_link_common))
     1549
     1550
     1551#
     1552# MISCBINS (Pass 1)
     1553#
     1554EXT     := BIN
     1555EXTPRE  :=
     1556definst := $(PATH_BIN)
     1557tool_prefix := LD
     1558bld_trg_base_var := TARGET
     1559$(foreach target, $(_ALL_MISCBINS), \
    15371560        $(evalval def_pass1_link_common))
    15381561
    … …  
    30123035
    30133036#
     3037# MISCBINS
     3038#
     3039
     3040# Process MISCBINS
     3041EXT     := BIN
     3042EXTPRE  :=
     3043tool_do := LINK_MISCBIN
     3044definst := $(PATH_BIN)
     3045typevar := _MISCBINS
     3046mode    := 0644
     3047bld_trg_base_var := TARGET
     3048$(foreach target, $(_ALL_MISCBINS), $(evalval def_link_common))
     3049
     3050ifdef KBUILD_PROFILE_SELF
     3051 $(evalcall def_profile_self, done misc binary targets)
     3052endif
     3053
     3054
     3055#
    30143056# OTHERS
    30153057#
    … …  
    36233665
    36243666# misc shortcuts (use secondary expansion here to save strcache[file] space).
    3625 targets:   bldprogs libraries dlls programs sysmods others installs
     3667targets:   bldprogs libraries dlls programs sysmods miscbins others installs
    36263668objects:   $$(_OBJS)
    36273669bldprogs:  $$(_BLDPROGS)
    … …  
    36303672programs:  $$(_PROGRAMS)
    36313673sysmods:   $$(_SYSMODS)
     3674miscbins:  $$(_MISCBINS)
    36323675others:    $$(_OTHERS)
    36333676installs:  $$(_INSTALLS) $$(_INSTALLS_DIRS) $$(_INSTALLS_FILES)
    … …  
    36823725 ifneq ($(KBUILD_PROFILE_SELF),0)
    36833726  $(info prof: ALL=$(words $(_ALL_TARGETS)) BLDPROGS=$(words $(_ALL_BLDPROGS)) LIBRARIES=$(words $(_ALL_LIBRARIES)) IMPORT_LIBS=$(words $(IMPORT_LIBS)) DLLS=$(words $(DLLS)) PROGRAMS=$(words $(_ALL_PROGRAMS)) )
    3684   $(info prof: SYSMODS=$(words $(_ALL_SYSMODS)) OTHERS=$(words $(_ALL_OTHERS)) INSTALLS=$(words $(_ALL_INSTALLS)) FETCHES=$(words $(_ALL_FETCHES)) PACKING=$(words $(_PACKING)) TESTING=$(words $(TESTING)) )
     3727  $(info prof: SYSMODS=$(words $(_ALL_SYSMODS)) MISCBINS=$(words $(_ALL_MISCBINS)) OTHERS=$(words $(_ALL_OTHERS)) INSTALLS=$(words $(_ALL_INSTALLS)) FETCHES=$(words $(_ALL_FETCHES)) PACKING=$(words $(_PACKING)) TESTING=$(words $(TESTING)) )
    36853728  $(info prof: DIRS=$(words $(_DIR_ALL)) TOOLS=$(words $(_TOOLS)) SDKS=$(words $(_SDKS)) USES=$(words $(_USES)) OUT_FILES=$(words $(_OUT_FILES)) OBJS=$(words $(_OBJS)) CLEAN_FILES=$(words $(CLEAN_FILES) $(OTHER_CLEAN)) )
    36863729  $(info prof: DEPFILES_INCLUDED=$(words $(_DEPFILES_INCLUDED)) DEPFILES=$(words $(_DEPFILES)) MAKEFILES=$(words $(MAKEFILE_LIST)) )

  • trunk/kBuild/header.kmk

    r2018 r2084  
    819819## @}
    820820
     821## @name Properties valid on misc binaries (MISCBINS)
     822## @{
     823PROPS_MISCBINS_SINGLE        := $(PROPS_SINGLE_LNK) LDTOOL BINSUFF
     824PROPS_MISCBINS_DEFERRED      := $(PROPS_DEFERRED)
     825PROPS_MISCBINS_ACCUMULATE_R  := $(PROPS_ACCUMULATE_R_LNK) LDFLAGS
     826PROPS_MISCBINS_ACCUMULATE_L  := $(PROPS_ACCUMULATE_L_LNK) LIBS LIBPATH
     827## @}
     828
    821829## @name Properties valid on installs (INSTALLS)
    822830## @{
    … …  
    852860endef
    853861$(foreach prop, $(PROPS_ALL) \
    854         FETCHES PATCHES BLDPROGS LIBRARIES IMPORT_LIBS DLLS PROGRAMS SYSMODS INSTALLS OTHERS \
     862        FETCHES PATCHES BLDPROGS LIBRARIES IMPORT_LIBS DLLS PROGRAMS SYSMODS MISCBINS INSTALLS OTHERS \
    855863        SUBDIRS MAKEFILES BLDDIRS \
    856864        ,$(eval $(value def_nuke_environment_prop)))
    … …  
    906914PASS_BINARIES       := Programs
    907915PASS_BINARIES_trgs  :=
    908 PASS_BINARIES_vars  := _PROGRAMS _SYSMODS _OTHER_BINARIES
     916PASS_BINARIES_vars  := _PROGRAMS _SYSMODS _MISC_BINS _OTHER_BINARIES
    909917PASS_BINARIES_pass  := binaries
    910918

  • trunk/kBuild/subfooter.kmk

    r2018 r2084  
    7171        $(PROGRAMS)    $(PROGRAMS.$(KBUILD_TARGET))     $(PROGRAMS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(PROGRAMS.$(KBUILD_TARGET_ARCH))    $(PROGRAMS.$(KBUILD_TARGET_CPU))    $(PROGRAMS.$(KBUILD_TYPE))    \
    7272        $(SYSMODS)     $(SYSMODS.$(KBUILD_TARGET))      $(SYSMODS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))     $(SYSMODS.$(KBUILD_TARGET_ARCH))     $(SYSMODS.$(KBUILD_TARGET_CPU))     $(SYSMODS.$(KBUILD_TYPE))     \
     73        $(MISCBINS)    $(MISCBINS.$(KBUILD_TARGET))     $(MISCBINS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(MISCBINS.$(KBUILD_TARGET_ARCH))    $(MISCBINS.$(KBUILD_TARGET_CPU))    $(MISCBINS.$(KBUILD_TYPE))    \
    7374        $(INSTALLS)    $(INSTALLS.$(KBUILD_TARGET))     $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_CPU))    $(INSTALLS.$(KBUILD_TYPE))    \
    7475        $(OTHERS)      $(OTHERS.$(KBUILD_TARGET))       $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_CPU))      $(OTHERS.$(KBUILD_TYPE))      \

  • trunk/kBuild/subheader.kmk

    r2018 r2084  
    8282        $(PROGRAMS)    $(PROGRAMS.$(KBUILD_TARGET))     $(PROGRAMS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(PROGRAMS.$(KBUILD_TARGET_ARCH))    $(PROGRAMS.$(KBUILD_TARGET_CPU))    $(PROGRAMS.$(KBUILD_TYPE))    \
    8383        $(SYSMODS)     $(SYSMODS.$(KBUILD_TARGET))      $(SYSMODS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))     $(SYSMODS.$(KBUILD_TARGET_ARCH))     $(SYSMODS.$(KBUILD_TARGET_CPU))     $(SYSMODS.$(KBUILD_TYPE))     \
     84        $(MISCBINS)    $(MISCBINS.$(KBUILD_TARGET))     $(MISCBINS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(MISCBINS.$(KBUILD_TARGET_ARCH))    $(MISCBINS.$(KBUILD_TARGET_CPU))    $(MISCBINS.$(KBUILD_TYPE))    \
    8485        $(INSTALLS)    $(INSTALLS.$(KBUILD_TARGET))     $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_CPU))    $(INSTALLS.$(KBUILD_TYPE))    \
    8586        $(OTHERS)      $(OTHERS.$(KBUILD_TARGET))       $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_CPU))      $(OTHERS.$(KBUILD_TYPE))      \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette