2010-11-07 12:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* external/sqlite3/sqlite3.hbp
  * external/sqlite3/Makefile
    + Added -DSQLITE_OMIT_DEPRECATED as suggested by Petr.
      Shaves off a few Ks from sqlite3 lib size.

  * contrib/hbodbc/tests/testodbc.prg
    * Formatting.

  * config/hbextern.hbs
    * cygwin update.

  * bin/hbmk2l2d.hbs
    ! Added missing #endif
    * Changed guard.

  * INSTALL
    * Updated hbmk2 examples about using libs/packages.

harbour/ChangeLog

@@ -16,6 +16,25 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-07 12:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * external/sqlite3/sqlite3.hbp
+  * external/sqlite3/Makefile
+    + Added -DSQLITE_OMIT_DEPRECATED as suggested by Petr.
+      Shaves off a few Ks from sqlite3 lib size.
+
+  * contrib/hbodbc/tests/testodbc.prg
+    * Formatting.
+
+  * config/hbextern.hbs
+    * cygwin update.
+
+  * bin/hbmk2l2d.hbs
+    ! Added missing #endif
+    * Changed guard.
+
+  * INSTALL
+    * Updated hbmk2 examples about using libs/packages.
+
 2010-11-07 01:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbodbc/tests/testodbc.prg
   * contrib/hbodbc/odbc.c

harbour/INSTALL

@@ -1266,13 +1266,11 @@ HARBOUR
        'hbmk2 myapp.hbp'
    - To build an application using incremental mode:
        'hbmk2 myapp.hbp -inc'
-   - To build an application which uses a contrib library:
-       'hbmk2 myapp.prg -lhbct'
-   - To build an application which uses a 3rd party library:
-       'hbmk2 myapp.prg -lsuplib -L<path_to_lib>'
-   - To build an application which uses a 3rd party library,
-     and the 3rd party lib has an .hbc file:
-       'hbmk2 myapp.prg rddleto.hbc -L<path_to_letodb>'
+   - To build an application which uses a library:
+       'hbmk2 myapp.prg -lmylib -L<path_to_mylib>'
+   - To build an application which uses a contrib package or
+     3rd party package that provides an .hbc file:
+       'hbmk2 myapp.prg hbct.hbc'
    - To build an application which uses Windows resources:
        'hbmk2 mymain.prg client.prg myres.rc'
    - To build an application which links against Harbour dynamic libraries:

harbour/bin/hbmk2l2d.hbs

@@ -34,7 +34,7 @@
 
 #define I_( x )                 hb_i18n_gettext( x )
 
-#if ! defined( __HBSCRIPT__HBRUN )
+#if defined( __HBSCRIPT__HBMK )
 
 FUNCTION hbmk2_plugin_lib2dyn( hbmk2 )
    LOCAL cRetVal := ""
@@ -165,3 +165,5 @@ FUNCTION hbmk2_plugin_lib2dyn( hbmk2 )
    ENDSWITCH
 
    RETURN cRetVal
+
+#endif

harbour/config/hbextern.hbs

@@ -50,7 +50,7 @@ STATIC FUNCTION __hb_extern_get_list( cInputName )
 
    /* NOTE: non-gcc extractor configs don't support dynamic libs as input. */
    DO CASE
-   CASE "|" + GetEnv( "HB_COMPILER" ) + "|" $ "|gcc|mingw|mingw64|cygwin|djgpp|"
+   CASE "|" + GetEnv( "HB_COMPILER" ) + "|" $ "|gcc|mingw|mingw64|djgpp|"
       cCommand := "nm -g" + iif( GetEnv( "HB_PLATFORM" ) == "darwin", "", " --defined-only -C" ) + " {I}"
    CASE "|" + GetEnv( "HB_COMPILER" ) + "|" $ "|msvc|msvc64|pocc|pocc64|"
       IF "|" + GetEnv( "HB_COMPILER" ) + "|" $ "|msvc|msvc64|"

harbour/contrib/hbodbc/tests/testodbc.prg

@@ -7,8 +7,8 @@
 #include "sql.ch"
 
 #xcommand GET ROW <nRow> INTO <cVar> => ;
-  <cVar> := space( 128 ) ;;
-  SQLGetData( hStmt, <nRow>, SQL_CHAR, len( <cVar> ), @<cVar> )
+  <cVar> := Space( 128 ) ;;
+  SQLGetData( hStmt, <nRow>, SQL_CHAR, Len( <cVar> ), @<cVar> )
 
 PROCEDURE Main()
 
@@ -16,7 +16,7 @@ PROCEDURE Main()
    LOCAL hDbc       := 0
    LOCAL hStmt      := 0
    LOCAL cConstrin
-   LOCAL cConstrout := SPACE(1024)
+   LOCAL cConstrout := Space( 1024 )
    LOCAL nRows      := 0
    LOCAL cCode, cFunc, cState, cComm
    LOCAL cError1, nError, cError2
@@ -25,7 +25,7 @@ PROCEDURE Main()
 
    cConstrin := "DBQ=" + hb_FNameMerge( hb_DirBase(), "test.mdb" ) + ";Driver={Microsoft Access Driver (*.mdb)}"
 
-   ? padc( "*** ODBC ACCESS TEST ***", 80 )
+   ? PadC( "*** ODBC ACCESS TEST ***", 80 )
    ?
    ? "Allocating environment... "
    SQLAllocEnv( @hEnv )

harbour/external/sqlite3/Makefile

@@ -53,6 +53,7 @@ ifeq ($(HB_SUPPORTED),yes)
 
    ifneq ($(HB_HAS_SQLITE3_LOCAL),)
 
+      HB_CFLAGS += -DSQLITE_OMIT_DEPRECATED
       ifeq ($(HB_PLATFORM),wce)
          HB_CFLAGS += -D_WIN32_WCE
       endif

harbour/external/sqlite3/sqlite3.hbp

@@ -16,6 +16,8 @@
 -warn=no
 -cpp=no
 
+-cflag=-DSQLITE_OMIT_DEPRECATED
+
 sqlite3.c
 
 # ORIGIN http://www.sqlite.org/