Changeset 743 for trunk/kBuild/header.kmk

Timestamp:

Dec 17, 2006, 9:12:30 AM (19 years ago)

Author:

bird

Message:

set PATH_target early (i.e. in subheader/subfooter).

File:

• trunk/kBuild/header.kmk (modified) (3 diffs)

trunk/kBuild/header.kmk

@@ -441 +441 @@
 LN_SYMLINK  := $(LN) -s
 
+
+#
+# Some Functions.
+# The lower cased ones are either fallbacks or candidates for functions.c. 
+#
+
 ## ABSPATH - make paths absolute.
 # This implementation is clumsy and doesn't resolve '..' and '.' components.
@@ -453 +459 @@
 DIRDEP = $(foreach path,$(patsubst %/,%,$(1)),$(path)/)
 
-
 ## Cygwin kludge.
 # This converts /cygdrive/x/% to x:%.
@@ -460 +465 @@
 # @remark       This macro is pretty much obsolete since we don't use cygwin base make.
 ifneq ($(patsubst /cygdrive/%,%,$(CURDIR)),$(CURDIR))
-CYGPATHMIXED = $(foreach path,$(1)\
+ CYGPATHMIXED = $(foreach path,$(1)\
    ,$(if $(patsubst /cygdrive/%,,$(path)),$(path),$(patsubst $(strip $(firstword $(subst /, ,$(patsubst /cygdrive/%,%,$(path)))))/%,$(strip $(firstword $(subst /, ,$(patsubst /cygdrive/%,%,$(path))))):/%,$(patsubst /cygdrive/%,%,$(path)))))
 else
-CYGPATHMIXED = $(1)
-endif
-
-
-ifneq ($(filter stack,$(KMK_FEATURES)),stack) ## @todo retire this to gnumake-header.kmk when all the programs have been recompiled.
-##
-# Pushes an item onto a 'stack' variable. 
-# @param    $1   The stack variable name
-# @param    $2   What to push.
-stack-push = $(eval $1 +=$2)
-
-##
-# Removes the top element from a 'stack' variable.
-# @returns  The popped element
-# @param    $1   The stack variable name
-stack-pop  = $(call stack-top,$1)$(call stack-popv,$1)
-
-##
-# Removes the top element from a 'stack' variable.
-# This does *NOT* return the top element, use 
-# @param    $1   The stack variable name
-# @remark This ain't very fast (that's why it's implemented in functions.c in kmk).
-stack-popv = $(eval $1:=$(wordlist 1,$(words $(wordlist 2,9999,$($1))),$($1)))
-
-##
-# Retrieves the top element from the 'stack' variable.
-# @param    $1   The stack variable name
-stack-top  = $(lastword $($1))
-endif
+ CYGPATHMIXED = $(1)
+endif
+
+ifneq ($(filter abspathex,$(KMK_FEATURES)),abspathex) ## @todo Retire this to gnumake-header.kmk when it has been implemented.
+## Converts an relative path to an absolute path using the given CWD.
+# @returns absolute path.
+# @param    $1      The path to fixup.
+# @param    $2      The CWD to use.
+abspathex = $(foreach _fix_path,$1\
+,$(if $(subst :$(call no-root-slash,$(call no-drive,$(_fix_path))):,,:$(_fix_path):),$(_fix_path),$(abspath $2/$(_fix_path))))
+endif
+
+## Removes the drive letter from a path (if it has one)
+# @param        $1              the path
+no-drive    = $(word $(words $(subst :, ,$(1))),$(subst :, ,$(1)))
+
+## Removes the root slash from a path (if it has one)
+# @param        $1              the path
+no-root-slash = $(patsubst /%,%,$(1))
+
+## Figure out where to put object files.
+# @param    $1      real target name.
+# @param    $2      normalized main target
+TARGET_BASE = $(PATH_TARGET)/$(2)/$(call no-root-slash,$(call no-drive,$(basename $(1))))
+
+## Figure out where to put object files.
+# @param    $1      normalized main target
+TARGET_PATH = $(PATH_TARGET)/$(1)