2010-06-04 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* src/rtl/memvarhb.prg
    * Minor in comment.

  * contrib/hbtpathy/tpunix.c
    + Applied patch sent to the list by Tamas Tevesz.
      Fixing some compilation problems due to missing predefined macros
      on certain *nix systems.

  * contrib/hbqt/hbqt_common.hbm
    * Formatting.

  * utils/hbmk2/hbmk2.prg
    ! Fixed to make sure -depcontrol= header path value is added
      to the header path search list in the same location as specified
      on the cmdline.

harbour/ChangeLog

@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-06-04 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/memvarhb.prg
+    * Minor in comment.
+
+  * contrib/hbtpathy/tpunix.c
+    + Applied patch sent to the list by Tamas Tevesz.
+      Fixing some compilation problems due to missing predefined macros
+      on certain *nix systems.
+
+  * contrib/hbqt/hbqt_common.hbm
+    * Formatting.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed to make sure -depcontrol= header path value is added
+      to the header path search list in the same location as specified
+      on the cmdline.
+
 2010-06-04 04:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Added basic support to recognize headers inside Frameworks

harbour/contrib/hbqt/hbqt_common.hbm

@@ -14,7 +14,6 @@
 
 -depkeyhead=qt:QtCore/qglobal.h
 -depcontrol=qt:${HB_WITH_QT}
-
 {!darwin}-depincpath=qt:/usr/include/qt4
 {!darwin}-depincpath=qt:/usr/lib/qt4/include
 {!darwin}-depincpath=qt:/usr/include

harbour/contrib/hbtpathy/tpunix.c

@@ -114,9 +114,27 @@ HB_FUNC( __TP_INITPORTSPEED )
       case 9600:    baud = B9600;    break;
       case 19200:   baud = B19200;   break;
       case 38400:   baud = B38400;   break;
+#if defined( B57600 )
       case 57600:   baud = B57600;   break;
+#endif
+#if defined( B115200 )
       case 115200:  baud = B115200;  break;
+#endif
+#if defined( B230400 )
       case 230400:  baud = B230400;  break;
+#endif
+#ifdef B460800
+      case 460800:  baud = B460800;  break;
+#endif
+#ifdef B500000
+      case 500000:  baud = B500000;  break;
+#endif
+#ifdef B576000
+      case 576000:  baud = B576000;  break;
+#endif
+#ifdef B921600
+      case 921600:  baud = B921600;  break;
+#endif
    }
 
    cfsetispeed( &options, baud );

harbour/src/rtl/memvarhb.prg

@@ -4,7 +4,7 @@
 
 /*
  * Harbour Project source code:
- * MEMVAR save/restore functions with >10 variable name support.
+ * MEMVAR save/restore functions with >10 long variable name support.
  *
  * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
  * www - http://harbour-project.org

harbour/utils/hbmk2/hbmk2.prg

@@ -377,6 +377,8 @@ REQUEST hbmk_KEYW
 
 #define _HBMK_MAX_              104
 
+#define _HBMK_DEP_CTRL_MARKER   ".control." /* must be an invalid path */
+
 #define _HBMKDEP_cName          1
 #define _HBMKDEP_aPKG           2
 #define _HBMKDEP_aKeyHeader     3
@@ -2135,6 +2137,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          cParam := MacroProc( hbmk, SubStr( cParam, Len( "-depcontrol=" ) + 1 ), aParam[ _PAR_cFileName ] )
          IF dep_split_arg( hbmk, cParam, @cParam, @tmp )
             hbmk[ _HBMK_hDEP ][ cParam ][ _HBMKDEP_cControl ] := AllTrim( tmp )
+            AAddNew( hbmk[ _HBMK_hDEP ][ cParam ][ _HBMKDEP_aINCPATH ], _HBMK_DEP_CTRL_MARKER )
          ENDIF
 
       CASE Left( cParam, Len( "-depincpath=" ) ) == "-depincpath="
@@ -3231,7 +3234,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          CASE hbmk[ _HBMK_cPLAT ] == "os2"   ; cOpt_Dyn := "OP quiet SYS os2v2_dll {FD} {IM} NAME {OD} {LO} {DL} {LL} {LB} {LS}{SCRIPT}"
          ENDCASE
          IF hbmk[ _HBMK_cPLAT ] $ "win|os2" .AND. ! Empty( hbmk[ _HBMK_aDEF ] )
-            /* TODO: Watcom wlink requires a non-standard layout for .def files.
+            /* TODO: Watcom wlink requires a non-standard internal layout for .def files.
                      We will need a converter and implement on-the-fly conversion
                      to a temp file and pass that via {IM}. */
             cDynDefPrefix := "@"
@@ -5950,6 +5953,7 @@ STATIC FUNCTION dep_split_arg( hbmk, cParam, /* @ */ cName, /* @ */ cData )
 
 STATIC PROCEDURE dep_postprocess( hbmk )
    LOCAL dep
+   LOCAL tmp
 
    FOR EACH dep IN hbmk[ _HBMK_hDEP ]
 
@@ -5995,7 +5999,15 @@ STATIC PROCEDURE dep_postprocess( hbmk )
          AAdd( hbmk[ _HBMK_aOPTC ], "-D" + _HBMK_HAS_PREF + StrToDefine( dep:__enumKey() ) )
          EXIT
       OTHERWISE
-         AAddNew( dep[ _HBMKDEP_aINCPATH ], dep[ _HBMKDEP_cControl ] )
+         /* If control is not a recognized control keyword, interpret it
+            as a header search path and add it to the search path list
+            by keeping the position where it was specified. [vszakats] */
+         FOR EACH tmp IN dep[ _HBMKDEP_aINCPATH ]
+            IF tmp == _HBMK_DEP_CTRL_MARKER
+               tmp := dep[ _HBMKDEP_cControl ]
+               EXIT
+            ENDIF
+         NEXT
       ENDSWITCH
    NEXT
 
@@ -6712,6 +6724,14 @@ STATIC FUNCTION AAddNewNotEmpty( array, xItem )
 
    RETURN array
 
+STATIC FUNCTION AAddNewAtTop( array, xItem )
+
+   IF AScan( array, {| tmp | tmp == xItem } ) == 0
+      hb_AIns( array, 1, xItem, .T. )
+   ENDIF
+
+   RETURN array
+
 STATIC FUNCTION AAddNew( array, xItem )
 
    IF AScan( array, {| tmp | tmp == xItem } ) == 0