From fad87ef70be33eb679afa53a40d5fe9f13264eb2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 11 Feb 2013 00:47:50 +0000 Subject: [PATCH] 2013-02-11 01:47 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg ! typo in an internal macro name --- harbour/ChangeLog.txt | 4 ++++ harbour/utils/hbmk2/hbmk2.prg | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 899130967c..c2020647b4 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,10 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-02-11 01:47 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + ! typo in an internal macro name + 2013-02-11 01:45 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg + documented $*.hbm embedded .hbm include files diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 2c7d21185d..8217a87c85 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -10699,13 +10699,13 @@ STATIC FUNCTION hbmk_builtin_File_hb_pkg_install() /* interface for handling built-in files */ -#define _HBMK_BUILDIN_FILENAME_MARKER_ "$" +#define _HBMK_BUILTIN_FILENAME_MARKER_ "$" STATIC FUNCTION hbmk_builtin_List() STATIC s_hHBM_BuildIn := { ; - _HBMK_BUILDIN_FILENAME_MARKER_ + "hb_pkg_dynlib.hbm" => {|| hbmk_builtin_File_hb_pkg_dynlib() } , ; - _HBMK_BUILDIN_FILENAME_MARKER_ + "hb_pkg_install.hbm" => {|| hbmk_builtin_File_hb_pkg_install() } } + _HBMK_BUILTIN_FILENAME_MARKER_ + "hb_pkg_dynlib.hbm" => {|| hbmk_builtin_File_hb_pkg_dynlib() } , ; + _HBMK_BUILTIN_FILENAME_MARKER_ + "hb_pkg_install.hbm" => {|| hbmk_builtin_File_hb_pkg_install() } } RETURN s_hHBM_BuildIn @@ -10713,8 +10713,8 @@ STATIC FUNCTION hbmk_builtin_Is( cFileName ) cFileName := hb_FNameNameExt( cFileName ) - RETURN LEFTEQUAL( cFileName, _HBMK_BUILDIN_FILENAME_MARKER_ ) .AND. ; - Len( cFileName ) > Len( _HBMK_BUILDIN_FILENAME_MARKER_ ) + RETURN LEFTEQUAL( cFileName, _HBMK_BUILTIN_FILENAME_MARKER_ ) .AND. ; + Len( cFileName ) > Len( _HBMK_BUILTIN_FILENAME_MARKER_ ) STATIC FUNCTION hbmk_builtin_Exists( cFileName ) @@ -14955,8 +14955,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) { "*.ch" , I_( "if passed directly as a source file, it will be used as additional standard header" ) }, ; { _HBMK_AUTOHBC_NAME , hb_StrFormat( I_( "standard .hbc file that gets automatically processed, if present. Possible location(s) (in order of precedence): %1$s" ), ArrayToList( AutoConfPathList(), ", " ) ) }, ; { _HBMK_AUTOHBM_NAME , I_( "optional .hbm file residing in current working directory, which gets automatically processed before other options" ) }, ; - { _HBMK_BUILDIN_FILENAME_MARKER_ + "hb_pkg_dynlib.hbm" , hb_StrFormat( I_( "special .hbm file embedded inside %1$s. It manages the details of creating a dynamic library (in the style of Harbour contribs)." ), _SELF_NAME_ ) } , ; - { _HBMK_BUILDIN_FILENAME_MARKER_ + "hb_pkg_install.hbm", hb_StrFormat( I_( "special .hbm file embedded inside %1$s. It manages the details of installing targets and related package files to standard locations (in the style of Harbour contribs)." ), _SELF_NAME_ ) } } + { _HBMK_BUILTIN_FILENAME_MARKER_ + "hb_pkg_dynlib.hbm" , hb_StrFormat( I_( "special .hbm file embedded inside %1$s. It manages the details of creating a dynamic library (in the style of Harbour contribs)." ), _SELF_NAME_ ) } , ; + { _HBMK_BUILTIN_FILENAME_MARKER_ + "hb_pkg_install.hbm", hb_StrFormat( I_( "special .hbm file embedded inside %1$s. It manages the details of installing targets and related package files to standard locations (in the style of Harbour contribs)." ), _SELF_NAME_ ) } } LOCAL aText_Macros := { ; "", ;