Changeset 725 for trunk/src/gmake

Timestamp:

Dec 15, 2006, 6:18:47 AM (19 years ago)

Author:

bird

Message:

Partial implementation of a _PATH target property for resolving relative paths. It's primarily intended for sub-makefile mode where we apply it to all targets automatically. TODOs: INCS, DEPs (source level) and SUBDIRS*.

Location:

trunk/src/gmake

Files:

• function.c (modified) (2 diffs)
• kbuild.c (modified) (6 diffs)

trunk/src/gmake/function.c

@@ -2119 +2119 @@
  return o;
 }
+
+#ifdef CONFIG_WITH_ABSPATHEX
+/* same as abspath except that the current path is given as the 2nd argument. */
+static char *
+func_abspathex (char *o, char **argv, const char *funcname UNUSED)
+{
+  /* Expand the argument.  */
+  char *p = argv[0];
+  PATH_VAR (current_directory);
+  char *cwd = argv[1];
+  unsigned int cwd_len = ~0U;
+  char *path = 0;
+  int doneany = 0;
+  unsigned int len = 0;
+  PATH_VAR (in);
+  PATH_VAR (out);
+
+  while ((path = find_next_token (&p, &len)) != 0)
+    {
+      if (len < GET_PATH_MAX)
+        {
+#ifdef HAVE_DOS_PATHS
+          if (path[0] != '/' && path[0] != '\\' && (len < 2 || path[1] != ':') && cwd)
+#else
+          if (path[0] != '/' && cwd)
+#endif 
+            {
+              /* relative path, prefix with cwd. */
+              if (cwd_len == ~0U)
+                cwd_len = strlen (cwd);
+              if (cwd_len + len + 1 >= GET_PATH_MAX)
+                  continue;
+              memcpy (in, cwd, cwd_len)
+              in[cwd_len] = '/';
+              memcpy (in + cwd_len + 1, path, len);
+              in[cwd_len + len + 1] = '\0';
+            }
+          else
+            {
+              /* absolute path pass it as-is. */
+              memcpy (in, path, len);
+              in[len] = '\0';
+            }
+
+          if (abspath (in, out))
+            {
+              o = variable_buffer_output (o, out, strlen (out));
+              o = variable_buffer_output (o, " ", 1);
+              doneany = 1;
+            }
+        }
+    }
+
+  /* Kill last space.  */
+  if (doneany)
+    --o;
+
+ return o;
+}
+#endif 
 
 #ifdef CONFIG_WITH_TOUPPER_TOLOWER
@@ -2378 +2438 @@
   { STRING_SIZE_TUPLE("tolower"),       0,  1,  1,  func_toupper_tolower},
 #endif
+#ifdef CONFIG_WITH_ABSPATHEX
+  { STRING_SIZE_TUPLE("abspathex"),     0,  2,  1,  func_abspathex},
+#endif 
 #if defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE)
   { STRING_SIZE_TUPLE("comp-vars"),     3,  3,  1,  func_comp_vars},

trunk/src/gmake/kbuild.c

@@ -788 +788 @@
                            struct variable *pType, struct variable *pBldType,
                            struct variable *pBldTrg, struct variable *pBldTrgArch, struct variable *pBldTrgCpu,
+                           struct variable *pDefPath,
                            const char *pszProp, const char *pszVarName, int iDirection)
 {
@@ -1002 +1003 @@
             paVars[iVar].cchExp = strlen(paVars[iVar].pszExp);
         }
+        if (pDefPath)
+        {
+            /** @todo */
+        }
         cchTotal += paVars[iVar].cchExp + 1;
     }
@@ -1030 +1035 @@
 }
 
-/* get a source property. */
+/* get a source property. Doesn't respect the default path. */
 char *
 func_kbuild_source_prop(char *o, char **argv, const char *pszFuncName)
@@ -1056 +1061 @@
     pVar = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType,
                                       pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
+                                      NULL,
                                       argv[0], argv[1], iDirection);
     if (pVar)
@@ -1190 +1196 @@
     struct variable *pTarget    = kbuild_get_variable("target");
     struct variable *pSource    = kbuild_get_variable("source");
+    struct variable *pDefPath   = kbuild_get_variable("defpath");
     struct variable *pType      = kbuild_get_variable("type");
     struct variable *pBldType   = kbuild_get_variable("bld_type");
@@ -1207 +1214 @@
     kbuild_get_sdks(&Sdks, pTarget, pSource, pBldType, pBldTrg, pBldTrgArch);
 
-    pDefs  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
+    if (pDefPath && !pDefPath->value_length)
+        pDefPath = NULL;
+    pDefs  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, NULL,
                                         "DEFS", "defs", 1/* left-to-right */);
-    pIncs  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
+    pIncs  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, NULL,
                                         "INCS", "incs", -1/* right-to-left */);
-    pFlags = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
+    pFlags = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, pDefPath,
                                         "FLAGS", "flags", 1/* left-to-right */);
-    pDeps  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
+    pDeps  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, pDefPath,
                                         "DEPS", "deps", 1/* left-to-right */);