Changeset 3120 for trunk/tools

Timestamp:

Mar 15, 2000, 4:02:11 PM (26 years ago)

Author:

bird

Message:

Added option: -o- which removes the object filename path.
Corrected the -Eall+ option.

File:

• trunk/tools/fastdep/fastdep.c (modified) (16 diffs)

trunk/tools/fastdep/fastdep.c

@@ -1 @@
-/* $Id: fastdep.c,v 1.4 2000-03-04 23:51:57 bird Exp $
+/* $Id: fastdep.c,v 1.5 2000-03-15 15:02:11 bird Exp $
  *
  * Fast dependents. (Fast = Quick and Dirty!)
@@ -74 +74 @@
     const char *    pszObjectExt;
     const char *    pszObjectDir;
+    BOOL            fObjectDir;        /* replace object directory? */
     const char *    pszRsrcExt;
     BOOL            fObjRule;
@@ -214 +215 @@
         szObjectExt,     /* pszObjectExt */
         szObjectDir,     /* pszObjectDir */
+        FALSE,           /* fObjectDir */
         szRsrcExt,       /* pszRsrcExt */
         TRUE,            /* fObjRule */
@@ -326 +328 @@
                     }
 
-                    /* path */
+                    /* path: -o or -o- */
+                    options.fObjectDir = TRUE;
                     if (strlen(argv[argi]) > 2)
-                        strcpy(szObjectDir, argv[argi]+2);
+                    {
+                        if (argv[argi][2] == '-')  /* no object path */
+                            szObjectDir[0] = '\0';
+                        else
+                            strcpy(szObjectDir, argv[argi]+2);
+                    }
                     else
                     {
@@ -334 +342 @@
                         argi++;
                     }
-                    if (szObjectDir[strlen(szObjectDir)-1] != '\\'
+                    if (szObjectDir[0] != '\0'
+                        && szObjectDir[strlen(szObjectDir)-1] != '\\'
                         && szObjectDir[strlen(szObjectDir)-1] != '/'
                         )
@@ -444 +453 @@
         "   -e excludepath  Exclude paths. If a filename is found in any\n"
         "                   of these paths only the filename is used, not\n"
-        "                   the path+filename (which is default).\n"
-        "   -eall<[+]|->    -eall+: No path are added to the filename.\n"
+        "                   the path+filename (which is default) (don't work?).\n"
+        "   -eall<[+]|->    Include and source filenames, paths or no paths.\n"
+        "                   -eall+: No path are added to the filename.\n"
         "                   -eall-: The filename is appended the include path\n"
         "                           was found in.\n"
@@ -453 +463 @@
         "   -o <objdir>     Path were object files are placed. This path replaces the\n"
         "                   entire filename path\n"
+        "   -o-             No object path\n"
         "   -obr<[+]|->     -obr+: Object rule.\n"
         "                   -obr-: No object rule, rule for source filename is generated.\n"
@@ -562 +573 @@
         else
             fprintf(phDep, "%s%s.%s:",
-                    (*pOptions->pszObjectDir != '\0') ?
+                    pOptions->fObjectDir ?
                         pOptions->pszObjectDir : filePathSlash(pszFilename, szBuffer),
                     fileNameNoExt(pszFilename, szBuffer + CCHMAXPATH),
@@ -568 +579 @@
 
         if (pOptions->fSrcWhenObj)
-            fprintf(phDep, " \\\n%4s %s", "", pszFilename);
+            fprintf(phDep, " \\\n%4s %s", "",
+                    pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : pszFilename
+                    );
     }
     else
@@ -824 +837 @@
         else
             fprintf(phDep, "%s%s.%s:",
-                    (*pOptions->pszObjectDir != '\0') ?
+                    pOptions->fObjectDir ?
                         pOptions->pszObjectDir : filePathSlash(pszFilename, szBuffer),
                     fileNameNoExt(pszFilename, szBuffer + CCHMAXPATH),
@@ -830 +843 @@
 
         if (pOptions->fSrcWhenObj)
-            fprintf(phDep, " \\\n%4s %s", "", pszFilename);
+            fprintf(phDep, " \\\n%4s %s", "",
+                    pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : pszFilename
+                    );
     }
     else
@@ -938 +953 @@
         else
             fprintf(phDep, "%s%s.res:",
-                    (*pOptions->pszObjectDir != '\0') ?
+                    pOptions->fObjectDir ?
                         pOptions->pszObjectDir : filePathSlash(pszFilename, szBuffer),
                     fileNameNoExt(pszFilename, szBuffer + CCHMAXPATH),
@@ -944 +959 @@
 
         if (pOptions->fSrcWhenObj)
-            fprintf(phDep, " \\\n%4s %s", "", pszFilename);
+            fprintf(phDep, " \\\n%4s %s", "",
+                    pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : pszFilename
+                    );
     }
     else
@@ -1054 +1071 @@
         else
             fprintf(phDep, "%s%s.%s:",
-                    (*pOptions->pszObjectDir != '\0') ?
+                    pOptions->fObjectDir ?
                         pOptions->pszObjectDir : filePathSlash(pszFilename, szBuffer),
                     fileNameNoExt(pszFilename, szBuffer + CCHMAXPATH),
@@ -1060 +1077 @@
 
         if (pOptions->fSrcWhenObj)
-            fprintf(phDep, " \\\n%4s %s", "", pszFilename);
+            fprintf(phDep, " \\\n%4s %s", "",
+                    pOptions->fExcludeAll ? fileName(pszFilename, szBuffer) : pszFilename
+                    );
     }
     else
@@ -1265 +1284 @@
 
 /**
- * Copies the path name (with extention) into pszBuffer and returns
+ * Copies the filename (with extention) into pszBuffer and returns
  * a pointer to the buffer.
- * If no path is found "" is returned.
  * @returns   Pointer to pszBuffer with path.
  * @param     pszFilename  Pointer to readonly filename.