Changeset 1701 for trunk/src/kmk

Timestamp:

Sep 2, 2008, 4:06:18 AM (17 years ago)

Author:

bird

Message:

kmk: Implemented secondary target expansion. Fixes #42.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (3 diffs)
• file.c (modified) (3 diffs)
• filedef.h (modified) (1 diff)
• main.c (modified) (1 diff)
• make.h (modified) (1 diff)
• read.c (modified) (1 diff)
• testcase-2ndtargetexp.kmk (added)

trunk/src/kmk/Makefile.am

@@ -102 +102 @@
         -DCONFIG_WITH_PREPEND_ASSIGNMENT \
         -DCONFIG_WITH_LOCAL_VARIABLES \
+        -DCONFIG_WITH_2ND_TARGET_EXPANSION \
         \
         -DKMK \

trunk/src/kmk/Makefile.kmk

@@ -137 +137 @@
         CONFIG_WITH_PREPEND_ASSIGNMENT \
         CONFIG_WITH_LOCAL_VARIABLES \
+        CONFIG_WITH_2ND_TARGET_EXPANSION \
         \
         KMK \
@@ -476 +477 @@
         $(MAKE) -f $(kmk_PATH)/testcase-includedep.kmk
 
+test_2ndtargetexp:
+        $(MAKE) -f $(kmk_PATH)/testcase-2ndtargetexp.kmk
+
 test_30_continued_on_failure_worker:
         this_executable_does_not_exist.exe
@@ -491 +495 @@
 
 
-test_all:       test_math test_stack test_shell test_if1of test_local test_includedep test_30_continued_on_failure
-
+test_all:       test_math test_stack test_shell test_if1of test_local test_includedep test_2ndtargetexp test_30_continued_on_failure
+

trunk/src/kmk/file.c

@@ -189 +189 @@
       f->last = new;
     }
+
+#ifdef CONFIG_WITH_2ND_TARGET_EXPANSION
+  /* Check if the name needs 2nd expansion or not. */
+  if (second_target_expansion && strchr (name, '$') != NULL)
+    new->need_2nd_target_expansion = 1;
+#endif 
 
   return new;
@@ -333 +339 @@
     }
 }
+
+
+#ifdef CONFIG_WITH_2ND_TARGET_EXPANSION
+/* Performs secondary target name expansion and then renames
+   the file using rename_file. */
+static void 
+do_2nd_target_expansion (struct file *f)
+{
+   char *tmp_name = allocated_variable_expand (f->name);
+   const char *name = strcache_add (tmp_name);
+   free (tmp_name);
+   rename_file (f, name);
+}
+#endif /* CONFIG_WITH_2ND_TARGET_EXPANSION */
 
 
@@ -654 +674 @@
     expand_deps (f);
 
+#ifdef CONFIG_WITH_2ND_TARGET_EXPANSION
+  /* Perform 2nd target expansion on files which requires this. This will
+     be re-inserting (delete+insert) hash table entries so we have to use
+     hash_dump(). */
+  file_slot_0 = (struct file **) hash_dump (&files, 0, 0);
+  file_end = file_slot_0 + files.ht_fill;
+  for (file_slot = file_slot_0; file_slot < file_end; file_slot++)
+    for (f = *file_slot; f != 0; f = f->prev)
+      if (f->need_2nd_target_expansion)
+        do_2nd_target_expansion (f);
+  free (file_slot_0);
+
+  /* Disable second target expansion now since we won't expand files
+     entered after this point. (saves CPU cycles in enter_file()). */
+  second_target_expansion = 0;
+#endif /* CONFIG_WITH_2ND_TARGET_EXPANSION */
+
   /* For every target that's not .SUFFIXES, expand its dependencies.
      We must use hash_dump (), because within this loop we might add new files

trunk/src/kmk/filedef.h

@@ -107 +107 @@
                                    by the explicit multi target rule. */
 #endif
+#ifdef CONFIG_WITH_2ND_TARGET_EXPANSION   
+    unsigned int need_2nd_target_expansion:1; /* Nonzero if this file needs 
+                                  second expansion of its name. Whether it
+                                  can receive this is decided at parse time,
+                                  and the expanding done in snap_deps. */
+#endif
 
   };

trunk/src/kmk/main.c

@@ -562 +562 @@
 int second_expansion;
 
+#ifdef CONFIG_WITH_2ND_TARGET_EXPANSION
+/* Nonzero if we have seen the '.SECONDTARGETEXPANSION' target.
+   This turns on secondary expansion of targets.  */
+
+int second_target_expansion;
+#endif
+
 #ifndef CONFIG_WITH_EXTENDED_NOTPARALLEL
 /* Nonzero if we have seen the `.NOTPARALLEL' target.

trunk/src/kmk/make.h

@@ -500 +500 @@
 extern int warn_undefined_variables_flag, posix_pedantic, not_parallel;
 extern int second_expansion, clock_skew_detected, rebuilding_makefiles;
+#ifdef CONFIG_WITH_2ND_TARGET_EXPANSION
+extern int second_target_expansion;
+#endif
 #ifdef CONFIG_PRETTY_COMMAND_PRINTING
 extern int pretty_command_printing;

trunk/src/kmk/read.c

@@ -2530 +2530 @@
       else if (streq (name, ".SECONDEXPANSION"))
         second_expansion = 1;
+#ifdef CONFIG_WITH_2ND_TARGET_EXPANSION
+      else if (streq (name, ".SECONDTARGETEXPANSION"))
+        second_target_expansion = 1;
+#endif
 
       implicit_percent = find_percent_cached (&name);