diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 2c645fe8a2..db768596d3 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,101 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-11-29 00:49 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbwin/hbole.ch + ! missing svn props + + * contrib/hbwin/hbsim.ch + * contrib/hbfoxpro/hbfoxpro.ch + * contrib/hbmysql/mysql.ch + ! added missing self-guards + This was a requirement, but now it really must + be done, if a header wants to be put in headers= + directive in a .hbc file for auto-inclusion. + + * contrib/hbmysql/tests/dbf2mysq.prg + ! missing #require directive + + * contrib/hbblat/hbblat.hbc + * contrib/hbblink/hbblink.hbc + * contrib/hbbz2/hbbz2.hbc + * contrib/hbcairo/hbcairo.hbc + * contrib/hbcurl/hbcurl.hbc + * contrib/hbexpat/hbexpat.hbc + * contrib/hbfimage/hbfimage.hbc + * contrib/hbfoxpro/hbfoxpro.hbc + * contrib/hbgd/hbgd.hbc + * contrib/hbhpdf/hbhpdf.hbc + * contrib/hblzf/hblzf.hbc + * contrib/hbmagic/hbmagic.hbc + * contrib/hbmlzo/hbmlzo.hbc + * contrib/hbmxml/hbmxml.hbc + * contrib/hbmysql/hbmysql.hbc + * contrib/hbmzip/hbmzip.hbc + * contrib/hbnetio/hbnetio.hbc + * contrib/hbpgsql/hbpgsql.hbc + * contrib/hbsqlit3/hbsqlit3.hbc + * contrib/hbssl/hbssl.hbc + * contrib/hbtpathy/hbtpathy.hbc + * contrib/hbxdiff/hbxdiff.hbc + * contrib/hbzebra/hbzebra.hbc + * contrib/rddsql/rddsql.hbc + + added .ch headers to .hbc files for + autoload. + ; For some contribs it still has to do + for several reasons, f.e. .ch file overrides + standard features so they must stay optional, + or they must be optional for other reasons, + or they have multiple headers and I didn't + decide yet which one of those should be + standard. + + * contrib/hbexpat/tests/test.prg + * contrib/hbexpat/tests/tohash.prg + * contrib/hbfimage/tests/fitest.prg + * contrib/hbgd/tests/animgif.prg + * contrib/hbgd/tests/antialia.prg + * contrib/hbgd/tests/counter.prg + * contrib/hbgd/tests/gdtest.prg + * contrib/hbgd/tests/gdtestcl.prg + * contrib/hbgd/tests/test_out.prg + * contrib/hbgd/tests/testdpi.prg + * contrib/hbgd/tests/tostring.prg + * contrib/hbgd/tests/tpoly.prg + * contrib/hbhpdf/tests/harupdf.prg + * contrib/hblzf/tests/test.prg + * contrib/hbmlzo/tests/test.prg + * contrib/hbpgsql/tests/cache.prg + * contrib/hbpgsql/tests/stress.prg + * contrib/hbpgsql/tests/test.prg + * contrib/hbsqlit3/tests/authoriz.prg + * contrib/hbsqlit3/tests/backup.prg + * contrib/hbsqlit3/tests/blob.prg + * contrib/hbsqlit3/tests/hooks.prg + * contrib/hbsqlit3/tests/metadata.prg + * contrib/hbsqlit3/tests/pack.prg + * contrib/hbsqlit3/tests/sl3_test.prg + * contrib/hbssl/tests/bio.prg + * contrib/hbssl/tests/crypt.prg + * contrib/hbssl/tests/digest.prg + * contrib/hbssl/tests/encode.prg + * contrib/hbssl/tests/pem.prg + * contrib/hbssl/tests/test.prg + * contrib/hbxdiff/tests/test.prg + * contrib/hbxdiff/tests/test2.prg + * contrib/hbxdiff/tests/test3.prg + * contrib/hbzebra/tests/testcair.prg + * contrib/hbzebra/tests/testhpdf.prg + * contrib/hbzebra/tests/testwin.prg + * contrib/sddmy/tests/test1.prg + * contrib/sddoci/tests/test1.prg + * contrib/sddodbc/tests/test1.prg + * contrib/sddodbc/tests/test2.prg + * contrib/sddsqlt3/tests/test1.prg + % no longer use #include to include standard + package headers. Rely on autoload triggered + by .hbc file or #require directive. + 2012-11-29 00:09 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbblat/hbblat.hbc * contrib/hbblink/hbblink.hbc diff --git a/harbour/contrib/hbblat/hbblat.hbc b/harbour/contrib/hbblat/hbblat.hbc index 156be0ac7a..f8cc10a1f9 100644 --- a/harbour/contrib/hbblat/hbblat.hbc +++ b/harbour/contrib/hbblat/hbblat.hbc @@ -8,7 +8,7 @@ skip={!win} incpaths=. -headers=hbblat.ch +headers=${hb_name}.ch libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=blat diff --git a/harbour/contrib/hbblink/hbblink.hbc b/harbour/contrib/hbblink/hbblink.hbc index 5d957226cf..487140c300 100644 --- a/harbour/contrib/hbblink/hbblink.hbc +++ b/harbour/contrib/hbblink/hbblink.hbc @@ -6,6 +6,6 @@ description=Blinker compatibility incpaths=. -headers=hbblink.ch +headers=${hb_name}.ch libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} diff --git a/harbour/contrib/hbbz2/hbbz2.hbc b/harbour/contrib/hbbz2/hbbz2.hbc index 2c1fbcc6e3..c1ceeb8d38 100644 --- a/harbour/contrib/hbbz2/hbbz2.hbc +++ b/harbour/contrib/hbbz2/hbbz2.hbc @@ -6,7 +6,7 @@ description=bz2 wrapper (compression) incpaths=. -headers=hbbz2.ch +headers=${hb_name}.ch libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=3rd/bz2/bz2.hbc diff --git a/harbour/contrib/hbcairo/hbcairo.hbc b/harbour/contrib/hbcairo/hbcairo.hbc index cce47b4601..3e742d1f13 100644 --- a/harbour/contrib/hbcairo/hbcairo.hbc +++ b/harbour/contrib/hbcairo/hbcairo.hbc @@ -6,7 +6,7 @@ description=Cairo wrapper (imaging) incpaths=. -headers=hbcairo.ch +headers=${hb_name}.ch libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} diff --git a/harbour/contrib/hbcurl/hbcurl.hbc b/harbour/contrib/hbcurl/hbcurl.hbc index 49b642a5bc..1dea477916 100644 --- a/harbour/contrib/hbcurl/hbcurl.hbc +++ b/harbour/contrib/hbcurl/hbcurl.hbc @@ -6,7 +6,7 @@ description=libcurl wrapper (IP communication) incpaths=. -headers=hbcurl.ch +headers=${hb_name}.ch {!(HB_STATIC_CURL&!hbdyn)}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} { (HB_STATIC_CURL&!hbdyn)}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF} diff --git a/harbour/contrib/hbexpat/hbexpat.hbc b/harbour/contrib/hbexpat/hbexpat.hbc index 1cca379fe4..ad01dfae6b 100644 --- a/harbour/contrib/hbexpat/hbexpat.hbc +++ b/harbour/contrib/hbexpat/hbexpat.hbc @@ -6,5 +6,7 @@ description=libexpat wrapper (XML parser) incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=3rd/expat/expat.hbc diff --git a/harbour/contrib/hbexpat/tests/test.prg b/harbour/contrib/hbexpat/tests/test.prg index 441b9201d6..9bf54c0e7b 100644 --- a/harbour/contrib/hbexpat/tests/test.prg +++ b/harbour/contrib/hbexpat/tests/test.prg @@ -12,8 +12,6 @@ #require "hbexpat" -#include "hbexpat.ch" - PROCEDURE Main( cFileName ) LOCAL p := XML_ParserCreate() diff --git a/harbour/contrib/hbexpat/tests/tohash.prg b/harbour/contrib/hbexpat/tests/tohash.prg index 30ad5278dd..516dbc42e2 100644 --- a/harbour/contrib/hbexpat/tests/tohash.prg +++ b/harbour/contrib/hbexpat/tests/tohash.prg @@ -13,8 +13,6 @@ #require "hbexpat" -#include "hbexpat.ch" - #define _D_aTree 1 #define _D_aNode 2 #define _D_MAX_ 2 diff --git a/harbour/contrib/hbfimage/hbfimage.hbc b/harbour/contrib/hbfimage/hbfimage.hbc index 60a0146aff..7d4b7d72ed 100644 --- a/harbour/contrib/hbfimage/hbfimage.hbc +++ b/harbour/contrib/hbfimage/hbfimage.hbc @@ -8,6 +8,8 @@ skip={dos} incpaths=. +headers=freeimag.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=freeimage diff --git a/harbour/contrib/hbfimage/tests/fitest.prg b/harbour/contrib/hbfimage/tests/fitest.prg index 006e8a5baf..3af201a64d 100644 --- a/harbour/contrib/hbfimage/tests/fitest.prg +++ b/harbour/contrib/hbfimage/tests/fitest.prg @@ -10,8 +10,6 @@ #require "hbfimage" -#include "freeimag.ch" - #include "fileio.ch" #include "simpleio.ch" diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.ch b/harbour/contrib/hbfoxpro/hbfoxpro.ch index 3b1e55e2ae..00031edc1d 100644 --- a/harbour/contrib/hbfoxpro/hbfoxpro.ch +++ b/harbour/contrib/hbfoxpro/hbfoxpro.ch @@ -51,6 +51,9 @@ * */ +#ifndef HBFOXPRO_CH_ +#define HBFOXPRO_CH_ + /* messages in FP */ #xtranslate . => : @@ -82,3 +85,5 @@ __dbList( <.off.>, { <{v}> }, <.all.>, ; <{for}>, <{while}>, , ; , <.rest.>, <.prn.>, <(f)> ) + +#endif /* HBFOXPRO_CH_ */ diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.hbc b/harbour/contrib/hbfoxpro/hbfoxpro.hbc index 6ae84a55db..2718f4ee0e 100644 --- a/harbour/contrib/hbfoxpro/hbfoxpro.hbc +++ b/harbour/contrib/hbfoxpro/hbfoxpro.hbc @@ -6,4 +6,6 @@ description=FoxPro compatibility incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} diff --git a/harbour/contrib/hbgd/hbgd.hbc b/harbour/contrib/hbgd/hbgd.hbc index 0bf5d08ffa..16055bf0fb 100644 --- a/harbour/contrib/hbgd/hbgd.hbc +++ b/harbour/contrib/hbgd/hbgd.hbc @@ -6,6 +6,8 @@ description=libgd wrapper (imaging) incpaths=. +headers=gd.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {win}libs=bgd diff --git a/harbour/contrib/hbgd/tests/animgif.prg b/harbour/contrib/hbgd/tests/animgif.prg index c23f2f2efb..c1b5c5c994 100644 --- a/harbour/contrib/hbgd/tests/animgif.prg +++ b/harbour/contrib/hbgd/tests/animgif.prg @@ -12,7 +12,6 @@ #require "hbgd" -#include "gd.ch" #include "simpleio.ch" #define IMAGES_IN "imgs_in" + hb_ps() diff --git a/harbour/contrib/hbgd/tests/antialia.prg b/harbour/contrib/hbgd/tests/antialia.prg index 4b96a87ab0..97092e1abd 100644 --- a/harbour/contrib/hbgd/tests/antialia.prg +++ b/harbour/contrib/hbgd/tests/antialia.prg @@ -10,7 +10,6 @@ #require "hbgd" -#include "gd.ch" #include "simpleio.ch" #define IMAGES_IN "imgs_in" + hb_ps() diff --git a/harbour/contrib/hbgd/tests/counter.prg b/harbour/contrib/hbgd/tests/counter.prg index 75c70eb9bd..a8bcba537d 100644 --- a/harbour/contrib/hbgd/tests/counter.prg +++ b/harbour/contrib/hbgd/tests/counter.prg @@ -13,7 +13,6 @@ #require "hbgd" -#include "gd.ch" #include "simpleio.ch" /* Some digits images from: diff --git a/harbour/contrib/hbgd/tests/gdtest.prg b/harbour/contrib/hbgd/tests/gdtest.prg index f6742b746b..7c6016ebca 100644 --- a/harbour/contrib/hbgd/tests/gdtest.prg +++ b/harbour/contrib/hbgd/tests/gdtest.prg @@ -10,7 +10,6 @@ #require "hbgd" -#include "gd.ch" #include "simpleio.ch" #define IMAGES_IN "imgs_in" + hb_ps() diff --git a/harbour/contrib/hbgd/tests/gdtestcl.prg b/harbour/contrib/hbgd/tests/gdtestcl.prg index f1d2f6d553..1b155d3c24 100644 --- a/harbour/contrib/hbgd/tests/gdtestcl.prg +++ b/harbour/contrib/hbgd/tests/gdtestcl.prg @@ -10,7 +10,6 @@ #require "hbgd" -#include "gd.ch" #include "simpleio.ch" #define IMAGES_IN "imgs_in" + hb_ps() diff --git a/harbour/contrib/hbgd/tests/test_out.prg b/harbour/contrib/hbgd/tests/test_out.prg index 205043ced6..738fdca5bd 100644 --- a/harbour/contrib/hbgd/tests/test_out.prg +++ b/harbour/contrib/hbgd/tests/test_out.prg @@ -10,8 +10,6 @@ #require "hbgd" -#include "gd.ch" - #command WRITE => FWrite( 1, + hb_eol() ) #command OutHTML => WRITE diff --git a/harbour/contrib/hbgd/tests/testdpi.prg b/harbour/contrib/hbgd/tests/testdpi.prg index 939d930466..6a576cb527 100644 --- a/harbour/contrib/hbgd/tests/testdpi.prg +++ b/harbour/contrib/hbgd/tests/testdpi.prg @@ -11,8 +11,6 @@ #require "hbgd" -#include "gd.ch" - #define IMAGES_IN "imgs_in" + hb_ps() #define IMAGES_OUT "imgs_out" + hb_ps() diff --git a/harbour/contrib/hbgd/tests/tostring.prg b/harbour/contrib/hbgd/tests/tostring.prg index c5274a5c6b..6d217ca4ab 100644 --- a/harbour/contrib/hbgd/tests/tostring.prg +++ b/harbour/contrib/hbgd/tests/tostring.prg @@ -10,7 +10,6 @@ #require "hbgd" -#include "gd.ch" #include "simpleio.ch" #define IMAGES_IN "imgs_in" + hb_ps() diff --git a/harbour/contrib/hbgd/tests/tpoly.prg b/harbour/contrib/hbgd/tests/tpoly.prg index b23a4811bb..c89f2cdd60 100644 --- a/harbour/contrib/hbgd/tests/tpoly.prg +++ b/harbour/contrib/hbgd/tests/tpoly.prg @@ -8,7 +8,6 @@ #require "hbgd" -#include "gd.ch" #include "simpleio.ch" #command TurnRight( ) => s_nAngle += Pi() / 3 * diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbc b/harbour/contrib/hbhpdf/hbhpdf.hbc index c3cde68709..e3ab024939 100644 --- a/harbour/contrib/hbhpdf/hbhpdf.hbc +++ b/harbour/contrib/hbhpdf/hbhpdf.hbc @@ -6,5 +6,7 @@ description=libharu wrapper (PDF) incpaths=. +headers=harupdf.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=3rd/libhpdf/libhpdf.hbc diff --git a/harbour/contrib/hbhpdf/tests/harupdf.prg b/harbour/contrib/hbhpdf/tests/harupdf.prg index 443a9d235c..64f23c3505 100644 --- a/harbour/contrib/hbhpdf/tests/harupdf.prg +++ b/harbour/contrib/hbhpdf/tests/harupdf.prg @@ -49,8 +49,6 @@ #require "hbhpdf" -#include "harupdf.ch" - // PROCEDURE Main( cFileToSave ) diff --git a/harbour/contrib/hblzf/hblzf.hbc b/harbour/contrib/hblzf/hblzf.hbc index c450346bba..1a7b4a8e22 100644 --- a/harbour/contrib/hblzf/hblzf.hbc +++ b/harbour/contrib/hblzf/hblzf.hbc @@ -6,5 +6,7 @@ description=LZF wrapper (compression) incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=3rd/liblzf/lzf.hbc diff --git a/harbour/contrib/hblzf/tests/test.prg b/harbour/contrib/hblzf/tests/test.prg index 408128f997..3774eecc87 100644 --- a/harbour/contrib/hblzf/tests/test.prg +++ b/harbour/contrib/hblzf/tests/test.prg @@ -6,8 +6,6 @@ #include "simpleio.ch" -#include "hblzf.ch" - #define TEST_STRING "This is test of LZF extension" #define _NREPL_ 128 diff --git a/harbour/contrib/hbmagic/hbmagic.hbc b/harbour/contrib/hbmagic/hbmagic.hbc index 428d544e76..90f8191e95 100644 --- a/harbour/contrib/hbmagic/hbmagic.hbc +++ b/harbour/contrib/hbmagic/hbmagic.hbc @@ -6,6 +6,8 @@ description=libmagic wrapper (file identification) incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {unix}libs=magic diff --git a/harbour/contrib/hbmlzo/hbmlzo.hbc b/harbour/contrib/hbmlzo/hbmlzo.hbc index 273b8c0abc..5b1e0fb051 100644 --- a/harbour/contrib/hbmlzo/hbmlzo.hbc +++ b/harbour/contrib/hbmlzo/hbmlzo.hbc @@ -6,5 +6,7 @@ description=minilzo wrapper (compression) incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=3rd/minilzo/minilzo.hbc diff --git a/harbour/contrib/hbmlzo/tests/test.prg b/harbour/contrib/hbmlzo/tests/test.prg index 2b6ae1ff12..6498aadab2 100644 --- a/harbour/contrib/hbmlzo/tests/test.prg +++ b/harbour/contrib/hbmlzo/tests/test.prg @@ -8,8 +8,6 @@ #include "simpleio.ch" -#include "hbmlzo.ch" - #define TEST_STRING "This is test of LZO extension" #define FMT_STRING "Compressed %d bytes into %d bytes (%d)" #define FMT2_STRING "Decompressed %d bytes back into %d bytes (%d)" @@ -89,7 +87,7 @@ PROCEDURE Main() ? ? "Simple compression test passed." -/* +#if 0 cStr := Replicate( TEST_STRING, 1000000 ) ? ? "BZ2 ", hb_ntos( Len( hb_bz2_Compress( cStr, NIL, @nResult ) ) ) @@ -105,7 +103,7 @@ PROCEDURE Main() ? "ZLIB", hb_ntos( Len( hb_ZCompress( cStr, NIL, @nResult ) ) ) ? "LZF ", hb_ntos( Len( hb_lzf_compress( cStr, NIL, @nResult ) ) ) ? "LZO ", hb_ntos( Len( hb_lzo1x_1_compress( cStr, NIL, @nResult ) ) ) -*/ +#endif RETURN diff --git a/harbour/contrib/hbmxml/hbmxml.hbc b/harbour/contrib/hbmxml/hbmxml.hbc index bbf5f19068..72fb24cd75 100644 --- a/harbour/contrib/hbmxml/hbmxml.hbc +++ b/harbour/contrib/hbmxml/hbmxml.hbc @@ -6,5 +6,7 @@ description=minixml wrapper (XML parser/generator) incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=3rd/minixml/mxml.hbc diff --git a/harbour/contrib/hbmysql/hbmysql.hbc b/harbour/contrib/hbmysql/hbmysql.hbc index 14c54bac9f..0eea6c8ace 100644 --- a/harbour/contrib/hbmysql/hbmysql.hbc +++ b/harbour/contrib/hbmysql/hbmysql.hbc @@ -6,6 +6,8 @@ description=MySQL wrapper (SQL) incpaths=. +headers=mysql.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {unix}libs=mysqlclient diff --git a/harbour/contrib/hbmysql/mysql.ch b/harbour/contrib/hbmysql/mysql.ch index 2a1a9cc460..3cfde95fca 100644 --- a/harbour/contrib/hbmysql/mysql.ch +++ b/harbour/contrib/hbmysql/mysql.ch @@ -51,6 +51,9 @@ * */ +#ifndef HBMYSQL_CH_ +#define HBMYSQL_CH_ + /* MySQL field types */ #define MYSQL_TYPE_DECIMAL 0 #define MYSQL_TYPE_TINY 1 /* NOTE: TINY is used to map clipper logical values to MySQL tables, so 0 == .F., 1 == .T. */ @@ -109,3 +112,5 @@ /* Extension to DBS_xxx defines to encompass NOT NULL fields, needed by indexes */ #define DBS_NOTNULL 5 /* True if field has to be NOT NULL */ + +#endif /* HBMYSQL_CH_ */ diff --git a/harbour/contrib/hbmysql/tests/dbf2mysq.prg b/harbour/contrib/hbmysql/tests/dbf2mysq.prg index e6411e4649..0108652baf 100644 --- a/harbour/contrib/hbmysql/tests/dbf2mysq.prg +++ b/harbour/contrib/hbmysql/tests/dbf2mysq.prg @@ -50,6 +50,8 @@ * */ +#require "hbmysql" + #include "inkey.ch" PROCEDURE Main( ... ) diff --git a/harbour/contrib/hbmzip/hbmzip.hbc b/harbour/contrib/hbmzip/hbmzip.hbc index da6e8668e0..52b594d6e0 100644 --- a/harbour/contrib/hbmzip/hbmzip.hbc +++ b/harbour/contrib/hbmzip/hbmzip.hbc @@ -6,5 +6,7 @@ description=minizip wrapper (zip compression) incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=3rd/minizip/minizip.hbc diff --git a/harbour/contrib/hbnetio/hbnetio.hbc b/harbour/contrib/hbnetio/hbnetio.hbc index 37f775eee7..73dee91f7c 100644 --- a/harbour/contrib/hbnetio/hbnetio.hbc +++ b/harbour/contrib/hbnetio/hbnetio.hbc @@ -6,4 +6,6 @@ description=HBNETIO file I/O for RDDs incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbc b/harbour/contrib/hbpgsql/hbpgsql.hbc index be92cb1004..2391e2505a 100644 --- a/harbour/contrib/hbpgsql/hbpgsql.hbc +++ b/harbour/contrib/hbpgsql/hbpgsql.hbc @@ -6,6 +6,8 @@ description=PostgreSQL wrapper (SQL) incpaths=. +headers=postgres.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {unix}libs=pq diff --git a/harbour/contrib/hbpgsql/tests/cache.prg b/harbour/contrib/hbpgsql/tests/cache.prg index c0bf688a5e..1e0b8c4368 100644 --- a/harbour/contrib/hbpgsql/tests/cache.prg +++ b/harbour/contrib/hbpgsql/tests/cache.prg @@ -8,8 +8,6 @@ #require "hbpgsql" -#include "postgres.ch" - #define DB_ALIAS 1 #define DB_FILE 2 #define DB_QUERY 3 diff --git a/harbour/contrib/hbpgsql/tests/stress.prg b/harbour/contrib/hbpgsql/tests/stress.prg index 26da0046e3..f90bdb3c35 100644 --- a/harbour/contrib/hbpgsql/tests/stress.prg +++ b/harbour/contrib/hbpgsql/tests/stress.prg @@ -8,8 +8,6 @@ #require "hbpgsql" -#include "postgres.ch" - PROCEDURE Main( cServer, cDatabase, cUser, cPass ) LOCAL conn, res, i, x diff --git a/harbour/contrib/hbpgsql/tests/test.prg b/harbour/contrib/hbpgsql/tests/test.prg index 38fc09611f..b0e8ae0027 100644 --- a/harbour/contrib/hbpgsql/tests/test.prg +++ b/harbour/contrib/hbpgsql/tests/test.prg @@ -4,8 +4,6 @@ #require "hbpgsql" -#include "postgres.ch" - PROCEDURE Main() LOCAL conn, res, aTemp, x, y, pFile diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbc b/harbour/contrib/hbsqlit3/hbsqlit3.hbc index bf4db2b797..07c4386981 100644 --- a/harbour/contrib/hbsqlit3/hbsqlit3.hbc +++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbc @@ -6,5 +6,7 @@ description=SQLite3 wrapper (SQL) incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=../3rd/sqlite3/sqlite3.hbc diff --git a/harbour/contrib/hbsqlit3/tests/authoriz.prg b/harbour/contrib/hbsqlit3/tests/authoriz.prg index 1616732aca..ae987a0ba3 100644 --- a/harbour/contrib/hbsqlit3/tests/authoriz.prg +++ b/harbour/contrib/hbsqlit3/tests/authoriz.prg @@ -78,8 +78,6 @@ #require "hbsqlit3" -#include "hbsqlit3.ch" - PROCEDURE Main() LOCAL cFile := ":memory:" diff --git a/harbour/contrib/hbsqlit3/tests/backup.prg b/harbour/contrib/hbsqlit3/tests/backup.prg index 36bcb47723..a33089d286 100644 --- a/harbour/contrib/hbsqlit3/tests/backup.prg +++ b/harbour/contrib/hbsqlit3/tests/backup.prg @@ -66,8 +66,6 @@ #require "hbsqlit3" -#include "hbsqlit3.ch" - PROCEDURE Main() LOCAL cFileSource := ":memory:", cFileDest := "backup.db", cSQLTEXT diff --git a/harbour/contrib/hbsqlit3/tests/blob.prg b/harbour/contrib/hbsqlit3/tests/blob.prg index bab4504b5b..cf81093844 100644 --- a/harbour/contrib/hbsqlit3/tests/blob.prg +++ b/harbour/contrib/hbsqlit3/tests/blob.prg @@ -52,8 +52,6 @@ #require "hbsqlit3" -#include "hbsqlit3.ch" - #define TABLE_SQL "CREATE TABLE image( id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT(50), image BLOB )" PROCEDURE Main() diff --git a/harbour/contrib/hbsqlit3/tests/hooks.prg b/harbour/contrib/hbsqlit3/tests/hooks.prg index 0c599544df..15e5821ba3 100644 --- a/harbour/contrib/hbsqlit3/tests/hooks.prg +++ b/harbour/contrib/hbsqlit3/tests/hooks.prg @@ -52,8 +52,6 @@ #require "hbsqlit3" -#include "hbsqlit3.ch" - PROCEDURE Main() LOCAL cSQLTEXT, cFile := ":memory:" diff --git a/harbour/contrib/hbsqlit3/tests/metadata.prg b/harbour/contrib/hbsqlit3/tests/metadata.prg index 4a29a04ae1..eaf97acf71 100644 --- a/harbour/contrib/hbsqlit3/tests/metadata.prg +++ b/harbour/contrib/hbsqlit3/tests/metadata.prg @@ -52,8 +52,6 @@ #require "hbsqlit3" -#include "hbsqlit3.ch" - // #define SQLITE_ENABLE_COLUMN_METADATA PROCEDURE Main() diff --git a/harbour/contrib/hbsqlit3/tests/pack.prg b/harbour/contrib/hbsqlit3/tests/pack.prg index aa2137b9e7..82ab76ea93 100644 --- a/harbour/contrib/hbsqlit3/tests/pack.prg +++ b/harbour/contrib/hbsqlit3/tests/pack.prg @@ -52,8 +52,6 @@ #require "hbsqlit3" -#include "hbsqlit3.ch" - PROCEDURE Main() LOCAL db := sqlite3_open_v2( "new.s3db", SQLITE_OPEN_READWRITE + SQLITE_OPEN_EXCLUSIVE ) diff --git a/harbour/contrib/hbsqlit3/tests/sl3_test.prg b/harbour/contrib/hbsqlit3/tests/sl3_test.prg index d591019612..ada99ace7c 100644 --- a/harbour/contrib/hbsqlit3/tests/sl3_test.prg +++ b/harbour/contrib/hbsqlit3/tests/sl3_test.prg @@ -52,8 +52,6 @@ #require "hbsqlit3" -#include "hbsqlit3.ch" - #define TRACE #define TABLE_SQL "CREATE TABLE t1( id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, age INTEGER )" diff --git a/harbour/contrib/hbssl/hbssl.hbc b/harbour/contrib/hbssl/hbssl.hbc index 747f461370..a68b589449 100644 --- a/harbour/contrib/hbssl/hbssl.hbc +++ b/harbour/contrib/hbssl/hbssl.hbc @@ -6,6 +6,8 @@ description=OpenSSL wrapper (encryption) incpaths=. +headers=${hb_name}.ch + skip={dos} {!HB_DYNBIND_OPENSSL&!(HB_STATIC_OPENSSL&!hbdyn)}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} diff --git a/harbour/contrib/hbssl/tests/bio.prg b/harbour/contrib/hbssl/tests/bio.prg index 682577468e..0df775e880 100644 --- a/harbour/contrib/hbssl/tests/bio.prg +++ b/harbour/contrib/hbssl/tests/bio.prg @@ -11,8 +11,6 @@ #include "simpleio.ch" -#include "hbssl.ch" - PROCEDURE Main() LOCAL bio diff --git a/harbour/contrib/hbssl/tests/crypt.prg b/harbour/contrib/hbssl/tests/crypt.prg index ce92151e9d..cd6bf75689 100644 --- a/harbour/contrib/hbssl/tests/crypt.prg +++ b/harbour/contrib/hbssl/tests/crypt.prg @@ -11,8 +11,6 @@ #include "simpleio.ch" -#include "hbssl.ch" - PROCEDURE Main() LOCAL ctx diff --git a/harbour/contrib/hbssl/tests/digest.prg b/harbour/contrib/hbssl/tests/digest.prg index af1493db0c..f420503bcf 100644 --- a/harbour/contrib/hbssl/tests/digest.prg +++ b/harbour/contrib/hbssl/tests/digest.prg @@ -11,8 +11,6 @@ #include "simpleio.ch" -#include "hbssl.ch" - PROCEDURE Main() LOCAL ctx diff --git a/harbour/contrib/hbssl/tests/encode.prg b/harbour/contrib/hbssl/tests/encode.prg index 8cf28019a8..31e5d23f17 100644 --- a/harbour/contrib/hbssl/tests/encode.prg +++ b/harbour/contrib/hbssl/tests/encode.prg @@ -11,8 +11,6 @@ #include "simpleio.ch" -#include "hbssl.ch" - PROCEDURE Main() LOCAL ctx diff --git a/harbour/contrib/hbssl/tests/pem.prg b/harbour/contrib/hbssl/tests/pem.prg index 6d39212551..178a55529b 100644 --- a/harbour/contrib/hbssl/tests/pem.prg +++ b/harbour/contrib/hbssl/tests/pem.prg @@ -11,8 +11,6 @@ #include "simpleio.ch" -#include "hbssl.ch" - PROCEDURE Main() LOCAL cString diff --git a/harbour/contrib/hbssl/tests/test.prg b/harbour/contrib/hbssl/tests/test.prg index 2f97d5febd..4abb6f2a17 100644 --- a/harbour/contrib/hbssl/tests/test.prg +++ b/harbour/contrib/hbssl/tests/test.prg @@ -11,8 +11,6 @@ #include "simpleio.ch" -#include "hbssl.ch" - #define CRLF Chr( 13 ) + Chr( 10 ) PROCEDURE Main() diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbc b/harbour/contrib/hbtpathy/hbtpathy.hbc index b396d35e33..6bbd43e2bd 100644 --- a/harbour/contrib/hbtpathy/hbtpathy.hbc +++ b/harbour/contrib/hbtpathy/hbtpathy.hbc @@ -6,4 +6,6 @@ description=Telepath(y) compatibility (serial communication) incpaths=. +headers=telepath.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} diff --git a/harbour/contrib/hbwin/hbsim.ch b/harbour/contrib/hbwin/hbsim.ch index 4b32cee7d1..3c783f32ff 100644 --- a/harbour/contrib/hbwin/hbsim.ch +++ b/harbour/contrib/hbwin/hbsim.ch @@ -50,6 +50,9 @@ * */ +#ifndef HBSIM_CH_ +#define HBSIM_CH_ + /* Error codes for SIM API */ #define SIM_E_OK 0 // This is non standard... #define SIM_E_HB_MISC -1 // This is non standard... @@ -125,3 +128,5 @@ #define SIM_ADDRTYPE_SUBSCRIBER 0x00000004 // Subscriber number (protocol-specific) #define SIM_ADDRTYPE_ALPHANUM 0x00000005 // Alphanumeric address #define SIM_ADDRTYPE_ABBREV 0x00000006 // Abbreviated number + +#endif /* HBSIM_CH_ */ diff --git a/harbour/contrib/hbxdiff/hbxdiff.hbc b/harbour/contrib/hbxdiff/hbxdiff.hbc index 03d0e47c62..bc9e2e2dc8 100644 --- a/harbour/contrib/hbxdiff/hbxdiff.hbc +++ b/harbour/contrib/hbxdiff/hbxdiff.hbc @@ -6,5 +6,7 @@ description=libxdiff wrapper (diffing) incpaths=. +headers=${hb_name}.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=3rd/libxdiff/xdiff.hbc diff --git a/harbour/contrib/hbxdiff/tests/test.prg b/harbour/contrib/hbxdiff/tests/test.prg index 09c11547f4..718f57b2a7 100644 --- a/harbour/contrib/hbxdiff/tests/test.prg +++ b/harbour/contrib/hbxdiff/tests/test.prg @@ -4,8 +4,6 @@ #require "hbxdiff" -#include "hbxdiff.ch" - #include "simpleio.ch" #define _SIZE 62 diff --git a/harbour/contrib/hbxdiff/tests/test2.prg b/harbour/contrib/hbxdiff/tests/test2.prg index f86ec51d99..26ce7c084b 100644 --- a/harbour/contrib/hbxdiff/tests/test2.prg +++ b/harbour/contrib/hbxdiff/tests/test2.prg @@ -4,8 +4,6 @@ #require "hbxdiff" -#include "hbxdiff.ch" - #include "fileio.ch" #include "simpleio.ch" diff --git a/harbour/contrib/hbxdiff/tests/test3.prg b/harbour/contrib/hbxdiff/tests/test3.prg index c91f8bfc4b..1f28efcc47 100644 --- a/harbour/contrib/hbxdiff/tests/test3.prg +++ b/harbour/contrib/hbxdiff/tests/test3.prg @@ -4,8 +4,6 @@ #require "hbxdiff" -#include "hbxdiff.ch" - #include "simpleio.ch" FUNCTION Diff( ... ) diff --git a/harbour/contrib/hbzebra/hbzebra.hbc b/harbour/contrib/hbzebra/hbzebra.hbc index 0fcb7b12b4..b5d94319e7 100644 --- a/harbour/contrib/hbzebra/hbzebra.hbc +++ b/harbour/contrib/hbzebra/hbzebra.hbc @@ -6,4 +6,6 @@ description=Barcode creating functions incpaths=. +headers=${hb_name}.ch + libs=${hb_name} diff --git a/harbour/contrib/hbzebra/tests/testcair.prg b/harbour/contrib/hbzebra/tests/testcair.prg index c87951a770..0ba559858b 100644 --- a/harbour/contrib/hbzebra/tests/testcair.prg +++ b/harbour/contrib/hbzebra/tests/testcair.prg @@ -5,9 +5,6 @@ #require "hbzebra" #require "hbcairo" -#include "hbzebra.ch" -#include "hbcairo.ch" - PROCEDURE Main() LOCAL hCairo, hSurface diff --git a/harbour/contrib/hbzebra/tests/testhpdf.prg b/harbour/contrib/hbzebra/tests/testhpdf.prg index 2ecb664497..6463e368eb 100644 --- a/harbour/contrib/hbzebra/tests/testhpdf.prg +++ b/harbour/contrib/hbzebra/tests/testhpdf.prg @@ -13,9 +13,6 @@ #require "hbzebra" #require "hbhpdf" -#include "hbzebra.ch" -#include "harupdf.ch" - PROCEDURE Main() LOCAL pdf diff --git a/harbour/contrib/hbzebra/tests/testwin.prg b/harbour/contrib/hbzebra/tests/testwin.prg index 2da2757c30..bafe23f04c 100644 --- a/harbour/contrib/hbzebra/tests/testwin.prg +++ b/harbour/contrib/hbzebra/tests/testwin.prg @@ -13,7 +13,6 @@ #require "hbzebra" #require "hbwin" -#include "hbzebra.ch" #include "hbwin.ch" PROCEDURE Main() diff --git a/harbour/contrib/rddsql/rddsql.hbc b/harbour/contrib/rddsql/rddsql.hbc index 65c6cc6796..02fb0717d6 100644 --- a/harbour/contrib/rddsql/rddsql.hbc +++ b/harbour/contrib/rddsql/rddsql.hbc @@ -6,4 +6,6 @@ description=RDDSQL core RDD incpaths=. +headers=hbrddsql.ch + libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} diff --git a/harbour/contrib/sddmy/tests/test1.prg b/harbour/contrib/sddmy/tests/test1.prg index f4006fb788..7f27dc76f4 100644 --- a/harbour/contrib/sddmy/tests/test1.prg +++ b/harbour/contrib/sddmy/tests/test1.prg @@ -2,13 +2,12 @@ * $Id$ */ +#require "rddsql" #require "sddmy" #include "dbinfo.ch" #include "error.ch" -#include "hbrddsql.ch" - REQUEST SDDMY, SQLMIX ANNOUNCE RDDSYS diff --git a/harbour/contrib/sddoci/tests/test1.prg b/harbour/contrib/sddoci/tests/test1.prg index 76eaf7a66a..ec2cf8736d 100644 --- a/harbour/contrib/sddoci/tests/test1.prg +++ b/harbour/contrib/sddoci/tests/test1.prg @@ -2,10 +2,10 @@ * $Id$ */ +#require "rddsql" #require "sddoci" #include "simpleio.ch" -#include "hbrddsql.ch" REQUEST SDDOCI, SQLMIX diff --git a/harbour/contrib/sddodbc/tests/test1.prg b/harbour/contrib/sddodbc/tests/test1.prg index 46ae05cc8e..d9e0a68d15 100644 --- a/harbour/contrib/sddodbc/tests/test1.prg +++ b/harbour/contrib/sddodbc/tests/test1.prg @@ -2,10 +2,10 @@ * $Id$ */ +#require "rddsql" #require "sddodbc" #include "simpleio.ch" -#include "hbrddsql.ch" REQUEST SDDODBC, SQLMIX diff --git a/harbour/contrib/sddodbc/tests/test2.prg b/harbour/contrib/sddodbc/tests/test2.prg index 536ed415af..345b28557b 100644 --- a/harbour/contrib/sddodbc/tests/test2.prg +++ b/harbour/contrib/sddodbc/tests/test2.prg @@ -2,10 +2,10 @@ * $Id$ */ +#require "rddsql" #require "sddodbc" #include "simpleio.ch" -#include "hbrddsql.ch" REQUEST SQLMIX, SDDODBC diff --git a/harbour/contrib/sddsqlt3/tests/test1.prg b/harbour/contrib/sddsqlt3/tests/test1.prg index 9228363c9d..b21dbe9bb0 100644 --- a/harbour/contrib/sddsqlt3/tests/test1.prg +++ b/harbour/contrib/sddsqlt3/tests/test1.prg @@ -2,10 +2,10 @@ * $Id$ */ +#require "rddsql" #require "sddsqlt3" #include "simpleio.ch" -#include "hbrddsql.ch" REQUEST SDDSQLITE3, SQLMIX