Changeset 825 for trunk/kBuild

Timestamp:

Feb 1, 2007, 7:37:56 AM (18 years ago)

Author:

bird

Message:

Added fake xargs implementation. Retired abspathex to gnumake-header.kmk.

Location:

trunk/kBuild

Files:

• gnumake-header.kmk (modified) (1 diff)
• header.kmk (modified) (1 diff)

trunk/kBuild/gnumake-header.kmk

@@ -56 +56 @@
 # @param    $1   The stack variable name
 stack-top  = $(lastword $($1))
+
+## 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))))
+
 
 ##

trunk/kBuild/header.kmk

@@ -484 +484 @@
 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))))
+ifneq ($(filter xargs,$(KMK_FEATURES)),xargs) ## @todo Retire this to gnumake-header.kmk when it has been implemented.
+##
+# Fake xargs without doing any commandline splitting.
+# @param    $1      The initial command.
+# @param    $2      The command for the subseqent command lines. optional
+# @param    $3          The command for the final command lines. optional
+# @param    $($#)   The arguments.
+xargs = $(1) $(if $(4),$(4),$(if $(3),$(3),$(2)))
 endif