From 1bf4ab84231e50e038b29340a161d17e306bcb89 Mon Sep 17 00:00:00 2001 From: vszakats Date: Sat, 16 Mar 2013 18:43:40 +0100 Subject: [PATCH] * minor correction to a help item * added note about accepted dirsep types --- ChangeLog.txt | 6 ++++++ utils/hbmk2/hbmk2.md | 3 ++- utils/hbmk2/hbmk2.prg | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 84fe9d7175..19a45b0ccb 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,12 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-16 18:42 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.md + * utils/hbmk2/hbmk2.prg + * minor correction to a help item + * added note about accepted dirsep types + 2013-03-16 18:28 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.md * utils/hbmk2/hbmk2.prg diff --git a/utils/hbmk2/hbmk2.md b/utils/hbmk2/hbmk2.md index 0ecb93348d..92050a7e81 100644 --- a/utils/hbmk2/hbmk2.md +++ b/utils/hbmk2/hbmk2.md @@ -215,7 +215,7 @@ You can sym\-link/copy/rename hbmk2 to the following names to alter default mode - **hbrun\*|\*hbrun** mode script runner / interactive shell - - **hbrund|hbrun\*d** mode script runner in debug mode / interactive shell + - **hbrund|hbrun\*d** mode script runner / interactive shell in debug mode - **harbour** mode \-hbraw \(emulate \-raw\- Harbour compiler\) - **clipper** mode \-hbcmp \(emulate Clipper compiler\) - **rtlink** mode \-rtlink \(emulate Clipper linker\) @@ -642,6 +642,7 @@ Notes: \(see them with \-harbourhelp option\) - 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\. - hbmk\.hbm make script in current directory is always processed if it exists\. + - Using forwards slashes is recommended in option values as directory separator, but backslashes are also equally accepted\. - Filters are accepted in each \.hbc line and most options\. Filters can be combined using '&' \(and\), '|' \(or\) operators, negated by '\!' operator and grouped by parentheses\. Ex\.: \{win\}, \{gcc\}, \{linux|darwin\}, \{win&\!pocc\}, \{\(win|linux\)&\!watcom\}, \{unix&mt&gui\}, \-cflag=\{win\}\-DMYDEF, \-stop\{dos\}, \-stop\{\!allwin\} - Most \.hbc lines \(libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=\) and corresponding command\-line parameters will accept macro variables\. libpaths= also accepts %\{hb\_name\} which translates to the name of the \.hbc file under search\. diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg index 366795fdbd..de653e3e56 100644 --- a/utils/hbmk2/hbmk2.prg +++ b/utils/hbmk2/hbmk2.prg @@ -15865,7 +15865,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lMore, lLong ) LOCAL aLst_Opt_Self := { ; NIL, ; { "hbrun*|*hbrun" , I_( "mode script runner / interactive shell" ) }, ; - { "hbrund|hbrun*d", I_( "mode script runner in debug mode / interactive shell" ) }, ; + { "hbrund|hbrun*d", I_( "mode script runner / interactive shell in debug mode" ) }, ; { "harbour" , I_( "mode -hbraw (emulate -raw- Harbour compiler)" ) }, ; { "clipper" , I_( "mode -hbcmp (emulate Clipper compiler)" ) }, ; { "rtlink" , I_( "mode -rtlink (emulate Clipper linker)" ) }, ; @@ -16252,6 +16252,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lMore, lLong ) _HBMK_AUTOHBC_NAME, _SELF_NAME_ ), ; hb_StrFormat( I_( "%1$s make script in current directory is always processed " + ; e"if it exists." ), _HBMK_AUTOHBM_NAME ), ; + I_( "Using forwards slashes is recommended in option values as directory separator, " + ; + e"but backslashes are also equally accepted." ), ; I_( e"Filters are accepted in each .hbc line and most options.\nFilters can " + ; e"be combined using '&' (and), '|' (or) operators, negated by '!' operator " + ; e"and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, " + ;