From f3efccb8d38c0a0eeb7d66695bb26810586cc030 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 30 Mar 2009 08:30:30 +0000 Subject: [PATCH] 2009-03-30 10:27 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Don't attempt to strip leading 'lib' from libnames, since this breaks libs which actually begin with 'lib', not meant as a prefix. F.e. libpng, libhpdf, libjpeg. * contrib/hbqt/tests/hbqt.hbp + Added static QT libname as comment (for now). --- harbour/ChangeLog | 33 ++++++++++++++++++----------- harbour/contrib/hbqt/tests/hbqt.hbp | 2 ++ harbour/utils/hbmk2/hbmk2.prg | 3 +++ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8db2db9bd3..012a0a5046 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,35 +8,44 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-30 10:27 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + ! Don't attempt to strip leading 'lib' from libnames, since + this breaks libs which actually begin with 'lib', not meant + as a prefix. F.e. libpng, libhpdf, libjpeg. + + * contrib/hbqt/tests/hbqt.hbp + + Added static QT libname as comment (for now). + 2009-03-30 11:30 UTC+0200 Petr Chornyj (myorg63 at mail.ru) * contrib/hbsqlit3/hbsqlit3.ch * contrib/hbsqlit3/hbsqlit3.c - * Added support for sqlite_exec() callback. + * Added support for sqlite_exec() callback. Now the 3rd parameter is an optional callback that is invoked once for each row of any query results. * Now we can pass name of logfile as third parameter of - sqlite3_trace(), sqlite3_profile(). - + Added sqlite3_set_authorizer() - + sqlite3_trace(), sqlite3_profile(). + + Added sqlite3_set_authorizer() - Compile-Time Authorization Callbacks. - + Added sqlite3_busy_handler() - + + Added sqlite3_busy_handler() - A Callback To Handle SQLITE_BUSY Errors. + Added sqlite3_progress_handler() - Query Progress Callbacks. + Added sqlite3_commit_hook(), sqlite3_rollback_hook() - Commit And Rollback Notification Callbacks + Added sqlite3_backup_*() API for backups purposes. + Added sqlite3_initialize(), sqlite3_shutdown(), sqlite3_interrupt(), - sqlite3_status(), sqlite3_db_status(), sqlite3_stmt_status(), + sqlite3_status(), sqlite3_db_status(), sqlite3_stmt_status(), sqlite3_sql(), sqlite3_extended_errcode(), sqlite3_threadsafe(), - sqlite3_memory_used(), sqlite3_memory_highwater(). + sqlite3_memory_used(), sqlite3_memory_highwater(). ! Fixed sqlite3_table_column_metadata(). - Temporary disabled sqlite3_db_handle(). - * Minor changes, cleanup and formating. - + contrib/hbsqlit3/tests/authorizer.prg - + contrib/hbsqlit3/tests/backup.prg - + contrib/hbsqlit3/tests/hooks.prg + * Minor changes, cleanup and formating. + + contrib/hbsqlit3/tests/authorizer.prg + + contrib/hbsqlit3/tests/backup.prg + + contrib/hbsqlit3/tests/hooks.prg + Added for demonstration of new possibilities. - + contrib/hbsqlit3/tests/metadata.prg - * Minor changes + + contrib/hbsqlit3/tests/metadata.prg + * Minor changes 2009-03-30 10:01 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * config/win/owatcom.cf diff --git a/harbour/contrib/hbqt/tests/hbqt.hbp b/harbour/contrib/hbqt/tests/hbqt.hbp index e49fca0301..0e8d4359a5 100644 --- a/harbour/contrib/hbqt/tests/hbqt.hbp +++ b/harbour/contrib/hbqt/tests/hbqt.hbp @@ -5,5 +5,7 @@ {mingw}libs=supc++ libs=hbqt libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4 +# static libs +#libs=QtCore QtGui QtNetwork QtWebKit gui=yes gt=gtnul diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index eb862bb613..5fc3474263 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2397,9 +2397,12 @@ STATIC FUNCTION ListCookLib( arraySrc, cPrefix, cExtNew ) FOR EACH cLibName IN array hb_FNameSplit( cLibName, @cDir ) IF Empty( cDir ) +#if 0 + /* Don't attempt to strip this as it can be valid for libs which have double lib prefixes (f.e. libpng) */ IF Left( cLibName, 3 ) == "lib" cLibName := SubStr( cLibName, 4 ) ENDIF +#endif IF cPrefix != NIL cLibName := cPrefix + cLibName ENDIF