From b33f79ec8b9dde69993aae2603125c2d0d799cde Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 15 Jul 2008 12:32:34 +0000 Subject: [PATCH] 2008-07-15 14:31 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbmysql/Makefile * harbour/contrib/hbodbc/Makefile * harbour/contrib/hbsqlit3/Makefile * harbour/contrib/hbfbird/Makefile * harbour/contrib/hbcurl/Makefile * harbour/contrib/hbhpdf/Makefile * harbour/contrib/hbpgsql/Makefile * harbour/contrib/hbfimage/Makefile * harbour/contrib/hbgd/Makefile * harbour/contrib/hbgf/hbgfgtk/Makefile * do not add default system include directory to C_USR during testing for foreign header files when HB_XBUILD variable is set - protection against including wrong header files in cross builds * harbour/contrib/hbtpathy/ChangeLog * changed SVN EOL style to 'native' * harbour/contrib/hbbmcdx/bmdbfcdx.c * pacified warning --- harbour/ChangeLog | 21 +++ harbour/contrib/hbbmcdx/bmdbfcdx.c | 2 +- harbour/contrib/hbcurl/Makefile | 9 +- harbour/contrib/hbfbird/Makefile | 2 + harbour/contrib/hbfimage/Makefile | 8 +- harbour/contrib/hbgd/Makefile | 2 + harbour/contrib/hbgf/hbgfgtk/Makefile | 2 + harbour/contrib/hbhpdf/Makefile | 7 +- harbour/contrib/hbmysql/Makefile | 2 + harbour/contrib/hbodbc/Makefile | 2 + harbour/contrib/hbpgsql/Makefile | 2 + harbour/contrib/hbsqlit3/Makefile | 21 ++- harbour/contrib/hbtpathy/ChangeLog | 250 +++++++++++++------------- 13 files changed, 184 insertions(+), 146 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3f6180cd2b..dfefa239d8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,27 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-15 14:31 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/hbmysql/Makefile + * harbour/contrib/hbodbc/Makefile + * harbour/contrib/hbsqlit3/Makefile + * harbour/contrib/hbfbird/Makefile + * harbour/contrib/hbcurl/Makefile + * harbour/contrib/hbhpdf/Makefile + * harbour/contrib/hbpgsql/Makefile + * harbour/contrib/hbfimage/Makefile + * harbour/contrib/hbgd/Makefile + * harbour/contrib/hbgf/hbgfgtk/Makefile + * do not add default system include directory to C_USR during testing + for foreign header files when HB_XBUILD variable is set - protection + against including wrong header files in cross builds + + * harbour/contrib/hbtpathy/ChangeLog + * changed SVN EOL style to 'native' + + * harbour/contrib/hbbmcdx/bmdbfcdx.c + * pacified warning + 2008-07-12 16:12 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * source/rtl/gtwvt/gtwvt.c * #if defined(_MSC_VER) and (_MSC_VER >= 1200) => diff --git a/harbour/contrib/hbbmcdx/bmdbfcdx.c b/harbour/contrib/hbbmcdx/bmdbfcdx.c index 3e8476e3d4..c403ef727a 100644 --- a/harbour/contrib/hbbmcdx/bmdbfcdx.c +++ b/harbour/contrib/hbbmcdx/bmdbfcdx.c @@ -9071,7 +9071,7 @@ static ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec ) { LPBM_FILTER pMap = (LPBM_FILTER) pArea->dbfi.lpvCargo; if( pArea->dbfi.fFilter && pMap && - !BM_GetBit( pMap->rmap, pMap->Size, *plRec ) ) + !BM_GetBit( pMap->rmap, pMap->Size, ( ULONG ) *plRec ) ) { *plRec = 0; } diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile index da5315a4cd..1b0f876218 100644 --- a/harbour/contrib/hbcurl/Makefile +++ b/harbour/contrib/hbcurl/Makefile @@ -6,14 +6,20 @@ ROOT = ../../ LIBNAME=hbcurl +HB_INC_CURL_OK = + ifneq ($(HB_ARCHITECTURE),dos) ifeq ($(HB_INC_CURL),) +ifeq ($(HB_XBUILD),) HB_INC_CURL = /usr/include endif +endif HB_INC_CURL_OK += $(foreach d, $(HB_INC_CURL), $(if $(wildcard $(d)/curl/curl.h),$(d),)) +endif + ifneq ($(strip $(HB_INC_CURL_OK)),) C_USR += $(foreach d, $(HB_INC_CURL_OK), -I$(d)) @@ -34,6 +40,3 @@ install:: else include $(TOP)$(ROOT)config/none.cf endif -else -include $(TOP)$(ROOT)config/none.cf -endif diff --git a/harbour/contrib/hbfbird/Makefile b/harbour/contrib/hbfbird/Makefile index 29a04d59aa..d3ab0d0d1c 100644 --- a/harbour/contrib/hbfbird/Makefile +++ b/harbour/contrib/hbfbird/Makefile @@ -7,8 +7,10 @@ ROOT = ../../ LIBNAME=hbfbird ifeq ($(HB_INC_FIREBIRD),) +ifeq ($(HB_XBUILD),) HB_INC_FIREBIRD = /usr/include /opt/firebird/include endif +endif HB_INC_FIREBIRD_OK += $(foreach d, $(HB_INC_FIREBIRD), $(if $(wildcard $(d)/ibase.h),$(d),)) diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile index 967ffd3d32..f38caa91d0 100644 --- a/harbour/contrib/hbfimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -6,13 +6,18 @@ ROOT = ../../ LIBNAME=hbfimage +HB_INC_FREEIMAGE_OK = + ifneq ($(HB_ARCHITECTURE),dos) ifeq ($(HB_INC_FREEIMAGE),) +ifeq ($(HB_XBUILD),) HB_INC_FREEIMAGE = /usr/include endif +endif HB_INC_FREEIMAGE_OK += $(foreach d, $(HB_INC_FREEIMAGE), $(if $(wildcard $(d)/FreeImage.h),$(d),)) +endif ifneq ($(strip $(HB_INC_FREEIMAGE_OK)),) @@ -37,6 +42,3 @@ install:: else include $(TOP)$(ROOT)config/none.cf endif -else -include $(TOP)$(ROOT)config/none.cf -endif diff --git a/harbour/contrib/hbgd/Makefile b/harbour/contrib/hbgd/Makefile index a13c59f69d..f1563296c4 100644 --- a/harbour/contrib/hbgd/Makefile +++ b/harbour/contrib/hbgd/Makefile @@ -7,8 +7,10 @@ ROOT = ../../ LIBNAME=hbgd ifeq ($(HB_INC_GD),) +ifeq ($(HB_XBUILD),) HB_INC_GD = /usr/include /opt/local/include endif +endif HB_INC_GD_OK += $(foreach d, $(HB_INC_GD), $(if $(wildcard $(d)/gd.h),$(d),)) diff --git a/harbour/contrib/hbgf/hbgfgtk/Makefile b/harbour/contrib/hbgf/hbgfgtk/Makefile index 6bd4368adc..b0f07d9b2d 100644 --- a/harbour/contrib/hbgf/hbgfgtk/Makefile +++ b/harbour/contrib/hbgf/hbgfgtk/Makefile @@ -9,8 +9,10 @@ LIBNAME=hbgfgtk ifeq ($(HB_ARCHITECTURE),linux) ifeq ($(HB_INC_GTK),) +ifeq ($(HB_XBUILD),) HB_INC_GTK = /usr/include /usr/include/glib-2.0/ endif +endif HB_INC_GTK_OK += $(foreach d, $(HB_INC_GTK), $(if $(wildcard $(d)/glib.h),$(d),)) endif diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile index 822bbb9943..ca92640dd1 100644 --- a/harbour/contrib/hbhpdf/Makefile +++ b/harbour/contrib/hbhpdf/Makefile @@ -6,11 +6,11 @@ ROOT = ../../ LIBNAME=hbhpdf -ifneq ($(HB_ARCHITECTURE),dos) - ifeq ($(HB_INC_LIBHARU),) +ifeq ($(HB_XBUILD),) HB_INC_LIBHARU = /usr/include endif +endif HB_INC_LIBHARU_OK += $(foreach d, $(HB_INC_LIBHARU), $(if $(wildcard $(d)/hpdf.h),$(d),)) @@ -36,6 +36,3 @@ install:: else include $(TOP)$(ROOT)config/none.cf endif -else -include $(TOP)$(ROOT)config/none.cf -endif diff --git a/harbour/contrib/hbmysql/Makefile b/harbour/contrib/hbmysql/Makefile index 6ed30b8353..4597da3ac6 100644 --- a/harbour/contrib/hbmysql/Makefile +++ b/harbour/contrib/hbmysql/Makefile @@ -7,8 +7,10 @@ ROOT = ../../ LIBNAME=hbmysql ifeq ($(HB_INC_MYSQL),) +ifeq ($(HB_XBUILD),) HB_INC_MYSQL = /usr/include/mysql endif +endif HB_INC_MYSQL_OK += $(foreach d, $(HB_INC_MYSQL), $(if $(wildcard $(d)/mysql.h),$(d),)) diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile index 380077a594..1581ca7415 100644 --- a/harbour/contrib/hbodbc/Makefile +++ b/harbour/contrib/hbodbc/Makefile @@ -14,8 +14,10 @@ ifneq ($(HB_ARCHITECTURE),w32) ifeq ($(HB_WITHOUT_ODBC),) ifeq ($(HB_INC_ODBC),) +ifeq ($(HB_XBUILD),) HB_INC_ODBC = /usr/include /usr/local/include endif +endif HB_INC_ODBC_OK += $(foreach d, $(HB_INC_ODBC), $(if $(wildcard $(d)/sql.h),$(d),)) diff --git a/harbour/contrib/hbpgsql/Makefile b/harbour/contrib/hbpgsql/Makefile index e400516e9d..6ec3500c2c 100644 --- a/harbour/contrib/hbpgsql/Makefile +++ b/harbour/contrib/hbpgsql/Makefile @@ -7,8 +7,10 @@ ROOT = ../../ LIBNAME=hbpgsql ifeq ($(HB_INC_PGSQL),) +ifeq ($(HB_XBUILD),) HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include endif +endif HB_INC_PGSQL_OK += $(foreach d, $(HB_INC_PGSQL), $(if $(wildcard $(d)/libpq-fe.h),$(d),)) diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile index 3376353725..3214be1fcb 100644 --- a/harbour/contrib/hbsqlit3/Makefile +++ b/harbour/contrib/hbsqlit3/Makefile @@ -6,10 +6,19 @@ ROOT = ../../ LIBNAME=hbsqlit3 -ifneq ($(HB_ARCHITECTURE),dos) -ifneq ($(HB_ARCHITECTURE),bsd) -ifneq ($(HB_ARCHITECTURE),hpux) +ifeq ($(HB_WITHOUT_SQLIT3),) +ifeq ($(HB_ARCHITECTURE),dos) +HB_WITHOUT_SQLIT3=yes +endif +ifeq ($(HB_ARCHITECTURE),bsd) +HB_WITHOUT_SQLIT3=yes +endif +ifeq ($(HB_ARCHITECTURE),hpux) +HB_WITHOUT_SQLIT3=yes +endif +endif +ifneq ($(HB_WITHOUT_SQLIT3),yes) C_SOURCES =\ hbsqlit3.c \ @@ -26,9 +35,3 @@ install:: else include $(TOP)$(ROOT)config/none.cf endif -else -include $(TOP)$(ROOT)config/none.cf -endif -else -include $(TOP)$(ROOT)config/none.cf -endif diff --git a/harbour/contrib/hbtpathy/ChangeLog b/harbour/contrib/hbtpathy/ChangeLog index 5a39e5d098..c43104a498 100644 --- a/harbour/contrib/hbtpathy/ChangeLog +++ b/harbour/contrib/hbtpathy/ChangeLog @@ -1,125 +1,125 @@ -/* - * $Id$ - */ - -/* Use this format for the entry headers: - YYYY-MM-DD HH:MM UTC[-|+]hhmm Your Full Name - For example: - 2002-12-01 23:12 UTC+0100 Foo Bar -*/ - -2005-10-24 16:30 UTC+0200 Maurilio Longo - ! tp_/linux.c - ! tp_/telepath.prg - ! tp_/ChangeLog - ! Latest commit broke EOL - * tp_/os2.c - + stub tp_ctrlcts() - -2005-10-13 13:00 UTC+0200 Maurilio Longo - * NB: With latest commits tp_recv() and tp_recvto() wait up to - 3 ms ( under linux ) before returning ( with or without any - character ). - OS/2 and win32 modules, instead, return immediatly if no - input is available and waiting in the com port receive buffer. - I think the correct way of doing read()s is the one implemented - in linux.c and I will change OS/2 and win32 behaviour as - soon as I can. - -2005-10-13 12:50 UTC+0200 Maurilio Longo - * tp_/Makefile - * added linux.c module to library - -2005-10-13 10:05 UTC+0200 Maurilio Longo - + tp_/linux.c - + Added linux low level serial module, tested with a - a serial printer and a connection to a cash register. - * tp_/telepath.prg - * changes to a few functions to make them work nicely with linux.c - -2004-08-31 16:50 UTC+0200 Maurilio Longo - * tp_/os2.c - * tp_/telepath.prg - ! corrected an error on tp_crc16() - + added a bunch of functions, right now only to OS/2 build - -2004-08-31 16:45 UTC+0200 Maurilio Longo - * tp_/TELEPATH.CH - - removed UPPERCASE file - + added telepath.ch - -2004-08-26 09:30 UTC+0200 Maurilio Longo - * tp_/os2.c - + added OS/2 low level C code - -2004-08-25 23:50 UTC+0200 Maurilio Longo - * tp_/telepath.prg - + tp_crc32() - -2004-08-25 15:50 UTC+0200 Maurilio Longo - * tp_/telepath.prg - * tp_/win32.c - + tp_baud(), tp_sendsub() - ! tp_send() and tp_receive() seem to work as expected. - -2004-08-25 10:35 UTC+0200 Maurilio Longo - * tp_/telepath.prg - + tp_crc16() thanks to Pete Disdale. - * modified a few functions to start using low level win32.c - + tp_/win32.c - + Low level C code for win32 serial port access - + tp_/Makefile - + OS/2 Makefile - + tp_/makefile.bc - + bcc32 makefile - + tp_/make_b32.bat - + win32 makefile - + tp_/TELEPATH.CH - + .prg level defines for telepathy compatibility - - /* At this time, on win32, I can ask to my modem its name :) */ - -2004-08-16 16:32 UTC+0200 Maurilio Longo - * tp_/telepath.prg - * tp_/testtp.prg - + Added xharbour Copyright header with full credit to the original - author of this library - - /* I think I will change a lot this library since I want to have it - multiplatform, so, for example, all C code will go to separated files - (one per platform) to have a common (high level) .prg code which - calls common (low level) C code functions from different (one per - platform) .c files. - - As it is now should compile and work under linux, I can't test it right - now and, probably, something will break in the process of making it - multiplatform. - */ - -2004-08-16 16:32 UTC+0200 Maurilio Longo - * tp_/telepath.prg - + removed the original developed with Flagship and inserted - the one ported to xharbour by Luiz Rafael Culik Guimaraes (culikr@brturbo.com) - -2004-08-16 16:22 UTC+0200 Maurilio Longo - * tp_/ChangeLog - * tp_/Makefile - * tp_/README - * tp_/telepath.prg - * tp_/testtp.prg - + Added CVS ID to every file - - -I sent the original version to the flagship website in may 2000. -I just now (July 2001) made the first change to the code. - -7/19/2001 -The bug I found is REALLY esoteric... it's in tp_open. It comes into play -when something previously set the parity to Even or Odd and then your telepathy program does a tp_open on that port and sets parity to None. I previously -assumed that if you were setting parity to N, the port was already at N and I -didn't explicitly call stty -parenb and -parodd. - -I included telepathy.bak in case you care to look at the prior version. - - - +/* + * $Id$ + */ + +/* Use this format for the entry headers: + YYYY-MM-DD HH:MM UTC[-|+]hhmm Your Full Name + For example: + 2002-12-01 23:12 UTC+0100 Foo Bar +*/ + +2005-10-24 16:30 UTC+0200 Maurilio Longo + ! tp_/linux.c + ! tp_/telepath.prg + ! tp_/ChangeLog + ! Latest commit broke EOL + * tp_/os2.c + + stub tp_ctrlcts() + +2005-10-13 13:00 UTC+0200 Maurilio Longo + * NB: With latest commits tp_recv() and tp_recvto() wait up to + 3 ms ( under linux ) before returning ( with or without any + character ). + OS/2 and win32 modules, instead, return immediatly if no + input is available and waiting in the com port receive buffer. + I think the correct way of doing read()s is the one implemented + in linux.c and I will change OS/2 and win32 behaviour as + soon as I can. + +2005-10-13 12:50 UTC+0200 Maurilio Longo + * tp_/Makefile + * added linux.c module to library + +2005-10-13 10:05 UTC+0200 Maurilio Longo + + tp_/linux.c + + Added linux low level serial module, tested with a + a serial printer and a connection to a cash register. + * tp_/telepath.prg + * changes to a few functions to make them work nicely with linux.c + +2004-08-31 16:50 UTC+0200 Maurilio Longo + * tp_/os2.c + * tp_/telepath.prg + ! corrected an error on tp_crc16() + + added a bunch of functions, right now only to OS/2 build + +2004-08-31 16:45 UTC+0200 Maurilio Longo + * tp_/TELEPATH.CH + - removed UPPERCASE file + + added telepath.ch + +2004-08-26 09:30 UTC+0200 Maurilio Longo + * tp_/os2.c + + added OS/2 low level C code + +2004-08-25 23:50 UTC+0200 Maurilio Longo + * tp_/telepath.prg + + tp_crc32() + +2004-08-25 15:50 UTC+0200 Maurilio Longo + * tp_/telepath.prg + * tp_/win32.c + + tp_baud(), tp_sendsub() + ! tp_send() and tp_receive() seem to work as expected. + +2004-08-25 10:35 UTC+0200 Maurilio Longo + * tp_/telepath.prg + + tp_crc16() thanks to Pete Disdale. + * modified a few functions to start using low level win32.c + + tp_/win32.c + + Low level C code for win32 serial port access + + tp_/Makefile + + OS/2 Makefile + + tp_/makefile.bc + + bcc32 makefile + + tp_/make_b32.bat + + win32 makefile + + tp_/TELEPATH.CH + + .prg level defines for telepathy compatibility + + /* At this time, on win32, I can ask to my modem its name :) */ + +2004-08-16 16:32 UTC+0200 Maurilio Longo + * tp_/telepath.prg + * tp_/testtp.prg + + Added xharbour Copyright header with full credit to the original + author of this library + + /* I think I will change a lot this library since I want to have it + multiplatform, so, for example, all C code will go to separated files + (one per platform) to have a common (high level) .prg code which + calls common (low level) C code functions from different (one per + platform) .c files. + + As it is now should compile and work under linux, I can't test it right + now and, probably, something will break in the process of making it + multiplatform. + */ + +2004-08-16 16:32 UTC+0200 Maurilio Longo + * tp_/telepath.prg + + removed the original developed with Flagship and inserted + the one ported to xharbour by Luiz Rafael Culik Guimaraes (culikr@brturbo.com) + +2004-08-16 16:22 UTC+0200 Maurilio Longo + * tp_/ChangeLog + * tp_/Makefile + * tp_/README + * tp_/telepath.prg + * tp_/testtp.prg + + Added CVS ID to every file + + +I sent the original version to the flagship website in may 2000. +I just now (July 2001) made the first change to the code. + +7/19/2001 +The bug I found is REALLY esoteric... it's in tp_open. It comes into play +when something previously set the parity to Even or Odd and then your telepathy program does a tp_open on that port and sets parity to None. I previously +assumed that if you were setting parity to N, the port was already at N and I +didn't explicitly call stty -parenb and -parodd. + +I included telepathy.bak in case you care to look at the prior version. + + +