From 8445d3e11c19b2c06a9bb45d887b2db0b523c1be Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 7 Sep 2009 07:08:01 +0000 Subject: [PATCH] 2009-09-07 09:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Added "Embarcadero" to Borland compiler description. ! Fixed "Open Watcom C++ 9 or above" compiler description. ; Thanks to Tamas Tevesz for pointing these. + Added a bit more detail to *BSD platform description. + Added eComStation to OS/2 platform description. ! Few minor fixes when referring to Borland C++ compiler by its full name. * utils/hbmk2/hbmk2.prg ! Using 'svnversion .' (instead of 'svnversion') to make it work with older svn versions. * examples/terminal/trm_cli.prg ! Fixed some var naming problems slipped in the source. Thanks to Bill Smith for reporting it. --- harbour/ChangeLog | 18 +++++++++ harbour/INSTALL | 12 +++--- harbour/examples/terminal/trm_cli.prg | 54 ++++++++++++++------------- harbour/utils/hbmk2/hbmk2.prg | 2 +- 4 files changed, 53 insertions(+), 33 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 03ea90d38c..0a02782392 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,24 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-07 09:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + + Added "Embarcadero" to Borland compiler description. + ! Fixed "Open Watcom C++ 9 or above" compiler description. + ; Thanks to Tamas Tevesz for pointing these. + + Added a bit more detail to *BSD platform description. + + Added eComStation to OS/2 platform description. + ! Few minor fixes when referring to Borland C++ compiler + by its full name. + + * utils/hbmk2/hbmk2.prg + ! Using 'svnversion .' (instead of 'svnversion') to make + it work with older svn versions. + + * examples/terminal/trm_cli.prg + ! Fixed some var naming problems slipped in the source. + Thanks to Bill Smith for reporting it. + 2009-09-06 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.pt_BR.po * utils/hbmk2/hbmk2.hu_HU.po diff --git a/harbour/INSTALL b/harbour/INSTALL index 7829499c07..b4c3bd60d0 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -65,7 +65,7 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE > hello You should see 'Hello world!' on screen. - NOTES: - When building for Borland C make sure that + NOTES: - When building for Borland C++ make sure that GNU Make is executed when typing 'make', Borland Make has the same name. @@ -317,14 +317,14 @@ SUPPORTED PLATFORMS AND C COMPILERS linux - Linux darwin - Mac OS X - bsd - *BSD + bsd - FreeBSD / OpenBSD / NetBSD / *BSD hpux - HP-UX sunos - Sun Solaris / OpenSolaris win - MS Windows (all flavors) wce - MS Windows CE dos - MS-DOS (32-bit protected mode only) (MS-DOS compatible systems also work, like dosemu) - os2 - OS/2 + os2 - OS/2 / eComStation You can use HB_COMPILER values to select compilers: @@ -364,7 +364,7 @@ SUPPORTED PLATFORMS AND C COMPILERS Also supported, some features may be missing: watcom - Open Watcom C++ - bcc - Borland/CodeGear C++ 4.x and above + bcc - Borland/CodeGear/Embarcadero C++ 4.x and above icc - Intel(R) C/C++ iccia64 - Intel(R) C/C++ IA-64 pocc - Pelles C 4.5 and above @@ -382,7 +382,7 @@ SUPPORTED PLATFORMS AND C COMPILERS dos --- djgpp - Delorie GNU C - watcom - Open Watcom C++ 9.x and above + watcom - Open Watcom C++ os2 --- @@ -598,7 +598,7 @@ EXAMPLES mingw32-make --- - --- Borland/CodeGear C++ + --- Borland C++ 5.5.1 set PATH=C:\Borland\BCC55\Bin;%PATH% mingw32-make --- diff --git a/harbour/examples/terminal/trm_cli.prg b/harbour/examples/terminal/trm_cli.prg index b1bfcc9f29..fd2b359f57 100644 --- a/harbour/examples/terminal/trm_cli.prg +++ b/harbour/examples/terminal/trm_cli.prg @@ -63,6 +63,7 @@ #include "hbgtinfo.ch" #include "fileio.ch" +#include "inkey.ch" #include "setcurs.ch" //----------------------------------------------------------------------// @@ -91,15 +92,15 @@ REQUEST Tone //----------------------------------------------------------------------// -Static commSocket -static nTotalBytes := 0 -static nScreens := 0 -static nPing := 0 -static lReceiving := .f. -static lSending := .f. -static lTraceLog := .f. -static nTrace := 0 -static aDat := { {"",""} } +Static s_commSocket +static s_nTotalBytes := 0 +static s_nScreens := 0 +static s_nPing := 0 +static s_lReceiving := .f. +static s_lSending := .f. +static s_lTraceLog := .f. +static s_nTrace := 0 +static s_aDat := { {"",""} } Function Main( cAddress, cPort, cAppln, cParams, cDirectory ) LOCAL Socket, n, cText, cResponse @@ -115,7 +116,7 @@ Function Main( cAddress, cPort, cAppln, cParams, cDirectory ) CLS /* Comment out following line if you wish to receive log */ - // lTraceLog := .t. + // s_lTraceLog := .t. Hb_InetInit() @@ -244,22 +245,23 @@ STATIC FUNCTION ResolveParams( cAddress, cPort, cAppln, cParams, cDirectory ) Function TrmServeServer( Socket, cAddress, cServerInfo ) Local nPort, a_, nError Local nSeconds := Seconds() + Local nKey a_:= hb_aTokens( cServerInfo, ";" ) nPort := val( a_[ 2 ] ) - commSocket := Hb_INetConnect( cAddress, nPort ) + s_commSocket := Hb_INetConnect( cAddress, nPort ) - do while Hb_INetErrorCode( commSocket ) != 0 + do while Hb_INetErrorCode( s_commSocket ) != 0 - commSocket := Hb_INetConnect( cAddress, nPort ) + s_commSocket := Hb_INetConnect( cAddress, nPort ) if Seconds()-nSeconds > 60 .or. Seconds()-nSeconds < 0 exit endif enddo - IF Hb_InetErrorCode( commSocket ) != 0 + IF Hb_InetErrorCode( s_commSocket ) != 0 Hb_INetClose( Socket ) - DispOutAt( 17,0, padc( "Can't connect with " + cAddress+": " + Hb_InetErrorDesc( commSocket ),maxcol()+1), "w+/n" ) + DispOutAt( 17,0, padc( "Can't connect with " + cAddress+": " + Hb_InetErrorDesc( s_commSocket ),maxcol()+1), "w+/n" ) DispOutAt( 18,0, padc( "Press a key to terminate the program", maxcol()+1 ), "w+/n" ) Inkey(0) quit @@ -267,7 +269,7 @@ Function TrmServeServer( Socket, cAddress, cServerInfo ) // Very Important Factor 10-50 ok // - Hb_INetTimeout( commSocket, -1 ) + Hb_INetTimeout( s_commSocket, -1 ) Hb_INetSend( Socket, "ARCONNECTED" + CR_LF ) Hb_INetClose( Socket ) @@ -310,15 +312,15 @@ Function TrmReceiveServer() Local a_, b_, cBuffer, nBytes, cCommand, cData, cOdd, cEvn, n LOCAL cOdd1, cEvn1 - if !( lReceiving ) .and. ( commSocket != NIL ) - lReceiving := .t. - if ( nBytes := Hb_INetDataReady( commSocket ) ) > 0 + if !( s_lReceiving ) .and. ( s_commSocket != NIL ) + s_lReceiving := .t. + if ( nBytes := Hb_INetDataReady( s_commSocket ) ) > 0 - Hb_INetTimeout( commSocket, 10 ) - cBuffer := Hb_INetRecvEndBlock( commSocket, "|/END\|", @nBytes ) - Hb_INetTimeout( commSocket, -1 ) + Hb_INetTimeout( s_commSocket, 10 ) + cBuffer := Hb_INetRecvEndBlock( s_commSocket, "|/END\|", @nBytes ) + Hb_INetTimeout( s_commSocket, -1 ) if nBytes > 0 .and. !empty( cBuffer ) - nTotalBytes += nBytes + s_nTotalBytes += nBytes do while .t. cCommand := TrmFetchCommand( @cBuffer, @cData ) @@ -328,7 +330,7 @@ Function TrmReceiveServer() do case case cCommand == "SCR" - nScreens++ + s_nScreens++ a_:= Str2A( cData, "" ) b_:= hb_aTokens( a_[ 1 ], ";" ) aeval( b_, {|e,i| b_[ i ] := val( e ) } ) @@ -369,7 +371,7 @@ Function TrmReceiveServer() endif ENDIF - lReceiving := .f. + s_lReceiving := .f. endif Return 0 @@ -491,7 +493,7 @@ Static Function uiDebug( p1,p2,p3,p4,p5,p6,p7,p8,p9,p10 ) cDebug += " " + uiXtos( p10 ) endif - if lTraceLog + if s_lTraceLog DbgTraceLog( cDebug ) else wapi_OutputDebugString( cDebug ) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 17baa9ae47..0a885c57ae 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -6481,7 +6481,7 @@ STATIC FUNCTION VCSID( cDir, cVCSHEAD, /* @ */ cType ) SWITCH nType CASE _VCS_SVN cType := "svn" - cCommand := "svnversion" + iif( Empty( cDir ), "", " " + cDir ) + cCommand := "svnversion " + iif( Empty( cDir ), ".", cDir ) EXIT CASE _VCS_GIT cType := "git"