From 4b671e29a322e74d2bfbc581d3ef96d7a197edcf Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 5 Jul 2010 01:42:08 +0000 Subject: [PATCH] 2010-07-05 03:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.pt_BR.po * utils/hbmk2/hbmk2.hu_HU.po * utils/hbmk2/hbmk2.prg + Added -instfile= option, instfiles= .hbc option and hbmk2 plugin API to add new files to the list of files to be copied to -instpath= targets. This option makes it possible to install extra files along the target lib or exe itself, f.e. headers or other supplementary files. This option only works for -instpath= options which point to a dir (not a file). * contrib/gtwvg/gtwvg.hbp * contrib/hbblat/hbblat.hbp * contrib/hbblink/hbblink.hbp * contrib/hbbz2/hbbz2.hbp * contrib/hbcairo/hbcairo.hbp * contrib/hbclipsm/hbclipsm.hbp * contrib/hbct/hbct.hbp * contrib/hbcurl/hbcurl.hbp * contrib/hbfimage/hbfimage.hbp * contrib/hbfoxpro/hbfoxpro.hbp * contrib/hbgd/hbgd.hbp * contrib/hbhpdf/hbhpdf.hbp * contrib/hbmysql/hbmysql.hbp * contrib/hbmzip/hbmzip.hbp * contrib/hbnf/hbnf.hbp * contrib/hbodbc/hbodbc.hbp * contrib/hbpgsql/hbpgsql.hbp * contrib/hbqt/gtqtc/gtqtc.hbp * contrib/hbqt/hbqt.hbp * contrib/hbsqlit3/hbsqlit3.hbp * contrib/hbssl/hbssl.hbp * contrib/hbtip/hbtip.hbp * contrib/hbtpathy/hbtpathy.hbp * contrib/hbwin/hbwin.hbp * contrib/hbxbp/hbxbp.hbp * contrib/hbxpp/hbxpp.hbp * contrib/rddads/rddads.hbp * contrib/rddsql/rddsql.hbp * contrib/xhb/xhb.hbp + Added -instfile= options for headers installed by Makefile. ; TODO: Make copying of headers to central dir unnecessary on *nix platforms as well. * contrib/makefile.hbs * Updated TODOs. * contrib/hbqt/gtqtc/gtqtc.hbp % Deleted -pi= option. * contrib/hbqt/gtqtc/gtqtcs/Makefile * Not needed to install headers from secondary (static) Makefile. * examples/gfspell/gfspell.hbp * examples/gtwvw/gtwvw.hbp * examples/hbapollo/hbapollo.hbp * examples/hbbtree/hbbtree.hbp * examples/hbdoc2/hbdoc2.hbp * examples/hbextern/hbextern.hbp * examples/hbsqlit2/hbsqlit2.hbp * examples/hbvpdf/hbvpdf.hbp * examples/ps32/ps32.hbp * examples/rddado/rddado.hbp * examples/superlib/superlib.hbp + Added -instfile= options for headers installed by Makefile. + Added -w option where missing. - Deleted -q0, -l where present. + Synced output setup with contribs. ! Added hbxpp.hbc reference for ps32. + Added dependency detection for hbsqlit2, hbapollo. ! hbdoc2 GT changed to GTCGI. ; Now the contrib and examples .hbp files are completely on the same feature level. --- harbour/ChangeLog | 84 +++++++++++++ harbour/contrib/gtwvg/gtwvg.hbp | 4 + harbour/contrib/hbblat/hbblat.hbp | 2 + harbour/contrib/hbblink/hbblink.hbp | 2 + harbour/contrib/hbbz2/hbbz2.hbp | 2 + harbour/contrib/hbcairo/hbcairo.hbp | 2 + harbour/contrib/hbclipsm/hbclipsm.hbp | 2 + harbour/contrib/hbct/hbct.hbp | 13 +++ harbour/contrib/hbcurl/hbcurl.hbp | 2 + harbour/contrib/hbfimage/hbfimage.hbp | 2 + harbour/contrib/hbfoxpro/hbfoxpro.hbp | 2 + harbour/contrib/hbgd/hbgd.hbp | 3 + harbour/contrib/hbhpdf/hbhpdf.hbp | 2 + harbour/contrib/hbmysql/hbmysql.hbp | 2 + harbour/contrib/hbmzip/hbmzip.hbp | 2 + harbour/contrib/hbnf/hbnf.hbp | 2 + harbour/contrib/hbodbc/hbodbc.hbp | 2 + harbour/contrib/hbpgsql/hbpgsql.hbp | 2 + harbour/contrib/hbqt/gtqtc/gtqtc.hbp | 5 +- harbour/contrib/hbqt/gtqtc/gtqtcs/Makefile | 4 - harbour/contrib/hbqt/hbqt.hbp | 2 + harbour/contrib/hbsqlit3/hbsqlit3.hbp | 2 + harbour/contrib/hbssl/hbssl.hbp | 2 + harbour/contrib/hbtip/hbtip.hbp | 3 + harbour/contrib/hbtpathy/hbtpathy.hbp | 2 + harbour/contrib/hbwin/hbwin.hbp | 5 + harbour/contrib/hbxbp/hbxbp.hbp | 5 + harbour/contrib/hbxpp/hbxpp.hbp | 6 + harbour/contrib/makefile.hbs | 7 +- harbour/contrib/rddads/rddads.hbp | 3 + harbour/contrib/rddsql/rddsql.hbp | 2 + harbour/contrib/xhb/xhb.hbp | 5 + harbour/examples/gfspell/gfspell.hbp | 8 +- harbour/examples/gtwvw/gtwvw.hbp | 5 +- harbour/examples/hbapollo/hbapollo.hbp | 17 ++- harbour/examples/hbbtree/hbbtree.hbp | 3 + harbour/examples/hbdoc2/hbdoc2.hbp | 6 +- harbour/examples/hbextern/hbextern.hbp | 4 +- harbour/examples/hbsqlit2/hbsqlit2.hbp | 14 ++- harbour/examples/hbvpdf/hbvpdf.hbp | 7 +- harbour/examples/ps32/ps32.hbp | 9 +- harbour/examples/rddado/rddado.hbp | 5 +- harbour/examples/superlib/superlib.hbp | 6 +- harbour/utils/hbmk2/hbmk2.hu_HU.po | 8 +- harbour/utils/hbmk2/hbmk2.prg | 130 +++++++++++++-------- harbour/utils/hbmk2/hbmk2.pt_BR.po | 8 +- 46 files changed, 331 insertions(+), 84 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0c196d36f9..55d5a179b1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,90 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-05 03:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.pt_BR.po + * utils/hbmk2/hbmk2.hu_HU.po + * utils/hbmk2/hbmk2.prg + + Added -instfile= option, instfiles= .hbc option and hbmk2 plugin + API to add new files to the list of files to be copied to + -instpath= targets. This option makes it possible to install + extra files along the target lib or exe itself, f.e. headers + or other supplementary files. This option only works for + -instpath= options which point to a dir (not a file). + + * contrib/gtwvg/gtwvg.hbp + * contrib/hbblat/hbblat.hbp + * contrib/hbblink/hbblink.hbp + * contrib/hbbz2/hbbz2.hbp + * contrib/hbcairo/hbcairo.hbp + * contrib/hbclipsm/hbclipsm.hbp + * contrib/hbct/hbct.hbp + * contrib/hbcurl/hbcurl.hbp + * contrib/hbfimage/hbfimage.hbp + * contrib/hbfoxpro/hbfoxpro.hbp + * contrib/hbgd/hbgd.hbp + * contrib/hbhpdf/hbhpdf.hbp + * contrib/hbmysql/hbmysql.hbp + * contrib/hbmzip/hbmzip.hbp + * contrib/hbnf/hbnf.hbp + * contrib/hbodbc/hbodbc.hbp + * contrib/hbpgsql/hbpgsql.hbp + * contrib/hbqt/gtqtc/gtqtc.hbp + * contrib/hbqt/hbqt.hbp + * contrib/hbsqlit3/hbsqlit3.hbp + * contrib/hbssl/hbssl.hbp + * contrib/hbtip/hbtip.hbp + * contrib/hbtpathy/hbtpathy.hbp + * contrib/hbwin/hbwin.hbp + * contrib/hbxbp/hbxbp.hbp + * contrib/hbxpp/hbxpp.hbp + * contrib/rddads/rddads.hbp + * contrib/rddsql/rddsql.hbp + * contrib/xhb/xhb.hbp + + Added -instfile= options for headers installed by Makefile. + ; TODO: Make copying of headers to central dir unnecessary on + *nix platforms as well. + + * contrib/makefile.hbs + * Updated TODOs. + + * contrib/hbqt/gtqtc/gtqtc.hbp + % Deleted -pi= option. + + * contrib/hbqt/gtqtc/gtqtcs/Makefile + * Not needed to install headers from secondary (static) Makefile. + + * examples/gfspell/gfspell.hbp + * examples/gtwvw/gtwvw.hbp + * examples/hbapollo/hbapollo.hbp + * examples/hbbtree/hbbtree.hbp + * examples/hbdoc2/hbdoc2.hbp + * examples/hbextern/hbextern.hbp + * examples/hbsqlit2/hbsqlit2.hbp + * examples/hbvpdf/hbvpdf.hbp + * examples/ps32/ps32.hbp + * examples/rddado/rddado.hbp + * examples/superlib/superlib.hbp + + Added -instfile= options for headers installed by Makefile. + + Added -w option where missing. + - Deleted -q0, -l where present. + + Synced output setup with contribs. + ! Added hbxpp.hbc reference for ps32. + + Added dependency detection for hbsqlit2, hbapollo. + ! hbdoc2 GT changed to GTCGI. + + ; Now the contrib and examples .hbp files are completely on the same + feature level. + +2010-07-05 00:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.pt_BR.po + * utils/hbmk2/hbmk2.hu_HU.po + * utils/hbmk2/hbmk2.prg + + Added -instfile= option, instfiles= .hbc option and plugin API. + They server to add files to the list of files which are copied + to -instpath. This only works if -instpath= points to a dir + (not a file). + 2010-07-05 00:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + -width=0 now means unlimited width. diff --git a/harbour/contrib/gtwvg/gtwvg.hbp b/harbour/contrib/gtwvg/gtwvg.hbp index 9d305ede10..6ace99cc93 100644 --- a/harbour/contrib/gtwvg/gtwvg.hbp +++ b/harbour/contrib/gtwvg/gtwvg.hbp @@ -16,6 +16,10 @@ # Optimize build time and make sure we build even with this option -cflag=-DWIN32_LEAN_AND_MEAN +-instfile=hbgtwvg.ch +-instfile=wvtwin.ch +-instfile=wvgparts.ch + gtwvg.c wvgcore.c wvgutils.c diff --git a/harbour/contrib/hbblat/hbblat.hbp b/harbour/contrib/hbblat/hbblat.hbp index 907dbdba0a..5af6ef6931 100644 --- a/harbour/contrib/hbblat/hbblat.hbp +++ b/harbour/contrib/hbblat/hbblat.hbp @@ -11,5 +11,7 @@ -stop{!win} +-instfile=hbblat.ch + blatwrp.c blatcls.prg diff --git a/harbour/contrib/hbblink/hbblink.hbp b/harbour/contrib/hbblink/hbblink.hbp index 447f16767d..492e854f0d 100644 --- a/harbour/contrib/hbblink/hbblink.hbp +++ b/harbour/contrib/hbblink/hbblink.hbp @@ -9,4 +9,6 @@ -w3 -es2 +-instfile=hbblink.ch + blinker.prg diff --git a/harbour/contrib/hbbz2/hbbz2.hbp b/harbour/contrib/hbbz2/hbbz2.hbp index 1f99cb236b..97217f0eb0 100644 --- a/harbour/contrib/hbbz2/hbbz2.hbp +++ b/harbour/contrib/hbbz2/hbbz2.hbp @@ -16,4 +16,6 @@ -depincpath=bzip2:/usr/include -depincpathlocal=bzip2:../../external/bzip2 +-instfile=hbbz2.ch + hbbz2.c diff --git a/harbour/contrib/hbcairo/hbcairo.hbp b/harbour/contrib/hbcairo/hbcairo.hbp index 5d8fe89891..1f03a013be 100644 --- a/harbour/contrib/hbcairo/hbcairo.hbp +++ b/harbour/contrib/hbcairo/hbcairo.hbp @@ -14,6 +14,8 @@ -depincpath=cairo:/usr/include/cairo -depincpath=cairo:/opt/local/include/cairo +-instfile=hbcairo.ch + context.c core.c image.c diff --git a/harbour/contrib/hbclipsm/hbclipsm.hbp b/harbour/contrib/hbclipsm/hbclipsm.hbp index 659b13e7de..6b1e3cf24f 100644 --- a/harbour/contrib/hbclipsm/hbclipsm.hbp +++ b/harbour/contrib/hbclipsm/hbclipsm.hbp @@ -9,6 +9,8 @@ -w3 -es2 +-instfile=time87.ch + date.c environ.c gauge.c diff --git a/harbour/contrib/hbct/hbct.hbp b/harbour/contrib/hbct/hbct.hbp index 09ec3d83e8..94cb245d16 100644 --- a/harbour/contrib/hbct/hbct.hbp +++ b/harbour/contrib/hbct/hbct.hbp @@ -9,6 +9,19 @@ -w3 -es2 +-instfile=ct.h +-instfile=ctmath.h +-instfile=ctset.h +-instfile=ctstr.h +-instfile=ctstrfil.h +-instfile=ctwin.h +-instfile=ct.ch +-instfile=ctcom.ch +-instfile=ctdisk.ch +-instfile=cterror.ch +-instfile=ctextern.ch +-instfile=ctvideo.ch + addascii.c asciisum.c ascpos.c diff --git a/harbour/contrib/hbcurl/hbcurl.hbp b/harbour/contrib/hbcurl/hbcurl.hbp index 650ae2e477..846ae2ecdc 100644 --- a/harbour/contrib/hbcurl/hbcurl.hbp +++ b/harbour/contrib/hbcurl/hbcurl.hbp @@ -14,4 +14,6 @@ -depcontrol=curl:${HB_WITH_CURL} -depincpath=curl:/usr/include +-instfile=hbcurl.ch + hbcurl.c diff --git a/harbour/contrib/hbfimage/hbfimage.hbp b/harbour/contrib/hbfimage/hbfimage.hbp index 1d1a415bb5..d8ef9ea160 100644 --- a/harbour/contrib/hbfimage/hbfimage.hbp +++ b/harbour/contrib/hbfimage/hbfimage.hbp @@ -18,5 +18,7 @@ -cflag=-DHB_LEGACY_TYPES_OFF +-instfile=freeimag.ch + fi_winfu.c fi_wrp.c diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.hbp b/harbour/contrib/hbfoxpro/hbfoxpro.hbp index 82fdc355fa..15459d040f 100644 --- a/harbour/contrib/hbfoxpro/hbfoxpro.hbp +++ b/harbour/contrib/hbfoxpro/hbfoxpro.hbp @@ -9,4 +9,6 @@ -w3 -es2 +-instfile=hbfoxpro.ch + dll.prg diff --git a/harbour/contrib/hbgd/hbgd.hbp b/harbour/contrib/hbgd/hbgd.hbp index 73a78f4df0..8ef809a864 100644 --- a/harbour/contrib/hbgd/hbgd.hbp +++ b/harbour/contrib/hbgd/hbgd.hbp @@ -15,6 +15,9 @@ -depincpath=gd:/usr/include -depincpath=gd:/opt/local/include +-instfile=gd.ch +-instfile=gdextern.ch + gdwrp.c gd.prg diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbp b/harbour/contrib/hbhpdf/hbhpdf.hbp index 0052e8e4da..d60de903bc 100644 --- a/harbour/contrib/hbhpdf/hbhpdf.hbp +++ b/harbour/contrib/hbhpdf/hbhpdf.hbp @@ -15,4 +15,6 @@ -depincpath=libharu:/usr/local/include -depincpathlocal=libharu:../../external/libhpdf +-instfile=harupdf.ch + harupdf.c diff --git a/harbour/contrib/hbmysql/hbmysql.hbp b/harbour/contrib/hbmysql/hbmysql.hbp index 3d255ff6d5..2abe613acc 100644 --- a/harbour/contrib/hbmysql/hbmysql.hbp +++ b/harbour/contrib/hbmysql/hbmysql.hbp @@ -14,6 +14,8 @@ -depincpath=mysql:/usr/include/mysql -depincpath=mysql:/opt/local/include/mysql5/mysql +-instfile=mysql.ch + mysql.c mysqlold.c diff --git a/harbour/contrib/hbmzip/hbmzip.hbp b/harbour/contrib/hbmzip/hbmzip.hbp index 1fcae80305..2e0c34fa17 100644 --- a/harbour/contrib/hbmzip/hbmzip.hbp +++ b/harbour/contrib/hbmzip/hbmzip.hbp @@ -23,4 +23,6 @@ -depincpath=zlib:/boot/develop/headers/3rdparty -depincpathlocal=zlib:../../external/zlib +-instfile=hbmzip.ch + hbmzip.c diff --git a/harbour/contrib/hbnf/hbnf.hbp b/harbour/contrib/hbnf/hbnf.hbp index aca4ca42b5..0490fa17fd 100644 --- a/harbour/contrib/hbnf/hbnf.hbp +++ b/harbour/contrib/hbnf/hbnf.hbp @@ -9,6 +9,8 @@ -w3 -es2 +-instfile=ftmenuto.ch + alt.c caplock.c chdir.c diff --git a/harbour/contrib/hbodbc/hbodbc.hbp b/harbour/contrib/hbodbc/hbodbc.hbp index f480f1aeb2..2693daf754 100644 --- a/harbour/contrib/hbodbc/hbodbc.hbp +++ b/harbour/contrib/hbodbc/hbodbc.hbp @@ -17,6 +17,8 @@ -depincpath=odbc:/usr/include -depincpath=odbc:/usr/local/include +-instfile=sql.ch + odbc.c odbcold.c diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbp b/harbour/contrib/hbpgsql/hbpgsql.hbp index 13294f3b2b..068b65c0b8 100644 --- a/harbour/contrib/hbpgsql/hbpgsql.hbp +++ b/harbour/contrib/hbpgsql/hbpgsql.hbp @@ -20,6 +20,8 @@ -depincpath=pgsql:/opt/local/include/postgresql84 -depincpath=pgsql:/opt/local/include/postgresql83 +-instfile=postgres.ch + postgres.c tpostgre.prg diff --git a/harbour/contrib/hbqt/gtqtc/gtqtc.hbp b/harbour/contrib/hbqt/gtqtc/gtqtc.hbp index dcff88ed29..eb6a1d58c8 100644 --- a/harbour/contrib/hbqt/gtqtc/gtqtc.hbp +++ b/harbour/contrib/hbqt/gtqtc/gtqtc.hbp @@ -7,6 +7,7 @@ -o${hb_name} -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name} -gtqtc.cpp +-instfile=hbgtqtc.ch --pi=gtqtc.h +gtqtc.cpp +gtqtc.h diff --git a/harbour/contrib/hbqt/gtqtc/gtqtcs/Makefile b/harbour/contrib/hbqt/gtqtc/gtqtcs/Makefile index 7cce630045..c4c5321f89 100644 --- a/harbour/contrib/hbqt/gtqtc/gtqtcs/Makefile +++ b/harbour/contrib/hbqt/gtqtc/gtqtcs/Makefile @@ -18,9 +18,6 @@ MOC_HEADERS := \ CPP_SOURCES := \ gtqtc.cpp \ -PRG_HEADERS := \ - hbgtqtc.ch - include $(TOP)$(ROOT)contrib/hbqt/detect.mk ifneq ($(HB_HAS_QT),) @@ -28,6 +25,5 @@ ifneq ($(HB_HAS_QT),) HB_CFLAGS += -DQT_NODLL include $(TOP)$(ROOT)contrib/hbqt/moc.mk - include $(TOP)$(ROOT)config/header.mk include $(TOP)$(ROOT)config/lib.mk endif diff --git a/harbour/contrib/hbqt/hbqt.hbp b/harbour/contrib/hbqt/hbqt.hbp index 4392b05689..9646c908f5 100644 --- a/harbour/contrib/hbqt/hbqt.hbp +++ b/harbour/contrib/hbqt/hbqt.hbp @@ -7,6 +7,8 @@ hbqt_common.hbm -o${hb_name} -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name} +-instfile=hbqt.ch + hbqt_base.cpp hbqt_destruct.cpp hbqt_hbdbfmodel.cpp diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbp b/harbour/contrib/hbsqlit3/hbsqlit3.hbp index 2686f89d5d..470fda9e7f 100644 --- a/harbour/contrib/hbsqlit3/hbsqlit3.hbp +++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbp @@ -15,4 +15,6 @@ -depincpath=sqlite3:/boot/common/include -depincpathlocal=sqlite3:../../external/sqlite3 +-instfile=hbsqlit3.ch + hbsqlit3.c diff --git a/harbour/contrib/hbssl/hbssl.hbp b/harbour/contrib/hbssl/hbssl.hbp index f72c5e8553..cbbf829f55 100644 --- a/harbour/contrib/hbssl/hbssl.hbp +++ b/harbour/contrib/hbssl/hbssl.hbp @@ -29,6 +29,8 @@ # Patent will expire in 2010/2011 -cflag=-DOPENSSL_NO_IDEA +-instfile=hbssl.ch + hbssl.c bio.c err.c diff --git a/harbour/contrib/hbtip/hbtip.hbp b/harbour/contrib/hbtip/hbtip.hbp index 7555d9179d..189f9e2355 100644 --- a/harbour/contrib/hbtip/hbtip.hbp +++ b/harbour/contrib/hbtip/hbtip.hbp @@ -10,6 +10,9 @@ -w3 -es2 +-instfile=tip.ch +-instfile=thtml.ch + encb64c.c encurlc.c utils.c diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbp b/harbour/contrib/hbtpathy/hbtpathy.hbp index e28562160a..d20af3d84e 100644 --- a/harbour/contrib/hbtpathy/hbtpathy.hbp +++ b/harbour/contrib/hbtpathy/hbtpathy.hbp @@ -9,4 +9,6 @@ -w3 -es2 +-instfile=telepath.ch + telepath.prg diff --git a/harbour/contrib/hbwin/hbwin.hbp b/harbour/contrib/hbwin/hbwin.hbp index ae81cf883d..0464a77732 100644 --- a/harbour/contrib/hbwin/hbwin.hbp +++ b/harbour/contrib/hbwin/hbwin.hbp @@ -19,6 +19,11 @@ -depincpath=png:/opt/local/include -depincpathlocal=png:../../external/png +-instfile=hbwapi.h +-instfile=hbwin.h +-instfile=hbwinole.h +-instfile=hbwin.ch + axcore.c legacycd.c legacyco.c diff --git a/harbour/contrib/hbxbp/hbxbp.hbp b/harbour/contrib/hbxbp/hbxbp.hbp index f94d6ad94c..68b534156b 100644 --- a/harbour/contrib/hbxbp/hbxbp.hbp +++ b/harbour/contrib/hbxbp/hbxbp.hbp @@ -11,6 +11,11 @@ ../hbqt/hbqt.hbc +-instfile=appevent.ch +-instfile=gra.ch +-instfile=xbp.ch +-instfile=xbpdev.ch + hbpprocess.prg xbp3state.prg xbpappevent.prg diff --git a/harbour/contrib/hbxpp/hbxpp.hbp b/harbour/contrib/hbxpp/hbxpp.hbp index 81a79f1922..b26aab2fad 100644 --- a/harbour/contrib/hbxpp/hbxpp.hbp +++ b/harbour/contrib/hbxpp/hbxpp.hbp @@ -9,6 +9,12 @@ -w3 -es2 +-instfile=dll.ch +-instfile=dmlb.ch +-instfile=hbxpp.ch +-instfile=hbxppext.ch +-instfile=thread.ch + binnumx.c dbcmdx.c dbdetacx.c diff --git a/harbour/contrib/makefile.hbs b/harbour/contrib/makefile.hbs index 5722c79429..0cd6bffb1e 100644 --- a/harbour/contrib/makefile.hbs +++ b/harbour/contrib/makefile.hbs @@ -12,9 +12,10 @@ /* TODO: 1. error handling / reporting / feedback - 2. copy headers (or solve .hbc search path in universal way) - 3. add .dll generation for contrib libs - 4. avoid long cmdlines to make ms-dos hosts happy + 2. add .dll generation for contrib libs + 3. avoid long cmdlines to make ms-dos hosts happy + 4. solve the automatic in-dir make clean/install/rebuild + workflow */ /* #pragma warninglevel=3 */ diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp index 01d7f52692..90b601c919 100644 --- a/harbour/contrib/rddads/rddads.hbp +++ b/harbour/contrib/rddads/rddads.hbp @@ -16,6 +16,9 @@ -depincpath=ads:/usr/local/ads/acesdk -depincpath=ads:${HOME}/ads/acesdk +-instfile=ads.ch +-instfile=adsextrn.ch + ads1.c adsfunc.c adsmgmnt.c diff --git a/harbour/contrib/rddsql/rddsql.hbp b/harbour/contrib/rddsql/rddsql.hbp index b2c9f1df59..12ceec40b3 100644 --- a/harbour/contrib/rddsql/rddsql.hbp +++ b/harbour/contrib/rddsql/rddsql.hbp @@ -9,5 +9,7 @@ -w3 -es2 +-instfile=hbrddsql.ch + sqlbase.c sqlmix.c diff --git a/harbour/contrib/xhb/xhb.hbp b/harbour/contrib/xhb/xhb.hbp index c3c769954c..618210bcd6 100644 --- a/harbour/contrib/xhb/xhb.hbp +++ b/harbour/contrib/xhb/xhb.hbp @@ -9,6 +9,11 @@ -w3 -es2 +-instfile=hbcompat.h +-instfile=xhb.h +-instfile=hbcompat.ch +-instfile=xhb.ch + bkgtsks.c cstructc.c datesxhb.c diff --git a/harbour/examples/gfspell/gfspell.hbp b/harbour/examples/gfspell/gfspell.hbp index da956a1c98..1d964f1670 100644 --- a/harbour/examples/gfspell/gfspell.hbp +++ b/harbour/examples/gfspell/gfspell.hbp @@ -3,9 +3,13 @@ # -hblib --olib/${hb_plat}/${hb_comp}/gfspell -inc --q0 -w1 -es2 -l + +-o${hb_name} + +-w1 -es2 + +-instfile=spell.ch spell.prg spellc.c diff --git a/harbour/examples/gtwvw/gtwvw.hbp b/harbour/examples/gtwvw/gtwvw.hbp index 1fa68b1dc9..51f12f5372 100644 --- a/harbour/examples/gtwvw/gtwvw.hbp +++ b/harbour/examples/gtwvw/gtwvw.hbp @@ -3,9 +3,12 @@ # -hblib --olib/${hb_plat}/${hb_comp}/gtwvw -inc +-o${hb_name} + +-w3 -es2 + "-echo={!allwin|!x86}Skipped: Only supported on win x86 platform." -stop{!allwin|!x86} diff --git a/harbour/examples/hbapollo/hbapollo.hbp b/harbour/examples/hbapollo/hbapollo.hbp index 8fee77b415..03568d91f0 100644 --- a/harbour/examples/hbapollo/hbapollo.hbp +++ b/harbour/examples/hbapollo/hbapollo.hbp @@ -3,10 +3,21 @@ # -hblib --olib/${hb_plat}/${hb_comp}/hbapollo -inc --q0 -w3 -es2 -l --i${HB_WITH_APOLLO} + +-o${hb_name} + +-w3 -es2 + +{HB_WITH_APOLLO_VER61}-depkeyhead=apollo:Sde61.h +{!HB_WITH_APOLLO_VER61}-depkeyhead=apollo:Sde7.h +-depcontrol=apollo:${HB_WITH_APOLLO} +-depincpath=apollo:/usr/include +-depincpath=apollo:/boot/common/include + +{HB_WITH_APOLLO_VER61}-cflags=-DHB_WITH_APOLLO_VER61 + +-instfile=apollo.ch apollo.c apollo1.prg diff --git a/harbour/examples/hbbtree/hbbtree.hbp b/harbour/examples/hbbtree/hbbtree.hbp index fd3d3aafec..3c33253fd4 100644 --- a/harbour/examples/hbbtree/hbbtree.hbp +++ b/harbour/examples/hbbtree/hbbtree.hbp @@ -9,5 +9,8 @@ -w3 -es2 +-instfile=hb_btree.ch +-instfile=hb_btree.h + hb_btree.c tbtree.prg diff --git a/harbour/examples/hbdoc2/hbdoc2.hbp b/harbour/examples/hbdoc2/hbdoc2.hbp index 3ba966aa4e..ee076687cd 100644 --- a/harbour/examples/hbdoc2/hbdoc2.hbp +++ b/harbour/examples/hbdoc2/hbdoc2.hbp @@ -2,13 +2,11 @@ # $Id$ # --q0 --w3 --es2 +-w3 -es2 -nulrdd --gtstd +-gtcgi hbdoc2.prg gentpl.prg diff --git a/harbour/examples/hbextern/hbextern.hbp b/harbour/examples/hbextern/hbextern.hbp index be94c68e32..135ee10e40 100644 --- a/harbour/examples/hbextern/hbextern.hbp +++ b/harbour/examples/hbextern/hbextern.hbp @@ -2,9 +2,7 @@ # $Id$ # --q0 --w3 --es2 +-w3 -es2 -nulrdd diff --git a/harbour/examples/hbsqlit2/hbsqlit2.hbp b/harbour/examples/hbsqlit2/hbsqlit2.hbp index 46a5c972ff..2b141cf440 100644 --- a/harbour/examples/hbsqlit2/hbsqlit2.hbp +++ b/harbour/examples/hbsqlit2/hbsqlit2.hbp @@ -3,12 +3,20 @@ # -hblib --olib/${hb_plat}/${hb_comp}/hbsqlit2 -inc --q0 -w3 -es2 -l --i${HB_WITH_SQLITE2} + +-o${hb_name} + +-w3 -es2 "-echo={dos}This library doesn't build on DOS." -stop{dos} +-depkeyhead=sqlite2:sqlite.h +-depcontrol=sqlite2:${HB_WITH_SQLITE2} +-depincpath=sqlite2:/usr/include +-depincpath=sqlite2:/boot/common/include + +-instfile=hbsqlit2.ch + hbsqlit2.c diff --git a/harbour/examples/hbvpdf/hbvpdf.hbp b/harbour/examples/hbvpdf/hbvpdf.hbp index e677a233ba..1aff1b1d12 100644 --- a/harbour/examples/hbvpdf/hbvpdf.hbp +++ b/harbour/examples/hbvpdf/hbvpdf.hbp @@ -3,9 +3,14 @@ # -hblib --olib/${hb_plat}/${hb_comp}/hbvpdf -inc +-o${hb_name} + +-w3 -es2 + +-instfile=hbvpdf.ch + hbvpdf.prg hbvpdft.prg hbvpsup.prg diff --git a/harbour/examples/ps32/ps32.hbp b/harbour/examples/ps32/ps32.hbp index cedc8f24ba..39cecf1b4b 100644 --- a/harbour/examples/ps32/ps32.hbp +++ b/harbour/examples/ps32/ps32.hbp @@ -3,7 +3,14 @@ # -hblib --olib/${hb_plat}/${hb_comp}/ps32 -inc +-o${hb_name} + +-w2 -es2 + +hbxpp.hbc + +-instfile=pscript.ch + tpscript.prg diff --git a/harbour/examples/rddado/rddado.hbp b/harbour/examples/rddado/rddado.hbp index 7ffdcedaa8..ab71750a7c 100644 --- a/harbour/examples/rddado/rddado.hbp +++ b/harbour/examples/rddado/rddado.hbp @@ -3,11 +3,14 @@ # -hblib --olib/${hb_plat}/${hb_comp}/rddado -inc +-o${hb_name} + -w3 -es2 -stop{!win} +-instfile=adordd.ch + adordd.prg diff --git a/harbour/examples/superlib/superlib.hbp b/harbour/examples/superlib/superlib.hbp index f32b1d67ae..716e8220a6 100644 --- a/harbour/examples/superlib/superlib.hbp +++ b/harbour/examples/superlib/superlib.hbp @@ -3,9 +3,11 @@ # -hblib --olib/${hb_plat}/${hb_comp}/super -inc --q0 -w1 -es2 -l + +-o${hb_name} + +-w1 -es2 hbsuper.prg diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index 2787e77724..190c1e4849 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -999,8 +999,8 @@ msgstr "GUI/konzol alkalmaz #: hbmk2.prg:7959 #, c-format -msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." -msgstr "Számos .hbc opcióban és parancssori megfelelőikben (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,echo=) használhatók makrók: ${hb_root}, ${hb_self}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." +msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." +msgstr "Számos .hbc opcióban és parancssori megfelelőikben (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=) használhatók makrók: ${hb_root}, ${hb_self}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." #: hbmk2.prg:7941 #, c-format @@ -1009,5 +1009,5 @@ msgstr "c #: hbmk2.prg:7959 #, c-format -msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\\nLines starting with '#' char are ignored" -msgstr ".hbc opciók (külön sorokba írandók): libs=[], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erőforrás fordító kapcsolók], ldflags=[szerkesztő kapcsolók], libpaths=[útvonalak], sources=[forrás fájlok], incpaths=[útvonalak], inctrypaths=[útvonalak], instpaths=[útvonalak], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja" +msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\nLines starting with '#' char are ignored" +msgstr ".hbc opciók (külön sorokba írandók): libs=[], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erőforrás fordító kapcsolók], ldflags=[szerkesztő kapcsolók], libpaths=[útvonalak], sources=[forrás fájlok], incpaths=[útvonalak], instfiles=[fájlok], instpaths=[útvonalak], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index d3442397e8..04bf40196b 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -347,43 +347,44 @@ REQUEST hbmk_KEYW #define _HBMK_aICON 76 #define _HBMK_aIMPLIBSRC 77 #define _HBMK_aDEF 78 -#define _HBMK_hDEPTS 79 +#define _HBMK_aINSTFILE 79 +#define _HBMK_hDEPTS 80 -#define _HBMK_aPO 80 -#define _HBMK_cHBL 81 -#define _HBMK_cHBLDir 82 -#define _HBMK_aLNG 83 -#define _HBMK_cPO 84 +#define _HBMK_aPO 81 +#define _HBMK_cHBL 82 +#define _HBMK_cHBLDir 83 +#define _HBMK_aLNG 84 +#define _HBMK_cPO 85 -#define _HBMK_aPLUGIN 85 -#define _HBMK_hPLUGINHRB 86 -#define _HBMK_hPLUGINVars 87 -#define _HBMK_aPLUGINPars 88 -#define _HBMK_hPLUGINExt 89 +#define _HBMK_aPLUGIN 86 +#define _HBMK_hPLUGINHRB 87 +#define _HBMK_hPLUGINVars 88 +#define _HBMK_aPLUGINPars 89 +#define _HBMK_hPLUGINExt 90 -#define _HBMK_lDEBUGTIME 90 -#define _HBMK_lDEBUGINC 91 -#define _HBMK_lDEBUGSTUB 92 -#define _HBMK_lDEBUGI18N 93 -#define _HBMK_lDEBUGDEPD 94 +#define _HBMK_lDEBUGTIME 91 +#define _HBMK_lDEBUGINC 92 +#define _HBMK_lDEBUGSTUB 93 +#define _HBMK_lDEBUGI18N 94 +#define _HBMK_lDEBUGDEPD 95 -#define _HBMK_cCCPATH 95 -#define _HBMK_cCCPREFIX 96 -#define _HBMK_cCCPOSTFIX 97 -#define _HBMK_cCCEXT 98 +#define _HBMK_cCCPATH 96 +#define _HBMK_cCCPREFIX 97 +#define _HBMK_cCCPOSTFIX 98 +#define _HBMK_cCCEXT 99 -#define _HBMK_cWorkDir 99 -#define _HBMK_cWorkDirDynSub 100 -#define _HBMK_nCmd_Esc 101 -#define _HBMK_nScr_Esc 102 -#define _HBMK_nCmd_FNF 103 -#define _HBMK_nScr_FNF 104 -#define _HBMK_nErrorLevel 105 +#define _HBMK_cWorkDir 100 +#define _HBMK_cWorkDirDynSub 101 +#define _HBMK_nCmd_Esc 102 +#define _HBMK_nScr_Esc 103 +#define _HBMK_nCmd_FNF 104 +#define _HBMK_nScr_FNF 105 +#define _HBMK_nErrorLevel 106 -#define _HBMK_cPROGDIR 106 -#define _HBMK_cPROGNAME 107 +#define _HBMK_cPROGDIR 107 +#define _HBMK_cPROGNAME 108 -#define _HBMK_MAX_ 107 +#define _HBMK_MAX_ 108 #define _HBMK_DEP_CTRL_MARKER ".control." /* must be an invalid path */ @@ -1613,6 +1614,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) hbmk[ _HBMK_aICON ] := {} hbmk[ _HBMK_aIMPLIBSRC ] := {} hbmk[ _HBMK_aDEF ] := {} + hbmk[ _HBMK_aINSTFILE ] := {} l_aOBJA := {} hbmk[ _HBMK_cPROGDIR ] := NIL hbmk[ _HBMK_cPROGNAME ] := NIL @@ -1960,6 +1962,13 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) AAdd( hbmk[ _HBMK_aLIBPATH ], DirDelPathSep( PathProc( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] ) ) ) ENDIF + CASE Left( cParamL, Len( "-instfile=" ) ) == "-instfile=" + + cParam := PathSepToSelf( MacroProc( hbmk, SubStr( cParam, Len( "-instfile=" ) + 1 ), aParam[ _PAR_cFileName ] ) ) + FOR EACH cParam IN FN_Expand( PathProc( cParam, aParam[ _PAR_cFileName ] ), Empty( aParam[ _PAR_cFileName ] ) ) + AAdd( hbmk[ _HBMK_aINSTFILE ], cParam ) + NEXT + CASE Left( cParamL, Len( "-instpath=" ) ) == "-instpath=" .AND. ; Len( cParamL ) > Len( "-instpath=" ) @@ -5409,21 +5418,34 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) ENDIF IF ! Empty( hbmk[ _HBMK_aINSTPATH ] ) + + hb_AIns( hbmk[ _HBMK_aINSTFILE ], 1, FN_NameExtGet( hbmk[ _HBMK_cPROGNAME ] ), .T. ) + FOR EACH tmp IN hbmk[ _HBMK_aINSTPATH ] - IF Empty( FN_NameExtGet( tmp ) ) - tmp1 := DirAddPathSep( tmp ) + FN_NameExtGet( hbmk[ _HBMK_cPROGNAME ] ) - ELSE - tmp1 := tmp - ENDIF - IF DirBuild( FN_DirGet( tmp1 ) ) - IF hb_FCopy( hbmk[ _HBMK_cPROGNAME ], tmp1 ) == F_ERROR - hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Copying target to %1$s failed with %2$s." ), tmp1, hb_ntos( FError() ) ) ) - ELSEIF hbmk[ _HBMK_lInfo ] - hbmk_OutStd( hbmk, hb_StrFormat( I_( "Copied target to %1$s" ), tmp1 ) ) + FOR EACH tmp2 IN hbmk[ _HBMK_aINSTFILE ] + IF Empty( FN_NameExtGet( tmp ) ) + tmp1 := DirAddPathSep( tmp ) + tmp2 + ELSE + /* If destination is a full name, don't copy the extra files, only the target */ + IF tmp2:__enumIndex() > 1 + IF hbmk[ _HBMK_lInfo ] + hbmk_OutStd( hbmk, hb_StrFormat( I_( "Warning: Install path not a directory (%1$s). Extra install files not copied." ), tmp ) ) + ENDIF + EXIT + ELSE + tmp1 := tmp + ENDIF ENDIF - ELSE - hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot create install directory for target %1$s." ), tmp1 ) ) - ENDIF + IF DirBuild( FN_DirGet( tmp1 ) ) + IF hb_FCopy( tmp2, tmp1 ) == F_ERROR + hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Copying %1$s to %2$s failed with %3$s." ), tmp2, tmp1, hb_ntos( FError() ) ) ) + ELSEIF hbmk[ _HBMK_lInfo ] + hbmk_OutStd( hbmk, hb_StrFormat( I_( "Copied %1$s to %2$s" ), tmp2, tmp1 ) ) + ENDIF + ELSE + hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot create install directory for install target %1$s." ), tmp1 ) ) + ENDIF + NEXT NEXT ENDIF ENDIF @@ -6564,6 +6586,13 @@ FUNCTION hbmk2_AddInput_RC( ctx, cFileName ) ENDIF RETURN NIL +FUNCTION hbmk2_AddInput_INSTFILE( ctx, cFileName ) + LOCAL hbmk := ctx_to_hbmk( ctx ) + IF hbmk != NIL .AND. ISCHARACTER( cFileName ) + AAdd( hbmk[ _HBMK_aINSTFILE ], PathSepToSelf( cFileName ) ) + ENDIF + RETURN NIL + FUNCTION hbmk2_Register_Input_File_Extension( ctx, cExt ) LOCAL hbmk := ctx_to_hbmk( ctx ) IF hbmk != NIL .AND. ISCHARACTER( cExt ) @@ -7643,6 +7672,14 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel ) ENDIF NEXT + CASE Lower( Left( cLine, Len( "instfiles=" ) ) ) == "instfiles=" ; cLine := SubStr( cLine, Len( "instfiles=" ) + 1 ) + FOR EACH cItem IN hb_ATokens( cLine,, .T. ) + cItem := MacroProc( hbmk, StrStripQuote( cItem ), cFileName ) + IF ! Empty( cItem ) + AAddNew( hbmk[ _HBMK_aINSTFILE ], PathNormalize( PathProc( PathSepToSelf( cItem ), FN_DirGet( cFileName ) ) ) ) + ENDIF + NEXT + CASE Lower( Left( cLine, Len( "echo=" ) ) ) == "echo=" ; cLine := SubStr( cLine, Len( "echo=" ) + 1 ) cLine := MacroProc( hbmk, cLine, cFileName ) IF ! Empty( cLine ) @@ -9966,7 +10003,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-vcshead=" , I_( "generate .ch header file with local repository information. SVN, CVS, Git, Mercurial, Bazaar and Fossil are currently supported. Generated header will define macro _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" ) },; { "-tshead=" , I_( "generate .ch header file with timestamp information. Generated header will define macros _HBMK_BUILD_DATE_, _HBMK_BUILD_TIME_, _HBMK_BUILD_TIMESTAMP_ with the date/time of build" ) },; { "-icon=" , I_( "set as application icon. should be a supported format on the target platform" ) },; - { "-instpath=" , I_( "copy target to . if is a directory, it should end with path separator. can be specified multiple times" ) },; + { "-instfile=" , I_( "add to the list of files to be copied to path specified by -instpath option" ) },; + { "-instpath=" , I_( "copy target to . if is a directory, it should end with path separatorm, in this case files specified by -instfile option will also be copied. can be specified multiple times" ) },; { "-stop" , I_( "stop without doing anything" ) },; { "-echo=" , I_( "echo text on screen" ) },; { "-pause" , I_( "force waiting for a key on exit in case of failure (with alternate GTs only)" ) },; @@ -10054,9 +10092,9 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) I_( "Regular Harbour compiler options are also accepted.\n(see them with -harbourhelp option)" ),; hb_StrFormat( I_( "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, /etc/harbour, /etc are checked (in that order) before the hbmk2 directory." ), _HBMK_CFG_NAME ),; hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ),; - I_( ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instpaths=[paths], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\nLines starting with '#' char are ignored" ),; + I_( ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\nLines starting with '#' char are ignored" ),; I_( "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][|||]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allwin|allmsvc|allgcc|allmingw|allicc|allpocc|unix}, {x86|x86_64|ia64|arm|mips|sh}, {debug|nodebug|gui|std|mt|st|shared|static|unicode|ascii|xhb}" ),; - I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ),; + I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ),; I_( 'Options accepting macros also support command substitution. Enclose command inside ``, and, if the command contains space, also enclose in double quotes. F.e. "-cflag=`wx-config --cflags`", or ldflags={unix&gcc}"`wx-config --libs`".' ),; I_( "Defaults and feature support vary by platform/compiler." ) ,; hb_StrFormat( I_( "Options can also be specified in environment variable %1$s" ), _HBMK_ENV_NAME ) } diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po index 9e376bae4e..42a1f2d6b1 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -314,8 +314,8 @@ msgstr "Aten #: hbmk2.prg:7960 #, c-format -msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." -msgstr "Algumas opçőes do .hbc (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) e seus correspondentes parâmetros de linha-de-comando aceitam as seguintes macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= também aceitam %{hb_name} que se traduz como o nome do arquivo .hbc sob pesquisa." +msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." +msgstr "Algumas opçőes do .hbc (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=) e seus correspondentes parâmetros de linha-de-comando aceitam as seguintes macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= também aceitam %{hb_name} que se traduz como o nome do arquivo .hbc sob pesquisa." #: hbmk2.prg:4258 #, c-format @@ -515,9 +515,9 @@ msgstr "Op # #: hbmk2.prg:7960 #, c-format -msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\\nLines starting with '#' char are ignored" +msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\nLines starting with '#' char are ignored" msgstr "" -"As opçőes em um arquivo .hbc devem estar em linhas separadas e săo: libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\\n" +"As opçőes em um arquivo .hbc devem estar em linhas separadas e săo: libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], incpaths=[paths], instfiles=[files], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\\n" "Linhas iniciadas com '#' săo interpretadas como comentários e serăo ignoradas" #: hbmk2.prg:7942