Changeset 2462 in kBuild

Timestamp:

Jul 8, 2011 8:42:53 AM (14 years ago)

Author:

bird

Message:

kmk: Implemented . Fixes #81.

Location:

trunk/src/kmk

Files:

• Makefile.kmk (modified) (2 diffs)
• function.c (modified) (4 diffs)
• testcase-root.kmk (added)

trunk/src/kmk/Makefile.kmk

@@ -585 +585 @@
         $(MAKE) -f $(kmk_DEFPATH)/testcase-includedep.kmk
 
+test_root:
+        $(MAKE) -f $(kmk_DEFPATH)/testcase-root.kmk
+
 test_2ndtargetexp:
         $(MAKE) -f $(kmk_DEFPATH)/testcase-2ndtargetexp.kmk
@@ -606 +609 @@
 
 
-test_all:       test_math test_stack test_shell test_if1of test_local test_includedep test_2ndtargetexp test_30_continued_on_failure test_lazy_deps_vars
-
-
+test_all: \
+        test_math \
+        test_stack \
+        test_shell \
+        test_if1of \
+        test_local \
+        test_root \
+        test_includedep \
+        test_2ndtargetexp \
+        test_30_continued_on_failure \
+        test_lazy_deps_vars
+
+

trunk/src/kmk/function.c

@@ -809 +809 @@
 
 #ifdef CONFIG_WITH_ROOT_FUNC
+
 /*
  $(root path)
@@ -882 +883 @@
       if (p2 != NULL)
         {
-          /* Include all subsequent path seperators. */
+          /* Include all subsequent path separators. */
 
           while (len > 0 && IS_PATHSEP(*p2))
@@ -898 +899 @@
   return o;
 }
+
+/*
+ $(notroot path)
+
+ This is mainly for dealing with drive letters and UNC paths on Windows
+ and OS/2.
+ */
+static char *
+func_notroot (char *o, char **argv, const char *funcname UNUSED)
+{
+  const char  *paths = argv[0] ? argv[0] : "";
+  int          doneany = 0;
+  const char  *p;
+  unsigned int len;
+
+  while ((p = find_next_token (&paths, &len)) != 0)
+    {
+      const char *p2 = p;
+
+#ifdef HAVE_DOS_PATHS
+      if (   len >= 2
+          && p2[1] == ':'
+          && (   (p2[0] >= 'A' && p2[0] <= 'Z')
+              || (p2[0] >= 'a' && p2[0] <= 'z')))
+        {
+          p2 += 2;
+          len -= 2;
+        }
+      else if (len >= 4 && IS_PATHSEP(p2[0]) && IS_PATHSEP(p2[1])
+               && !IS_PATHSEP(p2[2]))
+        {
+          /* Min recognized UNC: "//./" - find the next slash
+             Typical root: "//srv/shr/" */
+          /* XXX: Check if //./ needs special handling. */
+          unsigned int saved_len = len;
+
+          p2 += 3;
+          len -= 3;
+          while (len > 0 && !IS_PATHSEP(*p2))
+            p2++, len--;
+
+          if (len && IS_PATHSEP(p2[0]) && (len == 1 || !IS_PATHSEP(p2[1])))
+            {
+              p2++;
+              len--;
+
+              if (len) /* optional share */
+                while (len > 0 && !IS_PATHSEP(*p2))
+                  p2++, len--;
+            }
+          else
+            {
+              p2 = p;
+              len = saved_len;
+            }
+        }
+
+#elif defined (VMS) || defined (AMGIA)
+      /* XXX: VMS and AMGIA */
+      fatal (NILF, _("$(root ) is not implemented on this platform"));
+#endif
+
+      /* Exclude all subsequent / leading path separators. */
+
+      while (len > 0 && IS_PATHSEP(*p2))
+        p2++, len--;
+      if (len > 0)
+        o = variable_buffer_output (o, p2, len);
+      else
+        o = variable_buffer_output (o, ".", 1);
+      o = variable_buffer_output (o, " ", 1);
+      doneany = 1;
+    }
+
+  if (doneany)
+    /* Kill last space.  */
+    --o;
+
+  return o;
+}
+
 #endif /* CONFIG_WITH_ROOT_FUNC */
 
@@ -5065 +5147 @@
 #ifdef CONFIG_WITH_ROOT_FUNC
   { STRING_SIZE_TUPLE("root"),          0,  1,  1,  func_root},
+  { STRING_SIZE_TUPLE("notroot"),       0,  1,  1,  func_notroot},
 #endif
   { STRING_SIZE_TUPLE("subst"),         3,  3,  1,  func_subst},