Changeset 1503 for trunk/src/kmk/main.c

Timestamp:

Apr 9, 2008, 1:16:53 AM (17 years ago)

Author:

bird

Message:

Environment / globals cleanup. The new policy is to use KBUILD_ and KMK_ prefixes for things that is put into or/and picked from the environment. This will take a good while to complete.

Renamed (old still valid for some versions):
PATH_KBUILD -> KBUILD_PATH
PATH_KBUILD_BIN -> KBUILD_BIN_PATH
BUILD_PLATFORM -> KBUILD_HOST
BUILD_PLATFORM_ARCH -> KBUILD_HOST_ARCH
BUILD_PLATFORM_CPU -> KBUILD_HOST_CPU

Renamed - old not checked:
MAKELEVEL -> KMK_LEVEL
KMKFLAGS -> KMK_FLAGS
MAKEFLAGS -> KMK_FLAGS
MAKEOVERRIDES -> KMK_OVERRIDES

Removed:
MAKE_VERSION
MFLAGS

File:

• trunk/src/kmk/main.c (modified) (11 diffs)

trunk/src/kmk/main.c

@@ -1294 +1294 @@
     argv[0] = "";
   if (argv[0][0] == '\0')
+#ifdef KMK
+    program = "kmk";
+#else
     program = "make";
+#endif
   else
     {
@@ -1499 +1503 @@
 
 #ifdef KMK
-  decode_env_switches (STRING_SIZE_TUPLE ("KMKFLAGS"));
-#endif
+  decode_env_switches (STRING_SIZE_TUPLE ("KMK_FLAGS"));
+#else /* !KMK */
   decode_env_switches (STRING_SIZE_TUPLE ("MAKEFLAGS"));
 #if 0
@@ -1508 +1512 @@
   decode_env_switches (STRING_SIZE_TUPLE ("MFLAGS"));
 #endif
+#endif /* !KMK */
   decode_switches (argc, argv, 0);
 #ifdef WINDOWS32
@@ -1643 +1648 @@
          allow the user's setting of MAKEOVERRIDES to affect MAKEFLAGS, so
          a reference to this hidden variable is written instead. */
+#ifdef KMK
+      (void) define_variable ("KMK_OVERRIDES", 13,
+#else
       (void) define_variable ("MAKEOVERRIDES", 13,
+#endif
                               "${-*-command-variables-*-}", o_env, 1);
     }
@@ -1753 +1762 @@
   {
     extern char *default_shell;
-    const char *bin = get_path_kbuild_bin();
+    const char *bin = get_kbuild_bin_path();
     size_t len = strlen (bin);
     default_shell = xmalloc (len + sizeof("/kmk_ash.exe"));
@@ -1994 +2003 @@
   /* Decode switches again, in case the variables were set by the makefile.  */
 #ifdef KMK
-  decode_env_switches (STRING_SIZE_TUPLE ("KMKFLAGS"));
-#endif
+  decode_env_switches (STRING_SIZE_TUPLE ("KMK_FLAGS"));
+#else /* !KMK */
   decode_env_switches (STRING_SIZE_TUPLE ("MAKEFLAGS"));
 #if 0
   decode_env_switches (STRING_SIZE_TUPLE ("MFLAGS"));
 #endif
+#endif /* !KMK */
 
 #if defined (__MSDOS__) || defined (__EMX__)
@@ -2766 +2776 @@
   if (!remote_description || *remote_description == '\0')
     printf (_("\nThis program is built for %s/%s/%s [" __DATE__ " " __TIME__ "]\n"),
-            BUILD_PLATFORM, BUILD_PLATFORM_ARCH, BUILD_PLATFORM_CPU, remote_description);
+            KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU, remote_description);
   else
     printf (_("\nThis program is built for %s/%s/%s (%s) [" __DATE__ " " __TIME__ "]\n"),
-            BUILD_PLATFORM, BUILD_PLATFORM_ARCH, BUILD_PLATFORM_CPU, remote_description);
+            KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU, remote_description);
 #else  /* !KMK */
   if (!remote_description || *remote_description == '\0')
@@ -3051 +3061 @@
 define_makeflags (int all, int makefile)
 {
+#ifdef KMK
+  static const char ref[] = "$(KMK_OVERRIDES)";
+#else
   static const char ref[] = "$(MAKEOVERRIDES)";
+#endif
   static const char posixref[] = "$(-*-command-variables-*-)";
   register const struct command_switch *cs;
@@ -3241 +3255 @@
     *p = '\0';
 
+#ifdef KMK
   /* Since MFLAGS is not parsed for flags, there is no reason to
      override any makefile redefinition.  */
   (void) define_variable ("MFLAGS", 6, flagstring, o_env, 1);
+#endif /* !KMK */
 
   if (all && command_variables != 0)
@@ -3290 +3306 @@
   *p = '\0';
 
+#ifdef KMK
+  v = define_variable ("KMK_FLAGS", 9,
+#else
   v = define_variable ("MAKEFLAGS", 9,
+#endif
                        /* If there are switches, omit the leading dash
                           unless it is a single long option with two
@@ -3381 +3401 @@
 
 #ifdef KMK
-# ifdef PATH_KBUILD
+# ifdef KBUILD_PATH
   printf (_("%s\n\
-%sPATH_KBUILD:     '%s' (default '%s')\n\
-%sPATH_KBUILD_BIN: '%s' (default '%s')\n"),
+%sKBUILD_PATH:     '%s' (default '%s')\n\
+%sKBUILD_BIN_PATH: '%s' (default '%s')\n"),
           precede,
-          precede, get_path_kbuild(), PATH_KBUILD,
-          precede, get_path_kbuild_bin(), PATH_KBUILD_BIN);
-# else  /* !PATH_KBUILD */
+          precede, get_kbuild_path(), KBUILD_PATH,
+          precede, get_kbuild_bin_path(), KBUILD_BIN_PATH);
+# else  /* !KBUILD_PATH */
   printf (_("%s\n\
-%sPATH_KBUILD:     '%s'\n\
-%sPATH_KBUILD_BIN: '%s'\n"),
+%sKBUILD_PATH:     '%s'\n\
+%sKBUILD_BIN_PATH: '%s'\n"),
           precede,
-          precede, get_path_kbuild(),
-          precede, get_path_kbuild_bin());
-# endif /* !PATH_KBUILD */
+          precede, get_kbuild_path(),
+          precede, get_kbuild_bin_path());
+# endif /* !KBUILD_PATH */
   if (!remote_description || *remote_description == '\0')
     printf (_("\n%sThis program is built for %s/%s/%s [" __DATE__ " " __TIME__ "]\n"),
-            precede, BUILD_PLATFORM, BUILD_PLATFORM_ARCH, BUILD_PLATFORM_CPU, remote_description);
+            precede, KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU, remote_description);
   else
     printf (_("\n%sThis program is built for %s/%s/%s (%s) [" __DATE__ " " __TIME__ "]\n"),
-            precede, BUILD_PLATFORM, BUILD_PLATFORM_ARCH, BUILD_PLATFORM_CPU, remote_description);
+            precede, KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU, remote_description);
 #else
   if (!remote_description || *remote_description == '\0')