Changeset 26345 in vbox for trunk/src/bldprogs

Timestamp:

Feb 9, 2010 3:40:02 AM (15 years ago)

Author:

vboxsync

Message:

scm: config and build fix.

Location:

trunk/src/bldprogs

Files:

• Makefile.kmk (modified) (1 diff)
• scm.cpp (modified) (5 diffs)

trunk/src/bldprogs/Makefile.kmk

@@ -32 +32 @@
 
 PROGRAMS += scm
-scm_TEMPLATE = VBoxR3Static
+scm_TEMPLATE = VBOXR3EXE
 scm_SOURCES = scm.cpp
 scm_LIBS = \

trunk/src/bldprogs/scm.cpp

@@ -204 +204 @@
 static int          g_iVerbosity            = 2;//99; //0;
 static const char  *g_pszFileFilter         = "*";
-static const char  *g_pszFileFilterOut      = "*.exe|*.com|20*-*-*.log";
+static const char  *g_pszFileFilterOut      =
+    "*.exe|"
+    "*.com|"
+    "20*-*-*.log|"
+    "*/src/VBox/Runtime/testcase/soundcard.h|"
+    "*/src/VBox/Runtime/include/internal/ldrELF*.h|"
+    "*/src/VBox/Runtime/common/math/x86/fenv-x86.c|"
+    "*/src/VBox/Runtime/common/checksum/md5.cpp|"
+    "/dummy/."
+;
 static const char  *g_pszDirFilter          = NULL;
-static const char  *g_pszDirFilterOut       = \
+static const char  *g_pszDirFilterOut       =
     // generic
     ".svn|"
@@ -228 +237 @@
     "*/src/VBox/Devices/PC/Etherboot-src/*/.|"
     "*/src/VBox/Devices/Network/lwip/.|"
-    "*/src/VBox/Devices/Storage/VBoxHDDFormats/StorageCraft/*/."
+    "*/src/VBox/Devices/Storage/VBoxHDDFormats/StorageCraft/*/.|"
+    "*/src/VBox/Runtime/r0drv/solaris/vbi/*/.|"
+    "*/src/VBox/Runtime/common/math/gcc/.|"
+    "/dummy"
 ;
 
@@ -1863 +1875 @@
     }
     if (   g_pszFileFilterOut
-        && RTStrSimplePatternMultiMatch(g_pszFileFilterOut, RTSTR_MAX, pszBasename, cchBasename, NULL))
+        && (   RTStrSimplePatternMultiMatch(g_pszFileFilterOut, RTSTR_MAX, pszBasename, cchBasename, NULL)
+            || RTStrSimplePatternMultiMatch(g_pszFileFilterOut, RTSTR_MAX, pszFilename, RTSTR_MAX, NULL)) )
     {
         ScmVerbose(4, "file filter out: \"%s\"\n", pszFilename);
@@ -2095 +2108 @@
  *
  * @returns IPRT status code.
- * @param   pszDir              The directory to start with.
- */
-static int scmProcessDirTree(const char *pszDir)
+ * @param   pszDir              The directory to start with.  This is pointer to
+ *                              a RTPATH_MAX sized buffer.
+ */
+static int scmProcessDirTree(char *pszDir)
 {
     /*
      * Setup the recursion.
      */
-    char szBuf[RTPATH_MAX];
-    int rc = RTPathAbs(pszDir, szBuf, sizeof(szBuf));
+    int rc = RTPathAppend(pszDir, RTPATH_MAX, ".");
     if (RT_SUCCESS(rc))
-        rc = RTPathAppend(szBuf, sizeof(szBuf), ".");
-    if (RT_FAILURE(rc))
-    {
-        RTMsgError("RTPathAbs/Append: %Rrc\n", rc);
-        return rc;
-    }
-
-    /*
-     * Get going.
-     */
-    RTDIRENTRY Entry;
-    return scmProcessDirTreeRecursion(szBuf, strlen(szBuf), &Entry, 0);
+    {
+        RTDIRENTRY Entry;
+        rc = scmProcessDirTreeRecursion(pszDir, strlen(pszDir), &Entry, 0);
+    }
+    else
+        RTMsgError("RTPathAppend: %Rrc\n", rc);
+    return rc;
 }
 
@@ -2128 +2136 @@
 static int scmProcessSomething(const char *pszSomething)
 {
-    if (RTFileExists(pszSomething))
-    {
-        const char *pszBasename = RTPathFilename(pszSomething);
-        if (!pszBasename)
-            return VERR_IS_A_DIRECTORY;
-
-        size_t cchBasename = strlen(pszBasename);
-        if (    (   g_pszFileFilter
-                || RTStrSimplePatternMultiMatch(g_pszFileFilter, RTSTR_MAX,
-                                                pszBasename, cchBasename, NULL))
-            &&  (   g_pszFileFilterOut == NULL
-                || !RTStrSimplePatternMultiMatch(g_pszFileFilterOut, RTSTR_MAX,
-                                                 pszBasename, cchBasename, NULL))
-            )
-            return scmProcessFile(pszSomething, pszBasename, cchBasename);
-        return VINF_SUCCESS;
-    }
-
-    /*
-     * If it's not a file, try treat it as a directory tree.
-     */
-    return scmProcessDirTree(pszSomething);
+    char szBuf[RTPATH_MAX];
+    int rc = RTPathAbs(pszSomething, szBuf, sizeof(szBuf));
+    if (RT_SUCCESS(rc))
+    {
+        if (RTFileExists(szBuf))
+        {
+            const char *pszBasename = RTPathFilename(szBuf);
+            if (pszBasename)
+            {
+                size_t cchBasename = strlen(pszBasename);
+                rc = scmProcessFile(szBuf, pszBasename, cchBasename);
+            }
+            else
+            {
+                RTMsgError("RTPathFilename: NULL\n");
+                rc = VERR_IS_A_DIRECTORY;
+            }
+        }
+        else
+            rc = scmProcessDirTree(szBuf);
+    }
+    else
+        RTMsgError("RTPathAbs: %Rrc\n", rc);
+    return rc;
 }