From 4ec57e57d62b8e677052e07ca28ef47daaa97cb0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 11 Nov 2012 12:01:01 +0000 Subject: [PATCH] 2012-11-11 12:59 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/rddbm/rddbm.hbp * extras/gtwvw/gtwvw.hbp * extras/hbvpdf/hbvpdf.hbp * extras/hbxlsxml/hbxlsxml.hbp * extras/ps32/ps32.hbp * extras/rddado/rddado.hbp * extras/superlib/superlib.hbp + unified the common build parameters, so now all supports dynamic libs, installation and .hbx files + contrib/rddbm/rddbm.hbx + extras/rddado/rddado.hbx + added two new .hbx files --- harbour/ChangeLog | 16 +++++++++++ harbour/contrib/rddbm/rddbm.hbp | 2 -- harbour/contrib/rddbm/rddbm.hbx | 39 ++++++++++++++++++++++++++ harbour/extras/gtwvw/gtwvw.hbp | 6 ++-- harbour/extras/hbvpdf/hbvpdf.hbp | 6 ++-- harbour/extras/hbxlsxml/hbxlsxml.hbp | 6 ++-- harbour/extras/ps32/ps32.hbp | 4 +++ harbour/extras/rddado/rddado.hbp | 3 ++ harbour/extras/rddado/rddado.hbx | 41 ++++++++++++++++++++++++++++ harbour/extras/superlib/superlib.hbp | 3 ++ 10 files changed, 112 insertions(+), 14 deletions(-) create mode 100644 harbour/contrib/rddbm/rddbm.hbx create mode 100644 harbour/extras/rddado/rddado.hbx diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9f1290da3f..698ac86c2a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,22 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-11 12:59 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/rddbm/rddbm.hbp + * extras/gtwvw/gtwvw.hbp + * extras/hbvpdf/hbvpdf.hbp + * extras/hbxlsxml/hbxlsxml.hbp + * extras/ps32/ps32.hbp + * extras/rddado/rddado.hbp + * extras/superlib/superlib.hbp + + unified the common build parameters, so + now all supports dynamic libs, installation + and .hbx files + + + contrib/rddbm/rddbm.hbx + + extras/rddado/rddado.hbx + + added two new .hbx files + 2012-11-11 12:51 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg ! fixed to automatically create target directory diff --git a/harbour/contrib/rddbm/rddbm.hbp b/harbour/contrib/rddbm/rddbm.hbp index e39c06f2d3..b15df9b94f 100644 --- a/harbour/contrib/rddbm/rddbm.hbp +++ b/harbour/contrib/rddbm/rddbm.hbp @@ -9,8 +9,6 @@ -w3 -es2 --hbx= - bmdbfx.c bmdbfcdx.prg bmdbfnsx.prg diff --git a/harbour/contrib/rddbm/rddbm.hbx b/harbour/contrib/rddbm/rddbm.hbx new file mode 100644 index 0000000000..75f243faba --- /dev/null +++ b/harbour/contrib/rddbm/rddbm.hbx @@ -0,0 +1,39 @@ +/* -------------------------------------------------------------------- + * 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 using hbmk2 '-hbx=' option. + */ + +#ifndef __HBEXTERN_CH__RDDBM__ +#define __HBEXTERN_CH__RDDBM__ + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__RDDBM__ANNOUNCE ) + ANNOUNCE __HBEXTERN__RDDBM__ +#endif + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__RDDBM__REQUEST ) + #command DYNAMIC => EXTERNAL +#endif + +DYNAMIC BMDBFCDX +DYNAMIC BMDBFNSX +DYNAMIC BMDBFNTX +DYNAMIC bm_dbGetFilterArray +DYNAMIC bm_dbSeekWild +DYNAMIC bm_dbSetFilterArray +DYNAMIC bm_dbSetFilterArrayAdd +DYNAMIC bm_dbSetFilterArrayDel +DYNAMIC bm_Turbo +DYNAMIC _BMDBF + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__RDDBM__REQUEST ) + #uncommand DYNAMIC => EXTERNAL +#endif + +#endif diff --git a/harbour/extras/gtwvw/gtwvw.hbp b/harbour/extras/gtwvw/gtwvw.hbp index 65a3c38568..bff9499a57 100644 --- a/harbour/extras/gtwvw/gtwvw.hbp +++ b/harbour/extras/gtwvw/gtwvw.hbp @@ -13,10 +13,6 @@ "-stop={!allwin}Skipped: '${hb_name}' only supported on win platform." --hbx=gtwvw.hbx - -gtwvw.hbx - gtwvwd.c wvwcheck.c @@ -33,5 +29,7 @@ wvwtbar.c # NOTE: Due to large quantity of unprecise code, it doesn't build in C++ mode. -warn=no +-hbx=${hb_name}.hbx +${hb_name}.hbx $hb_pkg_dynlib.hbm $hb_pkg_install.hbm diff --git a/harbour/extras/hbvpdf/hbvpdf.hbp b/harbour/extras/hbvpdf/hbvpdf.hbp index 9f34afc42a..f50b1cbab8 100644 --- a/harbour/extras/hbvpdf/hbvpdf.hbp +++ b/harbour/extras/hbvpdf/hbvpdf.hbp @@ -9,12 +9,10 @@ -w3 -es2 --hbx=hbvpdf.hbx - -hbvpdf.hbx - core.prg fonts.prg +-hbx=${hb_name}.hbx +${hb_name}.hbx $hb_pkg_dynlib.hbm $hb_pkg_install.hbm diff --git a/harbour/extras/hbxlsxml/hbxlsxml.hbp b/harbour/extras/hbxlsxml/hbxlsxml.hbp index 997865c09e..62840c0744 100644 --- a/harbour/extras/hbxlsxml/hbxlsxml.hbp +++ b/harbour/extras/hbxlsxml/hbxlsxml.hbp @@ -9,13 +9,11 @@ -w3 -es2 --hbx=hbxlsxml.hbx - -hbxlsxml.hbx - xlsxml.prg xlsxml_s.prg xlsxml_y.prg +-hbx=${hb_name}.hbx +${hb_name}.hbx $hb_pkg_dynlib.hbm $hb_pkg_install.hbm diff --git a/harbour/extras/ps32/ps32.hbp b/harbour/extras/ps32/ps32.hbp index 1bce4c948d..3f0fe34a36 100644 --- a/harbour/extras/ps32/ps32.hbp +++ b/harbour/extras/ps32/ps32.hbp @@ -13,4 +13,8 @@ hbxpp.hbc tpscript.prg +-hbx=${hb_name}.hbx +${hb_name}.hbx +{hbdyn}${hb_name}.hbc +$hb_pkg_dynlib.hbm $hb_pkg_install.hbm diff --git a/harbour/extras/rddado/rddado.hbp b/harbour/extras/rddado/rddado.hbp index 469d5ab577..865e15f5f7 100644 --- a/harbour/extras/rddado/rddado.hbp +++ b/harbour/extras/rddado/rddado.hbp @@ -13,4 +13,7 @@ adordd.prg +-hbx=${hb_name}.hbx +${hb_name}.hbx +$hb_pkg_dynlib.hbm $hb_pkg_install.hbm diff --git a/harbour/extras/rddado/rddado.hbx b/harbour/extras/rddado/rddado.hbx new file mode 100644 index 0000000000..a3e87c2748 --- /dev/null +++ b/harbour/extras/rddado/rddado.hbx @@ -0,0 +1,41 @@ +/* -------------------------------------------------------------------- + * 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 using hbmk2 '-hbx=' option. + */ + +#ifndef __HBEXTERN_CH__RDDADO__ +#define __HBEXTERN_CH__RDDADO__ + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__RDDADO__ANNOUNCE ) + ANNOUNCE __HBEXTERN__RDDADO__ +#endif + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__RDDADO__REQUEST ) + #command DYNAMIC => EXTERNAL +#endif + +DYNAMIC ADORDD +DYNAMIC ADORDD_GETFUNCTABLE +DYNAMIC hb_adoRddGetCatalog +DYNAMIC hb_adoRddGetConnection +DYNAMIC hb_adoRddGetRecordSet +DYNAMIC hb_adoSetEngine +DYNAMIC hb_adoSetLocateFor +DYNAMIC hb_adoSetPassword +DYNAMIC hb_adoSetQuery +DYNAMIC hb_adoSetServer +DYNAMIC hb_adoSetTable +DYNAMIC hb_adoSetUser + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__RDDADO__REQUEST ) + #uncommand DYNAMIC => EXTERNAL +#endif + +#endif diff --git a/harbour/extras/superlib/superlib.hbp b/harbour/extras/superlib/superlib.hbp index 1d0508b31b..15da11d4bb 100644 --- a/harbour/extras/superlib/superlib.hbp +++ b/harbour/extras/superlib/superlib.hbp @@ -217,4 +217,7 @@ s_woyear.prg s_writef.prg s_xbxx.prg +-hbx=${hb_name}.hbx +${hb_name}.hbx +$hb_pkg_dynlib.hbm $hb_pkg_install.hbm