Changeset 520 in kBuild

Timestamp:

Sep 16, 2006 4:56:25 AM (19 years ago)

Author:

bird

Message:

Cleaning up the modifications. Changes are now either configurable or marked, and dead stuff has been removed (dll shell).

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• src/gmake/Makefile.kmk (modified) (2 diffs)
• src/gmake/build.sh.in (modified) (1 diff)
• src/gmake/commands.c (modified) (2 diffs)
• src/gmake/commands.h (modified) (1 diff)
• src/gmake/config/config.guess (modified) (1 diff)
• src/gmake/config/config.sub (modified) (1 diff)
• src/gmake/debug.h (modified) (3 diffs)
• src/gmake/file.c (modified) (2 diffs)
• src/gmake/function.c (modified) (8 diffs)
• src/gmake/job.c (modified) (25 diffs)
• src/gmake/job.h (modified) (3 diffs)
• src/gmake/main.c (modified) (4 diffs)
• src/gmake/make.h (modified) (4 diffs)
• src/gmake/misc.c (modified) (2 diffs)
• src/gmake/read.c (modified) (4 diffs)
• src/gmake/remake.c (modified) (2 diffs)
• src/gmake/variable.c (modified) (12 diffs)
• src/gmake/variable.h (modified) (1 diff)
• src/gmake/w32/pathstuff.c (modified) (5 diffs)

trunk/ChangeLog

@@ -1 +1 @@
 /* $Id$ */
+
+2006-09-16:
+    - src/gmake:
+        o Cleaning up the modifications. Changes are now either configurable 
+          or marked, and dead stuff has been removed (dll shell).
 
 2006-09-15:

trunk/src/gmake/Makefile.kmk

@@ -21 +21 @@
         CONFIG_NO_DEFAULT_SUFFIX_RULES \
         CONFIG_NO_DEFAULT_VARIABLES \
+    CONFIG_WITH_EXTENDED_NOTPARALLEL \
+    CONFIG_WITH_TOUPPER_TOLOWER \
         KMK \
         VARIABLE_HASH
@@ -187 +189 @@
 #                       
 config.h.$(BUILD_TARGET) := config.h.$(BUILD_TARGET)
+config.h.win   := config.h.W32
 config.h.win32 := config.h.W32
 config.h.win64 := config.h.W32

trunk/src/gmake/build.sh.in

@@ +1 @@
+#!/bin/sh
+# Shell script to build GNU Make in the absence of any `make' program.
+# @configure_input@
 
 # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

trunk/src/gmake/commands.c

@@ -361 +361 @@
       /* check if kmk builtin command */
       if (!strncmp(p, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
-        flags |= COMMANDS_BUILTIN;
+        flags |= COMMANDS_KMK_BUILTIN;
 #endif
 
@@ -388 +388 @@
     {
       /* If there are no commands, assume everything worked.  */
+#ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
       file->command_flags |= COMMANDS_NO_COMMANDS;
+#endif 
       set_command_state (file, cs_running);
       file->update_status = 0;

trunk/src/gmake/commands.h

@@ -35 +35 @@
 #define COMMANDS_SILENT         2 /* Silent: @.  */
 #define COMMANDS_NOERROR        4 /* No errors: -.  */
-#define COMMANDS_NOTPARALLEL   32 /* kmk: the commands must be executed alone. */
-#define COMMANDS_BUILTIN       64 /* kmk: builtin command. */
-#define COMMANDS_NO_COMMANDS  128 /* kmk: No commands. */
+#ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
+# define COMMANDS_NOTPARALLEL   32  /* kmk: The commands must be executed alone. */
+# define COMMANDS_NO_COMMANDS   64  /* kmk: No commands. */
+#endif 
+#ifdef CONFIG_WITH_KMK_BUILTIN
+# define COMMANDS_KMK_BUILTIN   128 /* kmk: kmk builtin command. */
+#endif
 
 extern void execute_file_commands PARAMS ((struct file *file));

trunk/src/gmake/config/config.guess

@@ +1 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
 timestamp='2006-03-13'

trunk/src/gmake/config/config.sub

@@ +1 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
 timestamp='2006-03-07'

trunk/src/gmake/debug.h

@@ -22 +22 @@
 #define DB_IMPLICIT     (0x008)
 #define DB_MAKEFILES    (0x100)
-#define DB_KMK          (0x800)
+#ifdef KMK
+# define DB_KMK         (0x800)
+#endif 
 
 #define DB_ALL          (0xfff)
@@ -28 +30 @@
 extern int db_level;
 
+#ifdef KMK
+
+/* Some extended info for -j and .NOTPARALLEL tracking. */
 extern unsigned int makelevel;
 extern unsigned int job_slots;
 extern unsigned int job_slots_used;
-
 
 #define DB_HDR()    do { printf ("[%u:%u/%u]", makelevel, job_slots_used, job_slots); } while (0)
@@ -47 +51 @@
 
 #define DB(_l,_x)   do{ if(ISDB(_l)) {DB_HDR(); printf _x; fflush (stdout);} }while(0)
+
+#else  /* !KMK */
+
+#define ISDB(_l)    ((_l)&db_level)
+
+#define DBS(_l,_x)  do{ if(ISDB(_l)) {print_spaces (depth); \
+                                      printf _x; fflush (stdout);} }while(0)
+
+#define DBF(_l,_x)  do{ if(ISDB(_l)) {print_spaces (depth); \
+                                      printf (_x, file->name); \
+                                      fflush (stdout);} }while(0)
+
+#define DB(_l,_x)   do{ if(ISDB(_l)) {printf _x; fflush (stdout);} }while(0)
+
+#endif /* !KMK */

trunk/src/gmake/file.c

@@ -738 +738 @@
     }
 
-  /* kmk changed */
   f = lookup_file (".NOTPARALLEL");
   if (f != 0 && f->is_target)
+#ifndef CONFIG_WITH_EXTENDED_NOTPARALLEL
+    not_parallel = 1;
+#else /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
     {
       if (f->deps == 0)
@@ -752 +754 @@
             f2->command_flags |= COMMANDS_NOTPARALLEL;
     }
+#endif /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
 
 #ifndef NO_MINUS_C_MINUS_O

trunk/src/gmake/function.c

@@ -29 +29 @@
 #endif
 
-#ifdef WINDOWS32
-#include "pathstuff.h"
+#ifdef WINDOWS32 /* bird */
+# include "pathstuff.h"
 #endif
 
@@ -1665 +1665 @@
   CLOSE_ON_EXEC(pipedes[0]);
   /* Never use fork()/exec() here! Use spawn() instead in exec_command() */
-  pid = child_execute_job (0, pipedes[1], command_argv, envp, NULL);
+  pid = child_execute_job (0, pipedes[1], command_argv, envp);
   if (pid < 0)
     perror_with_name (error_prefix, "spawn");
@@ -1900 +1900 @@
     return NULL;
 
-#ifdef WINDOWS32
+#ifdef WINDOWS32                                                    /* bird */
   dest = w32ify((char *)name, 1);
   if (!dest)
-      return NULL;
+    return NULL;
   {
   size_t len = strlen(dest);
@@ -1912 +1912 @@
   (void)end; (void)start; (void)apath_limit;
 
-#elif defined __OS2__
+#elif defined __OS2__                                               /* bird */
   if (_abspath(apath, name, GET_PATH_MAX))
-      return NULL;
+    return NULL;
   dest = strchr(apath, '\0');
 
@@ -1989 +1989 @@
 
   /* Unless it is root strip trailing separator.  */
-#ifdef HAVE_DOS_PATHS
+#ifdef HAVE_DOS_PATHS /* bird (is this correct? what about UNC?) */
   if (dest > apath + 1 + (apath[0] != '/') && dest[-1] == '/')
 #else
@@ -2077 +2077 @@
 }
 
-#ifdef KMK
+#ifdef CONFIG_WITH_TOUPPER_TOLOWER
 static char *
 func_toupper_tolower (char *o, char **argv, const char *funcname)
@@ -2099 +2099 @@
   return o;
 }
-#endif
+#endif /* CONFIG_WITH_TOUPPER_TOLOWER */
 
 /* Lookup table for builtin functions.
@@ -2158 +2158 @@
   { STRING_SIZE_TUPLE("not"),           0,  1,  1,  func_not},
 #endif
-#ifdef KMK
+#ifdef CONFIG_WITH_TOUPPER_TOLOWER
   { STRING_SIZE_TUPLE("toupper"),       0,  1,  1,  func_toupper_tolower},
   { STRING_SIZE_TUPLE("tolower"),       0,  1,  1,  func_toupper_tolower},

trunk/src/gmake/job.c

@@ -28 +28 @@
 #include "debug.h"
 #ifdef CONFIG_WITH_KMK_BUILTIN
-#include "kmkbuiltin.h"
+# include "kmkbuiltin.h"
 #endif
 
 
 #include <string.h>
-
-#ifdef MAKE_DLLSHELL
-#include <dlfcn.h>
-#endif
 
 /* Default shell to use.  */
@@ -64 +60 @@
 #elif defined (__EMX__)
 
-char *default_shell = "sh.exe";
+char *default_shell = "sh.exe"; /* bird changed this from "/bin/sh" as that doesn't make sense on OS/2. */
 int batch_mode_shell = 0;
 
@@ -210 +206 @@
 static int job_next_command PARAMS ((struct child *));
 static int start_waiting_job PARAMS ((struct child *));
-#ifdef MAKE_DLLSHELL
-static int spawn_command PARAMS ((char **argv, char **envp, struct child *child));
-#endif
 
 
@@ -492 +485 @@
       int any_remote, any_local;
       int dontcare;
-#if defined(CONFIG_WITH_KMK_BUILTIN) || defined(MAKE_DLLSHELL)
-      struct child *completed_child = 0;
+#ifdef CONFIG_WITH_KMK_BUILTIN
+      struct child *completed_child = NULL;
 #endif
 
@@ -534 +527 @@
           any_remote |= c->remote;
           any_local |= ! c->remote;
-#if defined(CONFIG_WITH_KMK_BUILTIN) || defined(MAKE_DLLSHELL)
-          if (c->have_status)
+#ifdef CONFIG_WITH_KMK_BUILTIN
+          if (c->has_status)
+            {
               completed_child = c;
+              DB (DB_JOBS, (_("builtin child 0x%08lx (%s) PID %ld %s Status %ld\n"),
+                            (unsigned long int) c, c->file->name,
+                            (long) c->pid, c->remote ? _(" (remote)") : "",
+                            (long) c->status));
+            }
+          else
 #endif
           DB (DB_JOBS, (_("Live child 0x%08lx (%s) PID %ld %s\n"),
@@ -564 +564 @@
         {
           /* No remote children.  Check for local children.  */
-#if defined(CONFIG_WITH_KMK_BUILTIN) || defined(MAKE_DLLSHELL)
+#ifdef CONFIG_WITH_KMK_BUILTIN
           if (completed_child)
             {
@@ -577 +577 @@
             }
           else
-#endif
+#endif /* CONFIG_WITH_KMK_BUILTIN */
 #if !defined(__MSDOS__) && !defined(_AMIGA) && !defined(WINDOWS32)
           if (any_local)
@@ -584 +584 @@
               vmsWaitForChildren (&status);
               pid = c->pid;
-#elif MAKE_DLLSHELL
-              pid = wait_jobs((int*)&status, block);
 #else
 #ifdef WAIT_NOHANG
@@ -1039 +1037 @@
         child->noerror = 1;
       else if (!isblank ((unsigned char)*p))
+#ifndef CONFIG_WITH_KMK_BUILTIN
+        break;
+#else  /* CONFIG_WITH_KMK_BUILTIN */
+
         {
-#ifdef CONFIG_WITH_KMK_BUILTIN
-          if (   !(flags & COMMANDS_BUILTIN)
+          if (   !(flags & COMMANDS_KMK_BUILTIN)
               && !strncmp(p, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
-            flags |= COMMANDS_BUILTIN;
-#endif /* CONFIG_WITH_KMK_BUILTIN */
+            flags |= COMMANDS_KMK_BUILTIN;
           break;
         }
+#endif /* CONFIG_WITH_KMK_BUILTIN */
       ++p;
     }
@@ -1058 +1059 @@
   child->file->cmds->lines_flags[child->command_line - 1]
 #ifdef CONFIG_WITH_KMK_BUILTIN
-    |= flags & (COMMANDS_RECURSE | COMMANDS_BUILTIN);
+    |= flags & (COMMANDS_RECURSE | COMMANDS_KMK_BUILTIN);
 #else
     |= flags & COMMANDS_RECURSE;
@@ -1184 +1185 @@
   /* If builtin command then pass it on to the builtin shell interpreter. */
 
-  if ((flags & COMMANDS_BUILTIN) && !just_print_flag)
+  if ((flags & COMMANDS_KMK_BUILTIN) && !just_print_flag)
     {
       int    rc;
@@ -1209 +1210 @@
       child->pid = (pid_t)42424242;
       child->status = rc << 8;
-      child->have_status = 1;
+      child->has_status = 1;
       return;
     }
@@ -1323 +1324 @@
       /* Never use fork()/exec() here! Use spawn() instead in exec_command() */
       child->pid = child_execute_job (child->good_stdin ? 0 : bad_stdin, 1,
-                                      argv, child->environment, child);
+                                      argv, child->environment);
       if (child->pid < 0)
         {
@@ -1506 +1507 @@
 {
   struct file *f = c->file;
+#ifdef DB_KMK
   DB (DB_KMK, (_("start_waiting_job %p (`%s') command_flags=%#x slots=%d/%d\n"), c, c->file->name, c->file->command_flags, job_slots_used, job_slots));
+#endif
 
   /* If we can start a job remotely, we always want to, and don't care about
@@ -1514 +1517 @@
   c->remote = start_remote_job_p (1);
 
+#ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
   if (c->file->command_flags & COMMANDS_NOTPARALLEL)
     {
-      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s')\n"), not_parallel, not_parallel + 1, c->file, c->file->name));
+      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s') [start_waiting_job]\n"), 
+                   not_parallel, not_parallel + 1, c->file, c->file->name));
+      assert(not_parallel >= 0);
       ++not_parallel;
     }
+#endif /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
 
   /* If we are running at least one job already and the load average
      is too high, make this one wait.  */
   if (!c->remote 
+#ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
       && ((job_slots_used > 0 && (not_parallel > 0 || load_too_high ()))
+#else
+      && ((job_slots_used > 0 && load_too_high ())
+#endif
 #ifdef WINDOWS32
           || (process_used_slots () >= MAXIMUM_WAIT_OBJECTS)
@@ -1529 +1540 @@
           ))
     {
+#ifndef CONFIG_WITH_EXTENDED_NOTPARALLEL
+        /* Put this child on the chain of children waiting for the load average
+           to go down.  */
+        set_command_state (f, cs_running);
+        c->next = waiting_jobs;
+        waiting_jobs = c;
+
+#else  /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
+
       /* Put this child on the chain of children waiting for the load average
-         to go down. if not parallel, put it last.  */
+         to go down. If not parallel, put it last.  */
       set_command_state (f, cs_running);
       c->next = waiting_jobs;
@@ -1541 +1561 @@
           prev->next = c;
         }
-      else
+      else /* FIXME: insert after the last node with COMMANDS_NOTPARALLEL set */
         waiting_jobs = c;
       DB (DB_KMK, (_("queued child %p (`%s')\n"), c, c->file->name));
+#endif /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
       return 0;
     }
-
 
   /* Start the first command; reap_children will run later command lines.  */
@@ -1555 +1575 @@
     case cs_running:
       c->next = children;
-      DB (DB_JOBS, (_("Putting child 0x%08lx (%s) PID %ld%s on the chain. (%u/%u)\n"),
+      DB (DB_JOBS, (_("Putting child 0x%08lx (%s) PID %ld%s on the chain.\n"),
                     (unsigned long int) c, c->file->name,
-                    (long) c->pid, c->remote ? _(" (remote)") : "", job_slots_used + 1, job_slots));
+                    (long) c->pid, c->remote ? _(" (remote)") : ""));
       children = c;
       /* One more job slot is in use.  */
@@ -1830 +1850 @@
   (void) start_waiting_job (c);
 
-  if (job_slots == 1 || not_parallel > 0)
+#ifndef CONFIG_WITH_EXTENDED_NOTPARALLEL
+  if (job_slots == 1 || not_parallel)
     /* Since there is only one job slot, make things run linearly.
        Wait for the child to die, setting the state to `cs_finished'.  */
-    while (file->command_state == cs_running
-        && (job_slots == 1 || not_parallel > 0)
-        && (children != 0 || shell_function_pid != 0) /* reap_child condition - hackish! */)
+    while (file->command_state == cs_running)
       reap_children (1, 0);
+
+#else /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
+
+  if (job_slots == 1 || not_parallel < 0)
+    {
+      /* Since there is only one job slot, make things run linearly.
+         Wait for the child to die, setting the state to `cs_finished'.  */
+      while (file->command_state == cs_running)
+        reap_children (1, 0);
+    }
+  else if (not_parallel > 0)
+    {
+      /* wait for all live children to finish and then continue 
+         with the not-parallel child(s). FIXME: this loop could be better? */
+      while (file->command_state == cs_running
+          && (children != 0 || shell_function_pid != 0) /* reap_child condition */
+          && not_parallel > 0)
+        reap_children (1, 0);
+    }
+#endif /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
 
   return;
@@ -1987 +2026 @@
       waiting_jobs = job->next;
 
-      /* we've already counted it. */
+#ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
+      /* If it's a not-parallel job, we've already counted it once
+         when it was queued in start_waiting_job, so decrement 
+         before sending it to  start_waiting_job again. */
       if (job->file->command_flags & COMMANDS_NOTPARALLEL)
         {
-          DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s') [waiting job]\n"), not_parallel, not_parallel - 1, job->file, job->file->name));
+          DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s') [start_waiting_jobs]\n"), 
+                       not_parallel, not_parallel - 1, job->file, job->file->name));
+          assert(not_parallel > 0);
           --not_parallel;
         }
+#endif /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
 
       /* Try to start that job.  We break out of the loop as soon
@@ -2006 +2051 @@
 
 /* EMX: Start a child process. This function returns the new pid.  */
-/* The child argument can be NULL (that's why we return the pid), if it is
-   and the shell is a dllshell:// a child structure is created and inserted
-   into the child list so reap_children can do its job.
-
-   BTW. the name of this function in this port is very misleading, spawn_job
-   would perhaps be more appropriate. */
 # if defined __MSDOS__ || defined __EMX__
 int
-child_execute_job (int stdin_fd, int stdout_fd, char **argv, char **envp,
-                   struct child *child)
+child_execute_job (int stdin_fd, int stdout_fd, char **argv, char **envp)
 {
   int pid;
@@ -2048 +2086 @@
     CLOSE_ON_EXEC (stdout_fd);
 
-#ifdef MAKE_DLLSHELL
-  pid = spawn_command(argv, envp, child);
-#else
   /* Run the command.  */
   pid = exec_command (argv, envp);
-#endif
 
   /* Restore stdout/stdin of the parent and close temporary FDs.  */
@@ -2098 +2132 @@
 #endif /* !AMIGA && !__MSDOS__ && !VMS */
 #endif /* !WINDOWS32 */
-
-
-#ifdef MAKE_DLLSHELL
-/* Globals for the currently loaded dllshell. */
-char   *dllshell_spec;
-void   *dllshell_dl;
-void   *dllshell_instance;
-void *(*dllshell_init) PARAMS ((const char *spec));
-pid_t (*dllshell_spawn) PARAMS ((void *instance, char **argv, char **envp, int *status, char *done));
-pid_t (*dllshell_wait) PARAMS ((void *instance, int *status, int block));
-
-/* This is called when all pipes and such are configured for the
-   child process. The child argument may be null, see child_execute_job. */
-static int spawn_command (char **argv, char **envp, struct child *c)
-{
-  /* Now let's see if there is a DLLSHELL specifier in the
-     first argument. */
-  if (!strncmp(argv[0], "dllshell://", 11))
-    {
-      /* dllshell://<dllname>[!<realshell>[!whatever]] */
-      char *name, *name_end;
-      int   insert_child = 0;
-
-      /* parse it */
-      name = argv[0] + 11;
-      name_end = strchr (name, '!');
-      if (!name_end)
-        name_end = strchr (name, '\0');
-      if (name_end == name)
-        fatal (NILF, _("%s : malformed specifier!\n"), argv[0]);
-
-      /* need loading? */
-      if (!dllshell_spec || strcmp (argv[0], dllshell_spec))
-        {
-          if (dllshell_spec)
-            fatal (NILF, _("cannot change the dllshell!!!\n"));
-
-          dllshell_spec = strdup (argv[0]);
-          dllshell_spec[name_end - argv[0]] = '\0';
-          dllshell_dl = dlopen (dllshell_spec + (name - argv[0]), RTLD_LOCAL);
-          if (!dllshell_dl)
-            fatal (NILF, _("%s : failed to load! dlerror: '%s'\n"), argv[0], dlerror());
-          dllshell_spec[name_end - name] = '!';
-
-          /* get symbols */
-          dllshell_init  = dlsym (dllshell_dl, "dllshell_init");
-          if (!dllshell_init)
-            fatal (NILF, _("%s : failed to find symbols 'dllshell_init' dlerror: %s\n"), argv[0], dlerror());
-          dllshell_spawn = dlsym (dllshell_dl, "dllshell_spawn");
-          if (!dllshell_spawn)
-            fatal (NILF, _("%s : failed to find symbols 'dllshell_spawn' dlerror: %s\n"), argv[0], dlerror());
-          dllshell_wait  = dlsym (dllshell_dl, "dllshell_wait");
-          if (!dllshell_wait)
-            fatal (NILF, _("%s : failed to find symbols 'dllshell_wait' dlerror: %s\n"), argv[0], dlerror());
-
-          /* init */
-          dllshell_instance = dllshell_init(dllshell_spec);
-          if (!dllshell_instance)
-            fatal (NILF, _("%s : init failed!!!\n"), argv[0]);
-        }
-
-      /* make child struct? */
-      if (!c)
-        {
-          c = (struct child *) xmalloc (sizeof (struct child));
-          bzero ((char *)c, sizeof (struct child));
-          insert_child = 1;
-        }
-
-      /* call it. return value is 0 on succes, -1 on failure. */
-      c->pid = dllshell_spawn (dllshell_instance, argv, envp, &c->status, &c->dllshell_done);
-      DB (DB_JOBS, (_("dllshell pid=%x\n"), c->pid));
-
-      if (insert_child && c->pid > 0)
-        {
-          c->next = children;
-          DB (DB_JOBS, (_("Putting child 0x%08lx (-) PID %ld on the chain.\n"),
-                        (unsigned long int) c, (long) c->pid));
-          children = c;
-          /* One more job slot is in use.  */
-          ++job_slots_used;
-        }
-    }
-  else
-    {
-      /* Run the command.  */
-#ifdef __EMX__
-      c->pid =
-        exec_command (argv, envp);
-#else
-# error MAKE_DLLSHELL is not ported to your platform yet.
-#endif
-      DB (DB_JOBS, (_("spawn pid=%x\n"), c->pid));
-    }
-
-  return c->pid;
-}
-
-/* Waits or pools for a job to finish.
-   If the block argument the the function will not return
-   till a job is completed (if there are any jobs).
-   Returns pid of completed job.
-   Returns 0 if no jobs are finished.
-   Returns -1 if no jobs are running. */
-pid_t  wait_jobs (int *status, int block)
-{
-  pid_t pid;
-  if (dllshell_wait)
-    pid = dllshell_wait(dllshell_instance, status, block);
-  else
-    {
-      if (block)
-        pid = WAIT_NOHANG(status);
-      else
-        pid = wait(status);
-    }
-  return pid;
-}
-
-#endif /* MAKE_DLLSHELL */
 
 
@@ -2633 +2547 @@
 #else  /* !__MSDOS__ */
   else if (strcmp (shell, default_shell))
+# ifndef KMK
+    goto slow;
+#else /* KMK */
     {
       /* Allow ash from kBuild. */
       const char *psz = strstr(shell, "/kmk_ash");
       if (   !psz
-          || (!psz[sizeof("/kmk_ash")] && psz[sizeof("/kmk_ash")] == '.'))
-          goto slow;
-    }
+          || (!psz[sizeof("/kmk_ash")] && psz[sizeof("/kmk_ash")] == '.')) /* FIXME: this test looks bogus... */
+        goto slow;
+    }
+# endif  /* KMK */
 #endif /* !__MSDOS__ && !__EMX__ */
 #endif /* not WINDOWS32 */
@@ -3289 +3207 @@
   }
 #if defined(CONFIG_WITH_KMK_BUILTIN) && defined(WINDOWS32)
+  /* On windows we have to avoid batch mode for builtin commands. */
   if (!strncmp(line, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
   {

trunk/src/gmake/job.h

@@ -56 +56 @@
 #endif
     char *sh_batch_file;        /* Script file for shell commands */
-#if defined(CONFIG_WITH_KMK_BUILTIN) || defined(MAKE_DLLSHELL)
+#ifdef CONFIG_WITH_KMK_BUILTIN
     int status;                 /* Status of the job. */
-    unsigned int have_status:1; /* Nonzero if status is available. */
-#endif
-#ifdef MAKE_DLLSHELL
-    unsigned int dllshelled:1;  /* Nonzero if executed thru dllshell. */
+    unsigned int has_status:1;  /* Nonzero if status is available. */
 #endif
     unsigned int remote:1;      /* Nonzero if executing remotely.  */
@@ -81 +78 @@
 #ifdef VMS
 extern int child_execute_job PARAMS ((char *argv, struct child *child));
-#elif defined(__EMX__) || defined (MAKE_DLLSHELL)
-extern int child_execute_job PARAMS ((int stdin_fd, int stdout_fd, char **argv, char **envp, struct child *child));
+#elif defined(__EMX__)
+extern int child_execute_job PARAMS ((int stdin_fd, int stdout_fd, char **argv, char **envp));
 #else
 extern void child_execute_job PARAMS ((int stdin_fd, int stdout_fd, char **argv, char **envp));
@@ -110 +107 @@
 extern unsigned int jobserver_tokens;
 
-#ifdef MAKE_DLLSHELL
-extern pid_t wait_jobs PARAMS ((int *status, int block));
-#endif
-
 #endif /* SEEN_JOB_H */

trunk/src/gmake/main.c

@@ -494 +494 @@
 int second_expansion;
 
-/* Negative if we have seen the `.NOTPARALLEL' target with empty dependency list.
-   Zero if no `.NOTPARALLEL' or no file in the dependency list is being executed.
-   Positive when a file in `.NOTPARALLEL' is being made.
-   Nonzero values have the effect of disabeling parallel building. */
+#ifndef CONFIG_WITH_EXTENDED_NOTPARALLEL
+/* Nonzero if we have seen the `.NOTPARALLEL' target.
+   This turns off parallel builds for this invocation of make.  */
+
+#else  /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
+
+/* Negative if we have seen the `.NOTPARALLEL' target with an 
+   empty dependency list. 
+
+   Zero if no `.NOTPARALLEL' or no file in the dependency list 
+   is being executed. 
+
+   Positive when a file in the `.NOTPARALLEL' dependency list 
+   is in progress, the value is the number of notparallel files
+   in progress (running or queued for running).
+
+   In short, any nonzero value means no more parallel builing. */
+#endif /* CONFIG_WITH_EXTENDED_NOTPARALLEL */
 
 int not_parallel;
@@ -633 +647 @@
               db_level |= DB_BASIC | DB_VERBOSE;
               break;
+#ifdef DB_KMK
             case 'k':
               db_level |= DB_KMK;
               break;
+#endif
             default:
               fatal (NILF, _("unknown debug level specification `%s'"), p);
@@ -2101 +2117 @@
             int pid;
             int status;
-            pid = child_execute_job (0, 1, nargv, environ, NULL);
+            pid = child_execute_job (0, 1, nargv, environ);
 
             /* is this loop really necessary? */
@@ -2738 +2754 @@
                            *(unsigned int *) cs->noarg_value))
                 ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
-#if !defined(KMK) || defined(MAKE_JOBSERVER) /* Win32 doesn't have a job server, but we really do want jobs despite the risks. */
               else if (cs->c == 'j')
                 /* Special case for `-j'.  */
                 ADD_FLAG ("1", 1);
-#endif
               else
                 {

trunk/src/gmake/make.h

@@ -41 +41 @@
 
 /* Use prototypes if available.  */
-#if defined (__cplusplus) || defined (__STDC__) || defined WINDOWS32
+#if defined (__cplusplus) || defined (__STDC__) || defined WINDOWS32 /* bird: protos on windows */
 # undef  PARAMS
 # define PARAMS(protos)  protos
@@ -425 +425 @@
 extern char *end_of_token PARAMS ((const char *));
 extern void collapse_continuations PARAMS ((char *));
-#ifdef KMK
+#if 1 /* memchr is usually compiler intrinsic, thus faster. */
 #define lindex(s, limit, c) ((char *)memchr((s), (c), (limit) - (s)))
 #else
@@ -615 +615 @@
                                while (((_v)=_c)==0 && errno==EINTR); }while(0)
 
-#ifdef __EMX__ /* saves 40-100ms on libc. */
+#ifdef __EMX__ /* bird: saves 40-100ms on libc. */
 #undef strchr
 #define strchr(s, c) \
@@ -700 +700 @@
 }
 
-#endif
+#endif /* __EMX__ (bird) */

trunk/src/gmake/misc.c

@@ -21 +21 @@
 #include "debug.h"
 
-#ifdef __EMX__  /* saves 5-10ms on libc */
+#ifdef __EMX__  /* bird: saves 5-10ms on libc */
 # define bcopy(src, dst, size)   __builtin_memcpy((dst), (src), (size))
 #endif
@@ -406 +406 @@
 
 
-#ifndef KMK /* This is really a reimplemntation of memchr. */
+#if 0 /* This is really a reimplemntation of memchr, only slower. 
+         It's been replaced by a macro in the header file. */
 /* Limited INDEX:
    Search through the string STRING, which ends at LIMIT, for the character C.

trunk/src/gmake/read.c

@@ -223 +223 @@
 #ifdef VMS
         /* all lower case since readdir() (the vms version) 'lowercasifies' */
+# ifdef KMK
         { "makefile.kmk", "makefile.vms", "gnumakefile.", "makefile.", 0 };
+# else
+        { "makefile.vms", "gnumakefile.", "makefile.", 0 };
+# endif 
 #else
 #ifdef _AMIGA
         /* what's the deal here? no dots? */
+# ifdef KMK
         { "Makefile.kmk", "makefile.kmk", "GNUmakefile", "Makefile", "SMakefile", 0 };
+# else
+        { "GNUmakefile", "Makefile", "SMakefile", 0 };
+# endif
 #else /* !Amiga && !VMS */
+# ifdef KMK
         { "Makefile.kmk", "makefile.kmk", "GNUmakefile", "makefile", "Makefile", 0 };
+# else
+        { "GNUmakefile", "makefile", "Makefile", 0 };
+# endif
 #endif /* AMIGA */
 #endif /* VMS */
@@ -1157 +1169 @@
               fatal (fstart, _("missing target pattern"));
             else if (target->next != 0)
-              fatal (fstart, _("multiple target patterns (target `%s')"), target->name);
+              fatal (fstart, _("multiple target patterns (target `%s')"), target->name); /* bird */
             pattern = target->name;
             pattern_percent = find_percent (pattern);
             if (pattern_percent == 0)
-              fatal (fstart, _("target pattern contains no `%%' (target `%s')"), target->name);
+              fatal (fstart, _("target pattern contains no `%%' (target `%s')"), target->name); /* bird */
             free ((char *)target);
           }
@@ -2156 +2168 @@
   unsigned int string_len = 0;
   register char *p = string;
-  register int ch; /* bird */
+  register int ch; /* bird: 'optimiziations' */
 
   if (ignorevars)
@@ -2269 +2281 @@
   struct nameseq *new = 0;
   struct nameseq *new1;
-#ifndef NO_ARCHIVES
+#ifndef NO_ARCHIVES /* bird: MSC warning */
   struct nameseq *lastnew1;
 #endif 

trunk/src/gmake/remake.c

@@ -803 +803 @@
   int ran = file->command_state == cs_running;
   int touched = 0;
-  DB (DB_JOBS, (_("notice_finished_file - entering: file=%p `%s' update_status=%d command_state=%d\n"),
+  DB (DB_JOBS, (_("notice_finished_file - entering: file=%p `%s' update_status=%d command_state=%d\n"), /* bird */
                   file, file->name, file->update_status, file->command_state));
   file->command_state = cs_finished;
   file->updated = 1;
 
+#ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
   /* update not_parallel if the file was flagged for that. */
-  if (ran && (file->command_flags & (COMMANDS_NOTPARALLEL | COMMANDS_NO_COMMANDS))
-      == COMMANDS_NOTPARALLEL)
-    {
-      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s')\n"), not_parallel,
+  if (   ran 
+      && (file->command_flags & (COMMANDS_NOTPARALLEL | COMMANDS_NO_COMMANDS)) 
+         == COMMANDS_NOTPARALLEL)
+    {
+      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s') [notice_finished_file]\n"), not_parallel,
                    not_parallel - 1, file, file->name));
       assert(not_parallel >= 1);
       --not_parallel;
     }
+#endif
 
   if (touch_flag
@@ -936 +939 @@
        So mark it now as "succeeded".  */
     file->update_status = 0;
-
-DB (DB_JOBS, (_("notice_finished_file - leaving: file=%p `%s' update_status=%d command_state=%d\n"), file, file->name, file->update_status, file->command_state));
 }
 

trunk/src/gmake/variable.c

@@ -167 +167 @@
 {
   struct variable const *key = (struct variable const *) keyv;
-#ifdef VARIABLE_HASH
-#ifdef VARIABLE_HASH_STRICT
+#ifdef VARIABLE_HASH /* bird */
+# ifdef VARIABLE_HASH_STRICT
   if (key->hash1 != variable_hash_a (key->name, key->length))
     __asm__("int3");
   if (key->hash2 && key->hash2 != variable_hash_b (key->name, key->length))
     __asm__("int3");
-#endif
+# endif
   return key->hash1;
 #else
-#ifdef KMK
+# ifdef KMK
   return variable_hash_a (key->name, key->length);
-#else
+# else
   return_STRING_N_HASH_1 (key->name, key->length);
-#endif
+# endif
 #endif
 }
@@ -187 +187 @@
 variable_hash_2 (const void *keyv)
 {
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   struct variable *key = (struct variable *) keyv;
   if (!key->hash2)
@@ -194 +194 @@
 #else
   struct variable const *key = (struct variable const *) keyv;
-#ifdef KMK
+# ifdef KMK
   return variable_hash_b (key->name, key->length);
-#else
+# else
   return_STRING_N_HASH_2 (key->name, key->length);
-#endif
+# endif
 #endif
 }
@@ -210 +210 @@
   if (result)
     return result;
-#ifdef KMK /* speed */
+#ifdef KMK /* bird: speed */
   {
     const char *xs = x->name;
@@ -249 +249 @@
   }
 #endif /* KMK */
-#ifdef VARIABLE_HASH_STRICT
+#ifdef VARIABLE_HASH_STRICT /* bird */
   if (x->hash1 != variable_hash_a (x->name, x->length))
     __asm__("int3");
@@ -333 +333 @@
   var_key.name = (char *) name;
   var_key.length = length;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   var_key.hash1 = variable_hash_a (name, length);
   var_key.hash2 = 0;
@@ -373 +373 @@
   v->name = savestring (name, length);
   v->length = length;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   v->hash1 = variable_hash_a (name, length);
   v->hash2 = 0;
@@ -514 +514 @@
   var_key.name = (char *) name;
   var_key.length = length;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   var_key.hash1 = variable_hash_a (name, length);
   var_key.hash2 = 0;
@@ -603 +603 @@
   var_key.name = (char *) name;
   var_key.length = length;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   var_key.hash1 = variable_hash_a (name, length);
   var_key.hash2 = 0;
@@ -903 +903 @@
   (void) define_variable ("MAKE_VERSION", 12, buf, o_default, 0);
 
+#ifdef KMK
   /* Define KMK_VERSION to indicate kMk. */
   (void) define_variable ("KMK_VERSION", 11, buf, o_default, 0);
@@ -908 +909 @@
   /* Define KMK_FEATURES to indicate various working KMK features. */
   (void) define_variable ("KMK_FEATURES", 12, "abspath toupper tolower", o_default, 0);
+#endif
 
 #ifdef CONFIG_WITH_KMK_BUILTIN
@@ -1135 +1137 @@
   makelevel_key.name = MAKELEVEL_NAME;
   makelevel_key.length = MAKELEVEL_LENGTH;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   makelevel_key.hash1 = variable_hash_a (MAKELEVEL_NAME, MAKELEVEL_LENGTH);
   makelevel_key.hash2 = 0;

trunk/src/gmake/variable.h

@@ -53 +53 @@
     char *name;                 /* Variable name.  */
     int length;                 /* strlen (name) */
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
     long hash1;                 /* the primary hash */
     long hash2;                 /* the secondary hash */

trunk/src/gmake/w32/pathstuff.c

@@ -16 +16 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
-#include <Windows.h>
+#include <Windows.h> /* bird */
+#include <stdio.h>   /* bird */
 #include <string.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include "make.h"
 #include "pathstuff.h"
-
 
 /*
@@ -83 +82 @@
 }
 
-/*
+/* 
  * Corrects the case of a path.
  * Expects a fullpath!
- */
-void w32_fixcase(char *pszPath)
+ * Added by bird for the $(abspath ) function and w32ify
+ */
+void 
+w32_fixcase(char *pszPath)
 {
 #define my_assert(expr) \
@@ -211 +212 @@
         strncpy(w32_path, filename, sizeof (w32_path));
 
-    w32_fixcase(w32_path);
+    w32_fixcase(w32_path); /* bird */
 
     for (p = w32_path; p && *p; p++)
@@ -233 +234 @@
 }
 
-/* Workaround for directory names with trailing slashes. */
+/* 
+ * Workaround for directory names with trailing slashes. 
+ * Added by bird reasons stated.
+ */
 int 
 stat(const char *path, struct stat *st)
 {
-    int rc = _stat(path, st);
+    int rc = _stat(path, (struct _stat *)st);
     if (    rc != 0
         &&  errno == ENOENT
@@ -251 +255 @@
             tmp[len_path + 1] = '\0';
             errno = 0;
-            rc = _stat(tmp, st);
+            rc = _stat(tmp, (struct _stat *)st);
             if (    rc == 0
                 &&  !S_ISDIR(st->st_mode))