Changeset 76512 in vbox

Timestamp:

Dec 30, 2018 5:14:08 AM (6 years ago)

Author:

vboxsync

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

127813

Message:

scm,asm*watcom*.h: Added scm option to omit the #pragma once for the multipass watcom inline assembly files. bugref:9344

Location:

trunk

Files:

• include/.scm-settings (modified) (1 diff)
• include/iprt/asm-amd64-x86-watcom-16.h (modified) (1 diff)
• include/iprt/asm-amd64-x86-watcom-32.h (modified) (1 diff)
• include/iprt/asm-watcom-x86-16.h (modified) (1 diff)
• include/iprt/asm-watcom-x86-32.h (modified) (1 diff)
• src/bldprogs/scm.cpp (modified) (5 diffs)
• src/bldprogs/scm.h (modified) (1 diff)
• src/bldprogs/scmrw.cpp (modified) (3 diffs)

trunk/include/.scm-settings

@@ -73 +73 @@
 /iprt/runtime-loader.h:                 --no-fix-header-guards
 /iprt/bldprog-strtab-template.cpp.h:    --no-fix-header-guards
+/iprt/asm*watcom*.h:                    --no-pragma-once
 

trunk/include/iprt/asm-amd64-x86-watcom-16.h

@@ -26 +26 @@
 #ifndef ___iprt_asm_amd64_x86_watcom_16_h
 #define ___iprt_asm_amd64_x86_watcom_16_h
-#ifndef RT_WITHOUT_PRAGMA_ONCE
-# pragma once
-#endif
+/* no pragma once */
 
 #ifndef ___iprt_asm_amd64_x86_h

trunk/include/iprt/asm-amd64-x86-watcom-32.h

@@ -26 +26 @@
 #ifndef ___iprt_asm_amd64_x86_watcom_32_h
 #define ___iprt_asm_amd64_x86_watcom_32_h
-#ifndef RT_WITHOUT_PRAGMA_ONCE
-# pragma once
-#endif
+/* no pragma once */
 
 #ifndef ___iprt_asm_amd64_x86_h

trunk/include/iprt/asm-watcom-x86-16.h

@@ -26 +26 @@
 #ifndef ___iprt_asm_watcom_x86_16_h
 #define ___iprt_asm_watcom_x86_16_h
-#ifndef RT_WITHOUT_PRAGMA_ONCE
-# pragma once
-#endif
+/* no pragma once */
 
 #ifndef ___iprt_asm_h

trunk/include/iprt/asm-watcom-x86-32.h

@@ -26 +26 @@
 #ifndef ___iprt_asm_watcom_x86_32_h
 #define ___iprt_asm_watcom_x86_32_h
-#ifndef RT_WITHOUT_PRAGMA_ONCE
-# pragma once
-#endif
+/* no pragma once */
 
 #ifndef ___iprt_asm_h

trunk/src/bldprogs/scm.cpp

@@ -77 +77 @@
     SCMOPT_FIX_HEADER_GUARDS,
     SCMOPT_NO_FIX_HEADER_GUARDS,
+    SCMOPT_PRAGMA_ONCE,
+    SCMOPT_NO_PRAGMA_ONCE,
     SCMOPT_FIX_TODOS,
     SCMOPT_NO_FIX_TODOS,
@@ -178 +180 @@
     /* .cMinBlankLinesBeforeFlowerBoxMakers = */    2,
     /* .fFixHeaderGuards = */                       false, /** @todo fFixHeaderGuards = true */
+    /* .fPragmaOnce = */                            true,
     /* .fFixTodos = */                              true,
     /* .fFixErrH = */                               true,
@@ -220 +223 @@
     { "--fix-header-guards",                SCMOPT_FIX_HEADER_GUARDS,               RTGETOPT_REQ_NOTHING },
     { "--no-fix-header-guards",             SCMOPT_NO_FIX_HEADER_GUARDS,            RTGETOPT_REQ_NOTHING },
+    { "--pragma-once",                      SCMOPT_PRAGMA_ONCE,                     RTGETOPT_REQ_NOTHING },
+    { "--no-pragma-once",                   SCMOPT_NO_PRAGMA_ONCE,                  RTGETOPT_REQ_NOTHING },
     { "--fix-todos",                        SCMOPT_FIX_TODOS,                       RTGETOPT_REQ_NOTHING },
     { "--no-fix-todos",                     SCMOPT_NO_FIX_TODOS,                    RTGETOPT_REQ_NOTHING },
@@ -1020 +1025 @@
         case SCMOPT_NO_FIX_HEADER_GUARDS:
             pSettings->fFixHeaderGuards = false;
+            return VINF_SUCCESS;
+
+        case SCMOPT_PRAGMA_ONCE:
+            pSettings->fPragmaOnce = true;
+            return VINF_SUCCESS;
+        case SCMOPT_NO_PRAGMA_ONCE:
+            pSettings->fPragmaOnce = false;
             return VINF_SUCCESS;
 
@@ -2693 +2705 @@
                 RTPrintf("      Fix header guards and #pragma once.  Default: %RTbool\n", g_Defaults.fFixHeaderGuards);
                 break;
+            case SCMOPT_PRAGMA_ONCE:
+                RTPrintf("      Whether to include #pragma once with the header guard.  Default: %RTbool\n", g_Defaults.fPragmaOnce);
+                break;
             case SCMOPT_FIX_TODOS:
                 RTPrintf("      Fix @todo statements so doxygen sees them.  Default: %RTbool\n", g_Defaults.fFixTodos);

trunk/src/bldprogs/scm.h

@@ -334 +334 @@
     /** Whether to fix C/C++ header guards and \#pragma once directives. */
     bool            fFixHeaderGuards;
+    /** Whether to include a pragma once statement with the header guard. */
+    bool            fPragmaOnce;
 
     /** Whether to fix C/C++ todos. */

trunk/src/bldprogs/scmrw.cpp

@@ -3019 +3019 @@
                             iPragmaOnce + 3, ErrInfo.Core.pszMsg, cchLine, pchLine);
         ScmVerbose(pState, 3, "Found pragma once\n");
+        fRet |= !pSettings->fPragmaOnce;
     }
     else
@@ -3025 +3026 @@
         if (RT_FAILURE(rc))
             return ScmError(pState, rc, "seek error\n");
-        fRet = true;
+        fRet = pSettings->fPragmaOnce;
         ScmVerbose(pState, 2, "Missing #pragma once\n");
     }
@@ -3032 +3033 @@
      * Write the pragma once stuff.
      */
-    ScmStreamPutLine(pOut, RT_STR_TUPLE("#ifndef RT_WITHOUT_PRAGMA_ONCE"), enmEol);
-    ScmStreamPutLine(pOut, RT_STR_TUPLE("# pragma once"), enmEol);
-    rc = ScmStreamPutLine(pOut, RT_STR_TUPLE("#endif"), enmEol);
-    if (RT_FAILURE(rc))
-        return false;
+    if (pSettings->fPragmaOnce)
+    {
+        ScmStreamPutLine(pOut, RT_STR_TUPLE("#ifndef RT_WITHOUT_PRAGMA_ONCE"), enmEol);
+        ScmStreamPutLine(pOut, RT_STR_TUPLE("# pragma once"), enmEol);
+        rc = ScmStreamPutLine(pOut, RT_STR_TUPLE("#endif"), enmEol);
+        if (RT_FAILURE(rc))
+            return false;
+    }
 
     /*