From 82697b6864f10bdedada1e03772f276acb6d90ec Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 25 Jan 2012 19:24:34 +0000
Subject: [PATCH] 2012-01-25 20:23 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg     + warning will be shown and lib ignored if user
 explicitly       specifies Harbour core library.     ! visual glitch in two
 trace msgs.

  * contrib/hbblat/tests/hbmk.hbm
  * contrib/hbhpdf/tests/hbmk.hbm
    + best practice: using .hbc files instead of -l options.
---
 harbour/ChangeLog                     | 14 ++++-
 harbour/contrib/hbblat/tests/hbmk.hbm |  2 +-
 harbour/contrib/hbhpdf/tests/hbmk.hbm |  2 +-
 harbour/utils/hbmk2/hbmk2.prg         | 84 +++++++++++++++++++--------
 4 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 05e84fbcd2..a7e7eafd78 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,11 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-01-25 20:23 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    + warning will be shown and lib ignored if user explicitly
+      specifies Harbour core library.
+    ! visual glitch in two trace msgs.
+
+  * contrib/hbblat/tests/hbmk.hbm
+  * contrib/hbhpdf/tests/hbmk.hbm
+    + best practice: using .hbc files instead of -l options.
+
 2012-01-24 18:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idefindreplace.prg
   * contrib/hbide/idesources.prg
     + Implemented: <Replace> option in <Find in Files> protocol.
-       Please test and forward your suggessions as to what can be 
+       Please test and forward your suggessions as to what can be
        improved hereunder.
 
 2012-01-24 15:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
@@ -28,7 +38,7 @@
   * contrib/hbide/idemain.prg
   * contrib/hbide/idesaveload.prg
     ! Optimized: to display the user interface as fast as possible.
-       The only feature compromized is the Window Theme set via 
+       The only feature compromized is the Window Theme set via
        <Setup><General><Style>.
        Now it appears to be lightening fast, let me know your experiences.
 
diff --git a/harbour/contrib/hbblat/tests/hbmk.hbm b/harbour/contrib/hbblat/tests/hbmk.hbm
index ca7e8844e3..861f0c153a 100644
--- a/harbour/contrib/hbblat/tests/hbmk.hbm
+++ b/harbour/contrib/hbblat/tests/hbmk.hbm
@@ -6,4 +6,4 @@
 
 -w3 -es2
 
--lhbwin
+hbwin.hbc
diff --git a/harbour/contrib/hbhpdf/tests/hbmk.hbm b/harbour/contrib/hbhpdf/tests/hbmk.hbm
index a57fcdbb20..e174403e07 100644
--- a/harbour/contrib/hbhpdf/tests/hbmk.hbm
+++ b/harbour/contrib/hbhpdf/tests/hbmk.hbm
@@ -6,4 +6,4 @@
 
 -w3 -es2
 
--lhbct
+hbct.hbc
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 1704b6a54e..468c2f2f8d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -456,17 +456,18 @@ REQUEST hbmk_KEYW
 #define _HBMK_hDEPTMACRO        138 /* Links to be created and pointing to the target */
 #define _HBMK_cC                139 /* C dialect */
 #define _HBMK_cCPP              140 /* C++ dialect */
+#define _HBMK_aLIB_BASE_WARN    141
 
-#define _HBMK_aArgs             141
-#define _HBMK_nArgTarget        142
-#define _HBMK_lPause            143
-#define _HBMK_nLevel            144
+#define _HBMK_aArgs             142
+#define _HBMK_nArgTarget        143
+#define _HBMK_lPause            144
+#define _HBMK_nLevel            145
 
-#define _HBMK_cHBX              145
+#define _HBMK_cHBX              146
 
-#define _HBMK_aGT               146
+#define _HBMK_aGT               147
 
-#define _HBMK_MAX_              146
+#define _HBMK_MAX_              147
 
 #define _HBMK_DEP_CTRL_MARKER   ".control." /* must be an invalid path */
 
@@ -1271,6 +1272,22 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                be created. [vszakats] */
    ENDIF
 
+   hbmk[ _HBMK_aLIB_BASE_WARN ] := ArrayAJoin( {;
+      aLIB_BASE_EXTERN ,;
+      aLIB_BASE_DEBUG  ,;
+      aLIB_BASE_1      ,;
+      aLIB_BASE_1_MT   ,;
+      aLIB_BASE_2      ,;
+      aLIB_BASE_2_MT   ,;
+      aLIB_BASE_NULRDD ,;
+      aLIB_BASE_RDD    ,;
+      aLIB_BASE_RDD_MT ,;
+      aLIB_BASE_CPLR   ,;
+      aLIB_BASE_3      ,;
+      aLIB_BASE_3_MT   ,;
+      { cLIB_BASE_PCRE } ,;
+      { cLIB_BASE_ZLIB } } )
+
    hbmk[ _HBMK_nCOMPVer ] := Val( GetEnv( "HB_COMPILER_VER" ) ) /* Format: <15><00>[.<00>] = <major><minor>[.<revision>] */
 
    /* Autodetect platform */
@@ -2731,12 +2748,16 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
          IF ! Empty( cParam )
             cParam := PathSepToSelf( cParam )
             IF Left( cParam, 1 ) == "-"
-               AAdd( hbmk[ _HBMK_aLIBFILTEROUT ], SubStr( cParam, 2 ) )
+               IF CheckLibParam( hbmk, SubStr( cParam, 2 ) )
+                  AAdd( hbmk[ _HBMK_aLIBFILTEROUT ], SubStr( cParam, 2 ) )
+               ENDIF
             ELSE
-               IF _IS_AUTOLIBSYSPRE( cParam )
-                  AAdd( hbmk[ _HBMK_aLIBUSERSYSPRE ], cParam )
-               ELSE
-                  AAdd( hbmk[ _HBMK_aLIBUSER ], cParam )
+               IF CheckLibParam( hbmk, cParam )
+                  IF _IS_AUTOLIBSYSPRE( cParam )
+                     AAdd( hbmk[ _HBMK_aLIBUSERSYSPRE ], cParam )
+                  ELSE
+                     AAdd( hbmk[ _HBMK_aLIBUSER ], cParam )
+                  ENDIF
                ENDIF
             ENDIF
          ENDIF
@@ -2904,10 +2925,12 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
          IF hb_FNameExt( cParamL ) == ".lib"
             cParam := FNameDirName( cParam )
          ENDIF
-         IF _IS_AUTOLIBSYSPRE( cParam )
-            AAdd( hbmk[ _HBMK_aLIBUSERSYSPRE ], cParam )
-         ELSE
-            AAdd( hbmk[ _HBMK_aLIBUSER ], cParam )
+         IF CheckLibParam( hbmk, cParam )
+            IF _IS_AUTOLIBSYSPRE( cParam )
+               AAdd( hbmk[ _HBMK_aLIBUSERSYSPRE ], cParam )
+            ELSE
+               AAdd( hbmk[ _HBMK_aLIBUSER ], cParam )
+            ENDIF
          ENDIF
 
       CASE hb_FNameExt( cParamL ) == ".framework"
@@ -5203,7 +5226,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                      hbmk_OutStd( hbmk, I_( "Harbour compiler command (embedded):" ) )
                   ENDIF
                ENDIF
-               OutStd( "(" + FNameEscape( hb_DirSepAdd( hb_DirBase() ) + cBin_CompPRG + cBinExt + ")", hbmk[ _HBMK_nCmd_Esc ] ) +;
+               OutStd( "(" + FNameEscape( hb_DirSepAdd( hb_DirBase() ) + cBin_CompPRG + cBinExt, hbmk[ _HBMK_nCmd_Esc ] ) + ")" +;
                        " " + ArrayToList( aCommand ) + _OUT_EOL )
             ENDIF
 
@@ -5214,7 +5237,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                   IF ( tmp := hb_compile( "harbour", aCommand ) ) != 0
                      hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running Harbour compiler (embedded). %1$s" ), hb_ntos( tmp ) ) )
                      IF ! hbmk[ _HBMK_lQuiet ]
-                        OutErr( "(" + FNameEscape( hb_DirSepAdd( hb_DirBase() ) + cBin_CompPRG + cBinExt + ")", hbmk[ _HBMK_nCmd_Esc ] ) +;
+                        OutErr( "(" + FNameEscape( hb_DirSepAdd( hb_DirBase() ) + cBin_CompPRG + cBinExt, hbmk[ _HBMK_nCmd_Esc ] ) + ")" +;
                                 " " + ArrayToList( aCommand ) + _OUT_EOL )
                      ENDIF
                      IF ! hbmk[ _HBMK_lIGNOREERROR ]
@@ -6723,6 +6746,17 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
    RETURN hbmk[ _HBMK_nErrorLevel ]
 
+STATIC FUNCTION CheckLibParam( hbmk, cLibName )
+
+   cLibName := Lower( cLibName )
+
+   IF AScan( hbmk[ _HBMK_aLIB_BASE_WARN ], {| tmp | Lower( tmp ) == cLibName } ) > 0
+      hbmk_OutStd( hbmk, hb_StrFormat( I_( "Warning: Ignoring explicitly specified core library: %1$s" ), cLibName ) )
+      RETURN .F.
+   ENDIF
+
+   RETURN .T.
+
 STATIC PROCEDURE convert_incpaths_to_options( hbmk, cOptIncMask, lCHD_Comp )
    LOCAL cBaseDir
    LOCAL cINCPATH
@@ -9224,12 +9258,16 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
             ELSE
                cItem := PathSepToSelf( cItem )
                IF Left( cItem, 1 ) == "-"
-                  AAddNewNotEmpty( hbmk[ _HBMK_aLIBFILTEROUT ], SubStr( cItem, 2 ) )
+                  IF CheckLibParam( hbmk, SubStr( cItem, 2 ) )
+                     AAddNewNotEmpty( hbmk[ _HBMK_aLIBFILTEROUT ], SubStr( cItem, 2 ) )
+                  ENDIF
                ELSE
-                  IF _IS_AUTOLIBSYSPRE( cItem )
-                     AAddNewNotEmpty( hbmk[ _HBMK_aLIBUSERSYSPRE ], cItem )
-                  ELSE
-                     AAddNewNotEmpty( hbmk[ _HBMK_aLIBUSER ], cItem )
+                  IF CheckLibParam( hbmk, cItem )
+                     IF _IS_AUTOLIBSYSPRE( cItem )
+                        AAddNewNotEmpty( hbmk[ _HBMK_aLIBUSERSYSPRE ], cItem )
+                     ELSE
+                        AAddNewNotEmpty( hbmk[ _HBMK_aLIBUSER ], cItem )
+                     ENDIF
                   ENDIF
                ENDIF
             ENDIF