silly regression in 2013-02-17 12:43 UTC+0100 causing -icon= option to stop working. Thanks to Pritpal for reporting.

This commit is contained in:
Viktor Szakats
2013-03-19 00:15:47 +01:00
parent 1071ec391c
commit 13297d34e9
2 changed files with 15 additions and 7 deletions

View File

@@ -10,6 +10,12 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-03-19 00:13 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
! silly regression in 2013-02-17 12:43 UTC+0100 causing
-icon= option to stop working.
Thanks to Pritpal for reporting.
2013-03-18 23:46 UTC+0100 vszakats (harbour syenar.net)
* README.txt
+ documented Git 1.7 requirement

View File

@@ -3100,6 +3100,15 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
ENDIF
ENDIF
/* NOTE: Keep this before the "-i" check. */
CASE Left( cParamL, Len( "-icon=" ) ) == "-icon="
cParam := MacroProc( hbmk, SubStr( cParam, Len( "-icon=" ) + 1 ), aParam[ _PAR_cFileName ] )
IF ! Empty( cParam )
AAdd( hbmk[ _HBMK_aICON ], hb_PathNormalize( PathMakeAbsolute( hb_DirSepToOS( cParam ), aParam[ _PAR_cFileName ] ) ) )
ENDIF
/* NOTE: Keep this after the "-icon=" check. */
CASE Left( cParamL, 2 ) == "-i" .AND. ;
Len( cParamL ) > 2 .AND. !( cParamL == "-i-" )
@@ -3117,13 +3126,6 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
NEXT
ENDIF
CASE Left( cParamL, Len( "-icon=" ) ) == "-icon="
cParam := MacroProc( hbmk, SubStr( cParam, Len( "-icon=" ) + 1 ), aParam[ _PAR_cFileName ] )
IF ! Empty( cParam )
AAdd( hbmk[ _HBMK_aICON ], hb_PathNormalize( PathMakeAbsolute( hb_DirSepToOS( cParam ), aParam[ _PAR_cFileName ] ) ) )
ENDIF
CASE Left( cParamL, Len( "-manifest=" ) ) == "-manifest="
cParam := MacroProc( hbmk, SubStr( cParam, Len( "-manifest=" ) + 1 ), aParam[ _PAR_cFileName ] )