From 2b2549b74adcb4ecfe9b0ec79812fbf480d8c741 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 15 Apr 2011 08:21:50 +0000 Subject: [PATCH] 2011-04-15 10:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/harbour.hbx + added HB_MUTEXEVAL * utils/hbmk2/hbmk2.prg * utils/hbmk2/*.po + Added note to -l option: 'Do not add core Harbour libraries, they are automatically added as needed.' * utils/hbmk2/hbmk2.hbp ! Deleted bad hack linking in hbcplr, hbpp, hbcommon on non-mingw win compilers. --- harbour/ChangeLog | 18 +++++++++++++++--- harbour/include/harbour.hbx | 1 + harbour/utils/hbmk2/hbmk2.es_PE.po | 2 +- harbour/utils/hbmk2/hbmk2.hbp | 4 ---- harbour/utils/hbmk2/hbmk2.hu_HU.po | 2 +- harbour/utils/hbmk2/hbmk2.prg | 2 +- harbour/utils/hbmk2/hbmk2.pt_BR.po | 2 +- 7 files changed, 20 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fd7e7a66b5..c8e153e727 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-15 10:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * include/harbour.hbx + + added HB_MUTEXEVAL + + * utils/hbmk2/hbmk2.prg + * utils/hbmk2/*.po + + Added note to -l option: 'Do not add core Harbour libraries, they are automatically added as needed.' + + * utils/hbmk2/hbmk2.hbp + ! Deleted bad hack linking in hbcplr, hbpp, hbcommon on non-mingw + win compilers. + 2011-04-15 00:59 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpfontdialog.prg * contrib/hbxbp/xbpparthandler.prg @@ -34,7 +46,7 @@ ! More synchronized. + contrib/hbxbp/tests/xbpqtc.prg - + Added: an XBP and QTC specific demonstartion which also + + Added: an XBP and QTC specific demonstartion which also offers Qt console(s) as threaded modules. 2011-04-14 11:59 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -80,8 +92,8 @@ + Functional: the class is functional to an extent. Example code in reply-message to this commit on dev-list. - NOTE: now this seems possible that Harbour can have a - pure GUI along with a console inside it to pave a + NOTE: now this seems possible that Harbour can have a + pure GUI along with a console inside it to pave a way for seemless migration to GUI world. See example code. 2011-04-13 03:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/include/harbour.hbx b/harbour/include/harbour.hbx index e382e23e6b..39bcfa56c6 100644 --- a/harbour/include/harbour.hbx +++ b/harbour/include/harbour.hbx @@ -646,6 +646,7 @@ DYNAMIC HB_MINUTE DYNAMIC HB_MMIDDLEDOWN DYNAMIC HB_MTVM DYNAMIC HB_MUTEXCREATE +DYNAMIC HB_MUTEXEVAL DYNAMIC HB_MUTEXLOCK DYNAMIC HB_MUTEXNOTIFY DYNAMIC HB_MUTEXNOTIFYALL diff --git a/harbour/utils/hbmk2/hbmk2.es_PE.po b/harbour/utils/hbmk2/hbmk2.es_PE.po index afca188b1e..882a5161c7 100644 --- a/harbour/utils/hbmk2/hbmk2.es_PE.po +++ b/harbour/utils/hbmk2/hbmk2.es_PE.po @@ -893,7 +893,7 @@ msgstr "Cargando proyecto hbmake: %1$s" #: hbmk2.prg:7851 hbmk2.prg:11512 #, c-format -msgid "link with library. should be without path, extension and 'lib' prefix (unless part of libname)." +msgid "link with library. should be without path, extension and 'lib' prefix (unless part of libname). Do not add core Harbour libraries, they are automatically added as needed." msgstr "linkar con librería . debe omitir path, extensión y prefijo 'lib' (a menos que sea parte de libname)." #: hbmk2.prg:7942 hbmk2.prg:11633 diff --git a/harbour/utils/hbmk2/hbmk2.hbp b/harbour/utils/hbmk2/hbmk2.hbp index de669938a3..2ce56a03de 100644 --- a/harbour/utils/hbmk2/hbmk2.hbp +++ b/harbour/utils/hbmk2/hbmk2.hbp @@ -11,10 +11,6 @@ -mt hbmk2.prg --lhbcplr --lhbpp --lhbcommon - hbmk2.%{hb_lng}.po -hbl=hbmk2.%{hb_lng}.hbl -lng=es_PE,hu_HU,pt_BR diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index c4e264fb51..1ae1952f54 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -804,7 +804,7 @@ msgstr "" #: hbmk2.prg:7850 hbmk2.prg:11512 #, c-format -msgid "link with library. should be without path, extension and 'lib' prefix (unless part of libname)." +msgid "link with library. should be without path, extension and 'lib' prefix (unless part of libname). Do not add core Harbour libraries, they are automatically added as needed." msgstr "szerkessze be függvénykönyvtárat. -ben nem szerepelhet útvonal, kiterjesztés és 'lib' előtag (kivéve ha az a név része)." #: hbmk2.prg:7941 hbmk2.prg:11633 diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index e7452b0295..18877679f9 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -11848,7 +11848,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) LOCAL aOpt_Basic := {; { "-o" , I_( "output file name" ) },; - { "-l" , I_( "link with library. should be without path, extension and 'lib' prefix (unless part of libname)." ) },; + { "-l" , I_( "link with library. should be without path, extension and 'lib' prefix (unless part of libname). Do not add core Harbour libraries, they are automatically added as needed." ) },; { "-L" , I_( "additional path to search for libraries" ) },; { "-i

|-incpath=

" , I_( "additional path to search for headers" ) },; { "-static|-shared" , I_( "link with static/shared libs" ) },; diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po index 2ba7b3dcd8..5efacc1321 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -893,7 +893,7 @@ msgstr "Carregando projeto do hbmake: %1$s" #: hbmk2.prg:7851 hbmk2.prg:11512 #, c-format -msgid "link with library. should be without path, extension and 'lib' prefix (unless part of libname)." +msgid "link with library. should be without path, extension and 'lib' prefix (unless part of libname). Do not add core Harbour libraries, they are automatically added as needed." msgstr "linkar com a biblioteca . deve omitir path, extensão e o prefixo 'lib' (à menos que faça parte do nome-de-arquivo)." #: hbmk2.prg:7942 hbmk2.prg:11633