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

2009-07-03 21:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* make_gnu.bat
    - Deleted pocc64 autodetection. With newer versions this wouldn't
      work just mask normal pocc autodetection.

  * contrib/xhb/hboutdbg.c
    % Cast.

  * utils/hbmk2/hbmk2.prg
    + Added support for `<command-creating-stdout>` type of macro
      in all options where regular macros are accepted.
      It's now possible to use this in an .hbp file:
         -cflag={unix&gcc}"`wx-config --cflags`"
This commit is contained in:
Viktor Szakats
2009-07-03 19:11:55 +00:00
parent 36a9aff8ff
commit 07bd2875b6
4 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -17,6 +17,20 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-03 21:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* make_gnu.bat
- Deleted pocc64 autodetection. With newer versions this wouldn't
work just mask normal pocc autodetection.
* contrib/xhb/hboutdbg.c
% Cast.
* utils/hbmk2/hbmk2.prg
+ Added support for `<command-creating-stdout>` type of macro
in all options where regular macros are accepted.
It's now possible to use this in an .hbp file:
-cflag={unix&gcc}"`wx-config --cflags`"
2009-07-03 18:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/fscopy.c
* source/rtl/copyfile.c

2
harbour/contrib/xhb/hboutdbg.c
View File

@@ -105,7 +105,7 @@ static void debugInit( void )
if( iFifoResult == 0 || iFifoResult == EEXIST )
{
if( strlen( pFileName->szName ) > 20 )
( ( char * ) pFileName->szName )[ 20 ] = 0;
pFileName->szName[ 20 ] = '\0';
hb_snprintf( szDebugTitle, sizeof( szDebugTitle ), "%s - Debug", pFileName->szName );

1
harbour/make_gnu.bat
View File

@@ -59,7 +59,6 @@ if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp
call :COMP_DET_ONE icl.exe icc win
call :COMP_DET_ONE cl.exe msvc win
call :COMP_DET_ONE bcc32.exe bcc win
call :COMP_DET_ONE porc64.exe pocc64 win
call :COMP_DET_ONE pocc.exe pocc win
call :COMP_DET_ONE xcc.exe xcc win
call :COMP_DET_ONE x86_64-w64-mingw32-gcc.exe mingw64 win x86_64-w64-mingw32-

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

@@ -412,19 +412,43 @@ PROCEDURE Main( ... )
#endif
STATIC FUNCTION hbmk_run( cCmd )
STATIC FUNCTION hbmk_run( cCmd, cStdOut )
#if defined( __PLATFORM__DOS )
RETURN hb_run( cCmd )
#else
LOCAL h := hb_ProcessOpen( cCmd )
LOCAL hStdOut
LOCAL h
LOCAL result
IF PCount() >= 2
h := hb_ProcessOpen( cCmd,, @hStdOut )
ELSE
h := hb_ProcessOpen( cCmd )
ENDIF
IF h != F_ERROR
IF PCount() >= 2
cStdOut := hbmk_ReadHnd( hStdOut )
ENDIF
result := hb_ProcessValue( h )
hb_ProcessClose( h, .T. )
IF PCount() >= 2
FClose( hStdOut )
ENDIF
ELSE
result := -1
ENDIF
RETURN result
STATIC FUNCTION hbmk_ReadHnd( hFile )
LOCAL cBuffer := Space( 4096 )
LOCAL cString := ""
LOCAL nLen
DO WHILE ( nLen := FRead( hFile, @cBuffer, Len( cBuffer ) ) ) > 0
cString += Left( cBuffer, nLen )
ENDDO
RETURN cString
#endif
STATIC PROCEDURE hbmk_COMP_Setup( cARCH, cCOMP, cBasePath )
@@ -5537,6 +5561,8 @@ STATIC FUNCTION MacroProc( hbmk, cString, cFileName, lLateMode )
LOCAL cStart
LOCAL cStdOut
IF lLateMode == NIL .OR. ! lLateMode
cStart := _MACRO_NORM_PREFIX + _MACRO_OPEN
ELSE
@@ -5544,9 +5570,9 @@ STATIC FUNCTION MacroProc( hbmk, cString, cFileName, lLateMode )
ENDIF
DO WHILE ( nStart := At( cStart, cString ) ) > 0 .AND. ;
( nEnd := hb_At( _MACRO_CLOSE, cString, nStart ) ) > 0
( nEnd := hb_At( _MACRO_CLOSE, cString, nStart + 1 ) ) > 0
cMacro := Upper( SubStr( cString, nStart + 2, nEnd - nStart - 2 ) )
cMacro := Upper( SubStr( cString, nStart + Len( cStart ), nEnd - nStart - ( ( Len( cStart ) + Len( _MACRO_CLOSE ) - 1 ) ) ) )
SWITCH cMacro
CASE "HB_ROOT"
@@ -5597,6 +5623,14 @@ STATIC FUNCTION MacroProc( hbmk, cString, cFileName, lLateMode )
cString := Left( cString, nStart - 1 ) + cMacro + SubStr( cString, nEnd + 1 )
ENDDO
DO WHILE ( nStart := At( "`", cString ) ) > 0 .AND. ;
( nEnd := hb_At( "`", cString, nStart + 1 ) ) > 0
cMacro := SubStr( cString, nStart + Len( "`" ), nEnd - nStart - ( Len( "`" ) + Len( "`" ) - 1 ) )
cStdOut := ""
hbmk_run( cMacro, @cStdOut )
cString := Left( cString, nStart - 1 ) + cStdOut + SubStr( cString, nEnd + 1 )
ENDDO
RETURN cString
STATIC FUNCTION TimeElapsed( nStartSec, nEndSec )
@@ -6652,6 +6686,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
I_( ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], skip=[yes|no], echo=<text>\nLines starting with '#' char are ignored" ),;
I_( "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<arch>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}" ),;
I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_arch}, ${hb_comp}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ),;
I_( "Options accepting macros are also accepting embedded commanded enclosed inside `` chars: `wx-config --libs`." ),;
I_( "Defaults and feature support vary by architecture/compiler." ) }
DEFAULT lLong TO .F.