Changeset 3134 in kBuild for trunk/src

Timestamp:

Mar 1, 2018 6:42:56 PM (7 years ago)

Author:

bird

Message:

kmk_append: Extended it with an -i parameter that enables looking for --insert-variable=xxx and --inserv-command=xxx. This allows us to merge the kmk_builtin_append commands at the end of each compilation, which significantly (e.g. 1m4s -> 37s) speeds up builds on windows and its dead slow file system.

File:

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

trunk/src/kmk/kmkbuiltin/append.c

@@ -57 +57 @@
             "      the first argument following the file name.\n"
             "  -c  Output the command for specified target(s). [builtin only]\n"
+            "  -i  look for --insert-command=trg and --insert-variable=var. [builtin only]\n"
             "  -n  Insert a newline between the strings.\n"
             "  -N  Suppress the trailing newline.\n"
@@ -82 +83 @@
     int fVariables = 0;
     int fCommands = 0;
+    int fLookForInserts = 0;
 
     g_progname = argv[0];
@@ -92 +94 @@
        &&  argv[i][0] == '-'
        &&  argv[i][1] != '\0' /* '-' is a file */
-       &&  strchr("-cdnNtv", argv[i][1]) /* valid option char */
+       &&  strchr("-cdinNtv", argv[i][1]) /* valid option char */
        )
     {
@@ -123 +125 @@
                         fDefine = 1;
                         break;
+                    case 'i':
+                        if (fVariables || fCommands)
+                        {
+                            errx(1, fVariables ? "Option '-i' clashes with '-v'." : "Option '-i' clashes with '-c'.");
+                            return usage(stderr);
+                        }
+#ifndef kmk_builtin_append
+                        fLookForInserts = 1;
+                        break;
+#else
+                        errx(1, "Option '-C' isn't supported in external mode.");
+                        return usage(stderr);
+#endif
                     case 'n':
                         fNewline = 1;
@@ -228 +243 @@
             }
         }
+        else if (fLookForInserts && strncmp(psz, "--insert-command=", 17) == 0)
+        {
+            char *pszOldBuf;
+            unsigned cchOldBuf;
+            char *pchEnd;
+
+            install_variable_buffer(&pszOldBuf, &cchOldBuf);
+
+            psz += 17;
+            pchEnd = func_commands(variable_buffer, (char **)&psz, "commands");
+            fwrite(variable_buffer, 1, pchEnd - variable_buffer, pFile);
+
+            restore_variable_buffer(pszOldBuf, cchOldBuf);
+        }
+        else if (fLookForInserts && strncmp(psz, "--insert-variable=", 18) == 0)
+        {
+            struct variable *pVar = lookup_variable(psz + 18, cch);
+            if (!pVar)
+                continue;
+            if (   !pVar->recursive
+                || IS_VARIABLE_RECURSIVE_WITHOUT_DOLLAR(pVar))
+                fwrite(pVar->value, 1, pVar->value_length, pFile);
+            else
+            {
+                char *pszExpanded = allocated_variable_expand(pVar->value);
+                fwrite(pszExpanded, 1, strlen(pszExpanded), pFile);
+                free(pszExpanded);
+            }
+        }
         else
 #endif