Changeset 1110 in kBuild

Timestamp:

Sep 25, 2007 3:04:41 AM (18 years ago)

Author:

bird

Message:

More CONFIG_WITH_EXPLICIT_MULTITARGET hacking. Have to deal with non-run stuff, or we'll get into endless loops.

File:

• trunk/src/kmk/remake.c (modified) (16 diffs)

trunk/src/kmk/remake.c

@@ -450 +450 @@
   this_mtime = file_mtime (file);
   f3 = file;
-  for (f2 = file->multi_next; 
-       f2 != NULL && this_mtime != NONEXISTENT_MTIME; 
+  for (f2 = file->multi_next;
+       f2 != NULL && this_mtime != NONEXISTENT_MTIME;
        f2 = f2->multi_next)
     if (!f2->multi_maybe)
@@ -539 +539 @@
                   continue;
                 }
-#endif 
+#endif
 
               error (NILF, _("Circular %s <- %s dependency dropped."),
@@ -546 +546 @@
 #else
                      file->name, d->file->name);
-#endif 
+#endif
               /* We cannot free D here because our the caller will still have
                  a reference to it when we were called recursively via
@@ -555 +555 @@
 #else
                 file->deps = d->next;
-#endif 
+#endif
               else
                 lastd->next = d->next;
@@ -566 +566 @@
 #else
           d->file->parent = file;
-#endif 
+#endif
           maybe_make = must_make;
     
@@ -617 +617 @@
         break;
     }
-#endif 
+#endif
 
   /* Now we know whether this target needs updating.
@@ -640 +640 @@
 #else
               d->file->parent = file;
-#endif 
+#endif
    
               /* Inherit dontcare flag from our parent. */
@@ -679 +679 @@
 #else
                 d->changed = ((file->phony && file->cmds != 0)
-#endif 
+#endif
                             || file_mtime (d->file) != mtime);
             }
@@ -739 +739 @@
         if (d->file == file && f2->multi_maybe)
           continue;
-#endif 
+#endif
         check_renamed (d->file);
   
@@ -891 +891 @@
 notice_finished_file (struct file *file)
 {
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  struct file *f2;
+#endif
   struct dep *d;
   int ran = file->command_state == cs_running;
@@ -898 +901 @@
   file->command_state = cs_finished;
   file->updated = 1;
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  if (file->multi_head)
+    {
+      assert (file == file->multi_head);
+      for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
+        {
+          f2->command_state = cs_finished;
+          f2->updated = 1;
+        }
+    }
+#endif
 
 #ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
@@ -934 +948 @@
         have_nonrecursing:
           if (file->phony)
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+            {
+              file->update_status = 0;
+              if (file->multi_head)
+                for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
+                  f2->update_status = 0;
+            }
+#else
             file->update_status = 0;
+#endif
           /* According to POSIX, -t doesn't affect targets with no cmds.  */
           else if (file->cmds != 0)
@@ -940 +963 @@
               /* Should set file's modification date and do nothing else.  */
               file->update_status = touch_file (file);
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+              if (file->multi_head)
+                for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
+                  {
+                    /* figure out this, touch if it exist ignore otherwise? */
+                  }
+#endif
 
               /* Pretend we ran a real touch command, to suppress the
@@ -956 +986 @@
   if (file->mtime_before_update == UNKNOWN_MTIME)
     file->mtime_before_update = file->last_mtime;
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  if (file->multi_head)
+    for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
+      if (f2->mtime_before_update == UNKNOWN_MTIME)
+        f2->mtime_before_update = f2->last_mtime;
+#endif
 
   if ((ran && !file->phony) || touched)
@@ -978 +1014 @@
 
       file->last_mtime = i == 0 ? UNKNOWN_MTIME : NEW_MTIME;
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+      if (file->multi_head)
+        for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
+          file->last_mtime = i == 0 ? UNKNOWN_MTIME : NEW_MTIME; /*??*/
+#endif
     }
 
@@ -1032 +1073 @@
       /* 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);
-            }
-        }
+        for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
+          {
+            f2->update_status = file->update_status;
+            if (!f2->phony)
+              f_mtime (f2, 0);
+          }
     }
 #endif
   else if (file->update_status == -1)
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+    {
+      /* Nothing was done for FILE, but it needed nothing done.
+         So mark it now as "succeeded".  */
+      file->update_status = 0;
+      if (file->multi_head)
+        for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
+          f2->update_status = 0;
+    }
+#else
     /* Nothing was done for FILE, but it needed nothing done.
        So mark it now as "succeeded".  */
     file->update_status = 0;
+#endif
 }