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

2013-03-14 18:36 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! fixed to not issue warning about missing sign tool
      if signing was not requested, plus, related optimization

  * bin/commit.hb
    ! fixed processing git output

  * contrib/hbct/getsecrt.prg
    ! GetSecret() fixed to turn on cursor while waiting

  * contrib/hbct/getsecrt.prg
  * contrib/hbct/getinput.prg
  * contrib/hbsqlit3/core.c
  * doc/en/rddmisc.txt
    ! formatting
This commit is contained in:
vszakats
2013-03-14 22:35:16 +01:00
parent a488097063
commit 161e99309f
7 changed files with 68 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog.txt
View File

@@ -10,6 +10,23 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-03-14 18:36 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
! fixed to not issue warning about missing sign tool
if signing was not requested, plus, related optimization
* bin/commit.hb
! fixed processing git output
* contrib/hbct/getsecrt.prg
! GetSecret() fixed to turn on cursor while waiting
* contrib/hbct/getsecrt.prg
* contrib/hbct/getinput.prg
* contrib/hbsqlit3/core.c
* doc/en/rddmisc.txt
! formatting
2013-03-14 20:10 UTC+0200 Pavel Tsarenko (tpe2 at mail.ru)
* contrib/hbct/screen2.c
* unicode support for SayMoveIn() and SaySpread() functions

4
harbour/bin/commit.hb
View File

@@ -159,6 +159,9 @@ STATIC FUNCTION DoctorChanges( cVCS, aChanges )
FOR EACH cLine IN aChanges
IF ! Empty( cLine ) .AND. SubStr( cLine, 3, 1 ) == " "
cStart := Left( cLine, 1 )
IF Empty( Left( cLine, 1 ) )
cStart := SubStr( cLine, 2, 1 )
ENDIF
SWITCH cStart
CASE " "
CASE "?"
@@ -189,7 +192,6 @@ STATIC FUNCTION DoctorChanges( cVCS, aChanges )
RETURN aNew
STATIC FUNCTION Shell()
LOCAL cShell

2
harbour/contrib/hbct/getinput.prg
View File

@@ -64,7 +64,7 @@ FUNCTION GetInput( xVar, nRow, nCol, lSay, xPrompt )
hb_default( @lSay, .F. )
SetPos( nRow, nCol )
IF xPrompt != Nil
IF xPrompt != NIL
DevOut( xPrompt )
nRow := Row()
nCol := Col() + 1

5
harbour/contrib/hbct/getsecrt.prg
View File

@@ -54,6 +54,7 @@
*/
#include "getexit.ch"
#include "setcurs.ch"
FUNCTION GetSecret( cVar, nRow, nCol, lSay, xPrompt )
@@ -68,7 +69,7 @@ FUNCTION GetSecret( cVar, nRow, nCol, lSay, xPrompt )
hb_default( @lSay, .F. )
SetPos( nRow, nCol )
IF xPrompt != Nil
IF xPrompt != NIL
DevOut( xPrompt )
nRow := Row()
nCol := Col() + 1
@@ -128,7 +129,9 @@ STATIC PROCEDURE _SECRET( _cGetSecret, lHide, oGet, oGetList )
ENDIF
DO WHILE oGet:exitState == GE_NOEXIT
SetCursor( iif( ReadStats( 17 /* SNSVCURSOR */ ) == SC_NONE, SC_NORMAL, ReadStats( 17 /* SNSVCURSOR */ ) ) )
nKey := Inkey( 0 )
SetCursor( SC_NONE )
IF ( bKeyBlock := SetKey( nKey ) ) != NIL
lHide := .F.
Eval( bKeyBlock, ;

2
harbour/contrib/hbsqlit3/core.c
View File

@@ -1840,7 +1840,7 @@ HB_FUNC( SQLITE3_BUFF_TO_FILE )
Causes any pending database operation to abort and return at its
earliest opportunity.
sqlite3_interrupt( db ) -> Nil
sqlite3_interrupt( db ) -> NIL
*/
HB_FUNC( SQLITE3_INTERRUPT )

4
harbour/doc/en/rddmisc.txt
View File

@@ -163,8 +163,8 @@
USE test NEW
? "Is Bof()", Bof()
dbGoTop()
While !Bof()
dbSkip(-1)
WHILE ! Bof()
dbSkip( -1 )
ENDDO
? "Is Bof()", Bof()
USE

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

@@ -7415,54 +7415,56 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
/* Setup code signing for host platform */
IF HBMK_ISPLAT( "win|wce" )
IF ( cBin_Sign := FindInPath( "signtool.exe" ) ) != NIL /* in MS Windows SDK */
cOpt_Sign := "sign {FS} -f {ID} -p {PW} -t {UT} {OB}"
IF AScan( hbmk[ _HBMK_aOPTS ], {| tmp | HBMK_IS_IN( Lower( tmp ), "-v|/v" ) } ) == 0
AAdd( hbmk[ _HBMK_aOPTS ], "-q" )
ENDIF
ELSEIF ( cBin_Sign := FindInPath( "posign.exe" ) ) != NIL /* in Pelles C 7.00.0 or newer */
cBin_Sign := "posign.exe"
cOpt_Sign := "{FS} -pfx:{ID} -pwd:{PW} -timeurl:{UT} {OB}"
ELSE
_hbmk_OutErr( hbmk, I_( "Warning: Code signing skipped, because no supported code signing tool could be found." ) )
ENDIF
ENDIF
IF ! Empty( cOpt_SignID ) .AND. ! hbmk[ _HBMK_lCreateLib ]
#if defined( __PLATFORM__DARWIN )
IF HBMK_ISPLAT( "darwin" )
DO CASE
CASE HBMK_ISPLAT( "win|wce" )
IF ( cBin_Sign := FindInPath( "signtool.exe" ) ) != NIL /* in MS Windows SDK */
cOpt_Sign := "sign {FS} -f {ID} -p {PW} -t {UT} {OB}"
IF AScan( hbmk[ _HBMK_aOPTS ], {| tmp | HBMK_IS_IN( Lower( tmp ), "-v|/v" ) } ) == 0
AAdd( hbmk[ _HBMK_aOPTS ], "-q" )
ENDIF
ELSEIF ( cBin_Sign := FindInPath( "posign.exe" ) ) != NIL /* in Pelles C 7.00.0 or newer */
cBin_Sign := "posign.exe"
cOpt_Sign := "{FS} -pfx:{ID} -pwd:{PW} -timeurl:{UT} {OB}"
ELSE
_hbmk_OutErr( hbmk, I_( "Warning: Code signing skipped, because no supported code signing tool could be found." ) )
ENDIF
#if defined( __PLATFORM__DARWIN )
CASE HBMK_ISPLAT( "darwin" )
cBin_Sign := "codesign"
cOpt_Sign := "{FS} -s {ID} -f {OB}"
ENDIF
#endif
#endif
ENDCASE
IF ! Empty( cOpt_SignID ) .AND. ! hbmk[ _HBMK_lCreateLib ] .AND. ! Empty( cBin_Sign )
IF ! Empty( cBin_Sign )
/* Code signing */
/* Code signing */
hReplace := { ;
"{FS}" => ArrayToList( hbmk[ _HBMK_aOPTS ] ), ;
"{UT}" => _HBMK_SIGN_TIMEURL, ;
"{ID}" => cOpt_SignID, ;
"{OB}" => FNameEscape( hbmk[ _HBMK_cPROGNAME ], nOpt_Esc, nOpt_FNF ), ;
"{PW}" => cOpt_SignPass }
hReplace := { ;
"{FS}" => ArrayToList( hbmk[ _HBMK_aOPTS ] ), ;
"{UT}" => _HBMK_SIGN_TIMEURL, ;
"{ID}" => cOpt_SignID, ;
"{OB}" => FNameEscape( hbmk[ _HBMK_cPROGNAME ], nOpt_Esc, nOpt_FNF ), ;
"{PW}" => cOpt_SignPass }
cCommand := cBin_Sign + " " + AllTrim( hb_StrReplace( cOpt_Sign, hReplace ) )
hReplace[ "{PW}" ] := iif( Empty( cOpt_SignPass ), "", "***" )
tmp1 := cBin_Sign + " " + AllTrim( hb_StrReplace( cOpt_Sign, hReplace ) )
cCommand := cBin_Sign + " " + AllTrim( hb_StrReplace( cOpt_Sign, hReplace ) )
hReplace[ "{PW}" ] := iif( Empty( cOpt_SignPass ), "", "***" )
tmp1 := cBin_Sign + " " + AllTrim( hb_StrReplace( cOpt_Sign, hReplace ) )
IF hbmk[ _HBMK_lTRACE ]
IF ! hbmk[ _HBMK_lQuiet ]
_hbmk_OutStd( hbmk, I_( "Code sign command:" ) )
ENDIF
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$d:" ), tmp ) )
IF ! hbmk[ _HBMK_lQuiet ]
IF hbmk[ _HBMK_lTRACE ]
IF ! hbmk[ _HBMK_lQuiet ]
_hbmk_OutStd( hbmk, I_( "Code sign command:" ) )
ENDIF
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$d:" ), tmp ) )
IF ! hbmk[ _HBMK_lQuiet ]
OutStd( tmp1 + _OUT_EOL )
ENDIF
ENDIF
ENDIF
ENDIF
ENDIF