From e5c3e08baa8996e0b0e7dccff7a5ef8937c3d826 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 6 Aug 2010 08:46:36 +0000
Subject: [PATCH] 2010-08-06 10:46 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     ! Fixed to not propagate
 _ERRLEV_STOP from sub-projects.     % -stop will not stop processing any
 further cmdline options.     * Avoided one dangerous IF instruction.

  * contrib/hbqt/hbqt_commons.hbm
    % If static mode is not requested stop before loading plugins.

  * config/global.mk
    ! Always set HB_REBUILD_* options to 'no' when HB_BUILD_PKG=yes.
---
 harbour/ChangeLog                     | 12 ++++++++++++
 harbour/config/global.mk              |  2 ++
 harbour/contrib/hbqt/hbqt_commons.hbm |  4 ++--
 harbour/utils/hbmk2/hbmk2.prg         | 19 +++++++++++++------
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0c5e1ab501..737de8de52 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-06 10:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed to not propagate _ERRLEV_STOP from sub-projects.
+    % -stop will not stop processing any further cmdline options.
+    * Avoided one dangerous IF instruction.
+
+  * contrib/hbqt/hbqt_commons.hbm
+    % If static mode is not requested stop before loading plugins.
+
+  * config/global.mk
+    ! Always set HB_REBUILD_* options to 'no' when HB_BUILD_PKG=yes.
+
 2010-08-06 10:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * debian/rules
   * package/harbour.spec
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index afbf875b76..2f46b350a3 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -181,6 +181,8 @@ ifeq ($(HB_INIT_DONE),)
       export HB_BUILD_DEBUG := no
       export HB_BUILD_SHARED := no
       export HB_INSTALL_IMPLIB := no
+      export HB_REBUILD_EXTERN := no
+      export HB_REBUILD_PARSER := no
    endif
 
    # Can't build shared tools if we don't create dlls
diff --git a/harbour/contrib/hbqt/hbqt_commons.hbm b/harbour/contrib/hbqt/hbqt_commons.hbm
index 92824f4db7..75e8b0d8e8 100644
--- a/harbour/contrib/hbqt/hbqt_commons.hbm
+++ b/harbour/contrib/hbqt/hbqt_commons.hbm
@@ -9,8 +9,8 @@
 
 # Common settings for all hbqt subcomponents (static mode)
 
-hbqt_common.hbm
-
 -stop{!HB_QT_BUILD_STATIC|!allwin}
 
+hbqt_common.hbm
+
 -cflag=-DQT_NODLL
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index a2224eb62b..4e62d6d22e 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1863,7 +1863,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
             ENDIF
          ELSE
             tmp := HBM_Load( hbmk, aParams, PathSepToSelf( cParam ), 1, .T. ) /* Load parameters from script file */
-            IF tmp != 0
+            IF tmp != _ERRLEV_OK .AND. ;
+               tmp != _ERRLEV_STOP
                RETURN tmp
             ENDIF
          ENDIF
@@ -1871,7 +1872,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
            ( Lower( FNameExtGet( cParam ) ) == ".hbm" .OR. ;
              Lower( FNameExtGet( cParam ) ) == ".hbp" )
          tmp := HBM_Load( hbmk, aParams, PathSepToSelf( cParam ), 1, .T. ) /* Load parameters from script file */
-         IF tmp != 0
+         IF tmp != _ERRLEV_OK .AND. ;
+            tmp != _ERRLEV_STOP
             RETURN tmp
          ENDIF
       OTHERWISE
@@ -2286,6 +2288,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                OutStd( hb_StrFormat( I_( "%1$s" ), cParam ) + _OUT_EOL )
             ENDIF
          ENDIF
+         EXIT
 
       CASE Left( cParamL, Len( "-echo=" ) ) == "-echo="
 
@@ -9043,7 +9046,8 @@ STATIC FUNCTION HBM_Load( hbmk, aParams, cFileName, nNestingLevel, lProcHBP )
                         ENDIF
                         /* TODO: Modify '@script.ext' (@ prefixes) inclusion to not inherit path from parent */
                         nResult := HBM_Load( hbmk, aParams, PathMakeAbsolute( PathSepToSelf( cParam ), cFileName ), nNestingLevel + 1, .T. ) /* Load parameters from script file */
-                        IF nResult != 0
+                        IF nResult != _ERRLEV_OK .AND. ;
+                           nResult != _ERRLEV_STOP
                            RETURN nResult
                         ENDIF
                      ELSE
@@ -9053,7 +9057,8 @@ STATIC FUNCTION HBM_Load( hbmk, aParams, cFileName, nNestingLevel, lProcHBP )
                        Lower( FNameExtGet( cParam ) ) == ".hbm"
                      IF nNestingLevel < _HBMK_NEST_MAX
                         nResult := HBM_Load( hbmk, aParams, PathMakeAbsolute( PathSepToSelf( cParam ), cFileName ), nNestingLevel + 1, .T. ) /* Load parameters from script file */
-                        IF nResult != 0
+                        IF nResult != _ERRLEV_OK .AND. ;
+                           nResult != _ERRLEV_STOP
                            RETURN nResult
                         ENDIF
                      ELSE
@@ -9193,8 +9198,10 @@ STATIC FUNCTION ArchCompFilter( hbmk, cItem )
             bFilter := NIL
          END SEQUENCE
 
-         IF ISBLOCK( bFilter ) .AND. ISLOGICAL( xResult := Eval( bFilter, hbmk ) ) .AND. xResult
-            RETURN cItem
+         IF ISBLOCK( bFilter ) .AND. ISLOGICAL( xResult := Eval( bFilter, hbmk ) )
+            IF xResult
+               RETURN cItem
+            ENDIF
          ENDIF
 
          RETURN ""