Changeset 69264 in vbox for trunk/src/bldprogs

Timestamp:

Oct 25, 2017 10:02:02 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

118582

Message:

scm: Configured rewriters for more files. Made verbosity level 2 only show what's changed and what we don't have rewriters for.

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (2 diffs)
• scmrw.cpp (modified) (3 diffs)

trunk/src/bldprogs/scm.cpp

@@ -360 +360 @@
 };
 
+static PFNSCMREWRITER const g_aRewritersFor_Xslt[] =
+{
+    rewrite_ForceNativeEol,
+    rewrite_ExpandTabs,
+    rewrite_StripTrailingBlanks,
+    rewrite_AdjustTrailingLines,
+    rewrite_SvnNoExecutable,
+    rewrite_SvnKeywords,
+    /** @todo copyright is in an XML comment. */
+};
+
+static PFNSCMREWRITER const g_aRewritersFor_QtResourceFiles[] =
+{
+    rewrite_ForceNativeEol,
+    rewrite_SvnNoExecutable,
+    rewrite_SvnKeywords,
+    /** @todo figure out copyright for Qt resource XML files. */
+};
+
+static PFNSCMREWRITER const g_aRewritersFor_QtTranslations[] =
+{
+    rewrite_ForceNativeEol,
+    rewrite_SvnNoExecutable,
+};
+
+static PFNSCMREWRITER const g_aRewritersFor_QtUiFiles[] =
+{
+    rewrite_ForceNativeEol,
+    rewrite_SvnNoExecutable,
+    rewrite_SvnKeywords,
+    /** @todo copyright is in an XML 'comment' element. */
+};
+
+
 #define SCM_CFG_ENTRY(a_aRewriters, a_fBinary, a_szFilePatterns) \
     { RT_ELEMENTS(a_aRewriters), &a_aRewriters[0], a_fBinary, a_szFilePatterns }
 static SCMCFGENTRY const g_aConfigs[] =
 {
-    SCM_CFG_ENTRY(g_aRewritersFor_Makefile_kup, false, "Makefile.kup" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_Makefile_kmk, false, "Makefile.kmk|Config.kmk" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_C_and_CPP,    false, "*.c|*.cpp|*.C|*.CPP|*.cxx|*.cc|*.m|*.mm" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_H_and_HPP,    false, "*.h|*.hpp" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_RC,           false, "*.rc" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_ASM,          false, "*.asm|*.mac" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_DEF,          false, "*.def" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_ShellScripts, false, "*.sh|configure" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_BatchFiles,   false, "*.bat|*.cmd|*.btm" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_BasicScripts, false, "*.vbs|*.vb" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_SedScripts,   false, "*.sed" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_Python,       false, "*.py" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_ScmSettings,  false, "*.scm-settings" ),
-    SCM_CFG_ENTRY(g_aRewritersFor_Images,       true,  "*.png|*.bmp|*.jpg" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_Makefile_kup,     false, "Makefile.kup" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_Makefile_kmk,     false, "*.kmk" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_C_and_CPP,        false, "*.c|*.cpp|*.C|*.CPP|*.cxx|*.cc|*.m|*.mm" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_H_and_HPP,        false, "*.h|*.hpp" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_RC,               false, "*.rc" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_ASM,              false, "*.asm|*.mac" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_DEF,              false, "*.def" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_ShellScripts,     false, "*.sh|configure" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_BatchFiles,       false, "*.bat|*.cmd|*.btm" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_BasicScripts,     false, "*.vbs|*.vb" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_SedScripts,       false, "*.sed" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_Python,           false, "*.py" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_ScmSettings,      false, "*.scm-settings" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_Images,           true,  "*.png|*.bmp|*.jpg" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_Xslt,             false, "*.xsl" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_QtResourceFiles,  false, "*.qrc" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_QtTranslations,   false, "*.ts" ),
+    SCM_CFG_ENTRY(g_aRewritersFor_QtUiFiles,        false, "*.ui" ),
 };
 
@@ -1394 +1432 @@
     if (!pCfg)
     {
-        ScmVerbose(NULL, 4, "skipping '%s': no rewriters configured\n", pszFilename);
+        ScmVerbose(NULL, 2, "skipping '%s': no rewriters configured\n", pszFilename);
         g_cFilesNoRewriters++;
         return VINF_SUCCESS;

trunk/src/bldprogs/scmrw.cpp

@@ -1001 +1001 @@
     Assert(strlen(pszBody) == cchBody);
     //RTPrintf("--- comment at %u, type %u ---\n%s\n--- end ---\n", pInfo->iLineStart, pInfo->enmType, pszBody);
-    ScmVerbose(pState->pState, 4,
+    ScmVerbose(pState->pState, 5,
                "--- comment at %u col %u, %u lines, type %u, %u lines before body, %u lines after body\n",
                pInfo->iLineStart, pInfo->offStart, pInfo->iLineEnd - pInfo->iLineStart + 1, pInfo->enmType,
@@ -1193 +1193 @@
 
             fFoundCopyright = true;
-            ScmVerbose(pState->pState, 2, "oracle copyright %u-%u: up-to-date=%RTbool well-formed=%RTbool\n",
+            ScmVerbose(pState->pState, 3, "oracle copyright %u-%u: up-to-date=%RTbool well-formed=%RTbool\n",
                        pState->uFirstYear, pState->uLastYear, pState->fUpToDateCopyright, pState->fWellFormedCopyright);
         }
         else
-            ScmVerbose(pState->pState, 2, "not oracle copyright: '%.*s'\n", pszEnd - pszBody, pszBody);
+            ScmVerbose(pState->pState, 3, "not oracle copyright: '%.*s'\n", pszEnd - pszBody, pszBody);
 
         if (!pszNextLine)
@@ -1283 +1283 @@
                     /** @todo Check that column 2 contains '*' for C/C++ files. */
 
-                    ScmVerbose(pState->pState, 2,
+                    ScmVerbose(pState->pState, 3,
                                "Found license %d/%d at %u..%u: is-correct=%RTbool well-formed=%RTbool external-part=%RTbool open-source=%RTbool\n",
                                pCur->enmType, pCur->enmOpt, pState->iLineLicense, pState->iLineLicense + pState->cLinesLicense,