Changeset 725 for trunk/src/gmake/kbuild.c

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*.

File:

• trunk/src/gmake/kbuild.c (modified) (6 diffs)

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 */);