From bf68197ca0eb75f8bb643491f8bb12d7a7dc2ab2 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 9 Apr 2008 18:44:03 +0000 Subject: [PATCH] 2008-04-09 20:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/ChangeLog * harbour/harbour.spec * reverted translation to UTF8 - Tomaz please check your editor settings and disable automatic translation to UTF8. It's not the first as such situation happens. * harbour/include/hbclass.ch + added two missing PP directives ! protected against some repeated external definitions * harbour/source/pp/Makefile * harbour/source/pp/hbppgen.c * harbour/source/pp/ppcore.c * harbour/source/common/hbver.c * harbour/source/common/hbverdsp.c * harbour/source/main/harbour.c * harbour/source/vm/cmdarg.c * harbour/utils/hbpp/hbpp.c * harbour/include/hbpp.h * harbour/include/hbcomp.h * harbour/include/hbver.h * harbour/include/hbapi.h * harbour/make_vcce.mak * harbour/make_b32.mak * harbour/make_vc.mak * harbour/make_gcc.mak + added support for dynamically set during compilation ChangeLog entry ChangeLog ID and SVN revision and compilation flags Now hbppgen creates in include directory hbverbld.h file with information extracted from ChangeLog. New hbppgen parameters: Syntax: ./hbppgen [.prg] [options] Options: -i add #include file search path -c[] look for ChangeLog file -o creates .c file with PP rules -v creates .h file with version information -w write preprocessed (.ppo) input file -q disable information messages + added new C functions: int hb_verSvnID( void ) - retrieves ChangeLog SVN revision number const char * hb_verSvnChangeLogID( void ) - retrieves a static buffer containing ChangeLog ID string const char * hb_verSvnLastEntry( void ) - retrieves a static buffer containing ChangeLog last entry string const char * hb_verFlagsC( void ) - retrieves a static buffer containing build time C compiler flags in C_USR envvar const char * hb_verFlagsL( void ) - retrieves a static buffer containing build time linker flags in L_USR envvar const char * hb_verFlagsPRG( void ) - retrieves a static buffer containing build time Harbour compiler flags in PRG_USR envvar + added new default PP defines which can be used in .prg code compiled by Harbour compiler: HB_VER_LENTRY, HB_VER_CHLID, HB_VER_SVNID * harbour/source/rtl/gtxwc/gtxwc.c * formatting * harbour/source/rtl/gttrm/gttrm.c ! fixed redrawing GPM mouse pointer after screen updating * harbour/source/rtl/gtstd/gtstd.c * harbour/source/rtl/gtpca/gtpca.c * updated for compilation even if some POSIX macros are not supported f.e. problems with some DJGPP versions reported recently * harbour/source/debug/dbgentry.c * harbour/source/debug/dbgtobj.prg * harbour/source/debug/dbgbrwsr.prg * harbour/source/debug/dbgthsh.prg * harbour/source/debug/tbrwtext.prg * harbour/source/debug/dbgwa.prg * harbour/source/debug/debugger.prg * harbour/source/debug/dbghelp.prg * harbour/source/debug/dbgtarr.prg ! Fixed object inspector in the debugger. ! Added HbDbBrowser:invalidate() message. Fixes work area browsing in debugger. ! Added an minimalistic TBrowse implementation that is just enough for internal use by the debugger. Fixes miscellaneous problems e.g. when debugging a piece of code with RELATIONs turned on. Fixes by Phil Krylov borrowed from xHarbour. --- harbour/ChangeLog | 149 +++++++++++++++---- harbour/harbour.spec | 68 ++++----- harbour/include/hbapi.h | 14 +- harbour/include/hbclass.ch | 24 ++- harbour/include/hbcomp.h | 1 - harbour/include/hbpp.h | 1 - harbour/include/hbver.h | 13 +- harbour/make_b32.mak | 8 +- harbour/make_gcc.mak | 8 +- harbour/make_vc.mak | 8 +- harbour/make_vcce.mak | 8 +- harbour/source/common/hbver.c | 5 +- harbour/source/common/hbverdsp.c | 51 ++++--- harbour/source/debug/dbgbrwsr.prg | 147 ++++++++++++++++-- harbour/source/debug/dbgentry.c | 65 ++------ harbour/source/debug/dbghelp.prg | 2 +- harbour/source/debug/dbgtarr.prg | 2 +- harbour/source/debug/dbgthsh.prg | 2 +- harbour/source/debug/dbgtobj.prg | 12 +- harbour/source/debug/dbgwa.prg | 37 +++-- harbour/source/debug/debugger.prg | 107 ++++++------- harbour/source/debug/tbrwtext.prg | 40 +++-- harbour/source/main/harbour.c | 49 ++++++ harbour/source/pp/Makefile | 2 +- harbour/source/pp/hbppgen.c | 240 +++++++++++++++++++++++++++++- harbour/source/pp/ppcore.c | 1 + harbour/source/rtl/gtpca/gtpca.c | 3 +- harbour/source/rtl/gtstd/gtstd.c | 48 ++++-- harbour/source/rtl/gttrm/gttrm.c | 2 +- harbour/source/rtl/gtxwc/gtxwc.c | 2 +- harbour/source/vm/cmdarg.c | 49 ++++++ harbour/utils/hbpp/hbpp.c | 5 + 32 files changed, 873 insertions(+), 300 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2522dcb7d3..861c7a5e0c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,4 +1,4 @@ -/* +/* * $Id$ */ @@ -7,11 +7,96 @@ For example: 2002-12-01 13:30 UTC+0100 Foo Bar */ + +2008-04-09 20:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/ChangeLog + * harbour/harbour.spec + * reverted translation to UTF8 - Tomaz please check your editor + settings and disable automatic translation to UTF8. It's not + the first as such situation happens. + + * harbour/include/hbclass.ch + + added two missing PP directives + ! protected against some repeated external definitions + + * harbour/source/pp/Makefile + * harbour/source/pp/hbppgen.c + * harbour/source/pp/ppcore.c + * harbour/source/common/hbver.c + * harbour/source/common/hbverdsp.c + * harbour/source/main/harbour.c + * harbour/source/vm/cmdarg.c + * harbour/utils/hbpp/hbpp.c + * harbour/include/hbpp.h + * harbour/include/hbcomp.h + * harbour/include/hbver.h + * harbour/include/hbapi.h + * harbour/make_vcce.mak + * harbour/make_b32.mak + * harbour/make_vc.mak + * harbour/make_gcc.mak + + added support for dynamically set during compilation ChangeLog entry + ChangeLog ID and SVN revision and compilation flags + Now hbppgen creates in include directory hbverbld.h file with + information extracted from ChangeLog. New hbppgen parameters: + Syntax: ./hbppgen [.prg] [options] + Options: -i add #include file search path + -c[] look for ChangeLog file + -o creates .c file with PP rules + -v creates .h file with version information + -w write preprocessed (.ppo) input file + -q disable information messages + + added new C functions: + int hb_verSvnID( void ) + - retrieves ChangeLog SVN revision number + const char * hb_verSvnChangeLogID( void ) + - retrieves a static buffer containing ChangeLog ID string + const char * hb_verSvnLastEntry( void ) + - retrieves a static buffer containing ChangeLog last entry string + const char * hb_verFlagsC( void ) + - retrieves a static buffer containing build time C compiler + flags in C_USR envvar + const char * hb_verFlagsL( void ) + - retrieves a static buffer containing build time linker + flags in L_USR envvar + const char * hb_verFlagsPRG( void ) + - retrieves a static buffer containing build time Harbour compiler + flags in PRG_USR envvar + + added new default PP defines which can be used in .prg code compiled + by Harbour compiler: HB_VER_LENTRY, HB_VER_CHLID, HB_VER_SVNID + + * harbour/source/rtl/gtxwc/gtxwc.c + * formatting + + * harbour/source/rtl/gttrm/gttrm.c + ! fixed redrawing GPM mouse pointer after screen updating + + * harbour/source/rtl/gtstd/gtstd.c + * harbour/source/rtl/gtpca/gtpca.c + * updated for compilation even if some POSIX macros are not supported + f.e. problems with some DJGPP versions reported recently + + * harbour/source/debug/dbgentry.c + * harbour/source/debug/dbgtobj.prg + * harbour/source/debug/dbgbrwsr.prg + * harbour/source/debug/dbgthsh.prg + * harbour/source/debug/tbrwtext.prg + * harbour/source/debug/dbgwa.prg + * harbour/source/debug/debugger.prg + * harbour/source/debug/dbghelp.prg + * harbour/source/debug/dbgtarr.prg + ! Fixed object inspector in the debugger. + ! Added HbDbBrowser:invalidate() message. Fixes work area browsing in debugger. + ! Added an minimalistic TBrowse implementation that is just enough + for internal use by the debugger. Fixes miscellaneous problems e.g. + when debugging a piece of code with RELATIONs turned on. + Fixes by Phil Krylov borrowed from xHarbour. + 2008-04-09 UTC+0100 Belgrano Massimo (mbelgrano/at/deltain.it) - *harbour/contrib/rddado/adordd.prg - *harbour/contrib/rddado/tests/access2.prg - Support For Found() working after a LOCATE command - by Antonio Linares + * harbour/contrib/rddado/adordd.prg + * harbour/contrib/rddado/tests/access2.prg + * Support For Found() working after a LOCATE command + by Antonio Linares 2008-03-26 16:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/gtos2/gtos2.c @@ -1507,12 +1592,12 @@ 2008-01-14 13:44 UTC+0100 Miguel Angel Marchuet Frutos * source/vm/extend.c * Undo Added conversion from logical params in hb_par* functions. - ( thks to Juan G�lvez ) + ( thks to Juan Gálvez ) 2008-01-14 12:28 UTC+0100 Miguel Angel Marchuet Frutos * source/vm/extend.c * Added conversion from logical params in hb_par* functions. - ( thks to Juan G�lvez ) + ( thks to Juan Gálvez ) 2008-01-15 10:31 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbdefs.h @@ -2007,7 +2092,7 @@ 2007-12-17 13:41 UTC+0100 Miguel Angel Marchuet Frutos * common.mak - + Added some missing files (suggested by Juan G�lvez) + + Added some missing files (suggested by Juan Gálvez) 2007-12-16 15:42 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbgtwvg/gtwvg.h @@ -4322,7 +4407,7 @@ 2007-11-20 17:02 UTC+0100 Miguel Angel Marchuet Frutos * contrib/xhb/common.mak - + Added some missing lines (suggested by Juan G�lvez) + + Added some missing lines (suggested by Juan Gálvez) 2007-11-20 13:45 UTC+0100 Miguel Angel Marchuet Frutos * contrib/bmdbfcdx/bmdbfcdx1.c @@ -10746,7 +10831,7 @@ * harbour/contrib/libct/Makefile * harbour/contrib/libct/makefile.bc * harbour/contrib/libct/makefile.vc - * added new files and Juan G�lvez fixes + * added new files and Juan Gálvez fixes * harbour/contrib/libct/like.c * harbour/contrib/libct/keyset.c ! fixed typo @@ -11536,7 +11621,7 @@ * harbour/harbour.spec * restored original national characters which were unintentionally damaged on 2006-06-29 08:25 UTC+0200 Tomaz Zupan - Toma� please do not use editors which will change national characters + Toma¾ please do not use editors which will change national characters in the whole file when you will change harbour.spec in the future 2007-06-07 11:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) @@ -12684,7 +12769,7 @@ Examples - � The following example enables optimization for the Inventor + ¦ The following example enables optimization for the Inventor database file using the SET OPTIMIZE command: USE Inventor NEW VIA "BMDBFCDX" @@ -26673,7 +26758,7 @@ NOTE: ! Changed return values for empty or failed calles to MemoRead() to return an empty string instead of a NULL ! Close file when MemoRead() was successful, but file was empty (was being left open) - Above solutions reported and provided by David Arturo Mac�as Corona. Thanks! + Above solutions reported and provided by David Arturo Macías Corona. Thanks! 2004-02-19 12:48 UTC-0800 Luis Krause Mantilla * contrib/rdd_ads/adsfunc.c @@ -27237,7 +27322,7 @@ NOTE: 2003-12-03 17:28 UTC-0800 Luis Krause Mantilla * source/rdd/dbcmd.c ! Fixed OrdKeyNo() bug that set RecNo() to LastRec() + 1 - reported by Roberto L�pez - borrowed from xharbour + reported by Roberto López - borrowed from xharbour 2003-12-03 14:24 UTC-0800 Luis Krause Mantilla * include/hbapirdd.h @@ -29107,7 +29192,7 @@ All this changes (except Ron's PP) are my work borrowed from xHarbour. 2003-04-16 14:50 UTC+0300 Alexander Kresin * source/rdd/dbfntx/dbfntx1.c - * A bug in hb_ntxTagKeyCount() fixed - reported by Jos� Luis Capel + * A bug in hb_ntxTagKeyCount() fixed - reported by Jos© Luis Capel 2003-04-15 13:10 UTC+0300 Alexander Kresin + contrib/ole @@ -29116,7 +29201,7 @@ All this changes (except Ron's PP) are my work borrowed from xHarbour. + contrib/ole/hbtest.prg + contrib/ole/ole2.c + contrib/ole/oleauto.prg - + With a kind permission of the author, Jos� F. Gim�nez , + + With a kind permission of the author, José F. Giménez , ole library for harbour added. Some unused stuff is removed from the original files, few bug fixes are made. @@ -29542,7 +29627,7 @@ All this changes (except Ron's PP) are my work borrowed from xHarbour. DBOI_ISCOND, DBOI_ISDESC, DBOI_UNIQUE, DBOI_POSITION, DBOI_RECNO, DBOI_KEYNORAW, DBOI_KEYCOUNT, DBOI_KEYCOUNTRAW. This makes ordKeyNo() = recno() and ordKeyCount() = lastrec() - in such case. Reported by Hern�n Diego Ceccarelli + in such case. Reported by Hernán Diego Ceccarelli + added helper function hb_cdxOrdListClear ! structural index isn't closed anymore @@ -29673,7 +29758,7 @@ All this changes (except Ron's PP) are my work borrowed from xHarbour. 2002-11-27 13:30 UTC+0300 Alexander Kresin * source/rdd/dbfntx/dbfntx1.c - ! Bug fixed, reported by Carlos Andr�s + ! Bug fixed, reported by Carlos Andr©s * source/rtl/cdpapi.c ! Bug fixed in HB_TRANSLATE() @@ -30019,7 +30104,7 @@ All this changes (except Ron's PP) are my work borrowed from xHarbour. 2002-10-22 18:53 UTC+0100 Antonio Linares * source/rtl/filesys.c - ! minor fix reported by Jos� Fco. P�rez + ! minor fix reported by José Fco. Pérez 2002-10-22 12:00 UTC-0500 Paul Tucker * source/rdd/dbcmd.c @@ -32346,7 +32431,7 @@ All this changes (except Ron's PP) are my work borrowed from xHarbour. ! fixed bug seek and set deleted on, reported by Lorenzo Fiorini also fix bug with set filter ! fixed bug with ordkeyno() and ordkeycount(), - reported by Manuel Mercado G�mez + reported by Manuel Mercado Gómez 2002-03-04 22:33 UTC+0100 Antonio Linares * source/rtl/set.c @@ -32806,7 +32891,7 @@ All this changes (except Ron's PP) are my work borrowed from xHarbour. ... __hrbUnload( hrbLib ) -2002-02-01 10:30 UTC-0300 Horacio Rold�n +2002-02-01 10:30 UTC-0300 Horacio Roldán * utils/hbmake/hbmake.prg utils/hbmake/hbmutils.prg * Better support for big project(Read and Generations) @@ -33115,7 +33200,7 @@ All this changes (except Ron's PP) are my work borrowed from xHarbour. 2002-01-28 14:21 UTC+0300 Alexander Kresin * source/rdd/dbf1.c - * Bug fixed in dbfGetMemo(), reported by Jos� Luis Capel + * Bug fixed in dbfGetMemo(), reported by Jos© Luis Capel 2002-01-28 13:50 UTC+0300 Alexander Kresin * source/rdd/dbfntx/dbfntx1.c @@ -33604,7 +33689,7 @@ ed 2002-01-11 08:10 GMT-3 Luiz Rafael Culik * source/rdd/dbf1.c ! Fixed problem with numeric field. - From Horacio Rold�n + From Horacio Roldán 2002-01-10 22:10 GMT-3 Luiz Rafael Culik * source/common/hbffind.c @@ -33618,7 +33703,7 @@ ed 2002-01-10 14:30 UTC-0500 David G. Holm * source/rtl/spfiles.c ! Fix to remove spurious ISCHAR(1) tests from C routines. - From Horacio Rold�n + From Horacio Roldán 2002-01-10 17:20 UTC+0300 Alexander Kresin * source/pp/pptable.c @@ -37768,7 +37853,7 @@ e.vc 2001-07-24 20:45 GMT -3 Luiz Rafael Culik +doc/es/math.txt - *Math docs translated to spanish. Thanks for Ricardo Ram�rez R. + *Math docs translated to spanish. Thanks for Ricardo Ramírez R. 2001-07-24 08:45 GMT -3 Luiz Rafael Culik /Jose Lalin * source/compiler/gencobj.c @@ -39135,7 +39220,7 @@ e.vc new Harbour License and Exception with permission from Andi Jahja , April White , - Ignacio_Ortiz_de_Z��iga , + Ignacio_Ortiz_de_Zúñiga , Kwon,OJun (Charles Kwon) , and Phil Barnett @@ -41582,7 +41667,7 @@ NOTE: there is no hb_gcLockItem/hb_gcUnlockItem functions - please remove 2001-03-14 04:55 UTC-0800 Ron Pinkas * source/vm/classes.c - ! Fixed hb_param() to hb_stackItemFromBase() (posted by Jos� F. Gim�nez) + ! Fixed hb_param() to hb_stackItemFromBase() (posted by José F. Giménez) 2001-03-13 03:45 UTC-0800 Ron Pinkas * contrib/dot/pp.txt @@ -41607,7 +41692,7 @@ NOTE: there is no hb_gcLockItem/hb_gcUnlockItem functions - please remove * source/lang/msgeo.c ! Updated + Added harbour license - ( provided by Jos� Lal�n ) + ( provided by Jos© Lal­n ) 2001-03-11 21:43 UTC+0500 April * doc/en/hb_macro.txt @@ -60503,7 +60588,7 @@ Tue Nov 09 11:56:05 1999 Gonzalo A. Diethelm rewritten and continued in C++, which is also Open Source, and you can find it at http://www.nexus.hu/cccpp/ - This great contribution was made by Levente Csisz�r + This great contribution was made by Levente Csisz r 19991109-01:09 GMT+1 Victor Szel * source/rtl/filesys.c @@ -62821,7 +62906,7 @@ Thu Oct 14 17:29:32 1999 Gonzalo A. Diethelm * source/rtl/memoline.c source/rtl/mlcount.c ! TAB handling fixes for MEMOLINE() and MLCOUNT() by - Ignacio Ortiz de Z�niga + Ignacio Ortiz de Zúniga * All USHORTs changed to ULONG. 19991006-13:05 GMT+1 Victor Szel @@ -63023,7 +63108,7 @@ Tue Oct 05 14:44:16 1999 Gonzalo A. Diethelm source/rtl/Makefile doc/funclist.txt + MEMOLINE() added - (thanks to Ignacio Ortiz de Z�niga ) + (thanks to Ignacio Ortiz de Zúniga ) !! WARNING !! Please modify non-GNU make files. 19991005-18:20 GMT+1 Victor Szel @@ -63238,7 +63323,7 @@ Mon Oct 04 12:52:42 1999 Gonzalo A. Diethelm source/rtl/Makefile doc/funclist.txt + MLCOUNT() added - (thanks to Ignacio Ortiz de Z�niga ) + (thanks to Ignacio Ortiz de Zúniga ) - source/runner/stdalone/runner.prg - Removed (now for sure) diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 623ae0470c..0669d78108 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -89,9 +89,9 @@ ###################################################################### Summary: Free software Clipper compatible compiler -Summary(pl): Darmowy kompilator kompatybilny z j�zykiem Clipper. +Summary(pl): Darmowy kompilator kompatybilny z jêzykiem Clipper. Summary(pt_BR): Um compilador Clipper compativel Gratis -Summary(ru): ��������� ����������, ����������� � ������ Clipper. +Summary(ru): ó×ÏÂÏÄÎÙÊ ËÏÍÐÉÌÑÔÏÒ, ÓÏ×ÍÅÓÔÉÍÙÊ Ó ÑÚÙËÏÍ Clipper. Name: %{name} Version: %{version} Release: %{releasen}%{platform} @@ -100,7 +100,7 @@ Group: Development/Languages Vendor: %{hb_host} URL: http://%{hb_host}/ Source: %{name}-%{version}.src.tar.gz -Packager: Przemys�aw Czerpak Luiz Rafael Culik Guimaraes +Packager: Przemys³aw Czerpak Luiz Rafael Culik Guimaraes BuildPrereq: gcc binutils bash ncurses ncurses-devel %{!?_without_gpm: gpm-devel} Requires: gcc binutils bash sh-utils %{name}-lib = %{?epoch:%{epoch}:}%{version}-%{release} Provides: %{name} harbour @@ -117,19 +117,19 @@ See README.RPM in the documentation directory for information specific to this RPM distribution. %description -l pl -%{dname} to kompatybilny z j�zykiem CA-Clipper kompilator rozwijany na -wielu r��nych platformach. Ten pakiet zawiera kompilator, preprocesor, -zbiory nag��wkowe, wirtualn� maszyn� oraz dokumentacj�. +%{dname} to kompatybilny z jêzykiem CA-Clipper kompilator rozwijany na +wielu ró¿nych platformach. Ten pakiet zawiera kompilator, preprocesor, +zbiory nag³ówkowe, wirtualn± maszynê oraz dokumentacjê. %description -l pt_BR -%{dname} � um compilador Clipper compativel para multiplas plataformas. -Esse pacote contem um compilador, um pr�-processador, arquivos de cabe�alho -uma maquina virtual e documenta��o. +%{dname} é um compilador Clipper compativel para multiplas plataformas. +Esse pacote contem um compilador, um pré-processador, arquivos de cabeçalho +uma maquina virtual e documentação. %description -l ru -%{dname} - ������������������ ����������, ����������� � ������ CA-Clipper. -���� ����� �������� ����������, ������������, ����� ����������, ����������� -������ � ������������. +%{dname} - ÍÎÏÇÏÐÌÁÔÆÏÒÍÅÎÎÙÊ ËÏÍÐÉÌÑÔÏÒ, ÓÏ×ÍÅÓÔÉÍÙÊ Ó ÑÚÙËÏÍ CA-Clipper. +üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ËÏÍÐÉÌÑÔÏÒ, ÐÒÅÐÒÏÃÅÓÓÏÒ, ÆÁÊÌÙ ÚÁÇÏÌÏ×ËÏ×, ×ÉÒÔÕÁÌØÎÕÀ +ÍÁÛÉÎÕ É ÄÏËÕÍÅÎÔÁÃÉÀ. ###################################################################### @@ -139,7 +139,7 @@ uma maquina virtual e documenta��o. %package lib Summary: Shared runtime libaries for %{dname} compiler Summary(pl): Dzielone bilioteki dla kompilatora %{dname} -Summary(ru): ��������� ������������ ���������� ��� ����������� %{dname} +Summary(ru): óÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ËÏÍÐÉÌÑÔÏÒÁ %{dname} Group: Development/Languages Provides: lib%{name}.so lib%{name}mt.so @@ -149,19 +149,19 @@ This package provides %{dname} runtime shared libraries for programs linked dynamically. %description -l pl lib -%{dname} to kompatybilny z j�zykiem CA-Clipper kompilator. -Ten pakiet udost�pnia dzielone bilioteki kompilatora %{dname} -dla program�w konsolidowanych dynamicznie. +%{dname} to kompatybilny z jêzykiem CA-Clipper kompilator. +Ten pakiet udostêpnia dzielone bilioteki kompilatora %{dname} +dla programów konsolidowanych dynamicznie. %description -l pt_BR lib -%{dname} � um compilador compativel com o Clipper. +%{dname} é um compilador compativel com o Clipper. Esse pacote %{dname} provem as bibliotecas compartilhadas para programas linkados dinamicamente. %description -l ru lib -%{dname} - ����������, ����������� � ������ CA-Clipper. -���� ����� �������� ��������� ������������ ���������� %{dname}, -����������� ��� ������ ����������� �������������� ��������. +%{dname} - ËÏÍÐÉÌÑÔÏÒ, ÓÏ×ÍÅÓÔÉÍÙÊ Ó ÑÚÙËÏÍ CA-Clipper. +üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ %{dname}, +ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÒÁÂÏÔÙ ÄÉÎÁÍÉÞÅÓËÉ ÓËÏÍÐÏÎÏ×ÁÎÎÙÈ ÐÒÏÇÒÁÍÍ. ###################################################################### @@ -171,7 +171,7 @@ linkados dinamicamente. %package static Summary: Static runtime libaries for %{dname} compiler Summary(pl): Statyczne bilioteki dla kompilatora %{dname} -Summary(ru): ����������� ���������� ��� ����������� %{dname} +Summary(ru): óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ËÏÍÐÉÌÑÔÏÒÁ %{dname} Group: Development/Languages Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -181,26 +181,26 @@ This package provides %{dname} static runtime libraries for static program linking. %description -l pl static -%{dname} to kompatybilny z j�zykiem CA-Clipper kompilator. -Ten pakiet udost�pnia statyczne bilioteki dla kompilatora %{dname} -niezb�dne do statycznej konsolidacji program�w. +%{dname} to kompatybilny z jêzykiem CA-Clipper kompilator. +Ten pakiet udostêpnia statyczne bilioteki dla kompilatora %{dname} +niezbêdne do statycznej konsolidacji programów. %description -l pt_BR static -%{dname} � um compilador compativel com o clippe. +%{dname} é um compilador compativel com o clippe. Esse pacote %{dname} provem as bibliotecas de run time staticas para linkagem dos os programas %description -l ru static -%{dname} - ����������, ����������� � ������ CA-Clipper. -���� ����� �������� ����������� ���������� ����������� %{dname}, -����������� ��� ����������� ���������� ��������. +%{dname} - ËÏÍÐÉÌÑÔÏÒ, ÓÏ×ÍÅÓÔÉÍÙÊ Ó ÑÚÙËÏÍ CA-Clipper. +üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ËÏÍÐÉÌÑÔÏÒÁ %{dname}, +ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÔÁÔÉÞÅÓËÏÊ ËÏÍÐÏÎÏ×ËÉ ÐÒÏÇÒÁÍÍ. %package contrib Summary: Contrib runtime libaries for %{dname} compiler Summary(pl): Bilioteki z drzewa contrib dla kompilatora %{dname} Summary(pt_BR): Libs contrib para %{dname} -Summary(ru): ���������� �� ������ contrib ��� ����������� %{dname} +Summary(ru): âÉÂÌÉÏÔÅËÉ ÉÚ ÄÅÒÅ×Á contrib ÄÌÑ ËÏÍÐÉÌÑÔÏÒÁ %{dname} Group: Development/Languages Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -209,18 +209,18 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} This package provides %{dname} contrib libraries for program linking. %description -l pl contrib -%{dname} to kompatybilny z j�zykiem CA-Clipper kompilator. -Ten pakiet udost�pnia statyczne bilioteki z drzewa contrib dla +%{dname} to kompatybilny z jêzykiem CA-Clipper kompilator. +Ten pakiet udostêpnia statyczne bilioteki z drzewa contrib dla kompilatora %{dname}. %description -l pt_BR contrib -%{dname} � um compilador compativel com o clippe. +%{dname} é um compilador compativel com o clippe. Esse pacote %{dname} provem as bibliotecas contrib para linkagem dos programas. %description -l ru contrib -%{dname} - ����������, ����������� � ������ CA-Clipper. -���� ����� �������� ����������� ���������� %{dname} �� ������ contrib. +%{dname} - ËÏÍÐÉÌÑÔÏÒ, ÓÏ×ÍÅÓÔÉÍÙÊ Ó ÑÚÙËÏÍ CA-Clipper. +üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ %{dname} ÉÚ ÄÅÒÅ×Á contrib. ###################################################################### diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index 399b909412..4ba652be02 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -987,12 +987,18 @@ extern void hb_idleSleep( double dSeconds ); /* sleep for a given time serving extern void hb_idleShutDown( void ); /* closes all background tasks */ /* misc */ -extern char * hb_verPlatform( void ); /* retrieves a newly allocated buffer containing platform version */ -extern char * hb_verCompiler( void ); /* retrieves a newly allocated buffer containing compiler version */ -extern char * hb_verHarbour( void ); /* retrieves a newly allocated buffer containing harbour version */ -extern char * hb_verPCode( void ); /* retrieves a newly allocated buffer containing PCode version */ +extern char * hb_verPlatform( void ); /* retrieves a newly allocated buffer containing platform version */ +extern char * hb_verCompiler( void ); /* retrieves a newly allocated buffer containing compiler version */ +extern char * hb_verHarbour( void ); /* retrieves a newly allocated buffer containing harbour version */ +extern char * hb_verPCode( void ); /* retrieves a newly allocated buffer containing PCode version */ extern char * hb_verBuildDate( void ); /* retrieves a newly allocated buffer containing build date and time */ extern void hb_verBuildInfo( void ); /* display harbour, compiler, and platform versions to standard console */ +extern int hb_verSvnID( void ); /* retrieves ChangeLog SVN revision number */ +extern const char * hb_verSvnChangeLogID( void ); /* retrieves a static buffer containing ChangeLog ID string */ +extern const char * hb_verSvnLastEntry( void ); /* retrieves a static buffer containing ChangeLog last entry string */ +extern const char * hb_verFlagsC( void ); /* retrieves a static buffer containing build time C compiler flags in C_USR envvar */ +extern const char * hb_verFlagsL( void ); /* retrieves a static buffer containing build time linker flags in L_USR envvar */ +extern const char * hb_verFlagsPRG( void ); /* retrieves a static buffer containing build time Harbour compiler flags in PRG_USR envvar */ extern HB_EXPORT BOOL hb_iswinnt( void ); /* return .T. if OS == WinNt, 2000, XP */ extern HB_EXPORT BOOL hb_iswince( void ); /* return .T. if OS is Windows CE or Windows Mobile */ diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch index ba02f5dae2..c45339a8a9 100644 --- a/harbour/include/hbclass.ch +++ b/harbour/include/hbclass.ch @@ -122,9 +122,15 @@ #ifndef __HARBOUR__ - #define HB_CLS_NO_DECORATION - #define HB_CLS_NO_DECLARATIONS - #define HB_CLS_PARAM_LIST + #ifndef HB_CLS_NO_DECORATION + #define HB_CLS_NO_DECORATION + #endif + #ifndef HB_CLS_NO_DECLARATIONS + #define HB_CLS_NO_DECLARATIONS + #endif + #ifndef HB_CLS_PARAM_LIST + #define HB_CLS_PARAM_LIST + #endif #endif /* Disable method decoration when Harbour compiled strict compatibility mode. @@ -143,7 +149,11 @@ * I have to enable this definition by default untill we will not fix * preprocessor. [druzus] */ -#define HB_CLS_NO_PARAMS_ERR +#ifndef HB_CLS_PARAMS_ERR + #ifndef HB_CLS_NO_PARAMS_ERR + #define HB_CLS_NO_PARAMS_ERR + #endif +#endif /* should we use <_ prefix for real method names? */ #ifdef HB_CLS_NO_DECORATION @@ -406,6 +416,12 @@ DECLARE HBClass ; #xcommand ASSIGN [ AS ] [LOCAL ] INLINE [] [] [