Changeset 921 in kBuild for trunk

Timestamp:

May 25, 2007 3:27:53 AM (18 years ago)

Author:

bird

Message:

multi target explicit rules. partly done.

Location:

trunk/src/gmakenew

Files:

• Makefile.kmk (modified) (1 diff)
• file.c (modified) (3 diffs)
• filedef.h (modified) (2 diffs)
• read.c (modified) (3 diffs)
• remake.c (modified) (3 diffs)

trunk/src/gmakenew/Makefile.kmk

@@ -94 +94 @@
         EXPERIMENTAL \
         CONFIG_WITH_TOUPPER_TOLOWER \
+        CONFIG_WITH_EXPLICIT_MULTITARGET \
         \
         KMK \

trunk/src/gmakenew/file.c

@@ -778 +778 @@
   for (d = file->also_make; d != 0; d = d->next)
     d->file->command_state = state;
+
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  if (file->multi_head)
+    {
+      assert (file == file->multi_head);
+      for (file = file->multi_head; file != 0; file = file->multi_next)
+        file->command_state = state;
+    }
+#endif
 }
 
@@ -898 +907 @@
   if (!f->is_target)
     puts (_("# Not a target:"));
-  printf ("%s:%s", f->name, f->double_colon ? ":" : "");
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  if (f->multi_head)
+    {
+      const struct file *f2;
+      if (f->multi_head == f)
+        {
+          int multi_maybe = -1;
+          assert (!f->multi_maybe);
+          assert (!f->double_colon);
+
+          printf ("%s", f->name);
+          for (f2 = f->multi_next; f2 != 0; f2 = f2->multi_next)
+            {
+              printf (" %s%s", f2->multi_maybe != multi_maybe
+                      ? f2->multi_maybe ? "+| " : "+ " : "",
+                      f2->name);
+              multi_maybe = f2->multi_maybe;
+            }
+          putchar (':');
+        }
+      else
+        printf ("%s:%s", f->name, f->double_colon ? ":" : "");
+    }
+  else
+#endif
+    printf ("%s:%s", f->name, f->double_colon ? ":" : "");
 
   /* Print all normal dependencies; note any order-only deps.  */
@@ -917 +951 @@
 
   putchar ('\n');
+
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  if (f->multi_head && f->multi_head != f)
+    {
+      const struct file *f2;
+      fputs (_("#  In multi target list:"), stdout);
+      for (f2 = f->multi_head; f2 != 0; f2 = f2->multi_next)
+        printf (" %s%s", f2->name, f == f2 ? "(*)" : "");
+      putchar ('\n');
+      if (f->multi_maybe)
+        puts (_("#  File is an optional multi target member."));
+    }
+#endif
 
   if (f->precious)

trunk/src/gmakenew/filedef.h

@@ -61 +61 @@
        the same file.  Otherwise this is null.  */
     struct file *double_colon;
+
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+    /* For a target of an explicit multi target rule, this points to the
+       primary target.  Otherwise this is null. */
+    struct file *multi_head;
+    /* Pointer to next target of an explicit multi target rule. */
+    struct file *multi_next;
+#endif
 
     short int update_status;    /* Status of the last attempt to update,
@@ -95 +103 @@
     unsigned int considered:1;  /* equal to 'considered' if file has been
                                    considered on current scan of goal chain */
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+    unsigned int multi_maybe:1; /* Nonzero if this file may not always be
+                                   touched/created by the multi target rule. */
+#endif
+
   };
 

trunk/src/gmakenew/read.c

@@ -1981 +1981 @@
   const char **targets = 0, **target_percents = 0;
   struct commands *cmds;
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  struct file *prev_file = 0;
+  enum multitarget_mode { m_unsettled, m_no, m_yes, m_yes_maybe }
+    multi_mode = !two_colon && !pattern ? m_unsettled : m_no;
+#endif
 
   /* If we've already snapped deps, that means we're in an eval being
@@ -2049 +2054 @@
         }
 
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+      /* Check for the explicit multitarget mode operators. For this to be
+         identified as an excplicit multiple target rule, the first + or +|
+         operator *must* appear between the first two files. If not found as
+         the 2nd file or if found as the 1st file, the rule will be rejected
+         as a potential multiple first target rule. For the subsequent files
+         the operator is only required to switch between maybe and non-maybe
+         mode:
+         `primary + 2nd 3rd +| 4th-maybe + 5th-for-sure: deps; cmds' */
+      if (multi_mode != m_no && name[0] == '+'
+        && (name[1] == '\0' || (name[1] == '|' && name[2] == '\0')))
+        {
+          if (!prev_file)
+            multi_mode = m_no; /* first */
+          else
+            {
+              if (multi_mode == m_unsettled)
+                prev_file->multi_head = prev_file;
+              multi_mode = name[1] == '\0' ? m_yes : m_yes_maybe;
+              continue;
+            }
+        }
+      else if (multi_mode == m_unsettled && prev_file)
+        multi_mode = m_no;
+#endif
+
       /* If this is a static pattern rule:
          `targets: target%pattern: dep%pattern; cmds',
@@ -2163 +2194 @@
                 f->updating = 1;
             }
+
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+          /* If this is an explicit multi target rule, add it to the
+             target chain and set the multi_maybe flag according to
+             the current mode. */
+
+          if (multi_mode >= m_yes)
+            {
+              f->multi_maybe = multi_mode == m_yes_maybe;
+              prev_file->multi_next = f;
+              assert (prev_file->multi_head != 0);
+              f->multi_head = prev_file->multi_head;
+            }
+          prev_file = f;
+#endif
         }
       else

trunk/src/gmakenew/remake.c

@@ -750 +750 @@
     }
 
-  DBF (DB_BASIC, _("Must remake target `%s'.\n"));
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  if (ISDB(DB_BASIC) && file->multi_head && file->multi_head != file)
+    DBS (DB_BASIC, (_("Must remake target `%s' - primary target `%s'.\n"), file->name, file->multi_head->name));
+  else
+#endif
+    DBF (DB_BASIC, _("Must remake target `%s'.\n"));
 
   /* It needs to be remade.  If it's VPATH and not reset via GPATH, toss the
@@ -917 +922 @@
 
   if (ran && file->update_status != -1)
-    /* We actually tried to update FILE, which has
-       updated its also_make's as well (if it worked).
-       If it didn't work, it wouldn't work again for them.
-       So mark them as updated with the same status.  */
-    for (d = file->also_make; d != 0; d = d->next)
-      {
-        d->file->command_state = cs_finished;
-        d->file->updated = 1;
-        d->file->update_status = file->update_status;
-
-        if (ran && !d->file->phony)
-          /* Fetch the new modification time.
-             We do this instead of just invalidating the cached time
-             so that a vpath_search can happen.  Otherwise, it would
-             never be done because the target is already updated.  */
-          f_mtime (d->file, 0);
-      }
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+    {
+#endif
+      /* We actually tried to update FILE, which has
+         updated its also_make's as well (if it worked).
+         If it didn't work, it wouldn't work again for them.
+         So mark them as updated with the same status.  */
+      for (d = file->also_make; d != 0; d = d->next)
+        {
+          d->file->command_state = cs_finished;
+          d->file->updated = 1;
+          d->file->update_status = file->update_status;
+
+          if (ran && !d->file->phony)
+            /* Fetch the new modification time.
+               We do this instead of just invalidating the cached time
+               so that a vpath_search can happen.  Otherwise, it would
+               never be done because the target is already updated.  */
+            f_mtime (d->file, 0);
+        }
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+      /* Same as above but for explicit multi target rules. */
+      if (file->multi_head)
+        {
+          struct file *f2;
+          assert (file == file->multi_head);
+          for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
+            {
+              f2->command_state = cs_finished;
+              f2->updated = 1;
+              f2->update_status = file->update_status;
+
+              if (!f2->phony)
+                f_mtime (f2, 0);
+            }
+        }
+    }
+#endif
   else if (file->update_status == -1)
     /* Nothing was done for FILE, but it needed nothing done.
@@ -1116 +1142 @@
 remake_file (struct file *file)
 {
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  /* Always operate on the primary file. */
+  if (file->multi_head && file->multi_head != file)
+    file = file->multi_head;
+#endif
+
   if (file->cmds == 0)
     {