Changeset 552 for trunk/kBuild/footer.kmk

Timestamp:

Sep 24, 2006, 9:37:41 AM (19 years ago)

Author:

bird

Message:

• kBuild/footer.kmk:

o Recursive template inheritance.

• kBuild/header.kmk, kBuild/footer.kmk:

o Removed some checks for features which are present in both gmake 3.81 and kmk.

Anyone trying to bootstrap kBuild will have to build gmake 3.81 first.

• Config.kmk, src/gmake:

o Allow all kinds of ways of saying Windows in BUILD_TARGET.

• kBuild/bin/x86.win32/:

o Rebuilt kmk.exe.

• kBuild/bin/x86.os2/:

o Added kDepPre.exe and kDepIDB.exe.
o Rebuilt kmk.exe and kmk_gmake.exe.

• src/gmake:

o Update KMK_FEATURES to include the optimizations from earlier this week.

File:

• trunk/kBuild/footer.kmk (modified) (7 diffs)

trunk/kBuild/footer.kmk

@@ -117 +117 @@
 # @param    bld_trg      build target.
 # @param    bld_trg_arch build target architecture.
+# @remark       Obsoleted by kBuild helpers in kmk. Only required for gmake compatbility.
 _SOURCE_TOOL = $(strip $(firstword \
         $($(target)_$(source)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
@@ -177 +178 @@
 #           1. Source files in the output directory are translated into a gen/ subdir.
 #               2. Catch anyone specifying $(PATH_SUB_CURRENT)/sourcefile.c.
+# @remark       obsoleted by kBuild helpers in kmk. Only required for gmake compatbility.
 _OBJECT_BASE = $(PATH_TARGET)/$(2)/$(call no-root-slash,$(call no-drive,$(basename \
         $(patsubst $(PATH_ROOT)/%,%,$(patsubst $(PATH_SUB_CURRENT)/%,%,$(patsubst $(PATH_TARGET)/$(2)/%,gen/%,$(1)))))))
@@ -234 +236 @@
 define def_template_extends_prop
 ifndef TEMPLATE_$(template)_$(prop)
-ifdef TEMPLATE_$(parent)_$(prop)
+ ifdef TEMPLATE_$(parent)_$(prop)
 TEMPLATE_$(template)_$(prop) = $$(TEMPLATE_$(parent)_$(prop))
-endif
-endif
-endef
+ endif
+endif
+endef
+
 
 define def_template_extends
 ifdef TEMPLATE_$(template)_EXTENDS
-parent := $(strip $(TEMPLATE_$(template)_EXTENDS))
-
-$(foreach prop, $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED)\
-$(addsuffix .$(BUILD_TARGET),                      $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-$(addsuffix .$(BUILD_TARGET).$(BUILD_TARGET_ARCH), $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-$(addsuffix .$(BUILD_TARGET_ARCH),                 $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-$(addsuffix .$(BUILD_TARGET_CPU),                  $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-$(addsuffix .$(BUILD_TYPE),                        $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-,$(eval $(def_template_extends_prop))) # exploits the 2 evaluation, so no value!
+ ifndef TEMPLATE_$(template)_EXTENDS_STATUS_
+  TEMPLATE_$(template)_EXTENDS_STATUS_ := 0
+  parent := $(strip $(TEMPLATE_$(template)_EXTENDS))
+
+  # recursivly process the parent if it's inherting from somebody too.
+  ifdef TEMPLATE_$(parent)_EXTENDS
+   ifneq ($(TEMPLATE_$(template)_EXTENDS_STATUS_),42)
+    # foreach will create 'template' in a new variable context hiding our current variable.
+    $(foreach template, $(TEMPLATE_$(parent)_EXTENDS), $(eval $(value def_template_extends)))
+    parent := $(strip $(TEMPLATE_$(template)_EXTENDS))
+   endif
+  endif
+
+  # inherit properties.
+  $(foreach prop, $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED)\
+  $(addsuffix .$(BUILD_TARGET),                      $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+  $(addsuffix .$(BUILD_TARGET).$(BUILD_TARGET_ARCH), $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+  $(addsuffix .$(BUILD_TARGET_ARCH),                 $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+  $(addsuffix .$(BUILD_TARGET_CPU),                  $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+  $(addsuffix .$(BUILD_TYPE),                        $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+  ,$(eval $(def_template_extends_prop))) # exploits the 2 evaluation, so no value!
+
+  TEMPLATE_$(template)_EXTENDS_STATUS_ := 42
+ else
+  # protect against inheritance loops.
+  ifneq ($(TEMPLATE_$(template)_EXTENDS_STATUS_),42)
+   $(error kBuild: inheritance loop! template=$(template))
+  endif
+ endif
 endif
 endef
@@ -495 +518 @@
 ## wrapper the compile command dependency check.
 ifndef NO_COMPILE_CMDS_DEPS
- ifdef NEW_KMK
+ ifneq ($(filter comp-vars,$(KMK_FEATURES)),)
 _DEP_COMPILE_CMDS = $(comp-vars $(target)_$(source)_CMDS_PREV_,$(target)_$(source)_CMDS_,FORCE)
  else
@@ -595 +618 @@
 # @param    bld_trg_arch  Build target arch.
 # @param    bld_trg_cpu   Build target cpu.
+# @remark       obsoleted by kBuild helpers in kmk. Only required for gmake compatbility.
 #
 define def_target_source_c_cpp_asm_old
@@ -868 +892 @@
         $($(target)_$(source)_$(type)FLAGS.$(bld_trg).$(bld_trg_arch))\
         $($(target)_$(source)_$(type)FLAGS.$(bld_trg_cpu))
+# this isn't 100% in sync with kBuild, but it doesn't matter as it's only for gmake now.
 objsuff     := $(firstword \
         $($(target)_$(source)_OBJSUFF.$(bld_trg).$(bld_trg_arch))\
@@ -966 +991 @@
 def_target_source_c_cpp_asm_new = $(kb-src-one x)
 
-ifdef NEW_KMK
+ifneq ($(filter kb-src-one,$(KMK_FEATURES)),)
 def_target_source_c_cpp_asm_var = def_target_source_c_cpp_asm_new
 else