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

2009-02-18 18:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk/hbmk2.prg
    % Optimizations in FindInPath().
    ! Fixed handling dirs in PATH with embedded path separator
      in them.
    ! Possible fix for owatcom compilers by forcing link
      script instead of passing options on the command line.

  * utils/hbmk/examples/winapi.hbp
    ! Updated for BCC.
This commit is contained in:
Viktor Szakats
2009-02-18 18:01:41 +00:00
parent e9d081f82c
commit 6750dfb8c1
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -8,6 +8,17 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-18 18:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk/hbmk2.prg
% Optimizations in FindInPath().
! Fixed handling dirs in PATH with embedded path separator
in them.
! Possible fix for owatcom compilers by forcing link
script instead of passing options on the command line.
* utils/hbmk/examples/winapi.hbp
! Updated for BCC.
2009-02-18 16:45 UTC+0100 Maurilio Longo (maurilio.longo@libero.it)
* ChangeLog
* little correction to previous entry.

3
harbour/utils/hbmk/examples/winapi.hbp
View File

@@ -5,4 +5,5 @@
# Used by Harbour core
{win}libs=kernel32 user32 wsock32 advapi32 gdi32
# Others
{win}libs=winspool comctl32 comdlg32 shell32 ole32 oleaut32 uuid odbc32 odbccp32 mpr winmm
{win}libs=winspool comctl32 comdlg32 shell32 ole32 oleaut32 uuid odbc32 mpr winmm
{win&!bcc32}libs=odbccp32

19
harbour/utils/hbmk/hbmk2.prg
View File

@@ -60,6 +60,7 @@
/* TODO: Add support for more hbmk script features. */
/* TODO: Add support for Windows resource files. */
/* TODO: Add support for library creation. */
/* TODO: msvc/bcc32: Use separate link phase. This allows incremental links. */
/* TODO: Support for more compilers/platforms. */
REQUEST hbm_ARCH
@@ -752,7 +753,7 @@ FUNCTION Main( ... )
cBin_CompC := "wpp386"
cOpt_CompC := "-j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS {OPTC} {C}"
cBin_Link := "wlink"
cOpt_Link := "OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe {OPTL} NAME {E} {O} {L}"
cOpt_Link := "OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe {OPTL} NAME {E} {O} {L}{SCRIPT}"
IF s_lDEBUG
cOpt_Link := "DEBUG " + cOpt_Link
ENDIF
@@ -765,7 +766,7 @@ FUNCTION Main( ... )
cBin_CompC := "wpp386"
cOpt_CompC := "-j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT {OPTC} {C}"
cBin_Link := "wlink"
cOpt_Link := "OP osn=NT OP stack=65536 OP CASEEXACT {OPTL} NAME {E} {O} {L}"
cOpt_Link := "OP osn=NT OP stack=65536 OP CASEEXACT {OPTL} NAME {E} {O} {L}{SCRIPT}"
IF s_lDEBUG
cOpt_Link := "DEBUG " + cOpt_Link
ENDIF
@@ -808,7 +809,7 @@ FUNCTION Main( ... )
cBin_CompC := "wpp386"
cOpt_CompC := "-j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2 {OPTC} {C}"
cBin_Link := "wlink"
cOpt_Link := "OP stack=65536 OP CASEEXACT {OPTL} NAME {E} {O} {L}"
cOpt_Link := "OP stack=65536 OP CASEEXACT {OPTL} NAME {E} {O} {L}{SCRIPT}"
IF s_lDEBUG
cOpt_Link := "DEBUG " + cOpt_Link
ENDIF
@@ -1091,9 +1092,7 @@ FUNCTION Main( ... )
STATIC FUNCTION FindInPath( cFileName )
LOCAL cPATH
LOCAL nCount
LOCAL cDir
LOCAL tmp
IF hb_FileExists( cFileName )
RETURN .T.
@@ -1101,15 +1100,9 @@ STATIC FUNCTION FindInPath( cFileName )
cPATH := GetEnv( "PATH" )
IF ! Empty( cPATH )
nCount := hb_TokenCount( cPATH, hb_osPathListSeparator() )
FOR tmp := 1 TO nCount
cDir := hb_TokenGet( cPATH, tmp, hb_osPathListSeparator() )
FOR EACH cDir IN hb_ATokens( cPATH, hb_osPathListSeparator(), .T. )
IF ! Empty( cDir )
IF Left( cDir, 1 ) == Chr( 34 ) .AND. Right( cDir, 1 ) == Chr( 34 )
cDir := SubStr( cDir, 2, Len( cDir ) - 2 )
ENDIF
IF hb_FileExists( DirAddPathSep( cDir ) + cFileName )
IF hb_FileExists( DirAddPathSep( StrStripQuote( cDir ) ) + cFileName )
RETURN .T.
ENDIF
ENDIF