Changeset 2540 in kBuild

Timestamp:

Aug 2, 2011 8:13:24 PM (13 years ago)

Author:

bird

Message:

kbuild.c: For the time being, we'll defined two sets of local variables. The new ones are: kbsrc_cmds, kbsrc_output, kbsrc_output_maybe, kbsrc_depend & kbsrc_depord.

File:

• trunk/src/kmk/kbuild.c (modified) (5 diffs)

trunk/src/kmk/kbuild.c

@@ -2111 +2111 @@
     do_variable_definition_2(NILF, pszDstVar, pVar->value, pVar->value_length,
                              !pVar->recursive, 0, o_local, f_simple, 0 /* !target_var */);
+    do_variable_definition_2(NILF, "kbsrc_cmds", pVar->value, pVar->value_length,
+                             !pVar->recursive, 0, o_local, f_simple, 0 /* !target_var */);
 
     memcpy(pszSrc, "_OUTPUT", sizeof("_OUTPUT"));
@@ -2117 +2119 @@
     pOutput = do_variable_definition_2(NILF, pszDstVar, pVar->value, pVar->value_length,
                                        !pVar->recursive, 0, o_local, f_simple, 0 /* !target_var */);
+    pOutput = do_variable_definition_2(NILF, "kbsrc_output", pVar->value, pVar->value_length,
+                                       !pVar->recursive, 0, o_local, f_simple, 0 /* !target_var */);
 
     memcpy(pszSrc, "_OUTPUT_MAYBE", sizeof("_OUTPUT_MAYBE"));
@@ -2122 +2126 @@
     pVar = kbuild_query_recursive_variable(pszSrcVar);
     if (pVar)
+    {
         pOutputMaybe = do_variable_definition_2(NILF, pszDstVar, pVar->value, pVar->value_length,
                                                 !pVar->recursive, 0, o_local, f_simple, 0 /* !target_var */);
+        pOutputMaybe = do_variable_definition_2(NILF, "kbsrc_output_maybe", pVar->value, pVar->value_length,
+                                                !pVar->recursive, 0, o_local, f_simple, 0 /* !target_var */);
+    }
     else
+    {
         pOutputMaybe = do_variable_definition_2(NILF, pszDstVar, "", 0, 1, 0, o_local, f_simple, 0 /* !target_var */);
+        pOutputMaybe = do_variable_definition_2(NILF, "kbsrc_output_maybe", "", 0, 1, 0, o_local, f_simple, 0 /* !target_var */);
+    }
 
     memcpy(pszSrc, "_DEPEND", sizeof("_DEPEND"));
@@ -2138 +2149 @@
     do_variable_definition_2(NILF, pszDstVar, pszVal, pVar->value_length + 1 + pDeps->value_length + 1 + pSource->value_length,
                              !pVar->recursive && !pDeps->recursive && !pSource->recursive,
+                             NULL, o_local, f_simple, 0 /* !target_var */);
+    do_variable_definition_2(NILF, "kbsrc_depend", pszVal, pVar->value_length + 1 + pDeps->value_length + 1 + pSource->value_length,
+                             !pVar->recursive && !pDeps->recursive && !pSource->recursive,
                              pszVal, o_local, f_simple, 0 /* !target_var */);
 
@@ -2150 +2164 @@
     memcpy(psz, pOrderDeps->value, pOrderDeps->value_length + 1);
     do_variable_definition_2(NILF, pszDstVar, pszVal,
+                             pVar->value_length + 1 + pDirDep->value_length + 1 + pOrderDeps->value_length,
+                             !pVar->recursive && !pDirDep->recursive && !pOrderDeps->recursive,
+                             NULL, o_local, f_simple, 0 /* !target_var */);
+    do_variable_definition_2(NILF, "kbsrc_depord", pszVal,
                              pVar->value_length + 1 + pDirDep->value_length + 1 + pOrderDeps->value_length,
                              !pVar->recursive && !pDirDep->recursive && !pOrderDeps->recursive,