Changeset 1621 in kBuild

Timestamp:

May 12, 2008 7:44:45 PM (17 years ago)

Author:

bird

Message:

Introduce the concept of units to prevent footer.kmk from growing beyond proportions. Features that are rarely used are put into units and dragged in via the USES property when needed. The first example of this is how lex (.l files) is handled.

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (7 diffs)
• header.kmk (modified) (4 diffs)
• tools/FLEX.kmk (added)
• units (added)
• units/lex.kmk (added)

trunk/kBuild/footer.kmk

@@ -1072 +1072 @@
 
 #
-# Include tools & sdks
+# Include tools, sdks and units.
 #
 # The first part of this exercise is to figure out which TOOLS and SDKS
@@ -1084 +1084 @@
           $(SDKS.$(KBUILD_TYPE)) \
           $(SDKS)
+_USES  := $(USES.$(KBUILD_TARGET))   $(USES.$(KBUILD_TARGET_ARCH))   $(USES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
+          $(USES.$(KBUILD_HOST)) $(USES.$(KBUILD_HOST_ARCH)) $(USES.$(KBUILD_HOST).$(KBUILD_HOST_ARCH)) \
+          $(USES.$(KBUILD_TYPE)) \
+          $(USES)
 define def_tools_sdks_target_source
 $(eval _TOOLS += $(foreach prop, $(PROPS_TOOLS), \
@@ -1105 +1109 @@
         $($(source)_SDKS) \
         $($(target)_$(source)_SDKS))
+$(eval _USES += \
+        $($(source)_USES.$(_bld_trg)) \
+        $($(target)_$(source)_USES.$(_bld_trg)) \
+        $($(source)_USES.$(_bld_trg).$(_bld_trg_arch)) \
+        $($(target)_$(source)_USES.$(_bld_trg).$(_bld_trg_arch)) \
+        $($(source)_USES.$(_bld_trg_arch)) \
+        $($(target)_$(source)_USES.$(_bld_trg_arch)) \
+        $($(source)_USES.$(KBUILD_TYPE)) \
+        $($(target)_$(source)_USES.$(KBUILD_TYPE)) \
+        $($(source)_USES) \
+        $($(target)_$(source)_USES))
 endef # def_tools_sdks_target_source
 
@@ -1123 +1138 @@
         $($(target)_SDKS.$(_bld_trg).$(_bld_trg_arch)) \
         $($(target)_SDKS))
+$(eval _USES += \
+        $($(target)_USES.$(_bld_trg)) \
+        $($(target)_USES.$(_bld_trg_arch)) \
+        $($(target)_USES.$(_bld_trg).$(_bld_trg_arch)) \
+        $($(target)_USES))
 $(foreach source, \
         $($(target)_SOURCES.$(_bld_trg)) \
@@ -1193 +1213 @@
 endef # def_sdk_load_function
 
+## Unit load function.
+# @param loading    The unit name
+define def_unit_load_function
+ifndef UNIT_$(loading)
+ UNIT_$(loading)_KMK_FILE := $(firstword $(foreach path, $(KBUILD_UNIT_PATHS) $(KBUILD_PATH)/units $(KBUILD_DEFAULT_PATHS), $(wildcard $(path)/$(loading).kmk)))
+ ifeq ($(UNIT_$(loading)_KMK_FILE),)
+  $(error kBuild: Cannot find include file for the unit '$(loading)'! Searched: $(KBUILD_UNIT_PATHS) $(KBUILD_PATH)/units $(KBUILD_DEFAULT_PATHS))
+ endif
+ include $(UNIT_$(loading)_KMK_FILE)
+ ifndef UNIT_$(loading)
+  $(warning kBuild: UNIT_$(loading) was not defined by $(UNIT_$(loading)_KMK_FILE)!)
+ endif
+endif
+endef # def_unit_load_function
+
 
 properties :=
@@ -1219 +1254 @@
 properties_deferred_r :=
 
+# No inheriting for the uses, they're just global 'code'.
+$(foreach loading, $(_USES), $(evalval def_unit_load_function))
+
 
 ifdef KBUILD_PROFILE_SELF
  _KBUILD_TS_NOW := $(nanots )
- $(info prof: $(int-sub $(_KBUILD_TS_NOW), $(_KBUILD_TS_HEADER_START)) - $(int-sub $(_KBUILD_TS_NOW), $(_KBUILD_TS_PREV)) - done tools and sdks)
+ $(info prof: $(int-sub $(_KBUILD_TS_NOW), $(_KBUILD_TS_HEADER_START)) - $(int-sub $(_KBUILD_TS_NOW), $(_KBUILD_TS_PREV)) - done tools, sdks and units)
  $(info stat: $(make-stats ))
  _KBUILD_TS_PREV := $(_KBUILD_TS_NOW)
@@ -2016 +2054 @@
         $($(target)_SOURCES.$(bld_trg_cpu))\
         $($(target)_SOURCES.$(bld_type))\
+        ,$(evalval def_src_handler_one) )
+
+$(foreach source,\
+        $($(target)_GEN_SOURCES_)\
+        $($(target)_GEN_SOURCES_.$(bld_trg))\
+        $($(target)_GEN_SOURCES_.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_GEN_SOURCES_.$(bld_trg_arch))\
+        $($(target)_GEN_SOURCES_.$(bld_trg_cpu))\
+        $($(target)_GEN_SOURCES_.$(bld_type))\
         ,$(evalval def_src_handler_one) )
 endef

trunk/kBuild/header.kmk

@@ -657 +657 @@
 KBUILD_SDK_PATHS :=
 
+## KBUILD_UNIT_PATHS
+# List of paths (separated by space) where units (USES) can be found.
+KBUILD_UNIT_PATHS :=
+
 ## KBUILD_DEFAULT_PATHS
 # List of paths (separated by space) to search for stuff as a last resort.
@@ -690 +694 @@
 ## PROPS_TOOLS
 # This is a subset of PROPS_SINGLE.
-PROPS_TOOLS := TOOL CTOOL CXXTOOL OBJCTOOL ASTOOL RCTOOL ARTOOL LDTOOL FETCHTOOL UNPACKTOOL PATCHTOOL
+PROPS_TOOLS := TOOL CTOOL CXXTOOL OBJCTOOL ASTOOL RCTOOL ARTOOL LDTOOL LEXTOOL FETCHTOOL UNPACKTOOL PATCHTOOL
 
 ## PROPS_SINGLE
@@ -701 +705 @@
 # Subset of PROPS_SINGLE which applies to all linkable targets.
 PROPS_SINGLE_LNK := TOOL TEMPLATE CTOOL CXXTOOL OBJCTOOL ASTOOL RCTOOL \
-    INST NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU \
+        INST NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU \
         OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF ASOBJSUFF RCOBJSUFF
 
@@ -742 +746 @@
 # will do the necessary inheritance from templates to targets.
 PROPS_ACCUMULATE_L := \
-        SDKS SOURCES SRC_HANDLERS INTERMEDIATES \
+        SDKS USES SOURCES SRC_HANDLERS INTERMEDIATES \
         INCS CINCS CXXINCS OBJCINCS ASINCS RCINCS \
         LIBS LIBPATH \