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

2012-06-15 03:28 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! do not try to dynamically load hbwin for registry 
      functions, if the lib is already linked
    ! allow -hbreg and -hbunreg to be passed when it's 
      renamed to hbrun
This commit is contained in:
Viktor Szakats
2012-06-15 01:30:47 +00:00
parent f36a5dbd3c
commit 6d385827a5
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-06-15 03:28 UTC+0200 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
! do not try to dynamically load hbwin for registry
functions, if the lib is already linked
! allow -hbreg and -hbunreg to be passed when it's
renamed to hbrun
2012-06-15 03:17 UTC+0200 Viktor Szakats (harbour syenar.net)
* bin/3rdpatch.hb
* contrib/make.hb

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

@@ -583,10 +583,12 @@ PROCEDURE _APPMAIN( ... )
/* Expand wildcard project specs */
IF Right( Lower( hb_FNameName( hb_argv( 0 ) ) ), 5 ) == "hbrun" .OR. ;
Left( Lower( hb_FNameName( hb_argv( 0 ) ) ), 5 ) == "hbrun" .OR. ;
hb_PValue( 1 ) == "." .OR. ;
"|" + Lower( hb_FNameExt( hb_PValue( 1 ) ) ) + "|" $ "|.hb|.hrb|"
IF ( Right( Lower( hb_FNameName( hb_argv( 0 ) ) ), 5 ) == "hbrun" .OR. ;
Left( Lower( hb_FNameName( hb_argv( 0 ) ) ), 5 ) == "hbrun" .OR. ;
hb_PValue( 1 ) == "." .OR. ;
"|" + Lower( hb_FNameExt( hb_PValue( 1 ) ) ) + "|" $ "|.hb|.hrb|" ) .AND. ;
!( Left( hb_PValue( 1 ), 6 ) == "-hbreg" .OR. ;
Left( hb_PValue( 1 ), 8 ) == "-hbunreg" )
__hbshell( ... )
QUIT
ENDIF
@@ -13007,7 +13009,7 @@ DYNAMIC win_regWrite
DYNAMIC win_regDelete
STATIC FUNCTION __hbshell_win_reg_self( lRegister, lAllUser )
IF ! hbshell_ext_load( "hbwin" )
IF ! hb_IsFunction( "__HBEXTERN__HBWIN__" ) .AND. ! hbshell_ext_load( "hbwin" )
RETURN .F.
ENDIF
IF ! hb_IsFunction( "win_regWrite" ) .OR. ;