Changeset 2024 in kBuild for trunk

Timestamp:

Nov 2, 2008 5:43:17 AM (16 years ago)

Author:

bird

Message:

kmk: Created a custom hook into the update_file process for checking additional file dependencies like changes in the commands and such. It's call .MUST_MAKE.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• commands.c (modified) (3 diffs)
• commands.h (modified) (2 diffs)
• file.c (modified) (1 diff)
• function.c (modified) (1 diff)
• implicit.c (modified) (1 diff)
• remake.c (modified) (4 diffs)
• tests/scripts/variables/must_make (added)
• variable.c (modified) (3 diffs)

trunk/src/kmk/Makefile.am

@@ -108 +108 @@
         -DCONFIG_WITH_DEFINED \
         -DCONFIG_WITH_EXPLICIT_MULTITARGET \
+        -DCONFIG_WITH_DOT_MUST_MAKE \
         -DCONFIG_WITH_PREPEND_ASSIGNMENT \
         -DCONFIG_WITH_LOCAL_VARIABLES \

trunk/src/kmk/Makefile.kmk

@@ -136 +136 @@
         CONFIG_WITH_DEFINED \
         CONFIG_WITH_EXPLICIT_MULTITARGET \
+        CONFIG_WITH_DOT_MUST_MAKE \
         CONFIG_WITH_PREPEND_ASSIGNMENT \
         CONFIG_WITH_LOCAL_VARIABLES \

trunk/src/kmk/commands.c

@@ -47 +47 @@
 
 void
+#if defined(CONFIG_WITH_COMMANDS_FUNC) || defined (CONFIG_WITH_DOT_MUST_MAKE)
+set_file_variables (struct file *file, int called_early)
+#else
 set_file_variables (struct file *file)
+#endif
 {
   const struct dep *d;
@@ -182 +186 @@
     DEFINE_VARIABLE ("%", 1, percent);
 #endif /* CONFIG_WITH_RDONLY_VARIABLE_VALUE */
+
+#if defined(CONFIG_WITH_COMMANDS_FUNC) || defined (CONFIG_WITH_DOT_MUST_MAKE)
+  /* The $^, $+, $? and $| variables should not be set if we're called
+     early by a .MUST_MAKE invocation or $(commands ).  */
+  if (called_early)
+    return;
+#endif
 
   /* Compute the values for $^, $+, $?, and $|.  */
@@ -500 +511 @@
   initialize_file_variables (file, 0);
 
+#if defined(CONFIG_WITH_COMMANDS_FUNC) || defined (CONFIG_WITH_DOT_MUST_MAKE)
+  set_file_variables (file, 0 /* final call */);
+#else
   set_file_variables (file);
+#endif
 
   /* Start the commands running.  */

trunk/src/kmk/commands.h

@@ -42 +42 @@
 # define COMMANDS_NOTPARALLEL   32  /* kmk: The commands must be executed alone. */
 # define COMMANDS_NO_COMMANDS   64  /* kmk: No commands. */
-#endif 
+#endif
 #ifdef CONFIG_WITH_KMK_BUILTIN
 # define COMMANDS_KMK_BUILTIN   128 /* kmk: kmk builtin command. */
@@ -54 +54 @@
 void delete_child_targets (struct child *child);
 void chop_commands (struct commands *cmds);
+#if defined(CONFIG_WITH_COMMANDS_FUNC) || defined (CONFIG_WITH_DOT_MUST_MAKE)
+void set_file_variables (struct file *file, int called_early);
+#else
 void set_file_variables (struct file *file);
+#endif

trunk/src/kmk/file.c

@@ -666 +666 @@
             f->stem = d->stem;
 
+#if defined(CONFIG_WITH_COMMANDS_FUNC) || defined (CONFIG_WITH_DOT_MUST_MAKE)
+          set_file_variables (f, 0 /* real call, f->deps == 0 so we're ok. */);
+#else
           set_file_variables (f);
+#endif
 
 #if !defined (CONFIG_WITH_VALUE_LENGTH) || !defined (CONFIG_WITH_STRCACHE2)

trunk/src/kmk/function.c

@@ -4365 +4365 @@
         }
 
-      initialize_file_variables (file, 1 /* reading - FIXME: we don't know? */);
-      set_file_variables (file); /* FIXME: this must *NOT* be done twice! */
+      initialize_file_variables (file, 1 /* don't search for pattern vars */);
+      set_file_variables (file, 1 /* early call */);
       chop_commands (cmds);
 

trunk/src/kmk/implicit.c

@@ -561 +561 @@
                       if (!file_variables_set)
                         {
+#if defined(CONFIG_WITH_COMMANDS_FUNC) || defined (CONFIG_WITH_DOT_MUST_MAKE)
+                          set_file_variables (file, 0 /* real call */);
+#else
                           set_file_variables (file);
+#endif
                           file_variables_set = 1;
                         }

trunk/src/kmk/remake.c

@@ -65 +65 @@
 static int check_dep (struct file *file, unsigned int depth,
                       FILE_TIMESTAMP this_mtime, int *must_make_ptr);
+#ifdef CONFIG_WITH_DOT_MUST_MAKE
+static int call_must_make_target_var (struct file *file);
+#endif
 static int touch_file (struct file *file);
 static void remake_file (struct file *file);
@@ -511 +514 @@
      and see whether any of them is more recent than this file.
      For explicit multitarget rules we must iterate all the output
-     files to get the correct picture. */
+     files to get the correct picture.  The special .MUST_MAKE
+     target variable call is also done from this context.  */
 
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
@@ -617 +621 @@
           d = d->next;
         }
+
+#ifdef CONFIG_WITH_DOT_MUST_MAKE
+      /* Check with the .MUST_MAKE target variable if it's
+         not already decided to make the file.  */
+      if (!must_make)
+# ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+        must_make = call_must_make_target_var (f2);
+# else
+        must_make = call_must_make_target_var (file);
+# endif
+#endif
+
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
       if (dep_status != 0 && !keep_going_flag)
@@ -884 +900 @@
   return file->update_status;
 }
+#ifdef CONFIG_WITH_DOT_MUST_MAKE
+
+
+/* Consider the .MUST_MAKE target variable if present.
+
+   Returns 1 if must remake, 0 if not.
+
+   The deal is that .MUST_MAKE returns non-zero if it thinks the target needs
+   updating.  We have to initialize file variables (for the sake of pattern
+   vars) and set the most important file variables before calling (expanding)
+   the .MUST_MAKE variable.
+
+   The file variables keeping the dependency lists, $+, $^, $? and $| are not
+   available at this point because $? depends on things happening after we've
+   decided to make the file.  So, to keep things simple all 4 of them are
+   undefined in this call.  */
+static int
+call_must_make_target_var (struct file *file)
+{
+  struct variable *var;
+  unsigned char ch;
+  const char *str;
+
+  if (file->variables)
+    {
+      var = lookup_variable_in_set (".MUST_MAKE", sizeof (".MUST_MAKE") - 1,
+                                    file->variables->set);
+      if (var)
+        {
+          initialize_file_variables (file, 0);
+          set_file_variables (file, 1 /* called early, no dep lists please */);
+
+          str = variable_expand_for_file_2 (NULL,
+                                            var->value, var->value_length,
+                                            file, NULL);
+
+          /* stripped string should be non-zero.  */
+          do
+            ch = *str++;
+          while (isspace (ch));
+
+          return (ch != '\0');
+        }
+    }
+  return 0;
+}
+#endif /* CONFIG_WITH_DOT_MUST_MAKE */
 
 

trunk/src/kmk/variable.c

@@ -1196 +1196 @@
   && defined (CONFIG_WITH_XARGS) \
   && defined (CONFIG_WITH_EXPLICIT_MULTITARGET) \
+  && defined (CONFIG_WITH_DOT_MUST_MAKE) \
   && defined (CONFIG_WITH_PREPEND_ASSIGNMENT) \
   && defined (CONFIG_WITH_SET_CONDITIONALS) \
@@ -1216 +1217 @@
                           " xargs"
                           " explicit-multitarget"
+                          " dot-must-make"
                           " prepend-assignment"
                           " set-conditionals intersects"
@@ -1256 +1258 @@
 #  if defined (CONFIG_WITH_EXPLICIT_MULTITARGET)
   strcat (buf, " explicit-multitarget");
+#  endif
+#  if defined (CONFIG_WITH_DOT_MUST_MAKE)
+  strcat (buf, " dot-must-make");
 #  endif
 #  if defined (CONFIG_WITH_PREPEND_ASSIGNMENT)