Changeset 552 for trunk/kBuild/header.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/header.kmk (modified) (4 diffs)

trunk/kBuild/header.kmk ¶

@@ -163 +163 @@
 # Common definitions.
 #
-ifeq ($(filter abspath,$(KMK_FEATURES)),abspath)
-
 PATH_CURRENT        := $(abspath $(CURDIR))
 ifneq ($(strip $(SUB_DEPTH)),)
@@ -172 +170 @@
 endif
 PATH_ROOT           := $(abspath $(PATH_CURRENT)/$(DEPTH))
-
-else
-
-PATH_CURRENT        := $(CURDIR)
-PATH_SUB_CURRENT    := $(PATH_CURRENT)
-ifneq ($(strip $(SUB_DEPTH)),)
-ifneq ($(SUB_DEPTH),.)
-$(foreach d,$(subst /, ,$(SUB_DEPTH)), $(eval PATH_SUB_CURRENT := $(patsubst %/,%,$(dir $(PATH_SUB_CURRENT)))) )
-endif
-endif
-PATH_ROOT           := $(PATH_CURRENT)
-ifneq ($(DEPTH),.)
-$(foreach d,$(subst /, ,$(DEPTH)), $(eval PATH_ROOT := $(patsubst %/,%,$(dir $(PATH_ROOT)))) )
-endif
-
-endif
 
 # Subdirectory relative to the root.
@@ -220 +202 @@
 PATH_KBUILD         := $(PATH_ROOT)/kBuild
 endif
-ifeq ($(filter abspath,$(KMK_FEATURES)),abspath)
 PATH_KBUILD         := $(abspath $(PATH_KBUILD))
-endif
 # kBuild files which might be of interest.
 FILE_KBUILD_HEADER  := $(PATH_KBUILD)/header.kmk
@@ -455 +435 @@
 #
 # @param        $1      The paths to make absolute.
-ifeq ($(filter abspath,$(KMK_FEATURES)),abspath)
 ABSPATH = $(abspath $(1))
-else
-ABSPATH = $(foreach path,$(1)\
-            ,$(strip $(if $(subst <,,$(firstword $(subst /, ,<$(path)))),\
-                      $(if $(patsubst %:,,$(firstword $(subst :,: ,$(path)))),$(PATH_CURRENT)/$(path),$(path)),\
-                      $(path))))
-endif
 
 ## DIRDEP - make create directory dependencies.