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

2013-03-05 11:57 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + described internal/developer options in '-longhelp'

  * contrib/hbct/tempfile.prg
    ! TEMPFILE() to append a dirsep to <cDir> parameter, when missing
      Thanks to Tony Quick for the report and fix suggestion
      (not required after 2013-03-05 11:53 UTC+0100, but I'm
      committing anyway to document this requirement in source code, 
      and to make it work with low-level implementations that 
      don't do it)

  * contrib/hbnf/fttext.c
    * minor cleanup to last modifications

  * contrib/hbnf/video2.prg
  * extras/hbxlsxml/xlsxml.prg
    % use hb_default()

  * contrib/hbnf/wda.prg
    * minor
This commit is contained in:
Viktor Szakats
2013-03-05 10:58:10 +00:00
parent ec5d228d18
commit 6d7f1caa4d
7 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
harbour/ChangeLog.txt
View File

@@ -6,10 +6,32 @@
YYYY-MM-DD HH:MM UTC[-|+]hhmm Your Full Name (your_email address)
2013-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
See copyright/license at the end of the file.
Encoding: UTF-8 (No BOM) Notation (in 5th column):
Encoding: UTF-8 (No BOM) Notation (in 5th position):
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-03-05 11:57 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
+ described internal/developer options in '-longhelp'
* contrib/hbct/tempfile.prg
! TEMPFILE() to append a dirsep to <cDir> parameter, when missing
Thanks to Tony Quick for the report and fix suggestion
(not required after 2013-03-05 11:53 UTC+0100, but I'm
committing anyway to document this requirement in source code,
and to make it work with low-level implementations that
don't do it)
* contrib/hbnf/fttext.c
* minor cleanup to last modifications
* contrib/hbnf/video2.prg
* extras/hbxlsxml/xlsxml.prg
% use hb_default()
* contrib/hbnf/wda.prg
* minor
2013-03-05 11:53 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/src/rtl/fstemp.c
! fixed hb_fsCreateTempEx() to add dir separator if necessary

4
harbour/contrib/hbct/tempfile.prg
View File

@@ -57,6 +57,10 @@ FUNCTION TempFile( cDir, cExt, nAttr )
LOCAL cName
LOCAL fhnd
IF HB_ISSTRING( cDir )
cDir := hb_DirSepAdd( cDir )
ENDIF
IF HB_ISSTRING( cExt ) .AND. !( Left( cExt, 1 ) == "." )
cExt := "." + cExt
ENDIF

3
harbour/contrib/hbnf/fttext.c
View File

@@ -855,6 +855,9 @@ static HB_ISIZ _findeol( char * buf, HB_ISIZ buf_len, HB_ISIZ * eol_len )
}
}
if( eol_len )
*eol_len = 0;
return 0;
}

12
harbour/contrib/hbnf/video2.prg
View File

@@ -52,24 +52,18 @@
FUNCTION ft_CLS( nTop, nLeft, nBottom, nRight, nColor )
IF ! HB_ISNUMERIC( nColor )
nColor := 0
ENDIF
hb_default( @nColor, 0 )
RETURN hb_Scroll( nTop, nLeft, nBottom, nRight,,, nColor )
FUNCTION ft_VidStr( nRow, nCol, cString, nColor )
IF ! HB_ISNUMERIC( nColor )
nColor := 0
ENDIF
hb_default( @nColor, 0 )
RETURN hb_DispOutAt( nRow, nCol, cString, nColor )
FUNCTION ft_WrtChr( nRow, nCol, cChar, nColor )
IF ! HB_ISNUMERIC( nColor )
nColor := 0
ENDIF
hb_default( @nColor, 0 )
RETURN hb_DispOutAt( nRow, nCol, Left( cChar, 1 ), nColor )

3
harbour/contrib/hbnf/wda.prg
View File

@@ -26,5 +26,4 @@ FUNCTION ft_AddWkDy( dStart, nDys )
RETURN iif( nDc == 7, ;
( nDys - 1 ) % 5 + 7 * Int( ( nDys - 1 ) / 5 ) + 2, ;
( nDys + nDc - 2 ) % 5 + 7 * Int( ( nDys + nDc - 2 ) / 5 ) + 2 - nDc ;
)
( nDys + nDc - 2 ) % 5 + 7 * Int( ( nDys + nDc - 2 ) / 5 ) + 2 - nDc )

16
harbour/extras/hbxlsxml/xlsxml.prg
View File

@@ -113,21 +113,17 @@ METHOD ExcelWriterXML:new( fileName )
METHOD ExcelWriterXML:setOverwriteFile( overwrite )
IF HB_ISLOGICAL( overwrite )
::overwriteFile := overwrite
ELSE
::overwriteFile := .F.
ENDIF
hb_default( @overwrite, .F. )
::overwriteFile := overwrite
RETURN NIL
METHOD ExcelWriterXML:showErrorSheet( show )
IF HB_ISLOGICAL( show )
::lShowErrorSheet := show
ELSE
::lShowErrorSheet := .T.
ENDIF
hb_default( @show, .T. )
::lShowErrorSheet := show
RETURN NIL

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

@@ -15673,6 +15673,22 @@ STATIC PROCEDURE ShowHelp( hbmk, lMore, lLong )
{ "-build" , I_( "Harbour compiler build information" ) }, ;
{ "-version" , I_( "display version header only" ) } }
/* Internal option descriptions intentionally not marked as translatable */
LOCAL aHdr_Opt_Internal := { ;
"", ;
"Options below are internal/developer ones (compatibility not guaranteed):" }
/* Internal option descriptions intentionally not marked as translatable */
LOCAL aLst_Opt_Internal := { ;
NIL, ;
{ "-debugtime" , "measure time spent on the build" }, ;
{ "-debuginc" , "display internals of incremental build" }, ;
{ "-debugstub" , "display content of all internally generated source files" }, ;
{ "-debugi18n" , "display internals on translation file generation" }, ;
{ "-debugdepd" , "display internals of dependency detection" }, ;
{ "-debugpars" , "display all input parameters in processing order" }, ;
{ "-debugrte" , "generate a runtime error" } }
LOCAL aHdr_Opt_Self := { ;
"", ;
{ "", hb_StrFormat( I_( "You can sym-link/copy/rename %1$s to the following names to alter default mode of operation:" ), _SELF_NAME_ ) } }
@@ -16180,6 +16196,10 @@ STATIC PROCEDURE ShowHelp( hbmk, lMore, lLong )
AEval( aLst_Opt_Long, {| tmp | OutOpt( hbmk, tmp ) } )
AEval( aHdr_Opt_LongCmd, {| tmp | OutHdr( hbmk, tmp + _OUT_EOL ) } )
AEval( aLst_Opt_LongCmd, {| tmp | OutOpt( hbmk, tmp ) } )
IF lLong
AEval( aHdr_Opt_Internal, {| tmp | OutHdr( hbmk, tmp + _OUT_EOL ) } )
AEval( aLst_Opt_Internal, {| tmp | OutOpt( hbmk, tmp ) } )
ENDIF
AEval( aHdr_Opt_Self, {| tmp | OutOpt( hbmk, tmp, 0 ) } )
AEval( aLst_Opt_Self, {| tmp | OutOpt( hbmk, tmp ) } )
AEval( aHdr_File, {| tmp | OutHdr( hbmk, tmp + _OUT_EOL ) } )