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

2012-05-04 20:07 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! fixed RTE when logging sign command
    ! fixed `` operator to strip CRs and convert LFs to space
      in stdout output.

  * src/rdd/dbcmd.c
    ! clarified DBCREATE() 4th parameter in comment
This commit is contained in:
Viktor Szakats
2012-05-04 18:09:22 +00:00
parent f5390e31ff
commit ddd8ef46bc
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -16,6 +16,15 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-05-04 20:07 UTC+0200 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
! fixed RTE when logging sign command
! fixed `` operator to strip CRs and convert LFs to space
in stdout output.
* src/rdd/dbcmd.c
! clarified DBCREATE() 4th parameter in comment
2012-05-04 12:57 UTC+0200 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
* .hb? input make files are now considered with UTF8 encoding.

3
harbour/src/rdd/dbcmd.c
View File

@@ -342,7 +342,8 @@ HB_FUNC( DBCREATE )
/*
* NOTE: 4-th, 5-th and 6-th parameters are undocumented Clipper ones
* 4-th is boolean flag indicating if file should stay open
* 4-th is boolean flag indicating if file should stay open (any boolean
* value will enable this behavior)
* 5-th is alias - if not given then WA is open without alias
* 6-th is optional DELIMITED value used by some RDDs like DELIM
*/

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

@@ -6826,19 +6826,19 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
cOpt_Sign := AllTrim( cOpt_Sign )
cCommand := cBin_Sign + " " + AllTrim( StrTran( cOpt_Sign, "{PW}", cOpt_SignPass ) )
tmp := cBin_Sign + " " + AllTrim( StrTran( cOpt_Sign, "{PW}", iif( Empty( cOpt_SignPass ), "", "****" ) ) )
tmp1 := cBin_Sign + " " + AllTrim( StrTran( cOpt_Sign, "{PW}", iif( Empty( cOpt_SignPass ), "", "***" ) ) )
IF hbmk[ _HBMK_lTRACE ]
IF ! hbmk[ _HBMK_lQuiet ]
hbmk_OutStd( hbmk, I_( "Code sign command:" ) )
ENDIF
OutStd( tmp + _OUT_EOL )
OutStd( tmp1 + _OUT_EOL )
ENDIF
IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand ) ) != 0
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Running code sign command. %1$s:" ), hb_ntos( tmp ) ) )
IF ! hbmk[ _HBMK_lQuiet ]
OutStd( tmp + _OUT_EOL )
OutStd( tmp1 + _OUT_EOL )
ENDIF
ENDIF
ENDIF
@@ -10217,6 +10217,7 @@ STATIC FUNCTION MacroProc( hbmk, cString, cFileName, cMacroPrefix )
cStdOut := ""
IF ! Empty( cMacro )
hb_processRun( cMacro,, @cStdOut )
cStdOut := StrTran( StrTran( cStdOut, Chr( 13 ) ), Chr( 10 ), " " )
ENDIF
cString := Left( cString, nStart - 1 ) + cStdOut + SubStr( cString, nEnd + Len( _CMDSUBST_CLOSE ) )
ENDDO
@@ -10225,6 +10226,19 @@ STATIC FUNCTION MacroProc( hbmk, cString, cFileName, cMacroPrefix )
STATIC FUNCTION MacroGet( hbmk, cMacro, cFileName )
#if 0
/* Support for: ${@<filename>} to include on-disk file content of <filename>
${@@<envvar>} to include on-disk file content referenced
from filename contained in <envvar> */
IF Left( cMacro, 1 ) == "@"
cMacro := SubStr( cMacro, 2 )
IF Left( cMacro, 1 ) == "@"
cMacro := GetEnv( SubStr( cMacro, 2 ) )
ENDIF
RETURN StrTran( StrTran( hb_MemoRead( cMacro ), Chr( 13 ) ), Chr( 10 ), " " )
ENDIF
#endif
SWITCH Upper( cMacro )
CASE "HB_ROOT"
cMacro := hb_DirSepAdd( hb_DirBase() ) ; EXIT