Changeset 225 in kBuild

Timestamp:

Feb 9, 2005 8:31:14 AM (20 years ago)

Author:

bird

Message:

kMk builtin command basics. KMK_VERSION variable.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (3 diffs)
• commands.c (modified) (1 diff)
• commands.h (modified) (1 diff)
• job.c (modified) (7 diffs)
• kmkbuiltin.c (added)
• kmkbuiltin.h (added)
• variable.c (modified) (1 diff)

trunk/src/gmake/Makefile.kmk

@@ -27 +27 @@
         CONFIG_NO_DEFAULT_TERMINAL_RULES \
         CONFIG_NO_DEFAULT_SUFFIX_RULES \
-        CONFIG_NO_DEFAULT_VARIABLES
+        CONFIG_NO_DEFAULT_VARIABLES \
+        CONFIG_WITH_KMK_BUILTIN
 kmk_DEFS.win32          = WINDOWS32 _CONSOLE WIN32
 kmk_DEFS.win32.release  = NDEBUG
 
-kmk_LDFLAGS.linux.release   = -s 
+kmk_LDFLAGS.linux.release   = -s
 kmk_LDFLAGS.os2             = -Zhigh-mem -Zstack=1024
 kmk_LDFLAGS.os2.release     = -s
@@ -42 +43 @@
         $(PATH_DEV)/x86.win32/sdk200209/lib/Kernel32.Lib \
         $(PATH_DEV)/x86.win32/sdk200209/lib/User32.Lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/AdvAPI32.Lib 
+        $(PATH_DEV)/x86.win32/sdk200209/lib/AdvAPI32.Lib
         
 kmk_SOURCES         = \
@@ -65 +66 @@
         version.c \
         vpath.c \
-        remote-stub.c
+        remote-stub.c \
+        kmkbuiltin.c
 
 kmk_SOURCES.os2 = \

trunk/src/gmake/commands.c

@@ -350 +350 @@
             flags |= COMMANDS_RECURSE;
         }
+#ifdef CONFIG_WITH_KMK_BUILTIN
+      if (!strncmp(p, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
+          flags |= COMMANDS_BUILTIN;
+#endif
 
       cmds->lines_flags[idx] = flags;

trunk/src/gmake/commands.h

@@ -36 +36 @@
 #define COMMANDS_SILENT         2 /* Silent: @.  */
 #define COMMANDS_NOERROR        4 /* No errors: -.  */
-#define COMMANDS_NOTPARALLEL    64 /* kmk: the commands must be executed alone. */
+#define COMMANDS_NOTPARALLEL    32 /* kmk: the commands must be executed alone. */
+#define COMMANDS_BUILTIN        64 /* kmk: builtin command. */
 
 extern void execute_file_commands PARAMS ((struct file *file));

trunk/src/gmake/job.c

@@ -28 +28 @@
 #include "variable.h"
 #include "debug.h"
+#ifdef CONFIG_WITH_KMK_BUILTIN
+#include "kmkbuiltin.h"
+#endif
+
 
 #include <string.h>
@@ -965 +969 @@
         child->noerror = 1;
       else if (!isblank ((unsigned char)*p))
-        break;
+        {
+#ifdef CONFIG_WITH_KMK_BUILTIN
+          if (   !(flags & COMMANDS_BUILTIN)
+              && !strncmp(p, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
+            flags |= COMMANDS_BUILTIN;
+#endif /* CONFIG_WITH_KMK_BUILTIN */
+          break;
+        }
       ++p;
     }
@@ -1095 +1106 @@
       goto next_command;
     }
+
+#ifdef CONFIG_WITH_KMK_BUILTIN
+  /* If builtin command then pass it on to the builtin shell interpreter. */
+
+  if ((flags & COMMANDS_BUILTIN) && !just_print_flag)
+    {
+      char **p2 = argv;
+      while (*p2 && strncmp(*p2, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
+          p2++;
+      assert(*p2);
+      set_command_state (child->file, cs_running);
+      int rc = kmk_builtin_command(p2);
+#ifndef VMS
+      free (argv[0]);
+      free ((char *) argv);
+#endif
+      if (!rc)
+          goto next_command;
+      child->file->update_status = 2;
+      notice_finished_file (child->file);
+      return;
+    }
+#endif /* CONFIG_WITH_KMK_BUILTIN */
 
   /* Flush the output streams so they won't have things written twice.  */
@@ -1388 +1422 @@
 {
   struct file *f = c->file;
+  DB (DB_KMK, (_("start_waiting_job %p (`%s') command_flags=%#x\n"), c, c->file->name, c->file->command_flags));
 
   /* If we can start a job remotely, we always want to, and don't care about
@@ -1397 +1432 @@
   /* If we are running at least one job already and the load average
      is too high, make this one wait.  */
-  if (!c->remote && job_slots_used > 0 && 
+  if (!c->remote && job_slots_used > 0 &&
       (not_parallel || (c->file->command_flags & COMMANDS_NOTPARALLEL) || load_too_high ()))
     {
@@ -1405 +1440 @@
       c->next = waiting_jobs;
       if (c->next && (c->file->command_flags & COMMANDS_NOTPARALLEL))
-        { 
+        {
           struct child *prev = waiting_jobs;
           while (prev->next)
@@ -1414 +1449 @@
       else
         waiting_jobs = c;
+      DB (DB_KMK, (_("queued child %p (`%s')\n"), c, c->file->name));
       return 0;
     }

trunk/src/gmake/variable.c

@@ -654 +654 @@
            ? "" : remote_description);
   (void) define_variable ("MAKE_VERSION", 12, buf, o_default, 0);
+
+  /* Define KMK_VERSION to indicate kMk. */
+  (void) define_variable ("KMK_VERSION", 11, buf, o_default, 0);
+
+#ifdef CONFIG_WITH_KMK_BUILTIN
+  /* The kMk Builtin Level. */
+  (void) define_variable ("KMK_BUILTIN", 11, "1", o_default, 0);
+#endif
 
 #ifdef  __MSDOS__