diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8a44498d73..a060c1c6aa 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-24 01:48 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbblat/hbblat.hbp + * contrib/hbbz2/hbbz2.hbp + * contrib/hbgd/hbgd.hbp + * contrib/hbodbc/hbodbc.hbp + * contrib/hbxpp/hbxpp.hbp + * do not copy .ch/.hbx files to central Harbour + directory. It means that if you need to use + these files from now on, you need to use the + .hbc files to add these packages to your project: + hbblat.ch hbbz2.ch + dll.ch dmlb.ch hbxpp.ch thread.ch (hbxpp.hbc) + gd.ch gdextern.ch (hbgd.hbc) + (and more if you need an .hbx file.) INCOMPATIBLE. + This is a gradual step to complete this TODO: + 2012-03-04 20:31 UTC+0100 + + * contrib/hbblat/hbblat.ch + * contrib/hbblat/tests/blattest.prg + * cleanups + 2012-10-24 00:48 UTC+0200 Viktor Szakats (harbour syenar.net) * doc/class_tp.txt * doc/hdr_tpl.txt diff --git a/harbour/contrib/hbblat/hbblat.ch b/harbour/contrib/hbblat/hbblat.ch index a78174d675..ae21915b25 100644 --- a/harbour/contrib/hbblat/hbblat.ch +++ b/harbour/contrib/hbblat/hbblat.ch @@ -73,29 +73,6 @@ Code Description 12 -server or -f options not specified and not found in registry 13 Error opening temporary file in temp directory -Gensock Error Code Descriptions - - case 4001: printf("Error: Malloc failed (possibly out of memory)."); break; - case 4002: printf("Error: Error sending data."); break; - case 4003: printf("Error: Error initializing gensock.dll."); break; - case 4004: printf("Error: Version not supported."); break; - case 4005: printf("Error: The winsock version specified by gensock is not supported by this winsock.dll."); break; - case 4006: printf("Error: Network not ready."); break; - case 4007: printf("Error: Can't resolve (mailserver) hostname."); break; - case 4008: printf("Error: Can't create a socket (too many simultaneous links?)"); break; - case 4009: printf("Error: Error reading socket."); break; - case 4010: printf("Error: Not a socket."); break; - case 4011: printf("Error: Busy."); break; - case 4012: printf("Error: Error closing socket."); break; - case 4013: printf("Error: Wait a bit (possible timeout)."); break; - case 4014: printf("Error: Can't resolve service."); break; - case 4015: printf("Error: Can't connect to mailserver (timed out if winsock.dll error 10060)"); break; - case 4016: printf("Error: Connection to mailserver was dropped."); break; - case 4017: printf("Error: Mail server refused connection."); break; - default: printf("error %d in function '%s'", retval, function); - - - */ @@ -107,7 +84,7 @@ Gensock Error Code Descriptions Numeric Errors */ -#define BLAT_ERR_UNKNONW -1 +#define BLAT_ERR_UNKNONW ( -1 ) #define BLAT_SUCCESS 0 #define BLAT_ERR_MESSAGE_NOT_ACCEPTED 1 @@ -170,31 +147,31 @@ Gensock Error Code Descriptions BLAT ERRORS */ -#define BLAT_ERR_CANT_MALLOC 4001 -#define BLAT_ERR_SENDING_DATA 4002 -#define BLAT_ERR_INITIALIZING 4003 -#define BLAT_ERR_VER_NOT_SUPPORTED 4004 -#define BLAT_ERR_EINVAL 4005 -#define BLAT_ERR_SYS_NOT_READY 4006 -#define BLAT_ERR_CANT_RESOLVE_HOSTNAME 4007 -#define BLAT_ERR_CANT_GET_SOCKET 4008 -#define BLAT_ERR_READING_SOCKET 4009 -#define BLAT_ERR_NOT_A_SOCKET 4010 -#define BLAT_ERR_BUSY 4011 -#define BLAT_ERR_CLOSING 4012 -#define BLAT_WAIT_A_BIT 4013 -#define BLAT_ERR_CANT_RESOLVE_SERVICE 4014 -#define BLAT_ERR_CANT_CONNECT 4015 -#define BLAT_ERR_NOT_CONNECTED 4016 -#define BLAT_ERR_CONNECTION_REFUSED 4017 +#define BLAT_ERR_CANT_MALLOC 4001 // "Malloc failed (possibly out of memory)." +#define BLAT_ERR_SENDING_DATA 4002 // "Error sending data." +#define BLAT_ERR_INITIALIZING 4003 // "Error initializing gensock.dll." +#define BLAT_ERR_VER_NOT_SUPPORTED 4004 // "Version not supported." +#define BLAT_ERR_EINVAL 4005 // "The winsock version specified by gensock is not supported by this winsock.dll." +#define BLAT_ERR_SYS_NOT_READY 4006 // "Network not ready." +#define BLAT_ERR_CANT_RESOLVE_HOSTNAME 4007 // "Can't resolve (mailserver) hostname." +#define BLAT_ERR_CANT_GET_SOCKET 4008 // "Can't create a socket (too many simultaneous links?)" +#define BLAT_ERR_READING_SOCKET 4009 // "Error reading socket." +#define BLAT_ERR_NOT_A_SOCKET 4010 // "Not a socket." +#define BLAT_ERR_BUSY 4011 // "Busy." +#define BLAT_ERR_CLOSING 4012 // "Error closing socket." +#define BLAT_WAIT_A_BIT 4013 // "Wait a bit (possible timeout)." +#define BLAT_ERR_CANT_RESOLVE_SERVICE 4014 // "Can't resolve service." +#define BLAT_ERR_CANT_CONNECT 4015 // "Can't connect to mailserver (timed out if winsock.dll error 10060)" +#define BLAT_ERR_NOT_CONNECTED 4016 // "Connection to mailserver was dropped." +#define BLAT_ERR_CONNECTION_REFUSED 4017 // "Mail server refused connection." -#define BLAT_ERR_NO_ERROR_CODE -5000 /* this is returned by misbehaving stacks that - * fail, but don't set an error code - */ +#define BLAT_ERR_NO_ERROR_CODE ( -5000 ) /* this is returned by misbehaving stacks that + * fail, but don't set an error code + */ -#define BLAT_TRY_INFINITE_KEY -1 -#define BLAT_TRY_INFINITE_VALUE 'INFINITE' +#define BLAT_TRY_INFINITE_KEY ( -1 ) +#define BLAT_TRY_INFINITE_VALUE "INFINITE" #endif // _HBBLAT_CH diff --git a/harbour/contrib/hbblat/hbblat.hbp b/harbour/contrib/hbblat/hbblat.hbp index 43fa0fdd05..a0fed9a563 100644 --- a/harbour/contrib/hbblat/hbblat.hbp +++ b/harbour/contrib/hbblat/hbblat.hbp @@ -18,9 +18,6 @@ -iflag={bcc}-a --instfile=inc:hbblat.ch --instfile=inc:hbblat.hbx - hbblat.hbx blatwrp.c diff --git a/harbour/contrib/hbblat/tests/blattest.prg b/harbour/contrib/hbblat/tests/blattest.prg index ffb14a9fd7..2f49cfe704 100644 --- a/harbour/contrib/hbblat/tests/blattest.prg +++ b/harbour/contrib/hbblat/tests/blattest.prg @@ -52,8 +52,6 @@ #require "hbblat" -#include "hbblat.ch" - #define ADDRESS_FROM "yourname@domain.com" // put here your address from #define ADDRESS_TO "hbblat_test@fsgiudice.com" // this mail can be used for tests //#define ADDRESS_CC "another@domain.com" @@ -62,7 +60,7 @@ PROCEDURE Main() - //LOCAL cCmd +// LOCAL cCmd LOCAL nRet LOCAL oBlat := HBBlat():New() diff --git a/harbour/contrib/hbbz2/hbbz2.hbp b/harbour/contrib/hbbz2/hbbz2.hbp index 692e6086c3..b74d91f1c8 100644 --- a/harbour/contrib/hbbz2/hbbz2.hbp +++ b/harbour/contrib/hbbz2/hbbz2.hbp @@ -18,9 +18,6 @@ -depincpathlocal=bzip2:3rd/bz2 -depfinish=bzip2 --instfile=inc:hbbz2.ch --instfile=inc:hbbz2.hbx - hbbz2.hbx core.c diff --git a/harbour/contrib/hbgd/hbgd.hbp b/harbour/contrib/hbgd/hbgd.hbp index da1c885bca..870fab92d2 100644 --- a/harbour/contrib/hbgd/hbgd.hbp +++ b/harbour/contrib/hbgd/hbgd.hbp @@ -21,10 +21,6 @@ hbct.hbc -depimplibs=gd:../bin/bgd.dll{!(msvc|pocc|mingw)|hbdyn} -depimplibs=gd:../lib/bgd.lib{(msvc|pocc|mingw)&!hbdyn} --instfile=inc:gd.ch --instfile=inc:gdextern.ch --instfile=inc:hbgd.hbx - hbgd.hbx gdwrp.c diff --git a/harbour/contrib/hbodbc/hbodbc.hbp b/harbour/contrib/hbodbc/hbodbc.hbp index 8887710945..11d6281f7f 100644 --- a/harbour/contrib/hbodbc/hbodbc.hbp +++ b/harbour/contrib/hbodbc/hbodbc.hbp @@ -19,9 +19,6 @@ -depincpath=odbc:/usr/include -depincpath=odbc:/usr/local/include --instfile=inc:sql.ch --instfile=inc:hbodbc.hbx - hbodbc.hbx odbc.c diff --git a/harbour/contrib/hbxpp/hbxpp.hbp b/harbour/contrib/hbxpp/hbxpp.hbp index 83863da592..1bf2990ffa 100644 --- a/harbour/contrib/hbxpp/hbxpp.hbp +++ b/harbour/contrib/hbxpp/hbxpp.hbp @@ -9,11 +9,6 @@ -w3 -es2 --instfile=inc:dll.ch --instfile=inc:dmlb.ch --instfile=inc:hbxpp.ch --instfile=inc:thread.ch - hbxpp.hbx binnumx.c