Changeset 2955 in kBuild

Timestamp:

Sep 21, 2016 7:05:53 PM (8 years ago)

Author:

bird

Message:

kDepObj: Added -e<ignored .ext> option for avoid circular dependencies when compiling the precompiled header file (pch).

Location:

trunk/src

Files:

• kDepPre/kDepPre.c (modified) (1 diff)
• kObjCache/kObjCache.c (modified) (1 diff)
• kmk/kmkbuiltin/kDepIDB.c (modified) (1 diff)
• kmk/kmkbuiltin/kDepObj.c (modified) (8 diffs)
• lib/kDep.c (modified) (2 diffs)
• lib/kDep.h (modified) (1 diff)

trunk/src/kDepPre/kDepPre.c

@@ -465 +465 @@
     if (!i)
     {
-        depOptimize(fFixCase, 0 /* fQuiet */);
+        depOptimize(fFixCase, 0 /* fQuiet */, NULL /*pszIgnoredExt*/);
         fprintf(pOutput, "%s:", pszTarget);
         depPrint(pOutput);

trunk/src/kObjCache/kObjCache.c

@@ -1101 +1101 @@
         FatalMsg("Failed to open dependency file '%s': %s\n", pszFilename, strerror(errno));
 
-    depOptimize(fFixCase, fQuiet);
+    depOptimize(fFixCase, fQuiet, NULL /*pszIgnoredExt*/);
 
     /* Make object file name with unix slashes. */

trunk/src/kmk/kmkbuiltin/kDepIDB.c

@@ -865 +865 @@
     if (!i)
     {
-        depOptimize(fFixCase, fQuiet);
+        depOptimize(fFixCase, fQuiet, NULL /*pszIgnoredExt*/);
         fprintf(pOutput, "%s:", pszTarget);
         depPrint(pOutput);

trunk/src/kmk/kmkbuiltin/kDepObj.c

@@ -974 +974 @@
 static void usage(const char *a_argv0)
 {
-    printf("usage: %s -o <output> -t <target> [-fqs] <OMF-file>\n"
+    printf("usage: %s -o <output> -t <target> [-fqs] [-e <ignore-ext>] <OMF or COFF file>\n"
            "   or: %s --help\n"
            "   or: %s --version\n",
@@ -992 +992 @@
     int         fStubs = 0;
     int         fFixCase = 0;
+    const char *pszIgnoreExt = NULL;
     /* Argument parsing. */
     int         fInput = 0;             /* set when we've found input argument. */
@@ -1010 +1011 @@
         if (argv[i][0] == '-')
         {
+            const char *pszValue;
             const char *psz = &argv[i][1];
-            if (*psz == '-')
+            char chOpt;
+            chOpt = *psz++;
+            if (chOpt == '-')
             {
-                if (!strcmp(psz, "-quiet"))
-                    psz = "q";
-                else if (!strcmp(psz, "-help"))
-                    psz = "?";
-                else if (!strcmp(psz, "-version"))
-                    psz = "V";
+                /* Convert long to short option. */
+                if (!strcmp(psz, "quiet"))
+                    chOpt = 'q';
+                else if (!strcmp(psz, "help"))
+                    chOpt = '?';
+                else if (!strcmp(psz, "version"))
+                    chOpt = 'V';
+                else
+                {
+                    fprintf(stderr, "%s: syntax error: Invalid argument '%s'.\n", argv[0], argv[i]);
+                    usage(argv[0]);
+                    return 2;
+                }
+                psz = "";
             }
 
-            switch (*psz)
+            /*
+             * Requires value?
+             */
+            switch (chOpt)
+            {
+                case 'o':
+                case 't':
+                case 'e':
+                    if (*psz)
+                        pszValue = psz;
+                    else if (++i < argc)
+                        pszValue = argv[i];
+                    else
+                    {
+                        fprintf(stderr, "%s: syntax error: The '-%c' option takes a value.\n", chOpt);
+                        return 2;
+                    }
+                    break;
+
+                default:
+                    pszValue = NULL;
+                    break;
+            }
+
+
+            switch (chOpt)
             {
                 /*
@@ -1028 +1065 @@
                 case 'o':
                 {
-                    pszOutput = &argv[i][2];
                     if (pOutput)
                     {
                         fprintf(stderr, "%s: syntax error: only one output file!\n", argv[0]);
-                        return 1;
+                        return 2;
                     }
-                    if (!*pszOutput)
-                    {
-                        if (++i >= argc)
-                        {
-                            fprintf(stderr, "%s: syntax error: The '-o' argument is missing the filename.\n", argv[0]);
-                            return 1;
-                        }
-                        pszOutput = argv[i];
-                    }
+                    pszOutput = pszValue;
                     if (pszOutput[0] == '-' && !pszOutput[1])
                         pOutput = stdout;
@@ -1065 +1093 @@
                         return 1;
                     }
-                    pszTarget = &argv[i][2];
-                    if (!*pszTarget)
-                    {
-                        if (++i >= argc)
-                        {
-                            fprintf(stderr, "%s: syntax error: The '-t' argument is missing the target name.\n", argv[0]);
-                            return 1;
-                        }
-                        pszTarget = argv[i];
-                    }
+                    pszTarget = pszValue;
                     break;
                 }
@@ -1102 +1121 @@
                 {
                     fStubs = 1;
+                    break;
+                }
+
+                /*
+                 * Extension to ignore.
+                 */
+                case 'e':
+                {
+                    if (pszIgnoreExt)
+                    {
+                        fprintf(stderr, "%s: syntax error: The '-e' option can only be used once!\n");
+                        return 2;
+                    }
+                    pszIgnoreExt = pszValue;
                     break;
                 }
@@ -1121 +1154 @@
                     fprintf(stderr, "%s: syntax error: Invalid argument '%s'.\n", argv[0], argv[i]);
                     usage(argv[0]);
-                    return 1;
+                    return 2;
             }
         }
@@ -1179 +1212 @@
     if (!i)
     {
-        depOptimize(fFixCase, fQuiet);
+        depOptimize(fFixCase, fQuiet, pszIgnoreExt);
         fprintf(pOutput, "%s:", pszTarget);
         depPrint(pOutput);

trunk/src/lib/kDep.c

@@ -187 +187 @@
  * 'Optimizes' and corrects the dependencies.
  */
-void depOptimize(int fFixCase, int fQuiet)
+void depOptimize(int fFixCase, int fQuiet, const char *pszIgnoredExt)
 {
     /*
      * Walk the list correct the names and re-insert them.
      */
-    PDEP pDepOrg = g_pDeps;
-    PDEP pDep = g_pDeps;
+    size_t  cchIgnoredExt = pszIgnoredExt ? strlen(pszIgnoredExt) : 0;
+    PDEP    pDepOrg = g_pDeps;
+    PDEP    pDep = g_pDeps;
     g_pDeps = NULL;
     for (; pDep; pDep = pDep->pNext)
@@ -214 +215 @@
             continue;
         pszFilename = pDep->szFilename;
+
+        /*
+         * Skip pszIgnoredExt if given.
+         */
+        if (   pszIgnoredExt
+            && pDep->cchFilename > cchIgnoredExt
+            && memcmp(&pDep->szFilename[pDep->cchFilename - cchIgnoredExt], pszIgnoredExt, cchIgnoredExt) == 0)
+            continue;
 
 #if K_OS != K_OS_OS2 && K_OS != K_OS_WINDOWS

trunk/src/lib/kDep.h

@@ -48 +48 @@
 
 extern PDEP depAdd(const char *pszFilename, size_t cchFilename);
-extern void depOptimize(int fFixCase, int fQuiet);
+extern void depOptimize(int fFixCase, int fQuiet, const char *pszIgnoredExt);
 extern void depPrint(FILE *pOutput);
 extern void depPrintStubs(FILE *pOutput);