Changeset 2104 in kBuild

Timestamp:

Nov 26, 2008 1:52:53 AM (16 years ago)

Author:

bird

Message:

kDepIDB: Added a -qquiet switch for disabling harmless warnings about stale files that cannot be found.

Location:

trunk/src

Files:

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

trunk/src/kDepPre/kDepPre.c

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

trunk/src/kmk/kmkbuiltin/kDepIDB.c

@@ -780 +780 @@
 static void usage(const char *argv0)
 {
-    printf("usage: %s -o <output> -t <target> [-f] [-s] <vc idb-file>\n"
+    printf("usage: %s -o <output> -t <target> [-fqs] <vc idb-file>\n"
            "   or: %s --help\n"
            "   or: %s --version\n",
@@ -800 +800 @@
     /* Argument parsing. */
     int         fInput = 0;             /* set when we've found input argument. */
+    int         fQuiet = 0;
 
     argv0 = argv[0];
@@ -818 +819 @@
             if (*psz == '-')
             {
-                if (!strcmp(psz, "-help"))
+                if (!strcmp(psz, "-quiet"))
+                    psz = "q";
+                else if (!strcmp(psz, "-help"))
                     psz = "?";
                 else if (!strcmp(psz, "-version"))
-                    psz = "v";
+                    psz = "V";
             }
 
@@ -891 +894 @@
 
                 /*
+                 * Quiet.
+                 */
+                case 'q':
+                {
+                    fQuiet = 1;
+                    break;
+                }
+
+                /*
                  * Generate stubs.
                  */
@@ -905 +917 @@
                     usage(argv[0]);
                     return 0;
+                case 'V':
                 case 'v':
                     return kbuild_version(argv[0]);
@@ -972 +985 @@
     if (!i)
     {
-        depOptimize(fFixCase);
+        depOptimize(fFixCase, fQuiet);
         fprintf(pOutput, "%s:", pszTarget);
         depPrint(pOutput);

trunk/src/lib/kDep.c

@@ -170 +170 @@
  * 'Optimizes' and corrects the dependencies.
  */
-void depOptimize(int fFixCase)
+void depOptimize(int fFixCase, int fQuiet)
 {
     /*
@@ -226 +226 @@
         if (stat(pszFilename, &s))
         {
-            fprintf(stderr, "kDep: Skipping '%s' - %s!\n", pszFilename, strerror(errno));
+            if (   !fQuiet
+                || errno != ENOENT
+                || (   pszFilename[0] != '/'
+                    && pszFilename[0] != '\\'
+                    && (   !isalpha(pszFilename[0])
+                        || pszFilename[1] != ':'
+                        || (    pszFilename[2] != '/'
+                            &&  pszFilename[2] != '\\')))
+               )
+                fprintf(stderr, "kDep: Skipping '%s' - %s!\n", pszFilename, strerror(errno));
             continue;
         }

trunk/src/lib/kDep.h

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