Changeset 129 for trunk/kBuild/header.kmk

Timestamp:

Jun 29, 2004, 1:55:07 PM (21 years ago)

Author:

bird

Message:

ABSPATH and no need for CYGPATHMIXED.

File:

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

trunk/kBuild/header.kmk

@@ -144 +144 @@
 BUILD_TARGET_CPU    := i586
 
-#
-# Cygwin kludge.
-#
-ifneq ($(patsubst /cygdrive/%,%,$(CURDIR)),$(CURDIR))
-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
 
 #
@@ -294 +285 @@
 endif
 
+## ABSPATH - makes a path absolute.
+# This implementation is clumsy and doesn't resolve '..' and '.' components.
+#
+# @param        $1      The paths to make absolute.
+ABSPATH = $(foreach path,$(1)\
+            ,$(strip $(if $(subst <,,$(firstword $(subst /, ,<$(path)))),\
+                      $(if $(patsubst %:,,$(firstword $(subst :,: ,$(path)))),$(PATH_CURRENT)/$(path),$(path)),\
+                      $(path))))
+
+## Cygwin kludge.
+# This converts /cygdrive/x/% to x:%.
+#
+# @param        $1      The paths to make native.
+# @remark       This macro is pretty much obsolete since we don't use cygwin base make.
+ifneq ($(patsubst /cygdrive/%,%,$(CURDIR)),$(CURDIR))
+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
+
 #
 # This is how we find the closest config.kmk.