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

2010-05-29 18:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Shows version of detected packages.
This commit is contained in:
Viktor Szakats
2010-05-29 16:56:59 +00:00
parent a435f32b18
commit 8bc59ee688
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -17,6 +17,10 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-05-29 18:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Shows version of detected packages.
2010-05-29 18:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Beefed up and fixed -reqpkg feature:

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

@@ -5776,9 +5776,11 @@ STATIC FUNCTION pkg_try_detection( hbmk, cName )
LOCAL lFound := .F.
LOCAL cDefine
LOCAL tmp
LOCAL cNameFlavour
LOCAL cIncludeDir
LOCAL cVersion
FOR EACH cNameFlavour IN hb_ATokens( cName, "|" )
@@ -5787,12 +5789,21 @@ STATIC FUNCTION pkg_try_detection( hbmk, cName )
cNameFlavour := AllTrim( cNameFlavour )
cStdOut := ""
hb_processRun( "pkg-config --libs --cflags " + cNameFlavour,, @cStdOut, @cErrOut )
hb_processRun( "pkg-config --modversion --libs --cflags " + cNameFlavour,, @cStdOut, @cErrOut )
IF Empty( cStdOut )
hb_processRun( cNameFlavour + "-config --libs --cflags",, @cStdOut, @cErrOut )
hb_processRun( cNameFlavour + "-config --version --libs --cflags",, @cStdOut, @cErrOut )
ENDIF
IF ! Empty( cStdOut )
cStdOut := StrTran( cStdOut, Chr( 13 ) )
IF ( tmp := At( Chr( 10 ), cStdOut ) ) > 0
cVersion := Left( cStdOut, tmp - 1 )
cStdOut := SubStr( cStdOut, tmp + 1 )
ELSE
cVersion := ""
ENDIF
FOR EACH cItem IN hb_ATokens( cStdOut,, .T. )
IF ! Empty( cItem )
lFound := .T.
@@ -5822,7 +5833,7 @@ STATIC FUNCTION pkg_try_detection( hbmk, cName )
ENDIF
cDefine := "HBMK2_HAS_" + StrToDefine( cNameFlavour )
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Autodetected package '%1$s' at '%2$s', defining '%3$s'." ), cNameFlavour, cIncludeDir, cDefine ) )
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Autodetected package '%1$s' (%2$s) at '%3$s', defining '%4$s'." ), cNameFlavour, cVersion, cIncludeDir, cDefine ) )
ENDIF
AAdd( hbmk[ _HBMK_aOPTC ], "-D" + cDefine )
EXIT