diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 753ca95737..0739dee13b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,29 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-05 11:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbmzip/hbmzip.hbp + + contrib/hbmzip/hbmzip.hbx + - contrib/hbmzip/hbmzip.c + + contrib/hbmzip/mzip.c + * contrib/hbmemio/hbmemio.hbp + + contrib/hbmemio/hbmemio.hbx + * contrib/hbzebra/hbzebra.hbp + + contrib/hbzebra/hbzebra.hbx + + Added .hbx files and included them in .hbp. + * Renamed sources with colliding (with .hbx) names. + + * contrib/hbrunext/hbrunext.hbp + * contrib/hbrunext/pullext.prg + + Added hbmzip and hbmemio. + + * contrib/hbgt/hbgt.hbx + * contrib/hbsms/hbsms.hbx + * contrib/hbnf/hbnf.hbx + * contrib/hbclipsm/hbclipsm.hbx + * contrib/hbcomm/hbcomm.hbx + * Regenerated. + 2011-02-05 11:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/examples/contribf.hbc ! Updated rddbm name. diff --git a/harbour/contrib/hbclipsm/hbclipsm.hbx b/harbour/contrib/hbclipsm/hbclipsm.hbx index b168db5fbb..c56d37b467 100644 --- a/harbour/contrib/hbclipsm/hbclipsm.hbx +++ b/harbour/contrib/hbclipsm/hbclipsm.hbx @@ -18,11 +18,11 @@ #ifndef __HBEXTERN_CH__HBCLIPSM__ #define __HBEXTERN_CH__HBCLIPSM__ -#ifdef __HBEXTERN__HBCLIPSM__ANNOUNCE +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCLIPSM__ANNOUNCE ) ANNOUNCE __HBEXTERN__HBCLIPSM__ #endif -#ifdef __HBEXTERN__HBCLIPSM__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCLIPSM__REQUEST ) #command DYNAMIC => EXTERNAL #endif @@ -64,7 +64,7 @@ DYNAMIC TIMEASSTRING DYNAMIC TIMEDIFF DYNAMIC TIMEISVALID -#ifdef __HBEXTERN__HBCLIPSM__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCLIPSM__REQUEST ) #uncommand DYNAMIC => EXTERNAL #endif diff --git a/harbour/contrib/hbcomm/hbcomm.hbx b/harbour/contrib/hbcomm/hbcomm.hbx index 0772f5dd9a..37f09e1bd2 100644 --- a/harbour/contrib/hbcomm/hbcomm.hbx +++ b/harbour/contrib/hbcomm/hbcomm.hbx @@ -18,24 +18,32 @@ #ifndef __HBEXTERN_CH__HBCOMM__ #define __HBEXTERN_CH__HBCOMM__ -#ifdef __HBEXTERN__HBCOMM__ANNOUNCE +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCOMM__ANNOUNCE ) ANNOUNCE __HBEXTERN__HBCOMM__ #endif -#ifdef __HBEXTERN__HBCOMM__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCOMM__REQUEST ) #command DYNAMIC => EXTERNAL #endif DYNAMIC INBUFSIZE +DYNAMIC INBUFSIZE +DYNAMIC INCHR DYNAMIC INCHR DYNAMIC INIT_PORT +DYNAMIC INIT_PORT +DYNAMIC ISWORKING DYNAMIC ISWORKING DYNAMIC OUTBUFCLR +DYNAMIC OUTBUFCLR +DYNAMIC OUTBUFSIZE DYNAMIC OUTBUFSIZE DYNAMIC OUTCHR +DYNAMIC OUTCHR +DYNAMIC UNINT_PORT DYNAMIC UNINT_PORT -#ifdef __HBEXTERN__HBCOMM__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCOMM__REQUEST ) #uncommand DYNAMIC => EXTERNAL #endif diff --git a/harbour/contrib/hbgt/hbgt.hbx b/harbour/contrib/hbgt/hbgt.hbx index 8ad8f1139c..2c35922336 100644 --- a/harbour/contrib/hbgt/hbgt.hbx +++ b/harbour/contrib/hbgt/hbgt.hbx @@ -18,11 +18,11 @@ #ifndef __HBEXTERN_CH__HBGT__ #define __HBEXTERN_CH__HBGT__ -#ifdef __HBEXTERN__HBGT__ANNOUNCE +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBGT__ANNOUNCE ) ANNOUNCE __HBEXTERN__HBGT__ #endif -#ifdef __HBEXTERN__HBGT__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBGT__REQUEST ) #command DYNAMIC => EXTERNAL #endif @@ -43,7 +43,7 @@ DYNAMIC GT_STRLEFT DYNAMIC GT_STRPBRK DYNAMIC GT_STRRIGHT -#ifdef __HBEXTERN__HBGT__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBGT__REQUEST ) #uncommand DYNAMIC => EXTERNAL #endif diff --git a/harbour/contrib/hbmemio/hbmemio.hbp b/harbour/contrib/hbmemio/hbmemio.hbp index 9ba4c748df..2b8f4b0dea 100644 --- a/harbour/contrib/hbmemio/hbmemio.hbp +++ b/harbour/contrib/hbmemio/hbmemio.hbp @@ -9,4 +9,8 @@ -w3 -es2 +-instfile=inc:hbmemio.hbx + +hbmemio.hbx + memio.c diff --git a/harbour/contrib/hbmemio/hbmemio.hbx b/harbour/contrib/hbmemio/hbmemio.hbx new file mode 100644 index 0000000000..91403579d2 --- /dev/null +++ b/harbour/contrib/hbmemio/hbmemio.hbx @@ -0,0 +1,35 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* NOTE: You can add manual override which functions to include or */ +/* exclude from automatically generated EXTERNAL/DYNAMIC list. */ +/* Syntax: // HB_FUNC_INCLUDE */ +/* // HB_FUNC_EXCLUDE */ +/* -------------------------------------------------------------------- */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated code below. DO NOT EDIT! */ +/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */ +/* compiler family. [vszakats] */ +/* -------------------------------------------------------------------- */ + +#ifndef __HBEXTERN_CH__HBMEMIO__ +#define __HBEXTERN_CH__HBMEMIO__ + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBMEMIO__ANNOUNCE ) + ANNOUNCE __HBEXTERN__HBMEMIO__ +#endif + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBMEMIO__REQUEST ) + #command DYNAMIC => EXTERNAL +#endif + +DYNAMIC HB_MEMIO + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBMEMIO__REQUEST ) + #uncommand DYNAMIC => EXTERNAL +#endif + +#endif diff --git a/harbour/contrib/hbmzip/hbmzip.hbp b/harbour/contrib/hbmzip/hbmzip.hbp index f2c2c22931..3b1e5273ec 100644 --- a/harbour/contrib/hbmzip/hbmzip.hbp +++ b/harbour/contrib/hbmzip/hbmzip.hbp @@ -27,7 +27,10 @@ -depincpathlocal=zlib:../../src/3rd/zlib -instfile=inc:hbmzip.ch +-instfile=inc:hbmzip.hbx -hbmzip.c +hbmzip.hbx + +mzip.c 3rd/minizip/minizip.hbc{HBMK_HAS_MINIZIP_LOCAL} diff --git a/harbour/contrib/hbmzip/hbmzip.hbx b/harbour/contrib/hbmzip/hbmzip.hbx new file mode 100644 index 0000000000..b1f17801b7 --- /dev/null +++ b/harbour/contrib/hbmzip/hbmzip.hbx @@ -0,0 +1,56 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* NOTE: You can add manual override which functions to include or */ +/* exclude from automatically generated EXTERNAL/DYNAMIC list. */ +/* Syntax: // HB_FUNC_INCLUDE */ +/* // HB_FUNC_EXCLUDE */ +/* -------------------------------------------------------------------- */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated code below. DO NOT EDIT! */ +/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */ +/* compiler family. [vszakats] */ +/* -------------------------------------------------------------------- */ + +#ifndef __HBEXTERN_CH__HBMZIP__ +#define __HBEXTERN_CH__HBMZIP__ + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBMZIP__ANNOUNCE ) + ANNOUNCE __HBEXTERN__HBMZIP__ +#endif + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBMZIP__REQUEST ) + #command DYNAMIC => EXTERNAL +#endif + +DYNAMIC HB_UNZIPCLOSE +DYNAMIC HB_UNZIPEXTRACTCURRENTFILE +DYNAMIC HB_UNZIPEXTRACTCURRENTFILETOHANDLE +DYNAMIC HB_UNZIPFILECLOSE +DYNAMIC HB_UNZIPFILEFIRST +DYNAMIC HB_UNZIPFILEGOTO +DYNAMIC HB_UNZIPFILEINFO +DYNAMIC HB_UNZIPFILENEXT +DYNAMIC HB_UNZIPFILEOPEN +DYNAMIC HB_UNZIPFILEPOS +DYNAMIC HB_UNZIPFILEREAD +DYNAMIC HB_UNZIPGLOBALINFO +DYNAMIC HB_UNZIPOPEN +DYNAMIC HB_ZIPCLOSE +DYNAMIC HB_ZIPDELETEFILE +DYNAMIC HB_ZIPFILECLOSE +DYNAMIC HB_ZIPFILECRC32 +DYNAMIC HB_ZIPFILECREATE +DYNAMIC HB_ZIPFILEWRITE +DYNAMIC HB_ZIPOPEN +DYNAMIC HB_ZIPSTOREFILE +DYNAMIC HB_ZIPSTOREFILEHANDLE + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBMZIP__REQUEST ) + #uncommand DYNAMIC => EXTERNAL +#endif + +#endif diff --git a/harbour/contrib/hbmzip/hbmzip.c b/harbour/contrib/hbmzip/mzip.c similarity index 100% rename from harbour/contrib/hbmzip/hbmzip.c rename to harbour/contrib/hbmzip/mzip.c diff --git a/harbour/contrib/hbnf/hbnf.hbx b/harbour/contrib/hbnf/hbnf.hbx index 5e019690f2..c6eaa03fca 100644 --- a/harbour/contrib/hbnf/hbnf.hbx +++ b/harbour/contrib/hbnf/hbnf.hbx @@ -18,11 +18,11 @@ #ifndef __HBEXTERN_CH__HBNF__ #define __HBEXTERN_CH__HBNF__ -#ifdef __HBEXTERN__HBNF__ANNOUNCE +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBNF__ANNOUNCE ) ANNOUNCE __HBEXTERN__HBNF__ #endif -#ifdef __HBEXTERN__HBNF__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBNF__REQUEST ) #command DYNAMIC => EXTERNAL #endif @@ -249,7 +249,7 @@ DYNAMIC _M_RESET DYNAMIC _V_SETVPG DYNAMIC __FTACUDF -#ifdef __HBEXTERN__HBNF__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBNF__REQUEST ) #uncommand DYNAMIC => EXTERNAL #endif diff --git a/harbour/contrib/hbrunext/hbrunext.hbp b/harbour/contrib/hbrunext/hbrunext.hbp index f904c85e83..06ecd72df5 100644 --- a/harbour/contrib/hbrunext/hbrunext.hbp +++ b/harbour/contrib/hbrunext/hbrunext.hbp @@ -22,5 +22,7 @@ pullext.prg hbct.hbc hbexpat.hbc +hbmemio.hbc +hbmzip.hbc hbunix.hbc{unix} hbwin.hbc{allwin} diff --git a/harbour/contrib/hbrunext/pullext.prg b/harbour/contrib/hbrunext/pullext.prg index 12311bc122..2e0056f438 100644 --- a/harbour/contrib/hbrunext/pullext.prg +++ b/harbour/contrib/hbrunext/pullext.prg @@ -54,6 +54,8 @@ ANNOUNCE __PULLEXT REQUEST __HBEXTERN__HBCT__ REQUEST __HBEXTERN__HBEXPAT__ +REQUEST __HBEXTERN__HBMEMIO__ +REQUEST __HBEXTERN__HBMZIP__ #if defined( __PLATFORM__UNIX ) REQUEST __HBEXTERN__HBUNIX__ #endif diff --git a/harbour/contrib/hbsms/hbsms.hbx b/harbour/contrib/hbsms/hbsms.hbx index ca0b38376a..d3534134b8 100644 --- a/harbour/contrib/hbsms/hbsms.hbx +++ b/harbour/contrib/hbsms/hbsms.hbx @@ -18,11 +18,11 @@ #ifndef __HBEXTERN_CH__HBSMS__ #define __HBEXTERN_CH__HBSMS__ -#ifdef __HBEXTERN__HBSMS__ANNOUNCE +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBSMS__ANNOUNCE ) ANNOUNCE __HBEXTERN__HBSMS__ #endif -#ifdef __HBEXTERN__HBSMS__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBSMS__REQUEST ) #command DYNAMIC => EXTERNAL #endif @@ -34,7 +34,7 @@ DYNAMIC SMSCTX_SEND DYNAMIC SMS_RECEIVEALL DYNAMIC SMS_SEND -#ifdef __HBEXTERN__HBSMS__REQUEST +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBSMS__REQUEST ) #uncommand DYNAMIC => EXTERNAL #endif diff --git a/harbour/contrib/hbzebra/hbzebra.hbp b/harbour/contrib/hbzebra/hbzebra.hbp index 7090eccb26..f272a64694 100644 --- a/harbour/contrib/hbzebra/hbzebra.hbp +++ b/harbour/contrib/hbzebra/hbzebra.hbp @@ -10,6 +10,9 @@ -w3 -es2 -instfile=inc:hbzebra.ch +-instfile=inc:hbzebra.hbx + +hbzebra.hbx # Core core.c diff --git a/harbour/contrib/hbzebra/hbzebra.hbx b/harbour/contrib/hbzebra/hbzebra.hbx new file mode 100644 index 0000000000..00d6b1eb4e --- /dev/null +++ b/harbour/contrib/hbzebra/hbzebra.hbx @@ -0,0 +1,51 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* NOTE: You can add manual override which functions to include or */ +/* exclude from automatically generated EXTERNAL/DYNAMIC list. */ +/* Syntax: // HB_FUNC_INCLUDE */ +/* // HB_FUNC_EXCLUDE */ +/* -------------------------------------------------------------------- */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated code below. DO NOT EDIT! */ +/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */ +/* compiler family. [vszakats] */ +/* -------------------------------------------------------------------- */ + +#ifndef __HBEXTERN_CH__HBZEBRA__ +#define __HBEXTERN_CH__HBZEBRA__ + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBZEBRA__ANNOUNCE ) + ANNOUNCE __HBEXTERN__HBZEBRA__ +#endif + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBZEBRA__REQUEST ) + #command DYNAMIC => EXTERNAL +#endif + +DYNAMIC HB_ZEBRA_CREATE_CODABAR +DYNAMIC HB_ZEBRA_CREATE_CODE11 +DYNAMIC HB_ZEBRA_CREATE_CODE128 +DYNAMIC HB_ZEBRA_CREATE_CODE39 +DYNAMIC HB_ZEBRA_CREATE_CODE93 +DYNAMIC HB_ZEBRA_CREATE_DATAMATRIX +DYNAMIC HB_ZEBRA_CREATE_EAN13 +DYNAMIC HB_ZEBRA_CREATE_EAN8 +DYNAMIC HB_ZEBRA_CREATE_ITF +DYNAMIC HB_ZEBRA_CREATE_MSI +DYNAMIC HB_ZEBRA_CREATE_PDF417 +DYNAMIC HB_ZEBRA_CREATE_UPCA +DYNAMIC HB_ZEBRA_CREATE_UPCE +DYNAMIC HB_ZEBRA_DESTROY +DYNAMIC HB_ZEBRA_DRAW +DYNAMIC HB_ZEBRA_GETCODE +DYNAMIC HB_ZEBRA_GETERROR + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBZEBRA__REQUEST ) + #uncommand DYNAMIC => EXTERNAL +#endif + +#endif