From 11d87204c3bc4fa8f2fb93d1abdc47c9d522d719 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 8 Mar 2011 07:59:19 +0000
Subject: [PATCH] 2011-03-08 08:59 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     * Invoke xhb compiler (in -xhb mode)
 for each input source file,       to avoid xhb compiler bugs (like aborting
 due to too many       warnings even if -w0 is used - reported by Pritpal in
 xhb 2007 Oct       version).

---
 harbour/ChangeLog             |  7 ++++
 harbour/utils/hbmk2/hbmk2.prg | 63 ++++++++++++++++++++---------------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 179ac8f94d..90fac74389 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-03-08 08:59 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    * Invoke xhb compiler (in -xhb mode) for each input source file,
+      to avoid xhb compiler bugs (like aborting due to too many
+      warnings even if -w0 is used - reported by Pritpal in xhb 2007 Oct
+      version).
+
 2011-03-08 00:27 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/cdpapihb.c
     ! fixed typo in my last commit
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 7fa7144fe4..c51e430708 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -5085,37 +5085,46 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       ELSE
          /* Use external compiler */
 
-         cCommand := FNameEscape( hb_DirSepAdd( PathSepToSelf( l_cHB_INSTALL_BIN ) ) + cBin_CompPRG + cBinExt, hbmk[ _HBMK_nCmd_Esc ] ) +;
-                     " " + iif( hbmk[ _HBMK_lCreateLib ] .OR. hbmk[ _HBMK_lCreateDyn ], "-n1", iif( hbmk[ _HBMK_nHBMODE ] != _HBMODE_NATIVE, "-n", "-n2" ) ) +;
-                     " " + ArrayToList( l_aPRG_TO_DO,, hbmk[ _HBMK_nCmd_Esc ] ) +;
-                     iif( hbmk[ _HBMK_lBLDFLGP ], " " + hb_Version( HB_VERSION_FLAG_PRG ), "" ) +;
-                     iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) +;
-                     iif( ! Empty( hbmk[ _HBMK_aOPTPRG ] ), " " + ArrayToList( hbmk[ _HBMK_aOPTPRG ] ), "" )
-
-         cCommand := AllTrim( cCommand )
-
-         IF hbmk[ _HBMK_lTRACE ]
-            IF ! hbmk[ _HBMK_lQuiet ]
-               hbmk_OutStd( hbmk, I_( "Harbour compiler command:" ) )
-            ENDIF
-            OutStd( cCommand + _OUT_EOL )
+         IF _HBMODE_IS_XHB( hbmk[ _HBMK_nHBMODE ] )
+            tmp1 := l_aPRG_TO_DO /* Call compiler for each source file to avoid compiler bugs. */
+         ELSE
+            tmp1 := { ArrayToList( l_aPRG_TO_DO,, hbmk[ _HBMK_nCmd_Esc ] ) }
          ENDIF
 
-         IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand ) ) != 0
-            hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running Harbour compiler. %1$s" ), hb_ntos( tmp ) ) )
-            IF ! hbmk[ _HBMK_lQuiet ]
-               OutErr( cCommand + _OUT_EOL )
-            ENDIF
-            IF ! hbmk[ _HBMK_lIGNOREERROR ]
-               IF lDeleteWorkDir
-                  hb_DirDelete( hbmk[ _HBMK_cWorkDir ] )
+         FOR EACH tmp IN tmp1
+
+            cCommand := FNameEscape( hb_DirSepAdd( PathSepToSelf( l_cHB_INSTALL_BIN ) ) + cBin_CompPRG + cBinExt, hbmk[ _HBMK_nCmd_Esc ] ) +;
+                        " " + iif( hbmk[ _HBMK_lCreateLib ] .OR. hbmk[ _HBMK_lCreateDyn ], "-n1", iif( hbmk[ _HBMK_nHBMODE ] != _HBMODE_NATIVE, "-n", "-n2" ) ) +;
+                        " " + iif( _HBMODE_IS_XHB( hbmk[ _HBMK_nHBMODE ] ), FNameEscape( tmp, hbmk[ _HBMK_nCmd_Esc ], hbmk[ _HBMK_nCmd_FNF ] ), tmp ) +;
+                        iif( hbmk[ _HBMK_lBLDFLGP ], " " + hb_Version( HB_VERSION_FLAG_PRG ), "" ) +;
+                        iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) +;
+                        iif( ! Empty( hbmk[ _HBMK_aOPTPRG ] ), " " + ArrayToList( hbmk[ _HBMK_aOPTPRG ] ), "" )
+
+            cCommand := AllTrim( cCommand )
+
+            IF hbmk[ _HBMK_lTRACE ]
+               IF ! hbmk[ _HBMK_lQuiet ]
+                  hbmk_OutStd( hbmk, I_( "Harbour compiler command:" ) )
                ENDIF
-               IF hbmk[ _HBMK_lBEEP ]
-                  DoBeep( .F. )
-               ENDIF
-               RETURN _ERRLEV_COMPPRG
+               OutStd( cCommand + _OUT_EOL )
             ENDIF
-         ENDIF
+
+            IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand ) ) != 0
+               hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running Harbour compiler. %1$s" ), hb_ntos( tmp ) ) )
+               IF ! hbmk[ _HBMK_lQuiet ]
+                  OutErr( cCommand + _OUT_EOL )
+               ENDIF
+               IF ! hbmk[ _HBMK_lIGNOREERROR ]
+                  IF lDeleteWorkDir
+                     hb_DirDelete( hbmk[ _HBMK_cWorkDir ] )
+                  ENDIF
+                  IF hbmk[ _HBMK_lBEEP ]
+                     DoBeep( .F. )
+                  ENDIF
+                  RETURN _ERRLEV_COMPPRG
+               ENDIF
+            ENDIF
+         NEXT
       ENDIF
    ENDIF