Changeset 1503 for trunk/src/kmk/kbuild.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/kbuild.c (modified) (6 diffs)

trunk/src/kmk/kbuild.c

@@ -205 +205 @@
 
 /**
- * Determin the PATH_KBUILD value.
+ * Determin the KBUILD_PATH value.
  *
  * @returns Pointer to static a buffer containing the value (consider it read-only).
  */
-const char *get_path_kbuild(void)
+const char *get_kbuild_path(void)
 {
     static const char *s_pszPath = NULL;
@@ -215 +215 @@
     {
         PATH_VAR(szTmpPath);
-        const char *pszEnvVar = getenv("PATH_KBUILD");
+        const char *pszEnvVar = getenv("KBUILD_PATH");
         if (    !pszEnvVar
             ||  !my_abspath(pszEnvVar, szTmpPath))
         {
-#ifdef PATH_KBUILD
-            return s_pszPath = PATH_KBUILD;
+            const char *pszEnvVar = getenv("PATH_KBUILD");
+            if (    !pszEnvVar
+                ||  !my_abspath(pszEnvVar, szTmpPath))
+            {
+#ifdef KBUILD_PATH
+                return s_pszPath = KBUILD_PATH;
 #else
-            /* $(abspath $(PATH_KBUILD_BIN)/../..)*/
-            size_t cch = strlen(get_path_kbuild_bin());
-            char *pszTmp2 = alloca(cch + sizeof("/../.."));
-            strcat(strcpy(pszTmp2, get_path_kbuild_bin()), "/../..");
-            if (!my_abspath(pszTmp2, szTmpPath))
-                fatal(NILF, _("failed to determin PATH_KBUILD"));
-#endif
+                /* $(abspath $(KBUILD_BIN_PATH)/../..)*/
+                size_t cch = strlen(get_kbuild_bin_path());
+                char *pszTmp2 = alloca(cch + sizeof("/../.."));
+                strcat(strcpy(pszTmp2, get_kbuild_bin_path()), "/../..");
+                if (!my_abspath(pszTmp2, szTmpPath))
+                    fatal(NILF, _("failed to determin KBUILD_PATH"));
+#endif
+            }
         }
         s_pszPath = xstrdup(szTmpPath);
@@ -237 +242 @@
 
 /**
- * Determin the PATH_KBUILD_BIN value.
+ * Determin the KBUILD_BIN_PATH value.
  *
  * @returns Pointer to static a buffer containing the value (consider it read-only).
  */
-const char *get_path_kbuild_bin(void)
+const char *get_kbuild_bin_path(void)
 {
     static const char *s_pszPath = NULL;
@@ -247 +252 @@
     {
         PATH_VAR(szTmpPath);
-        const char *pszEnvVar = getenv("PATH_KBUILD_BIN");
+
+        const char *pszEnvVar = getenv("KBUILD_BIN_PATH");
         if (    !pszEnvVar
             ||  !my_abspath(pszEnvVar, szTmpPath))
         {
-#ifdef PATH_KBUILD
-            return s_pszPath = PATH_KBUILD_BIN;
+            const char *pszEnvVar = getenv("PATH_KBUILD_BIN");
+            if (    !pszEnvVar
+                ||  !my_abspath(pszEnvVar, szTmpPath))
+            {
+#ifdef KBUILD_PATH
+                return s_pszPath = KBUILD_BIN_PATH;
 #else
-            /* $(abspath $(dir $(ARGV0)).) */
-            size_t cch = strlen(g_pszExeName);
-            char *pszTmp2 = alloca(cch + sizeof("."));
-            char *pszSep = pszTmp2 + cch - 1;
-            memcpy(pszTmp2, g_pszExeName, cch);
-#ifdef HAVE_DOS_PATHS
-            while (pszSep >= pszTmp2 && *pszSep != '/' && *pszSep != '\\' && *pszSep != ':')
-#else
-            while (pszSep >= pszTmp2 && *pszSep != '/')
-#endif
-                pszSep--;
-            if (pszSep >= pszTmp2)
-              strcpy(pszSep + 1, ".");
-            else
-              strcpy(pszTmp2, ".");
-
-            if (!my_abspath(pszTmp2, szTmpPath))
-                fatal(NILF, _("failed to determin PATH_KBUILD_BIN (pszTmp2=%s szTmpPath=%s)"), pszTmp2, szTmpPath);
-#endif
+                /* $(abspath $(dir $(ARGV0)).) */
+                size_t cch = strlen(g_pszExeName);
+                char *pszTmp2 = alloca(cch + sizeof("."));
+                char *pszSep = pszTmp2 + cch - 1;
+                memcpy(pszTmp2, g_pszExeName, cch);
+# ifdef HAVE_DOS_PATHS
+                while (pszSep >= pszTmp2 && *pszSep != '/' && *pszSep != '\\' && *pszSep != ':')
+# else
+                while (pszSep >= pszTmp2 && *pszSep != '/')
+# endif
+                    pszSep--;
+                if (pszSep >= pszTmp2)
+                  strcpy(pszSep + 1, ".");
+                else
+                  strcpy(pszTmp2, ".");
+    
+                if (!my_abspath(pszTmp2, szTmpPath))
+                    fatal(NILF, _("failed to determin KBUILD_BIN_PATH (pszTmp2=%s szTmpPath=%s)"), pszTmp2, szTmpPath);
+#endif /* !KBUILD_PATH */
+            }
         }
         s_pszPath = xstrdup(szTmpPath);
@@ -289 +300 @@
     static char *s_pszDefaultShell = NULL;
     if (!s_pszDefaultShell)
-      {
+    {
 #if defined(__OS2__) || defined(_WIN32) || defined(WINDOWS32)
         static const char s_szShellName[] = "/kmk_ash.exe";
@@ -295 +306 @@
         static const char s_szShellName[] = "/kmk_ash";
 #endif
-        const char *pszBin = get_path_kbuild_bin();
+        const char *pszBin = get_kbuild_bin_path();
         size_t cchBin = strlen(pszBin);
         s_pszDefaultShell = xmalloc(cchBin + sizeof(s_szShellName));
         memcpy(s_pszDefaultShell, pszBin, cchBin);
         memcpy(&s_pszDefaultShell[cchBin], s_szShellName, sizeof(s_szShellName));
-      }
+    }
     return s_pszDefaultShell;
 }