Changeset 2325 in kBuild

Timestamp:

Apr 10, 2009 4:17:25 PM (16 years ago)

Author:

bird

Message:

Backported 2274: footer.kmk,header.kmk: Enhanced tools inhertiance

Location:

branches/kBuild-0.1.5

Files:

• . (modified) (1 prop)
• kBuild/footer.kmk (modified) (1 diff)
• kBuild/header.kmk (modified) (2 diffs)

branches/kBuild-0.1.5/kBuild/footer.kmk

@@ -1337 +1337 @@
 properties_deferred_r := $(PROPS_ACCUMULATE_R)
 
+src_prefix := SDK_
+load_function := def_sdk_load_function
+$(foreach trg, $(addprefix SDK_,$(_SDKS)), $(evalval def_inherit))
+
+properties_deferred   := $(PROPS_SINGLE) $(PROPS_DEFERRED) $(PROPS_TOOLS_ONLY)
 src_prefix := TOOL_
 load_function := def_tools_load_function
 $(foreach trg, $(addprefix TOOL_,$(_TOOLS)), $(evalval def_inherit))
-
-src_prefix := SDK_
-load_function := def_sdk_load_function
-$(foreach trg, $(addprefix SDK_,$(_SDKS)), $(evalval def_inherit))
 
 # done inheriting.

branches/kBuild-0.1.5/kBuild/header.kmk

@@ -889 +889 @@
 PROPS_ALL = $(PROPS_SINGLE) $(PROPS_DEFERRED) $(PROPS_ACCUMULATE_L) $(PROPS_ACCUMULATE_R)
 
-
 ## @name Properties valid on programs (BLDPROGS and PROGRAMS)
 ## @{
@@ -945 +944 @@
 PROPS_FETCHES_ACCUMULATE_L   := SOURCES CLEAN
 ## @}
+
+## KBUILD_COMPILE_CATEGTORIES
+# Tools categories for compiling.
+KBUILD_COMPILE_CATEGTORIES   := AS C CXX OBJC OBJCXX RC
+
+## KBUILD_GENERIC_CATEGORIES
+# Generic tool categories.
+KBUILD_GENERIC_CATEGORIES    := FETCH UNPACK PATCH $(addprefix LINK_,LIBRARY PROGRAM DLL SYSMOD MISCBIN)
+
+## PROPS_TOOLS_ONLY
+# Properties found only on tools.
+# This is expanded in a deferred manner, so it will pick up changes made to
+# KBUILD_COMPILE_CATEGTORIES and KBUILD_GENERIC_CATEGORIES made by units.
+PROPS_TOOLS_ONLY              = \
+        $(foreach cat, $(KBUILD_COMPILE_CATEGTORIES), \
+                COMPILE_$(cat)_CMDS \
+                COMPILE_$(cat)_OUTPUT \
+                COMPILE_$(cat)_OUTPUT_MAYBE \
+                COMPILE_$(cat)_DEPEND \
+                COMPILE_$(cat)_DEPORD \
+                COMPILE_$(cat)_USES_KOBJCACHE ) \
+        $(foreach cat, $(KBUILD_GENERIC_CATEGORIES), \
+                $(cat)_CMDS \
+                $(cat)_OUTPUT \
+                $(cat)_OUTPUT_MAYBE \
+                $(cat)_DEPEND \
+                $(cat)_DEPORD ))