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

2012-11-22 16:55 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + added support for .hbc autofind in contrib and addons 
      dir, even if the .hbc names isn't the same as the 
      contrib name. This can be used to autofind secondary 
      supplementary or alternative .hbc files automatically 
      on all platforms.

  * contrib/hbwin/tests/olesrv1.hbp
  * contrib/hbwin/tests/olesrv2.hbp
  * contrib/hbwin/tests/olesrv3.hbp
  * contrib/hbwin/tests/olesrv4.hbp
    % deleted relative paths from .hbc references to 
      supplementary .hbc file. They will now be autofound.
This commit is contained in:
Viktor Szakats
2012-11-22 15:57:32 +00:00
parent 79613d440a
commit 43399132a7
6 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -10,6 +10,21 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-11-22 16:55 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
+ added support for .hbc autofind in contrib and addons
dir, even if the .hbc names isn't the same as the
contrib name. This can be used to autofind secondary
supplementary or alternative .hbc files automatically
on all platforms.
* contrib/hbwin/tests/olesrv1.hbp
* contrib/hbwin/tests/olesrv2.hbp
* contrib/hbwin/tests/olesrv3.hbp
* contrib/hbwin/tests/olesrv4.hbp
% deleted relative paths from .hbc references to
supplementary .hbc file. They will now be autofound.
2012-11-22 16:34 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbwin/tests/olesrv1.hbp
* contrib/hbwin/tests/olesrv2.hbp

2
harbour/contrib/hbwin/tests/olesrv1.hbp
View File

@@ -4,7 +4,7 @@
-hbdynvm
../hbolesrv.hbc
hbolesrv.hbc
olesrv1.prg

2
harbour/contrib/hbwin/tests/olesrv2.hbp
View File

@@ -4,6 +4,6 @@
-hbdynvm
../hbolesrv.hbc
hbolesrv.hbc
olesrv2.prg

2
harbour/contrib/hbwin/tests/olesrv3.hbp
View File

@@ -4,6 +4,6 @@
-hbdynvm
../hbolesrv.hbc
hbolesrv.hbc
olesrv3.prg

2
harbour/contrib/hbwin/tests/olesrv4.hbp
View File

@@ -4,6 +4,6 @@
-hbdynvm
../hbolesrv.hbc
hbolesrv.hbc
olesrv4.prg

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

@@ -9718,6 +9718,10 @@ STATIC FUNCTION HBC_Find( hbmk, cFile, nNesting )
LOCAL cLibPath
LOCAL lFound
LOCAL cDir
LOCAL aFile
LOCAL tmp
hb_default( @nNesting, 1 )
lFound := .F.
@@ -9731,6 +9735,25 @@ STATIC FUNCTION HBC_Find( hbmk, cFile, nNesting )
EXIT
ENDIF
NEXT
IF ! lFound
FOR EACH cDir IN { ;
hbmk[ _HBMK_cHB_INSTALL_CON ], ;
hbmk[ _HBMK_cHB_INSTALL_ADD ] }
FOR EACH aFile IN Directory( hb_DirSepAdd( cDir ), "D" )
IF hb_FileExists( tmp := hb_DirSepAdd( cDir ) + aFile[ F_NAME ] + hb_ps() + hb_FNameNameExt( cFile ) )
cFile := tmp
lFound := .T.
EXIT
ENDIF
NEXT
IF lFound
EXIT
ENDIF
NEXT
ENDIF
ENDIF
IF lFound