fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2013-02-05 12:53 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbtest/hbtest.prg
    + will now recognize -help and --help options to
      display help

  - utils/hbmk2/hbmk2.1
  - utils/hbtest/hbtest.1
  * config/postinst.hb
    - deleted platform specific "man"-files, which were
      either outdated (hbmk2) or the exact same as regular
      help output (hbtest). They are also extremely
      inconvenient to edit with regular text editors, plus
      keeping two similar docs in sync is very inefficient
      so pbly it's better idea to create .md output from
      the tools themselves and convert those to man
      format using an automated tool like md2man.rb.

  * utils/hbmk2/hbmk2.es_PE.po
  * utils/hbmk2/hbmk2.hu_HU.po
  * utils/hbmk2/hbmk2.pt_BR.po
    * updated one string in sync with hbmk2.prg

  * utils/hbmk2/hbmk2.prg
    * update in a comment
This commit is contained in:
Viktor Szakats
2013-02-05 11:54:30 +00:00
parent 3f1c43d8bf
commit 0c8195cf3e
9 changed files with 36 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
harbour/ChangeLog.txt
View File

@@ -10,6 +10,31 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-02-05 12:53 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbtest/hbtest.prg
+ will now recognize -help and --help options to
display help
- utils/hbmk2/hbmk2.1
- utils/hbtest/hbtest.1
* config/postinst.hb
- deleted platform specific "man"-files, which were
either outdated (hbmk2) or the exact same as regular
help output (hbtest). They are also extremely
inconvenient to edit with regular text editors, plus
keeping two similar docs in sync is very inefficient
so pbly it's better idea to create .md output from
the tools themselves and convert those to man
format using an automated tool like md2man.rb.
* utils/hbmk2/hbmk2.es_PE.po
* utils/hbmk2/hbmk2.hu_HU.po
* utils/hbmk2/hbmk2.pt_BR.po
* updated one string in sync with hbmk2.prg
* utils/hbmk2/hbmk2.prg
* update in a comment
2013-02-05 12:38 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
+ help text added for envvars, disk files and macros

2
harbour/config/postinst.hb
View File

@@ -126,8 +126,6 @@ PROCEDURE Main( ... )
FOR EACH tmp IN { ;
"src/main/harbour.1", ;
"src/pp/hbpp.1", ;
"utils/hbmk2/hbmk2.1", ;
"utils/hbtest/hbtest.1", ;
"contrib/hbrun/hbrun.1" }
mk_hb_FCopy( tmp, GetEnvC( "HB_INSTALL_MAN" ) + hb_ps() + "man1" + hb_ps(), .T. )
NEXT

157
harbour/utils/hbmk2/hbmk2.1
View File

@@ -1,157 +0,0 @@
.TH HBMK2 1
.SH NAME
hbmk2 \- Harbour Make
.SH SYNOPSIS
\fBhbmk2\fP \fB[options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res]>\fP
.SH DESCRIPTION
\fBhbmk2\fP is the Harbour make utility.
It's a wrapper to the Harbour compiler, a C compiler and linker.
.SH OPTIONS
.IP "\fB-help\fP" 10
Display full help
.IP "\fB-o<outname>\fP" 10
output file name
.IP "\fB-l<libname>\fP" 10
link with <libname> library
.IP "\fB-L<libpath>\fP" 10
additional path to search for libraries
.IP "\fB-static|-shared\fP" 10
link with static/shared libs
.IP "\fB-mt|-st\fP" 10
link with multi-thread/single-thread VM
.IP "\fB-gt<name>\fP" 10
link with GT<name> GT driver, can be repeated to link
with more GTs. First one will be the default at runtime
.IP "\fB-gui|-std\fP" 10
create GUI/console executable
.IP "\fB-main=<mainfunc>\fP" 10
override the name of starting function/procedure.
.IP "\fB-fullstatic\fP" 10
link with all static libs
.IP "\fB-nulrdd[-]\fP" 10
link with nulrdd
.IP "\fB-bldf[-]\fP" 10
inherit all/no (default) flags from Harbour build
.IP "\fB-bldf=[p][c][l]\fP" 10
inherit .prg/.c/linker flags (or none) from Harbour build
.IP "\fB-debug[-]\fP" 10
add/exclude debug info
.IP "\fB-map[-]\fP" 10
create (or not) a map file
.IP "\fB-strip[-]\fP" 10
strip (no strip) binaries
.IP "\fB-trace[-]\fP" 10
show commands executed
.IP "\fB-run[-]\fP" 10
run/don't run the created executable
.IP "\fB-hbcc, -hbcmp\fP" 10
stop after creating the object files
create link/copy hbmk2 to hbcc/hbcmp for the same effect
.IP "\fB-hblnk\fP" 10
act as linker. Currently this is the same as -q
.IP "\fB-plat=<plat>\fP" 10
assume specific platform. Same as HB_PLATFORM envvar
.IP "\fB-comp=<comp>\fP" 10
use specific compiler. Same as HB_COMPILER envvar
Special value:
- bld: use original build settings (default on *nix)
.IP "\fB-info\fP" 10
turn on informational messages
.IP "\fB-quiet\fP" 10
suppress all screen messages
<script> can be <@script> (.hbm file), <script.hbm> or <script.hbc>.
Regular Harbour compiler options are also accepted.
Multiple -l, -L and <script> parameters are accepted.
hbmk.hbc option file in hbmk2 directory is always processed if it exists.
On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour,
<base>/etc are checked (in that order) before the hbmk2 directory.
.hbc option files in current dir are automatically processed.
.hbc options (they should come in separate lines):
libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags]
cflags=[C compiler flags], ldflags=[Linker flags], libpaths=[lib paths]
gui|mt|shared|nulrdd|debug|map|strip|run=[yes|no]
Lines starting with '#' char are ignored
Platform filters are accepted in each .hbc line and with -l options.
Filter format: {[!][<plat|comp>]}. Filters can be combined
using '&', '|' operators and grouped by parentheses.
Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}
Defaults and feature support vary by platform/compiler.
Supported <comp> values for each supported <plat> value:
linux: gcc, gpp, watcom, icc
darwin: gcc
win: mingw, msvc, bcc, watcom, icc, pocc, cygwin, msvc64, msvcia64, pocc64
wce: mingwarm, msvcarm, poccarm
os2: gcc, watcom
dos: djgpp, watcom
bsd, hpux, sunos: gcc
.SH FILES
hbmk.hbc
hbmk.hbm
hb_extension / hb_ext.ini
.SH ENVIRONMENT
.IP "\fBHBMK_OPTIONS\fP" 10
.IP "\fBHB_CCPATH\fP" 10
.IP "\fBHB_CCPREFIX\fP" 10
.IP "\fBHB_CCPOSTFIX\fP" 10
.IP "\fBHB_PLATFORM\fP" 10
.IP "\fBHB_COMPILER\fP" 10
.IP "\fBHB_COMPILER_VER\fP" 10
.IP "\fBHB_CPU\fP" 10
.IP "\fBHB_BUILD_NAME\fP" 10
.IP "\fBHB_INSTALL_PREFIX\fP" 10
.IP "\fBHB_INSTALL_ADDONS\fP" 10
.IP "\fBHB_USER_LIBS\fP" 10
.IP "\fBHB_USER_LIBPATHS\fP" 10
.IP "\fBHB_USER_PRGFLAGS\fP" 10
.IP "\fBHB_USER_RESFLAGS\fP" 10
.IP "\fBHB_USER_CFLAGS\fP" 10
.IP "\fBHB_USER_LDFLAGS\fP" 10
.IP "\fBHB_USER_DFLAGS\fP" 10
.IP "\fBHB_USER_AFLAGS\fP" 10
.IP "\fBHB_EXTENSION\fP" 10
.IP "\fBHB_LANG\fP" 10
.SH AUTHOR
Viktor Szakats, The Harbour Project (http://harbour-project.org)

2
harbour/utils/hbmk2/hbmk2.es_PE.po
View File

@@ -473,7 +473,7 @@ msgstr "las opciones regulares de compilador Harbour también son aceptadas.\\n(
#: hbmk2.prg:7960 hbmk2.prg:13120
#, c-format
msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\\nLines starting with '#' char are ignored"
msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\\nLines starting with '#' character are ignored"
msgstr "Opciones de .hbc (que debe estar en líneas separadas): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\nLas líneas que empiezan con en carácter '#' son ignoradas"
#: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102

2
harbour/utils/hbmk2/hbmk2.hu_HU.po
View File

@@ -994,7 +994,7 @@ msgstr "cél futtatása"
#: hbmk2.prg:7959 hbmk2.prg:13120
#, c-format
msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\\nLines starting with '#' char are ignored"
msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\\nLines starting with '#' character are ignored"
msgstr ".hbc opciók (külön sorokba írandók): libs=[<libnevek>], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[<libnevek>], frameworks=[<framework-ök>], 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], headers=[Harbour fejléc fájlok], incpaths=[útvonalak], instfiles=[fájlok], instpaths=[útvonalak], autohbcs=[<.ch>:<.hbc>], plugins=[plugin-ek], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<ok>, stop=<ok>, echo=<szöveg>\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja"
#: hbmk2.prg:11633 hbmk2.prg:13102

2
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -75,6 +75,8 @@
gem install md2man
Convert with:
md2man hbmk2.md > hbmk2.1
(hbmk2.md should come out from hbmk2 executable as output,
so the help doesn't have to be updated in two disctinct places)
Man page HOWTO:
http://www.schweikhardt.net/man_page_howto.html

2
harbour/utils/hbmk2/hbmk2.pt_BR.po
View File

@@ -473,7 +473,7 @@ msgstr "Opções usadas com o compilador Harbour também são aceitas."
#: hbmk2.prg:7960 hbmk2.prg:13120
#, c-format
msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\\nLines starting with '#' char are ignored"
msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\\nLines starting with '#' character are ignored"
msgstr "As opções em um arquivo .hbc devem estar em linhas separadas e são: libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], 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], headers=[Harbour header files], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=[yes|no], echo=<text>\\nLinhas iniciadas com '#' são interpretadas como comentários e serão ignoradas"
#: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102

26
harbour/utils/hbtest/hbtest.1
View File

@@ -1,26 +0,0 @@
.TH HBTEST 1
.SH NAME
hbtest \- Harbour Regression Test Suite
.SH SYNOPSIS
\fBhbtest\fP \fB[options]\fP
.SH DESCRIPTION
\fBhbtest\fP is the Harbour regression test suite.
.SH OPTIONS
.IP "\fB-h, -?\fP" 10
Display help
.IP "\fB-all\fP" 10
Display all tests, not only the failures
.IP "\fB-skip:<list>\fP" 10
Skip the listed test numbers
.SH AUTHOR
Author of hbtest: The Harbour team (http://harbour-project.org)
This manual page was written by Luis Mayoral <mayoral@linuxadicto.org>,
for the Debian GNU/Linux system (but may be used by others).

10
harbour/utils/hbtest/hbtest.prg
View File

@@ -118,10 +118,12 @@ PROCEDURE Main( cPar1, cPar2 )
cPar2 := ""
ENDIF
IF "/?" $ Upper( cPar1 ) .OR. ;
"/H" $ Upper( cPar1 ) .OR. ;
"-?" $ Upper( cPar1 ) .OR. ;
"-H" $ Upper( cPar1 )
IF "/?" $ Lower( cPar1 ) .OR. ;
"/h" $ Lower( cPar1 ) .OR. ;
"-?" $ Lower( cPar1 ) .OR. ;
"-h" $ Lower( cPar1 ) .OR. ;
"-help" $ Lower( cPar1 ) .OR. ;
"--help" $ Lower( cPar1 )
OutStd( hb_eol() +;
"Syntax: hbtest [options]" + hb_eol() +;