2012-11-27 17:08 UTC+0100 Viktor Szakats (harbour syenar.net)

* contrib/*/*.hbp % use ${hb_name}.hbx to avoid duplicating the project name inside the .hbp files
2012-11-27 16:14:13 +00:00
parent 7732beb09f
commit 7fccc044ad
48 changed files with 52 additions and 47 deletions
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,11 @@
     * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
 */

+2012-11-27 17:08 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/*/*.hbp
+    % use ${hb_name}.hbx to avoid duplicating the project
+      name inside the .hbp files
+
 2012-11-27 16:57 UTC+0100 Viktor Szakats (harbour syenar.net)
  * package/winuni/RELNOTES.txt
    * msvc 2012 update 1
--- a/harbour/contrib/gtwvg/gtwvg.hbp
+++ b/harbour/contrib/gtwvg/gtwvg.hbp
@@ -26,7 +26,7 @@ wvgutils.c
 wvgwin.c
 wvgwing.c

-gtwvg.hbx
+${hb_name}.hbx

 3state.prg
 activex.prg
--- a/harbour/contrib/hbamf/hbamf.hbp
+++ b/harbour/contrib/hbamf/hbamf.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbamf.hbx
+${hb_name}.hbx

 amfenc.c
 amfdec.c
--- a/harbour/contrib/hbblat/hbblat.hbp
+++ b/harbour/contrib/hbblat/hbblat.hbp
@@ -18,7 +18,7 @@

 -iflag={bcc}-a

-hbblat.hbx
+${hb_name}.hbx

 blatwrp.c
 blatcls.prg
--- a/harbour/contrib/hbblink/hbblink.hbp
+++ b/harbour/contrib/hbblink/hbblink.hbp
@@ -9,6 +9,6 @@

 -w3 -es2

-hbblink.hbx
+${hb_name}.hbx

 blinker.prg
--- a/harbour/contrib/hbbz2/hbbz2.hbp
+++ b/harbour/contrib/hbbz2/hbbz2.hbp
@@ -18,7 +18,7 @@
 -depincpathlocal=bzip2:3rd/bz2
 -depfinish=bzip2

-hbbz2.hbx
+${hb_name}.hbx

 core.c

--- a/harbour/contrib/hbcairo/hbcairo.hbp
+++ b/harbour/contrib/hbcairo/hbcairo.hbp
@@ -20,7 +20,7 @@

 -iflag={bcc}-a

-hbcairo.hbx
+${hb_name}.hbx

 context.c
 core.c
--- a/harbour/contrib/hbcomm/hbcomm.hbp
+++ b/harbour/contrib/hbcomm/hbcomm.hbp
@@ -9,6 +9,6 @@

 -w3 -es2

-hbcomm.hbx
+${hb_name}.hbx

 comm.prg
--- a/harbour/contrib/hbct/hbct.hbp
+++ b/harbour/contrib/hbct/hbct.hbp
@@ -19,7 +19,7 @@
 -instfile=contrib:ctstrfil.h
 -instfile=contrib:ctwin.h

-hbct.hbx
+${hb_name}.hbx

 addascii.c
 asciisum.c
--- a/harbour/contrib/hbcups/hbcups.hbp
+++ b/harbour/contrib/hbcups/hbcups.hbp
@@ -16,6 +16,6 @@
 -depcontrol=cups:${HB_WITH_CUPS}
 -depincpath=cups:/usr/include

-hbcups.hbx
+${hb_name}.hbx

 core.c
--- a/harbour/contrib/hbexpat/hbexpat.hbp
+++ b/harbour/contrib/hbexpat/hbexpat.hbp
@@ -18,7 +18,7 @@

 -cflag=-DXML_STATIC

-hbexpat.hbx
+${hb_name}.hbx

 core.c
 internal.c
--- a/harbour/contrib/hbfbird/hbfbird.hbp
+++ b/harbour/contrib/hbfbird/hbfbird.hbp
@@ -24,7 +24,7 @@
 # For FireBird headers
 -c=gnu90

-hbfbird.hbx
+${hb_name}.hbx

 firebird.c
 tfirebrd.prg
--- a/harbour/contrib/hbfimage/hbfimage.hbp
+++ b/harbour/contrib/hbfimage/hbfimage.hbp
@@ -22,6 +22,6 @@
 # For FreeImage headers
 -c=gnu90

-hbfimage.hbx
+${hb_name}.hbx

 fi_wrp.c
--- a/harbour/contrib/hbformat/hbformat.hbp
+++ b/harbour/contrib/hbformat/hbformat.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbformat.hbx
+${hb_name}.hbx

 hbfmtcls.prg
 hbfuncs.prg
--- a/harbour/contrib/hbfoxpro/hbfoxpro.hbp
+++ b/harbour/contrib/hbfoxpro/hbfoxpro.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbfoxpro.hbx
+${hb_name}.hbx

 dll.prg
 misc.prg
--- a/harbour/contrib/hbfship/hbfship.hbp
+++ b/harbour/contrib/hbfship/hbfship.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbfship.hbx
+${hb_name}.hbx

 fldarr.prg
 isdb.prg
--- a/harbour/contrib/hbgd/hbgd.hbp
+++ b/harbour/contrib/hbgd/hbgd.hbp
@@ -21,7 +21,7 @@ hbct.hbc
 -depimplibs=gd:../bin/bgd.dll{!(msvc|pocc|mingw)|hbdyn}
 -depimplibs=gd:../lib/bgd.lib{(msvc|pocc|mingw)&!hbdyn}

-hbgd.hbx
+${hb_name}.hbx

 gdwrp.c

--- a/harbour/contrib/hbgs/hbgs.hbp
+++ b/harbour/contrib/hbgs/hbgs.hbp
@@ -21,6 +21,6 @@
 -depimplibs=gs:${HB_WITH_GS_BIN}/gsdll2.dll{os2}
 -depimplibd=gs:gs

-hbgs.hbx
+${hb_name}.hbx

 core.c
--- a/harbour/contrib/hbgt/hbgt.hbp
+++ b/harbour/contrib/hbgt/hbgt.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbgt.hbx
+${hb_name}.hbx

 asciisgt.c
 ascposgt.c
--- a/harbour/contrib/hbhpdf/hbhpdf.hbp
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbp
@@ -19,7 +19,7 @@
 -depimplibs=libharu:../lib_dll/libhpdf.dll
 -depfinish=libharu

-hbhpdf.hbx
+${hb_name}.hbx

 core.c
 annot.c
--- a/harbour/contrib/hbhttpd/hbhttpd.hbp
+++ b/harbour/contrib/hbhttpd/hbhttpd.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbhttpd.hbx
+${hb_name}.hbx

 core.prg
 widgets.prg
--- a/harbour/contrib/hblzf/hblzf.hbp
+++ b/harbour/contrib/hblzf/hblzf.hbp
@@ -16,7 +16,7 @@
 -depincpathlocal=lzf:3rd/liblzf
 -depfinish=lzf

-hblzf.hbx
+${hb_name}.hbx

 core.c

--- a/harbour/contrib/hbmagic/hbmagic.hbp
+++ b/harbour/contrib/hbmagic/hbmagic.hbp
@@ -15,7 +15,7 @@
 -depincpath=libmagic:/usr/include
 -depincpath=libmagic:/opt/local/include

-hbmagic.hbx
+${hb_name}.hbx

 core.c
 hbmagis.prg
--- a/harbour/contrib/hbmemio/hbmemio.hbp
+++ b/harbour/contrib/hbmemio/hbmemio.hbp
@@ -9,6 +9,6 @@

 -w3 -es2

-hbmemio.hbx
+${hb_name}.hbx

 memio.c
--- a/harbour/contrib/hbmisc/hbmisc.hbp
+++ b/harbour/contrib/hbmisc/hbmisc.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbmisc.hbx
+${hb_name}.hbx

 bbabble.c
 dates.c
--- a/harbour/contrib/hbmlzo/hbmlzo.hbp
+++ b/harbour/contrib/hbmlzo/hbmlzo.hbp
@@ -16,7 +16,7 @@
 -depincpathlocal=minilzo:3rd/minilzo
 -depfinish=minilzo

-hbmlzo.hbx
+${hb_name}.hbx

 core.c

--- a/harbour/contrib/hbmxml/hbmxml.hbp
+++ b/harbour/contrib/hbmxml/hbmxml.hbp
@@ -16,7 +16,7 @@
 -depincpathlocal=mxml:3rd/minixml
 -depfinish=mxml

-hbmxml.hbx
+${hb_name}.hbx

 core.c
 format.prg
--- a/harbour/contrib/hbmysql/hbmysql.hbp
+++ b/harbour/contrib/hbmysql/hbmysql.hbp
@@ -18,7 +18,7 @@
 -depimplibs=mysql:../lib/opt/libmySQL.dll
 -depimplibs=mysql:../lib/libmySQL.dll

-hbmysql.hbx
+${hb_name}.hbx

 mysql.c

--- a/harbour/contrib/hbmzip/hbmzip.hbp
+++ b/harbour/contrib/hbmzip/hbmzip.hbp
@@ -31,7 +31,7 @@
 -depincpath=zlib:/boot/develop/headers/3rdparty
 -depincpathlocal=zlib:../../src/3rd/zlib

-hbmzip.hbx
+${hb_name}.hbx

 mzip.c
 mziperr.prg
--- a/harbour/contrib/hbnetio/hbnetio.hbp
+++ b/harbour/contrib/hbnetio/hbnetio.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbnetio.hbx
+${hb_name}.hbx

 netiosrv.c
 netiocli.c
--- a/harbour/contrib/hbnf/hbnf.hbp
+++ b/harbour/contrib/hbnf/hbnf.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbnf.hbx
+${hb_name}.hbx

 alt.c
 caplock.c
--- a/harbour/contrib/hbodbc/hbodbc.hbp
+++ b/harbour/contrib/hbodbc/hbodbc.hbp
@@ -19,7 +19,7 @@
 -depincpath=odbc:/usr/include
 -depincpath=odbc:/usr/local/include

-hbodbc.hbx
+${hb_name}.hbx

 odbc.c

--- a/harbour/contrib/hboslib/hboslib.hbp
+++ b/harbour/contrib/hboslib/hboslib.hbp
@@ -9,6 +9,6 @@

 -w3 -es2

-hboslib.hbx
+${hb_name}.hbx

 core.prg
--- a/harbour/contrib/hbpgsql/hbpgsql.hbp
+++ b/harbour/contrib/hbpgsql/hbpgsql.hbp
@@ -24,7 +24,7 @@

 -iflag={bcc}-a

-hbpgsql.hbx
+${hb_name}.hbx

 postgres.c
 rddcopy.c
--- a/harbour/contrib/hbsms/hbsms.hbp
+++ b/harbour/contrib/hbsms/hbsms.hbp
@@ -9,6 +9,6 @@

 -w3 -es2

-hbsms.hbx
+${hb_name}.hbx

 sms.prg
--- a/harbour/contrib/hbsqlit3/hbsqlit3.hbp
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbp
@@ -17,7 +17,7 @@
 -depincpathlocal=sqlite3:../3rd/sqlite3
 -depfinish=sqlite3

-hbsqlit3.hbx
+${hb_name}.hbx

 core.c
 hdbcsqlt.prg
--- a/harbour/contrib/hbtinymt/hbtinymt.hbp
+++ b/harbour/contrib/hbtinymt/hbtinymt.hbp
@@ -18,7 +18,7 @@
 -depincpathlocal=tinymt:3rd/tinymt
 -depfinish=tinymt

-hbtinymt.hbx
+${hb_name}.hbx

 core32.c
 core64.c
--- a/harbour/contrib/hbtip/hbtip.hbp
+++ b/harbour/contrib/hbtip/hbtip.hbp
@@ -10,7 +10,7 @@

 -w3 -es2

-hbtip.hbx
+${hb_name}.hbx

 encurlc.c
 utils.c
--- a/harbour/contrib/hbtpathy/hbtpathy.hbp
+++ b/harbour/contrib/hbtpathy/hbtpathy.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbtpathy.hbx
+${hb_name}.hbx

 telepath.prg
 tp_idle.prg
--- a/harbour/contrib/hbunix/hbunix.hbp
+++ b/harbour/contrib/hbunix/hbunix.hbp
@@ -13,7 +13,7 @@

 -c=gnu90

-hbunix.hbx
+${hb_name}.hbx

 chdir.c
 chroot.c
--- a/harbour/contrib/hbwin/hbwin.hbp
+++ b/harbour/contrib/hbwin/hbwin.hbp
@@ -26,7 +26,7 @@
 -instfile=contrib:hbwinole.h
 -instfile=contrib:*.def

-hbwin.hbx
+${hb_name}.hbx

 axcore.c
 mapi.c
--- a/harbour/contrib/hbxdiff/hbxdiff.hbp
+++ b/harbour/contrib/hbxdiff/hbxdiff.hbp
@@ -16,7 +16,7 @@
 -depincpathlocal=xdiff:3rd/libxdiff
 -depfinish=xdiff

-hbxdiff.hbx
+${hb_name}.hbx

 core.c

--- a/harbour/contrib/hbxpp/hbxpp.hbp
+++ b/harbour/contrib/hbxpp/hbxpp.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbxpp.hbx
+${hb_name}.hbx

 binnumx.c
 dbcmdx.c
--- a/harbour/contrib/hbzebra/hbzebra.hbp
+++ b/harbour/contrib/hbzebra/hbzebra.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbzebra.hbx
+${hb_name}.hbx

 # Core
 core.c
--- a/harbour/contrib/hbziparc/hbziparc.hbp
+++ b/harbour/contrib/hbziparc/hbziparc.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-hbziparc.hbx
+${hb_name}.hbx

 ziparc.prg

--- a/harbour/contrib/rddads/rddads.hbp
+++ b/harbour/contrib/rddads/rddads.hbp
@@ -26,7 +26,7 @@
 # for ADS headers
 -c=gnu90

-rddads.hbx
+${hb_name}.hbx

 ads1.c
 adsfunc.c
--- a/harbour/contrib/rddbm/rddbm.hbp
+++ b/harbour/contrib/rddbm/rddbm.hbp
@@ -9,7 +9,7 @@

 -w3 -es2

-rddbm.hbx
+${hb_name}.hbx

 bmdbfx.c
 bmdbfcdx.prg
--- a/harbour/contrib/xhb/xhb.hbp
+++ b/harbour/contrib/xhb/xhb.hbp
@@ -24,7 +24,7 @@ hbwin.hbc
 hbfship.hbc
 hbxpp.hbc

-xhb.hbx
+${hb_name}.hbx

 bkgtsks.c
 cstructc.c