From 7cf87dea67db850cc65b8647f44243be0ff6a07a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 15 Jun 2009 12:46:55 +0000 Subject: [PATCH] 2009-06-15 14:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/legacyco.c * contrib/hbwin/legacy.prg ! Fixed typos in prev. (Thanks EMG) * contrib/hbmysql/hbmysql.hbc - contrib/hbct/tests/hbct.hbc + contrib/hbct/tests/hbmk.hbm + contrib/hbct/hbct.hbc + contrib/xhb/xhb.hbc + contrib/xhb/tests/hbmk.hbm - contrib/xhb/tests/xhb.hbc + contrib/hbodbc/tests/hbmk.hbm - contrib/hbodbc/tests/hbodbc.hbc + contrib/hbodbc/hbodbc.hbc + contrib/hbtpathy/tests/hbmk.hbm - contrib/hbtpathy/tests/hbtpathy.hbc + contrib/hbtpathy/hbtpathy.hbc + contrib/hbgt/hbgt.hbc - contrib/hbmzip/tests/hbmzip.hbc + contrib/hbmzip/tests/hbmk.hbm + contrib/hbmzip/hbmzip.hbc - contrib/hbsqlit3/tests/hbsqlit3.hbc + contrib/hbsqlit3/tests/hbmk.hbm + contrib/hbsqlit3/hbsqlit3.hbc + contrib/hbfbird/tests/hbmk.hbm - contrib/hbfbird/tests/hbfbird.hbc + contrib/hbfbird/hbfbird.hbc + contrib/hbziparc/tests/hbmk.hbm - contrib/hbziparc/tests/hbziparc.hbc + contrib/hbziparc/hbziparc.hbc + contrib/hbnf/tests/hbmk.hbm - contrib/hbnf/tests/hbnf.hbc + contrib/hbnf/hbnf.hbc + contrib/hbcurl/tests/hbmk.hbm - contrib/hbcurl/tests/hbcurl.hbc + contrib/hbcurl/hbcurl.hbc + contrib/gtqtc/tests/hbmk.hbm - contrib/gtqtc/tests/gtqtc.hbc + contrib/gtqtc/gtqtc.hbc + contrib/rddado/tests/hbmk.hbm - contrib/rddado/tests/rddado.hbc + contrib/rddado/rddado.hbc + contrib/gtwvg/gtwvg.hbc + contrib/gtwvg/tests/hbmk.hbm - contrib/gtwvg/tests/gtwvg.hbc + contrib/hbpgsql/tests/hbmk.hbm - contrib/hbpgsql/tests/hbpgsql.hbc + contrib/hbpgsql/hbpgsql.hbc + contrib/rddads/tests/hbmk.hbm - contrib/rddads/tests/rddads.hbc + contrib/rddads/rddads.hbc + contrib/hbclipsm/tests/hbmk.hbm - contrib/hbclipsm/tests/hbclipsm.hbc + contrib/hbclipsm/hbclipsm.hbc + contrib/hbfimage/tests/hbmk.hbm - contrib/hbfimage/tests/hbfimage.hbc + contrib/hbfimage/hbfimage.hbc + contrib/hbgd/hbgd.hbc + contrib/hbgd/tests/hbmk.hbm - contrib/hbgd/tests/hbgd.hbc + contrib/hbmisc/hbmisc.hbc - contrib/hbmisc/tests/hbmisc.hbc + contrib/hbmisc/tests/hbmk.hbm + contrib/hbtip/hbtip.hbc + contrib/hbtip/tests/hbmk.hbm - contrib/hbtip/tests/hbtip.hbc + contrib/hbbmcdx/hbbmcdx.hbc - contrib/hbvpdf/tests/hbvpdf.hbc + contrib/hbvpdf/tests/hbmk.hbm + contrib/hbvpdf/hbvpdf.hbc - contrib/hbssl/tests/hbssl.hbc + contrib/hbssl/tests/hbmk.hbm + contrib/hbssl/hbssl.hbc - contrib/hbbtree/tests/hbbtree.hbc + contrib/hbbtree/tests/hbmk.hbm + contrib/hbbtree/hbbtree.hbc - contrib/hbcrypt/tests/hbcrypt.hbc + contrib/hbcrypt/tests/hbmk.hbm + contrib/hbcrypt/hbcrypt.hbc + Added new hbmk2 make file layout: hbmk.hbm in tests dir, referring to .hbc file in contrib main dir. + Added -incpaths=. option to those .hbc files where contrib has public headers. * Changed a few inter-contrib reference to refer to .hbc file rather than lib directly. ; TODO: Change inter-contrib references to hbwin to refer to hbwin.hbc. --- harbour/ChangeLog | 91 +++++++++++++++++++ harbour/contrib/gtqtc/{tests => }/gtqtc.hbc | 0 harbour/contrib/gtqtc/tests/hbmk.hbm | 5 + harbour/contrib/gtwvg/{tests => }/gtwvg.hbc | 0 harbour/contrib/gtwvg/tests/hbmk.hbm | 5 + harbour/contrib/hbbmcdx/hbbmcdx.hbc | 5 + .../contrib/hbbtree/{tests => }/hbbtree.hbc | 2 + harbour/contrib/hbbtree/tests/hbmk.hbm | 5 + .../contrib/hbclipsm/{tests => }/hbclipsm.hbc | 2 + harbour/contrib/hbclipsm/tests/hbmk.hbm | 5 + .../contrib/hbcrypt/{tests => }/hbcrypt.hbc | 0 harbour/contrib/hbcrypt/tests/hbmk.hbm | 5 + harbour/contrib/hbct/{tests => }/hbct.hbc | 2 + harbour/contrib/hbct/tests/hbmk.hbm | 5 + harbour/contrib/hbcurl/hbcurl.hbc | 8 ++ harbour/contrib/hbcurl/tests/hbcurl.hbc | 5 - harbour/contrib/hbcurl/tests/hbmk.hbm | 5 + harbour/contrib/hbfbird/hbfbird.hbc | 8 ++ harbour/contrib/hbfbird/tests/hbfbird.hbc | 5 - harbour/contrib/hbfbird/tests/hbmk.hbm | 5 + harbour/contrib/hbfimage/hbfimage.hbc | 8 ++ harbour/contrib/hbfimage/tests/hbfimage.hbc | 5 - harbour/contrib/hbfimage/tests/hbmk.hbm | 5 + harbour/contrib/hbgd/{tests => }/hbgd.hbc | 2 + harbour/contrib/hbgd/tests/hbmk.hbm | 5 + harbour/contrib/hbgt/hbgt.hbc | 5 + harbour/contrib/hbmisc/{tests => }/hbmisc.hbc | 0 harbour/contrib/hbmisc/tests/hbmk.hbm | 5 + harbour/contrib/hbmysql/hbmysql.hbc | 5 +- harbour/contrib/hbmzip/{tests => }/hbmzip.hbc | 2 + harbour/contrib/hbmzip/tests/hbmk.hbm | 5 + harbour/contrib/hbnf/{tests => }/hbnf.hbc | 2 + harbour/contrib/hbnf/tests/hbmk.hbm | 5 + harbour/contrib/hbodbc/{tests => }/hbodbc.hbc | 2 + harbour/contrib/hbodbc/tests/hbmk.hbm | 5 + harbour/contrib/hbpgsql/hbpgsql.hbc | 8 ++ harbour/contrib/hbpgsql/tests/hbmk.hbm | 5 + harbour/contrib/hbpgsql/tests/hbpgsql.hbc | 5 - harbour/contrib/hbsqlit3/hbsqlit3.hbc | 8 ++ harbour/contrib/hbsqlit3/tests/hbmk.hbm | 5 + harbour/contrib/hbsqlit3/tests/hbsqlit3.hbc | 5 - harbour/contrib/hbssl/{tests => }/hbssl.hbc | 2 + harbour/contrib/hbssl/tests/hbmk.hbm | 5 + harbour/contrib/hbtip/{tests => }/hbtip.hbc | 2 + harbour/contrib/hbtip/tests/hbmk.hbm | 5 + .../contrib/hbtpathy/{tests => }/hbtpathy.hbc | 2 + harbour/contrib/hbtpathy/tests/hbmk.hbm | 5 + harbour/contrib/hbvpdf/{tests => }/hbvpdf.hbc | 2 + harbour/contrib/hbvpdf/tests/hbmk.hbm | 5 + harbour/contrib/hbwin/legacy.prg | 4 +- harbour/contrib/hbwin/legacyco.c | 7 -- harbour/contrib/hbziparc/hbziparc.hbc | 6 ++ harbour/contrib/hbziparc/tests/hbmk.hbm | 5 + harbour/contrib/hbziparc/tests/hbziparc.hbc | 5 - harbour/contrib/rddado/rddado.hbc | 8 ++ harbour/contrib/rddado/tests/hbmk.hbm | 5 + harbour/contrib/rddado/tests/rddado.hbc | 5 - harbour/contrib/rddads/rddads.hbc | 8 ++ harbour/contrib/rddads/tests/hbmk.hbm | 5 + harbour/contrib/rddads/tests/rddads.hbc | 5 - harbour/contrib/xhb/tests/hbmk.hbm | 5 + harbour/contrib/xhb/{tests => }/xhb.hbc | 2 + 62 files changed, 313 insertions(+), 50 deletions(-) rename harbour/contrib/gtqtc/{tests => }/gtqtc.hbc (100%) create mode 100644 harbour/contrib/gtqtc/tests/hbmk.hbm rename harbour/contrib/gtwvg/{tests => }/gtwvg.hbc (100%) create mode 100644 harbour/contrib/gtwvg/tests/hbmk.hbm create mode 100644 harbour/contrib/hbbmcdx/hbbmcdx.hbc rename harbour/contrib/hbbtree/{tests => }/hbbtree.hbc (56%) create mode 100644 harbour/contrib/hbbtree/tests/hbmk.hbm rename harbour/contrib/hbclipsm/{tests => }/hbclipsm.hbc (57%) create mode 100644 harbour/contrib/hbclipsm/tests/hbmk.hbm rename harbour/contrib/hbcrypt/{tests => }/hbcrypt.hbc (100%) create mode 100644 harbour/contrib/hbcrypt/tests/hbmk.hbm rename harbour/contrib/hbct/{tests => }/hbct.hbc (64%) create mode 100644 harbour/contrib/hbct/tests/hbmk.hbm create mode 100644 harbour/contrib/hbcurl/hbcurl.hbc delete mode 100644 harbour/contrib/hbcurl/tests/hbcurl.hbc create mode 100644 harbour/contrib/hbcurl/tests/hbmk.hbm create mode 100644 harbour/contrib/hbfbird/hbfbird.hbc delete mode 100644 harbour/contrib/hbfbird/tests/hbfbird.hbc create mode 100644 harbour/contrib/hbfbird/tests/hbmk.hbm create mode 100644 harbour/contrib/hbfimage/hbfimage.hbc delete mode 100644 harbour/contrib/hbfimage/tests/hbfimage.hbc create mode 100644 harbour/contrib/hbfimage/tests/hbmk.hbm rename harbour/contrib/hbgd/{tests => }/hbgd.hbc (77%) create mode 100644 harbour/contrib/hbgd/tests/hbmk.hbm create mode 100644 harbour/contrib/hbgt/hbgt.hbc rename harbour/contrib/hbmisc/{tests => }/hbmisc.hbc (100%) create mode 100644 harbour/contrib/hbmisc/tests/hbmk.hbm rename harbour/contrib/hbmzip/{tests => }/hbmzip.hbc (55%) create mode 100644 harbour/contrib/hbmzip/tests/hbmk.hbm rename harbour/contrib/hbnf/{tests => }/hbnf.hbc (53%) create mode 100644 harbour/contrib/hbnf/tests/hbmk.hbm rename harbour/contrib/hbodbc/{tests => }/hbodbc.hbc (67%) create mode 100644 harbour/contrib/hbodbc/tests/hbmk.hbm create mode 100644 harbour/contrib/hbpgsql/hbpgsql.hbc create mode 100644 harbour/contrib/hbpgsql/tests/hbmk.hbm delete mode 100644 harbour/contrib/hbpgsql/tests/hbpgsql.hbc create mode 100644 harbour/contrib/hbsqlit3/hbsqlit3.hbc create mode 100644 harbour/contrib/hbsqlit3/tests/hbmk.hbm delete mode 100644 harbour/contrib/hbsqlit3/tests/hbsqlit3.hbc rename harbour/contrib/hbssl/{tests => }/hbssl.hbc (71%) create mode 100644 harbour/contrib/hbssl/tests/hbmk.hbm rename harbour/contrib/hbtip/{tests => }/hbtip.hbc (54%) create mode 100644 harbour/contrib/hbtip/tests/hbmk.hbm rename harbour/contrib/hbtpathy/{tests => }/hbtpathy.hbc (57%) create mode 100644 harbour/contrib/hbtpathy/tests/hbmk.hbm rename harbour/contrib/hbvpdf/{tests => }/hbvpdf.hbc (55%) create mode 100644 harbour/contrib/hbvpdf/tests/hbmk.hbm create mode 100644 harbour/contrib/hbziparc/hbziparc.hbc create mode 100644 harbour/contrib/hbziparc/tests/hbmk.hbm delete mode 100644 harbour/contrib/hbziparc/tests/hbziparc.hbc create mode 100644 harbour/contrib/rddado/rddado.hbc create mode 100644 harbour/contrib/rddado/tests/hbmk.hbm delete mode 100644 harbour/contrib/rddado/tests/rddado.hbc create mode 100644 harbour/contrib/rddads/rddads.hbc create mode 100644 harbour/contrib/rddads/tests/hbmk.hbm delete mode 100644 harbour/contrib/rddads/tests/rddads.hbc create mode 100644 harbour/contrib/xhb/tests/hbmk.hbm rename harbour/contrib/xhb/{tests => }/xhb.hbc (87%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0c418acff5..719df0b131 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,97 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-15 14:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbwin/legacyco.c + * contrib/hbwin/legacy.prg + ! Fixed typos in prev. + (Thanks EMG) + + * contrib/hbmysql/hbmysql.hbc + - contrib/hbct/tests/hbct.hbc + + contrib/hbct/tests/hbmk.hbm + + contrib/hbct/hbct.hbc + + contrib/xhb/xhb.hbc + + contrib/xhb/tests/hbmk.hbm + - contrib/xhb/tests/xhb.hbc + + contrib/hbodbc/tests/hbmk.hbm + - contrib/hbodbc/tests/hbodbc.hbc + + contrib/hbodbc/hbodbc.hbc + + contrib/hbtpathy/tests/hbmk.hbm + - contrib/hbtpathy/tests/hbtpathy.hbc + + contrib/hbtpathy/hbtpathy.hbc + + contrib/hbgt/hbgt.hbc + - contrib/hbmzip/tests/hbmzip.hbc + + contrib/hbmzip/tests/hbmk.hbm + + contrib/hbmzip/hbmzip.hbc + - contrib/hbsqlit3/tests/hbsqlit3.hbc + + contrib/hbsqlit3/tests/hbmk.hbm + + contrib/hbsqlit3/hbsqlit3.hbc + + contrib/hbfbird/tests/hbmk.hbm + - contrib/hbfbird/tests/hbfbird.hbc + + contrib/hbfbird/hbfbird.hbc + + contrib/hbziparc/tests/hbmk.hbm + - contrib/hbziparc/tests/hbziparc.hbc + + contrib/hbziparc/hbziparc.hbc + + contrib/hbnf/tests/hbmk.hbm + - contrib/hbnf/tests/hbnf.hbc + + contrib/hbnf/hbnf.hbc + + contrib/hbcurl/tests/hbmk.hbm + - contrib/hbcurl/tests/hbcurl.hbc + + contrib/hbcurl/hbcurl.hbc + + contrib/gtqtc/tests/hbmk.hbm + - contrib/gtqtc/tests/gtqtc.hbc + + contrib/gtqtc/gtqtc.hbc + + contrib/rddado/tests/hbmk.hbm + - contrib/rddado/tests/rddado.hbc + + contrib/rddado/rddado.hbc + + contrib/gtwvg/gtwvg.hbc + + contrib/gtwvg/tests/hbmk.hbm + - contrib/gtwvg/tests/gtwvg.hbc + + contrib/hbpgsql/tests/hbmk.hbm + - contrib/hbpgsql/tests/hbpgsql.hbc + + contrib/hbpgsql/hbpgsql.hbc + + contrib/rddads/tests/hbmk.hbm + - contrib/rddads/tests/rddads.hbc + + contrib/rddads/rddads.hbc + + contrib/hbclipsm/tests/hbmk.hbm + - contrib/hbclipsm/tests/hbclipsm.hbc + + contrib/hbclipsm/hbclipsm.hbc + + contrib/hbfimage/tests/hbmk.hbm + - contrib/hbfimage/tests/hbfimage.hbc + + contrib/hbfimage/hbfimage.hbc + + contrib/hbgd/hbgd.hbc + + contrib/hbgd/tests/hbmk.hbm + - contrib/hbgd/tests/hbgd.hbc + + contrib/hbmisc/hbmisc.hbc + - contrib/hbmisc/tests/hbmisc.hbc + + contrib/hbmisc/tests/hbmk.hbm + + contrib/hbtip/hbtip.hbc + + contrib/hbtip/tests/hbmk.hbm + - contrib/hbtip/tests/hbtip.hbc + + contrib/hbbmcdx/hbbmcdx.hbc + - contrib/hbvpdf/tests/hbvpdf.hbc + + contrib/hbvpdf/tests/hbmk.hbm + + contrib/hbvpdf/hbvpdf.hbc + - contrib/hbssl/tests/hbssl.hbc + + contrib/hbssl/tests/hbmk.hbm + + contrib/hbssl/hbssl.hbc + - contrib/hbbtree/tests/hbbtree.hbc + + contrib/hbbtree/tests/hbmk.hbm + + contrib/hbbtree/hbbtree.hbc + - contrib/hbcrypt/tests/hbcrypt.hbc + + contrib/hbcrypt/tests/hbmk.hbm + + contrib/hbcrypt/hbcrypt.hbc + + Added new hbmk2 make file layout: + hbmk.hbm in tests dir, referring to .hbc file in + contrib main dir. + + Added -incpaths=. option to those .hbc files where + contrib has public headers. + * Changed a few inter-contrib reference to refer to + .hbc file rather than lib directly. + ; TODO: Change inter-contrib references to hbwin to refer + to hbwin.hbc. + 2009-06-15 13:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/legacy.prg * contrib/hbwin/legacyco.c diff --git a/harbour/contrib/gtqtc/tests/gtqtc.hbc b/harbour/contrib/gtqtc/gtqtc.hbc similarity index 100% rename from harbour/contrib/gtqtc/tests/gtqtc.hbc rename to harbour/contrib/gtqtc/gtqtc.hbc diff --git a/harbour/contrib/gtqtc/tests/hbmk.hbm b/harbour/contrib/gtqtc/tests/hbmk.hbm new file mode 100644 index 0000000000..d7d6aca270 --- /dev/null +++ b/harbour/contrib/gtqtc/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../gtqtc.hbc diff --git a/harbour/contrib/gtwvg/tests/gtwvg.hbc b/harbour/contrib/gtwvg/gtwvg.hbc similarity index 100% rename from harbour/contrib/gtwvg/tests/gtwvg.hbc rename to harbour/contrib/gtwvg/gtwvg.hbc diff --git a/harbour/contrib/gtwvg/tests/hbmk.hbm b/harbour/contrib/gtwvg/tests/hbmk.hbm new file mode 100644 index 0000000000..7fb8cb9184 --- /dev/null +++ b/harbour/contrib/gtwvg/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../gtwvg.hbc diff --git a/harbour/contrib/hbbmcdx/hbbmcdx.hbc b/harbour/contrib/hbbmcdx/hbbmcdx.hbc new file mode 100644 index 0000000000..abd138dd49 --- /dev/null +++ b/harbour/contrib/hbbmcdx/hbbmcdx.hbc @@ -0,0 +1,5 @@ +# +# $Id$ +# + +libs=hbbmcdx diff --git a/harbour/contrib/hbbtree/tests/hbbtree.hbc b/harbour/contrib/hbbtree/hbbtree.hbc similarity index 56% rename from harbour/contrib/hbbtree/tests/hbbtree.hbc rename to harbour/contrib/hbbtree/hbbtree.hbc index 169445d02e..97c0914825 100644 --- a/harbour/contrib/hbbtree/tests/hbbtree.hbc +++ b/harbour/contrib/hbbtree/hbbtree.hbc @@ -2,4 +2,6 @@ # $Id$ # +incpaths=. + libs=hbbtree diff --git a/harbour/contrib/hbbtree/tests/hbmk.hbm b/harbour/contrib/hbbtree/tests/hbmk.hbm new file mode 100644 index 0000000000..f306bee45d --- /dev/null +++ b/harbour/contrib/hbbtree/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbbtree.hbc diff --git a/harbour/contrib/hbclipsm/tests/hbclipsm.hbc b/harbour/contrib/hbclipsm/hbclipsm.hbc similarity index 57% rename from harbour/contrib/hbclipsm/tests/hbclipsm.hbc rename to harbour/contrib/hbclipsm/hbclipsm.hbc index 5c69edd259..90e36e0ef6 100644 --- a/harbour/contrib/hbclipsm/tests/hbclipsm.hbc +++ b/harbour/contrib/hbclipsm/hbclipsm.hbc @@ -2,4 +2,6 @@ # $Id$ # +incpaths=. + libs=hbclipsm diff --git a/harbour/contrib/hbclipsm/tests/hbmk.hbm b/harbour/contrib/hbclipsm/tests/hbmk.hbm new file mode 100644 index 0000000000..c25a9fd199 --- /dev/null +++ b/harbour/contrib/hbclipsm/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbclipsm.hbc diff --git a/harbour/contrib/hbcrypt/tests/hbcrypt.hbc b/harbour/contrib/hbcrypt/hbcrypt.hbc similarity index 100% rename from harbour/contrib/hbcrypt/tests/hbcrypt.hbc rename to harbour/contrib/hbcrypt/hbcrypt.hbc diff --git a/harbour/contrib/hbcrypt/tests/hbmk.hbm b/harbour/contrib/hbcrypt/tests/hbmk.hbm new file mode 100644 index 0000000000..c82a235506 --- /dev/null +++ b/harbour/contrib/hbcrypt/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbcrypt.hbc diff --git a/harbour/contrib/hbct/tests/hbct.hbc b/harbour/contrib/hbct/hbct.hbc similarity index 64% rename from harbour/contrib/hbct/tests/hbct.hbc rename to harbour/contrib/hbct/hbct.hbc index e95d25fef2..c432770df8 100644 --- a/harbour/contrib/hbct/tests/hbct.hbc +++ b/harbour/contrib/hbct/hbct.hbc @@ -2,4 +2,6 @@ # $Id$ # +incpaths=. + libs=hbct diff --git a/harbour/contrib/hbct/tests/hbmk.hbm b/harbour/contrib/hbct/tests/hbmk.hbm new file mode 100644 index 0000000000..dd9c7b9e6c --- /dev/null +++ b/harbour/contrib/hbct/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbct.hbc diff --git a/harbour/contrib/hbcurl/hbcurl.hbc b/harbour/contrib/hbcurl/hbcurl.hbc new file mode 100644 index 0000000000..5fcbc244d8 --- /dev/null +++ b/harbour/contrib/hbcurl/hbcurl.hbc @@ -0,0 +1,8 @@ +# +# $Id$ +# + +incpaths=. + +libs=hbcurl +libs=libcurl diff --git a/harbour/contrib/hbcurl/tests/hbcurl.hbc b/harbour/contrib/hbcurl/tests/hbcurl.hbc deleted file mode 100644 index 2f166e9b77..0000000000 --- a/harbour/contrib/hbcurl/tests/hbcurl.hbc +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id$ -# - -libs=hbcurl libcurl diff --git a/harbour/contrib/hbcurl/tests/hbmk.hbm b/harbour/contrib/hbcurl/tests/hbmk.hbm new file mode 100644 index 0000000000..4c1beb81ab --- /dev/null +++ b/harbour/contrib/hbcurl/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbcurl.hbc diff --git a/harbour/contrib/hbfbird/hbfbird.hbc b/harbour/contrib/hbfbird/hbfbird.hbc new file mode 100644 index 0000000000..249e5e8985 --- /dev/null +++ b/harbour/contrib/hbfbird/hbfbird.hbc @@ -0,0 +1,8 @@ +# +# $Id$ +# + +incpaths=. + +libs=hbfbird +libs=fbclient diff --git a/harbour/contrib/hbfbird/tests/hbfbird.hbc b/harbour/contrib/hbfbird/tests/hbfbird.hbc deleted file mode 100644 index c2c90becc8..0000000000 --- a/harbour/contrib/hbfbird/tests/hbfbird.hbc +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id$ -# - -libs=hbfbird fbclient diff --git a/harbour/contrib/hbfbird/tests/hbmk.hbm b/harbour/contrib/hbfbird/tests/hbmk.hbm new file mode 100644 index 0000000000..b6c20e4abe --- /dev/null +++ b/harbour/contrib/hbfbird/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbfbird.hbc diff --git a/harbour/contrib/hbfimage/hbfimage.hbc b/harbour/contrib/hbfimage/hbfimage.hbc new file mode 100644 index 0000000000..494020795d --- /dev/null +++ b/harbour/contrib/hbfimage/hbfimage.hbc @@ -0,0 +1,8 @@ +# +# $Id$ +# + +incpaths=. + +libs=hbfimage +libs=freeimage diff --git a/harbour/contrib/hbfimage/tests/hbfimage.hbc b/harbour/contrib/hbfimage/tests/hbfimage.hbc deleted file mode 100644 index 800727fff4..0000000000 --- a/harbour/contrib/hbfimage/tests/hbfimage.hbc +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id$ -# - -libs=hbfimage freeimage diff --git a/harbour/contrib/hbfimage/tests/hbmk.hbm b/harbour/contrib/hbfimage/tests/hbmk.hbm new file mode 100644 index 0000000000..153c03185a --- /dev/null +++ b/harbour/contrib/hbfimage/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbfimage.hbc diff --git a/harbour/contrib/hbgd/tests/hbgd.hbc b/harbour/contrib/hbgd/hbgd.hbc similarity index 77% rename from harbour/contrib/hbgd/tests/hbgd.hbc rename to harbour/contrib/hbgd/hbgd.hbc index 145da4e719..6a4d5b06dc 100644 --- a/harbour/contrib/hbgd/tests/hbgd.hbc +++ b/harbour/contrib/hbgd/hbgd.hbc @@ -2,6 +2,8 @@ # $Id$ # +incpaths=. + libs=hbgd {win}libs=bgd {linux}libs=gdlib png jpeg freetype m diff --git a/harbour/contrib/hbgd/tests/hbmk.hbm b/harbour/contrib/hbgd/tests/hbmk.hbm new file mode 100644 index 0000000000..e5163daff4 --- /dev/null +++ b/harbour/contrib/hbgd/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbgd.hbc diff --git a/harbour/contrib/hbgt/hbgt.hbc b/harbour/contrib/hbgt/hbgt.hbc new file mode 100644 index 0000000000..79a96416d6 --- /dev/null +++ b/harbour/contrib/hbgt/hbgt.hbc @@ -0,0 +1,5 @@ +# +# $Id$ +# + +libs=hbgt diff --git a/harbour/contrib/hbmisc/tests/hbmisc.hbc b/harbour/contrib/hbmisc/hbmisc.hbc similarity index 100% rename from harbour/contrib/hbmisc/tests/hbmisc.hbc rename to harbour/contrib/hbmisc/hbmisc.hbc diff --git a/harbour/contrib/hbmisc/tests/hbmk.hbm b/harbour/contrib/hbmisc/tests/hbmk.hbm new file mode 100644 index 0000000000..7556765507 --- /dev/null +++ b/harbour/contrib/hbmisc/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbmisc.hbc diff --git a/harbour/contrib/hbmysql/hbmysql.hbc b/harbour/contrib/hbmysql/hbmysql.hbc index 1439933aa0..07490bca3d 100644 --- a/harbour/contrib/hbmysql/hbmysql.hbc +++ b/harbour/contrib/hbmysql/hbmysql.hbc @@ -2,4 +2,7 @@ # $Id$ # -libs=hbmysql libmysql +incpaths=. + +libs=hbmysql +libs=libmysql diff --git a/harbour/contrib/hbmzip/tests/hbmzip.hbc b/harbour/contrib/hbmzip/hbmzip.hbc similarity index 55% rename from harbour/contrib/hbmzip/tests/hbmzip.hbc rename to harbour/contrib/hbmzip/hbmzip.hbc index e51a3d3cbe..67db145018 100644 --- a/harbour/contrib/hbmzip/tests/hbmzip.hbc +++ b/harbour/contrib/hbmzip/hbmzip.hbc @@ -2,4 +2,6 @@ # $Id$ # +incpaths=. + libs=hbmzip diff --git a/harbour/contrib/hbmzip/tests/hbmk.hbm b/harbour/contrib/hbmzip/tests/hbmk.hbm new file mode 100644 index 0000000000..149cf7fef3 --- /dev/null +++ b/harbour/contrib/hbmzip/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbmzip.hbc diff --git a/harbour/contrib/hbnf/tests/hbnf.hbc b/harbour/contrib/hbnf/hbnf.hbc similarity index 53% rename from harbour/contrib/hbnf/tests/hbnf.hbc rename to harbour/contrib/hbnf/hbnf.hbc index b4f05bf99e..4e3493a583 100644 --- a/harbour/contrib/hbnf/tests/hbnf.hbc +++ b/harbour/contrib/hbnf/hbnf.hbc @@ -2,4 +2,6 @@ # $Id$ # +incpaths=. + libs=hbnf diff --git a/harbour/contrib/hbnf/tests/hbmk.hbm b/harbour/contrib/hbnf/tests/hbmk.hbm new file mode 100644 index 0000000000..9ae4ae15ab --- /dev/null +++ b/harbour/contrib/hbnf/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbnf.hbc diff --git a/harbour/contrib/hbodbc/tests/hbodbc.hbc b/harbour/contrib/hbodbc/hbodbc.hbc similarity index 67% rename from harbour/contrib/hbodbc/tests/hbodbc.hbc rename to harbour/contrib/hbodbc/hbodbc.hbc index 98390f118a..ed88fa1ce3 100644 --- a/harbour/contrib/hbodbc/tests/hbodbc.hbc +++ b/harbour/contrib/hbodbc/hbodbc.hbc @@ -2,5 +2,7 @@ # $Id$ # +incpaths=. + libs=hbodbc {win}libs=odbc32 diff --git a/harbour/contrib/hbodbc/tests/hbmk.hbm b/harbour/contrib/hbodbc/tests/hbmk.hbm new file mode 100644 index 0000000000..bbe9c8424e --- /dev/null +++ b/harbour/contrib/hbodbc/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbodbc.hbc diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbc b/harbour/contrib/hbpgsql/hbpgsql.hbc new file mode 100644 index 0000000000..0893b77526 --- /dev/null +++ b/harbour/contrib/hbpgsql/hbpgsql.hbc @@ -0,0 +1,8 @@ +# +# $Id$ +# + +incpaths=. + +libs=hbpgsql +libs=libpq diff --git a/harbour/contrib/hbpgsql/tests/hbmk.hbm b/harbour/contrib/hbpgsql/tests/hbmk.hbm new file mode 100644 index 0000000000..b290770621 --- /dev/null +++ b/harbour/contrib/hbpgsql/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbpgsql.hbc diff --git a/harbour/contrib/hbpgsql/tests/hbpgsql.hbc b/harbour/contrib/hbpgsql/tests/hbpgsql.hbc deleted file mode 100644 index a815e99f01..0000000000 --- a/harbour/contrib/hbpgsql/tests/hbpgsql.hbc +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id$ -# - -libs=hbpgsql libpq diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbc b/harbour/contrib/hbsqlit3/hbsqlit3.hbc new file mode 100644 index 0000000000..b2636e3f88 --- /dev/null +++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbc @@ -0,0 +1,8 @@ +# +# $Id$ +# + +incpaths=. + +libs=hbsqlit3 +libs=sqlite3 diff --git a/harbour/contrib/hbsqlit3/tests/hbmk.hbm b/harbour/contrib/hbsqlit3/tests/hbmk.hbm new file mode 100644 index 0000000000..66973f989a --- /dev/null +++ b/harbour/contrib/hbsqlit3/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbsqlit3.hbc diff --git a/harbour/contrib/hbsqlit3/tests/hbsqlit3.hbc b/harbour/contrib/hbsqlit3/tests/hbsqlit3.hbc deleted file mode 100644 index ca9aeb2724..0000000000 --- a/harbour/contrib/hbsqlit3/tests/hbsqlit3.hbc +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id$ -# - -libs=hbsqlit3 sqlite3 diff --git a/harbour/contrib/hbssl/tests/hbssl.hbc b/harbour/contrib/hbssl/hbssl.hbc similarity index 71% rename from harbour/contrib/hbssl/tests/hbssl.hbc rename to harbour/contrib/hbssl/hbssl.hbc index b2dd0bb3cd..37ff2d41f4 100644 --- a/harbour/contrib/hbssl/tests/hbssl.hbc +++ b/harbour/contrib/hbssl/hbssl.hbc @@ -2,5 +2,7 @@ # $Id$ # +incpaths=. + libs=hbssl {win}libs=libeay32 ssleay32 diff --git a/harbour/contrib/hbssl/tests/hbmk.hbm b/harbour/contrib/hbssl/tests/hbmk.hbm new file mode 100644 index 0000000000..00ccb1127e --- /dev/null +++ b/harbour/contrib/hbssl/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbssl.hbc diff --git a/harbour/contrib/hbtip/tests/hbtip.hbc b/harbour/contrib/hbtip/hbtip.hbc similarity index 54% rename from harbour/contrib/hbtip/tests/hbtip.hbc rename to harbour/contrib/hbtip/hbtip.hbc index 176fe60009..b87892e6a7 100644 --- a/harbour/contrib/hbtip/tests/hbtip.hbc +++ b/harbour/contrib/hbtip/hbtip.hbc @@ -2,4 +2,6 @@ # $Id$ # +incpaths=. + libs=hbtip diff --git a/harbour/contrib/hbtip/tests/hbmk.hbm b/harbour/contrib/hbtip/tests/hbmk.hbm new file mode 100644 index 0000000000..119c08e410 --- /dev/null +++ b/harbour/contrib/hbtip/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbtip.hbc diff --git a/harbour/contrib/hbtpathy/tests/hbtpathy.hbc b/harbour/contrib/hbtpathy/hbtpathy.hbc similarity index 57% rename from harbour/contrib/hbtpathy/tests/hbtpathy.hbc rename to harbour/contrib/hbtpathy/hbtpathy.hbc index 93d050eef3..b7ad00a482 100644 --- a/harbour/contrib/hbtpathy/tests/hbtpathy.hbc +++ b/harbour/contrib/hbtpathy/hbtpathy.hbc @@ -2,4 +2,6 @@ # $Id$ # +incpaths=. + libs=hbtpathy diff --git a/harbour/contrib/hbtpathy/tests/hbmk.hbm b/harbour/contrib/hbtpathy/tests/hbmk.hbm new file mode 100644 index 0000000000..566bbda45b --- /dev/null +++ b/harbour/contrib/hbtpathy/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbtpathy.hbc diff --git a/harbour/contrib/hbvpdf/tests/hbvpdf.hbc b/harbour/contrib/hbvpdf/hbvpdf.hbc similarity index 55% rename from harbour/contrib/hbvpdf/tests/hbvpdf.hbc rename to harbour/contrib/hbvpdf/hbvpdf.hbc index c5db5fc9de..c84c10c487 100644 --- a/harbour/contrib/hbvpdf/tests/hbvpdf.hbc +++ b/harbour/contrib/hbvpdf/hbvpdf.hbc @@ -2,4 +2,6 @@ # $Id$ # +incpaths=. + libs=hbvpdf diff --git a/harbour/contrib/hbvpdf/tests/hbmk.hbm b/harbour/contrib/hbvpdf/tests/hbmk.hbm new file mode 100644 index 0000000000..2d9c297375 --- /dev/null +++ b/harbour/contrib/hbvpdf/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbvpdf.hbc diff --git a/harbour/contrib/hbwin/legacy.prg b/harbour/contrib/hbwin/legacy.prg index a73b524653..9a7a1433fc 100644 --- a/harbour/contrib/hbwin/legacy.prg +++ b/harbour/contrib/hbwin/legacy.prg @@ -103,11 +103,11 @@ FUNCTION GetActiveObject( xOle, cIID ) ENDIF IF hb_isPointer( xOle ) - ::__hObj := xOle + o:__hObj := xOle ELSEIF ISCHARACTER( xOle ) xOle := __OleGetActiveObject( xOle, cIID ) IF ! Empty( xOle ) - ::__hObj := xOle + o:__hObj := xOle ENDIF ENDIF diff --git a/harbour/contrib/hbwin/legacyco.c b/harbour/contrib/hbwin/legacyco.c index ab05b53233..f8afb28419 100644 --- a/harbour/contrib/hbwin/legacyco.c +++ b/harbour/contrib/hbwin/legacyco.c @@ -61,13 +61,6 @@ #include "hbapi.h" -HB_FUNC_EXTERN( WIN_OLEGETACTIVEOBJECT ); - -HB_FUNC( GETACTIVEOBJECT ) -{ - HB_FUNC_EXEC( WIN_OLEGETACTIVEOBJECT ); -} - HB_FUNC_EXTERN( WIN_OLEERROR ); HB_FUNC( OLEERROR ) diff --git a/harbour/contrib/hbziparc/hbziparc.hbc b/harbour/contrib/hbziparc/hbziparc.hbc new file mode 100644 index 0000000000..cad9ec8c26 --- /dev/null +++ b/harbour/contrib/hbziparc/hbziparc.hbc @@ -0,0 +1,6 @@ +# +# $Id$ +# + +libs=hbziparc +hbcs=../hbmzip/hbmzip.hbc diff --git a/harbour/contrib/hbziparc/tests/hbmk.hbm b/harbour/contrib/hbziparc/tests/hbmk.hbm new file mode 100644 index 0000000000..ffa3ed4b49 --- /dev/null +++ b/harbour/contrib/hbziparc/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../hbziparc.hbc diff --git a/harbour/contrib/hbziparc/tests/hbziparc.hbc b/harbour/contrib/hbziparc/tests/hbziparc.hbc deleted file mode 100644 index d50a741ee7..0000000000 --- a/harbour/contrib/hbziparc/tests/hbziparc.hbc +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id$ -# - -libs=hbziparc hbmzip diff --git a/harbour/contrib/rddado/rddado.hbc b/harbour/contrib/rddado/rddado.hbc new file mode 100644 index 0000000000..dcbb11c82b --- /dev/null +++ b/harbour/contrib/rddado/rddado.hbc @@ -0,0 +1,8 @@ +# +# $Id$ +# + +incpaths=. + +{win}libs=rddado +{win}libs=hbwin diff --git a/harbour/contrib/rddado/tests/hbmk.hbm b/harbour/contrib/rddado/tests/hbmk.hbm new file mode 100644 index 0000000000..046964625a --- /dev/null +++ b/harbour/contrib/rddado/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../rddado.hbc diff --git a/harbour/contrib/rddado/tests/rddado.hbc b/harbour/contrib/rddado/tests/rddado.hbc deleted file mode 100644 index 009270f6da..0000000000 --- a/harbour/contrib/rddado/tests/rddado.hbc +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id$ -# - -{win}libs=rddado hbwin diff --git a/harbour/contrib/rddads/rddads.hbc b/harbour/contrib/rddads/rddads.hbc new file mode 100644 index 0000000000..ae936e01d5 --- /dev/null +++ b/harbour/contrib/rddads/rddads.hbc @@ -0,0 +1,8 @@ +# +# $Id$ +# + +incpaths=. + +libs=rddads +libs=ace32 diff --git a/harbour/contrib/rddads/tests/hbmk.hbm b/harbour/contrib/rddads/tests/hbmk.hbm new file mode 100644 index 0000000000..1e6a4ff771 --- /dev/null +++ b/harbour/contrib/rddads/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../rddads.hbc diff --git a/harbour/contrib/rddads/tests/rddads.hbc b/harbour/contrib/rddads/tests/rddads.hbc deleted file mode 100644 index c4ed9d8386..0000000000 --- a/harbour/contrib/rddads/tests/rddads.hbc +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id$ -# - -libs=rddads ace32 diff --git a/harbour/contrib/xhb/tests/hbmk.hbm b/harbour/contrib/xhb/tests/hbmk.hbm new file mode 100644 index 0000000000..df99903c28 --- /dev/null +++ b/harbour/contrib/xhb/tests/hbmk.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +../xhb.hbc diff --git a/harbour/contrib/xhb/tests/xhb.hbc b/harbour/contrib/xhb/xhb.hbc similarity index 87% rename from harbour/contrib/xhb/tests/xhb.hbc rename to harbour/contrib/xhb/xhb.hbc index 2eafaf3308..c7451e520e 100644 --- a/harbour/contrib/xhb/tests/xhb.hbc +++ b/harbour/contrib/xhb/xhb.hbc @@ -2,6 +2,8 @@ # $Id$ # +incpaths=. + libs=xhb # xhb has these as part of core, so we're adding them to emulate it.