From a2c4a6c4ab73d1222c8c504476038ae3180eb63a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 9 Jul 2012 20:04:18 +0000 Subject: [PATCH] 2012-07-09 22:00 UTC+0200 Viktor Szakats (harbour syenar.net) + .gitignore + added .gitignore file. experimental. * utils/hbmk2/hbmk2.prg + -hbx= without parameter will now disable .hbx generation instead of being a noop * minor formatting * contrib/3rd/sqlite3/sqlite3.hbp * contrib/gtalleg/gtalleg.hbm * contrib/gtwvg/gtwvg.hbp * contrib/hbbz2/3rd/bz2/bz2.hbp * contrib/hbexpat/3rd/expat/expat.hbp * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp * contrib/hbhttpd/hbhttpds.hbp * contrib/hblzf/3rd/liblzf/lzf.hbp * contrib/hbmlzo/3rd/minilzo/minilzo.hbp * contrib/hbmxml/3rd/minixml/mxml.hbp * contrib/hbmzip/3rd/minizip/minizip.hbp * contrib/hbqt/gtqtc/gtqtc.hbm * contrib/hbtip/hbtipssl.hbp * contrib/rddbm/rddbm.hbp * contrib/rddsql/rddsql.hbp * contrib/sddfb/sddfb.hbp * contrib/sddmy/sddmy.hbp * contrib/sddoci/sddoci.hbp * contrib/sddodbc/sddodbc.hbp * contrib/sddpg/sddpg.hbp * contrib/sddsqlt3/sddsqlt3.hbp % make sure not to create .hbx files we're not using anyway * contrib/hbqt/gtqtc/gtqtc.hbp * minor formatting --- harbour/.gitignore | 8 +++++ harbour/ChangeLog | 35 +++++++++++++++++++ harbour/contrib/3rd/sqlite3/sqlite3.hbp | 2 ++ harbour/contrib/gtalleg/gtalleg.hbm | 2 ++ harbour/contrib/gtwvg/gtwvg.hbp | 2 ++ harbour/contrib/hbbz2/3rd/bz2/bz2.hbp | 2 ++ harbour/contrib/hbexpat/3rd/expat/expat.hbp | 2 ++ .../contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp | 2 ++ harbour/contrib/hbhttpd/hbhttpds.hbp | 2 ++ harbour/contrib/hblzf/3rd/liblzf/lzf.hbp | 2 ++ .../contrib/hbmlzo/3rd/minilzo/minilzo.hbp | 2 ++ harbour/contrib/hbmxml/3rd/minixml/mxml.hbp | 2 ++ .../contrib/hbmzip/3rd/minizip/minizip.hbp | 2 ++ harbour/contrib/hbqt/gtqtc/gtqtc.hbm | 2 ++ harbour/contrib/hbqt/gtqtc/gtqtc.hbp | 1 - harbour/contrib/hbtip/hbtipssl.hbp | 2 ++ harbour/contrib/rddbm/rddbm.hbp | 2 ++ harbour/contrib/rddsql/rddsql.hbp | 2 ++ harbour/contrib/sddfb/sddfb.hbp | 2 ++ harbour/contrib/sddmy/sddmy.hbp | 2 ++ harbour/contrib/sddoci/sddoci.hbp | 2 ++ harbour/contrib/sddodbc/sddodbc.hbp | 2 ++ harbour/contrib/sddpg/sddpg.hbp | 2 ++ harbour/contrib/sddsqlt3/sddsqlt3.hbp | 2 ++ harbour/utils/hbmk2/hbmk2.prg | 20 ++++++----- 25 files changed, 96 insertions(+), 10 deletions(-) create mode 100644 harbour/.gitignore diff --git a/harbour/.gitignore b/harbour/.gitignore new file mode 100644 index 0000000000..cfac3c8f72 --- /dev/null +++ b/harbour/.gitignore @@ -0,0 +1,8 @@ +.svn +.hbmk +obj +lib +*.exe +*.dll +!*-make.exe +!lib/3rd diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c6a8ebd939..2c874bdcad 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,41 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-09 22:00 UTC+0200 Viktor Szakats (harbour syenar.net) + + .gitignore + + added .gitignore file. experimental. + + * utils/hbmk2/hbmk2.prg + + -hbx= without parameter will now disable .hbx generation + instead of being a noop + * minor formatting + + * contrib/3rd/sqlite3/sqlite3.hbp + * contrib/gtalleg/gtalleg.hbm + * contrib/gtwvg/gtwvg.hbp + * contrib/hbbz2/3rd/bz2/bz2.hbp + * contrib/hbexpat/3rd/expat/expat.hbp + * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp + * contrib/hbhttpd/hbhttpds.hbp + * contrib/hblzf/3rd/liblzf/lzf.hbp + * contrib/hbmlzo/3rd/minilzo/minilzo.hbp + * contrib/hbmxml/3rd/minixml/mxml.hbp + * contrib/hbmzip/3rd/minizip/minizip.hbp + * contrib/hbqt/gtqtc/gtqtc.hbm + * contrib/hbtip/hbtipssl.hbp + * contrib/rddbm/rddbm.hbp + * contrib/rddsql/rddsql.hbp + * contrib/sddfb/sddfb.hbp + * contrib/sddmy/sddmy.hbp + * contrib/sddoci/sddoci.hbp + * contrib/sddodbc/sddodbc.hbp + * contrib/sddpg/sddpg.hbp + * contrib/sddsqlt3/sddsqlt3.hbp + % make sure not to create .hbx files we're not using anyway + + * contrib/hbqt/gtqtc/gtqtc.hbp + * minor formatting + 2012-07-09 18:49 UTC+0200 Viktor Szakats (harbour syenar.net) * examples/guestbk/guestbk.htm * examples/guestbk/testcgi.prg diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.hbp b/harbour/contrib/3rd/sqlite3/sqlite3.hbp index 74f6c43fad..0c83e618a5 100644 --- a/harbour/contrib/3rd/sqlite3/sqlite3.hbp +++ b/harbour/contrib/3rd/sqlite3/sqlite3.hbp @@ -18,6 +18,8 @@ -o${hb_targetname} +-hbx= + -warn=low -cpp=no -pic diff --git a/harbour/contrib/gtalleg/gtalleg.hbm b/harbour/contrib/gtalleg/gtalleg.hbm index 96aab1fb9d..f7e8fba5b2 100644 --- a/harbour/contrib/gtalleg/gtalleg.hbm +++ b/harbour/contrib/gtalleg/gtalleg.hbm @@ -10,6 +10,8 @@ -w3 -es2 +-hbx= + -stop{hbdyn|pocc|pocc64|poccarm|xcc|dmc|watcom|mingwarm|msvcarm} -depkeyhead=allegro:allegro.h diff --git a/harbour/contrib/gtwvg/gtwvg.hbp b/harbour/contrib/gtwvg/gtwvg.hbp index feb0088f16..8583116d33 100644 --- a/harbour/contrib/gtwvg/gtwvg.hbp +++ b/harbour/contrib/gtwvg/gtwvg.hbp @@ -10,6 +10,8 @@ -w3 -es2 -winuni +-hbx= + -stop{!win|hbdyn} hbwin.hbc diff --git a/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp b/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp index 06df4ce190..a02420d3be 100644 --- a/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp +++ b/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp @@ -11,6 +11,8 @@ -o${hb_targetname} +-hbx= + -warn=low -cpp=no -pic diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.hbp b/harbour/contrib/hbexpat/3rd/expat/expat.hbp index d679598200..f48c1046c4 100644 --- a/harbour/contrib/hbexpat/3rd/expat/expat.hbp +++ b/harbour/contrib/hbexpat/3rd/expat/expat.hbp @@ -9,6 +9,8 @@ -o${hb_targetname} +-hbx= + -warn=low -pic diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp index e99cbdb027..826ea7f6b8 100644 --- a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp +++ b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp @@ -12,6 +12,8 @@ -o${hb_targetname} +-hbx= + -warn=low -cpp=no -pic diff --git a/harbour/contrib/hbhttpd/hbhttpds.hbp b/harbour/contrib/hbhttpd/hbhttpds.hbp index 1903007b6e..2499d2b7f0 100644 --- a/harbour/contrib/hbhttpd/hbhttpds.hbp +++ b/harbour/contrib/hbhttpd/hbhttpds.hbp @@ -2,6 +2,8 @@ # $Id$ # +-hbx= + @hbhttpd.hbp hbssl.hbc diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp b/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp index 7843c5ec29..dc149da687 100644 --- a/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp +++ b/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp @@ -9,6 +9,8 @@ -o${hb_targetname} +-hbx= + -warn=low -cpp=no -pic diff --git a/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbp b/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbp index a29d4382b9..1d5bcee753 100644 --- a/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbp +++ b/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbp @@ -7,6 +7,8 @@ -o${hb_targetname} +-hbx= + -warn=low -pic diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp b/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp index d2b2625e75..cf6539baa2 100644 --- a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp +++ b/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp @@ -9,6 +9,8 @@ -o${hb_targetname} +-hbx= + -warn=low -cpp=no -pic diff --git a/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp b/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp index 1c9e778f95..166d295a48 100644 --- a/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp +++ b/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp @@ -9,6 +9,8 @@ -o${hb_targetname} +-hbx= + -warn=low -cpp=no -pic diff --git a/harbour/contrib/hbqt/gtqtc/gtqtc.hbm b/harbour/contrib/hbqt/gtqtc/gtqtc.hbm index b0df31faa9..bb8f84143c 100644 --- a/harbour/contrib/hbqt/gtqtc/gtqtc.hbm +++ b/harbour/contrib/hbqt/gtqtc/gtqtc.hbm @@ -8,6 +8,8 @@ ../qtcore/hbqtcore.hbc +-hbx= + gtqtc.cpp gtqtc.h diff --git a/harbour/contrib/hbqt/gtqtc/gtqtc.hbp b/harbour/contrib/hbqt/gtqtc/gtqtc.hbp index 5ec8766f6f..a0eadc3f8d 100644 --- a/harbour/contrib/hbqt/gtqtc/gtqtc.hbp +++ b/harbour/contrib/hbqt/gtqtc/gtqtc.hbp @@ -6,5 +6,4 @@ gtqtc.hbm - gtqtcs.hbp diff --git a/harbour/contrib/hbtip/hbtipssl.hbp b/harbour/contrib/hbtip/hbtipssl.hbp index ba0fb879d4..6df062ed51 100644 --- a/harbour/contrib/hbtip/hbtipssl.hbp +++ b/harbour/contrib/hbtip/hbtipssl.hbp @@ -2,6 +2,8 @@ # $Id$ # +-hbx= + hbtip.hbm hbssl.hbc diff --git a/harbour/contrib/rddbm/rddbm.hbp b/harbour/contrib/rddbm/rddbm.hbp index b15df9b94f..e39c06f2d3 100644 --- a/harbour/contrib/rddbm/rddbm.hbp +++ b/harbour/contrib/rddbm/rddbm.hbp @@ -9,6 +9,8 @@ -w3 -es2 +-hbx= + bmdbfx.c bmdbfcdx.prg bmdbfnsx.prg diff --git a/harbour/contrib/rddsql/rddsql.hbp b/harbour/contrib/rddsql/rddsql.hbp index cfb9a66b67..ec01f7bf06 100644 --- a/harbour/contrib/rddsql/rddsql.hbp +++ b/harbour/contrib/rddsql/rddsql.hbp @@ -9,6 +9,8 @@ -w3 -es2 +-hbx= + -instfile=inc:hbrddsql.ch sqlbase.c diff --git a/harbour/contrib/sddfb/sddfb.hbp b/harbour/contrib/sddfb/sddfb.hbp index a4756326bd..456575b083 100644 --- a/harbour/contrib/sddfb/sddfb.hbp +++ b/harbour/contrib/sddfb/sddfb.hbp @@ -11,6 +11,8 @@ rddsql.hbc +-hbx= + -stop{pocc64|poccarm} -depkeyhead=firebird:ibase.h diff --git a/harbour/contrib/sddmy/sddmy.hbp b/harbour/contrib/sddmy/sddmy.hbp index c8fd547495..6b250f69f9 100644 --- a/harbour/contrib/sddmy/sddmy.hbp +++ b/harbour/contrib/sddmy/sddmy.hbp @@ -11,6 +11,8 @@ rddsql.hbc +-hbx= + -depkeyhead=mysql:mysql.h -depcontrol=mysql:no{HB_BUILD_3RDEXT='no'} -depcontrol=mysql:${HB_WITH_MYSQL} diff --git a/harbour/contrib/sddoci/sddoci.hbp b/harbour/contrib/sddoci/sddoci.hbp index cb6ce83b46..595a3c8f04 100644 --- a/harbour/contrib/sddoci/sddoci.hbp +++ b/harbour/contrib/sddoci/sddoci.hbp @@ -11,6 +11,8 @@ rddsql.hbc +-hbx= + -stop{dos|os2|wce} -depkeyhead=ocilib:ocilib.h diff --git a/harbour/contrib/sddodbc/sddodbc.hbp b/harbour/contrib/sddodbc/sddodbc.hbp index 4f92420299..07b3894028 100644 --- a/harbour/contrib/sddodbc/sddodbc.hbp +++ b/harbour/contrib/sddodbc/sddodbc.hbp @@ -12,6 +12,8 @@ rddsql.hbc +-hbx= + -stop{dos|os2|rsxnt} -depkeyhead=odbc:sql.h diff --git a/harbour/contrib/sddpg/sddpg.hbp b/harbour/contrib/sddpg/sddpg.hbp index cabf0f9695..a25e28cd3b 100644 --- a/harbour/contrib/sddpg/sddpg.hbp +++ b/harbour/contrib/sddpg/sddpg.hbp @@ -11,6 +11,8 @@ rddsql.hbc +-hbx= + -depkeyhead=pgsql:libpq-fe.h -depcontrol=pgsql:no{HB_BUILD_3RDEXT='no'} -depcontrol=pgsql:${HB_WITH_PGSQL} diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbp b/harbour/contrib/sddsqlt3/sddsqlt3.hbp index ea72d4019c..b8f9e16ca7 100644 --- a/harbour/contrib/sddsqlt3/sddsqlt3.hbp +++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbp @@ -11,6 +11,8 @@ rddsql.hbc +-hbx= + -depkeyhead=sqlite3:sqlite3.h -depcontrol=sqlite3:local{HB_BUILD_3RDEXT='no'} -depcontrol=sqlite3:${HB_WITH_SQLITE3} diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index dcdcb3dfd7..7e3e67a54f 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2549,7 +2549,9 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE Left( cParamL, 5 ) == "-hbx=" cParam := MacroProc( hbmk, SubStr( cParam, 6 ), aParam[ _PAR_cFileName ] ) - IF ! Empty( cParam ) + IF Empty( cParam ) + hbmk[ _HBMK_cHBX ] := NIL + ELSE hbmk[ _HBMK_cHBX ] := PathMakeAbsolute( PathSepToSelf( cParam ), hb_FNameDir( aParam[ _PAR_cFileName ] ) ) ENDIF @@ -13085,13 +13087,13 @@ STATIC FUNCTION __hbshell_win_reg_app( lRegister, lAllUser, cAppPath ) LOCAL tmp LOCAL aEntries := {; - cHive + '\' , "" ,; - cHive + '\.hb\' , "HarbourScript" ,; - cHive + '\HarbourScript\' , "Harbour Script file" ,; - cHive + '\HarbourScript\DefaultIcon\' , cAppPath + ",-1" ,; - cHive + '\HarbourScript\Shell\' , "Run" ,; - cHive + '\HarbourScript\Shell\Run\' , "" ,; - cHive + '\HarbourScript\Shell\Run\Command\', cAppPath + ' "%1"' } + cHive + '\' , "" ,; + cHive + '\.hb\' , "HarbourScript" ,; + cHive + '\HarbourScript\' , "Harbour Script file" ,; + cHive + '\HarbourScript\DefaultIcon\' , cAppPath + ",-1" ,; + cHive + '\HarbourScript\Shell\' , "Run" ,; + cHive + '\HarbourScript\Shell\Run\' , "" ,; + cHive + '\HarbourScript\Shell\Run\Command\', cAppPath + ' "%1"' } IF lRegister FOR tmp := 1 TO Len( aEntries ) STEP 2 @@ -13735,7 +13737,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-[no]minipo" , I_( "do (not) add Harbour version number and source file reference to .po (default: add them)" ) },; { "-rebuildpo" , I_( "recreate .po file, thus removing all obsolete entries in it" ) },; NIL,; - { "-hbx=<.ch>" , I_( "Create Harbour header (in .hbx format) with all external symbols." ) },; + { "-hbx=[<.ch>]" , I_( "Create Harbour header (in .hbx format) with all external symbols. Empty parameter will disable it." ) },; { "-autohbc=<.ch:.hbc>", I_( "<.ch> is a header file name. <.hbc> is a .hbc filename to be automatically included in case the header is found in any of the compiled sources. (EXPERIMENTAL)" ) },; NIL,; { "-deppkgname=" , I_( " is the name of the dependency. name of the package depedency. Can be specified multiple times." ) },;