diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 83d640991c..88a520f314 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,26 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-01-13 22:44 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/bin/hb-func.sh + ! restored GCC optimization flags in hb* scripts disabled unintentionally + by some other modifications + + * harbour/include/hbapifs.h + * harbour/source/rtl/hbproces.c + * renamed hb_fsOpenProcess() and hb_fsCloseProcess() to + hb_fsProcessOpen(), hb_fsProcessClose() + + * harbour/include/hbextern.ch + * harbour/source/rtl/hbprocfn.c + * renamed hb_openProcess() and hb_closeProcess() to + hb_processOpen(), hb_processClose() + + * harbour/contrib/xhb/hbcompat.ch + * added xHarbour compatible translations + hb_openProcess() <-> hb_processOpen() + hb_closeProcess() <-> hb_processClose() + 2009-01-13 20:00 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/rddads/adsx.c * improved code to solve RDD initialisation order problem diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index e14df149d0..50d410bf1f 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -200,6 +200,7 @@ mk_hbtools() fi HB_SLN_LIB="slang" fi + CC_C_USR="-O3 ${CC_C_USR}" if [ "${C_USR//-mlp64/}" != "${C_USR}" ]; then CC_C_USR="${CC_C_USR} -mlp64" CC_L_USR="${CC_L_USR} -mlp64" @@ -214,7 +215,9 @@ mk_hbtools() CC_L_USR="${CC_L_USR} -m32" fi if [ "${C_USR//-fPIC/}" != "${C_USR}" ]; then - CC_C_USR="${CC_L_USR} -fPIC" + CC_C_USR="${CC_C_USR} -fPIC" + elif [ "${C_USR//-fpic/}" != "${C_USR}" ]; then + CC_C_USR="${CC_C_USR} -fpic" fi echo "Generating ${hb_tool}... " diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index 59588c26a0..d8d8af6108 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -81,6 +81,9 @@ #xtranslate hb_FieldDec([]) => FieldDec() #xtranslate hb_FieldType([]) => FieldType() + #xtranslate hb_processOpen([]) => hb_openProcess() + #xtranslate hb_processClose([]) => hb_closeProcess() + #xtranslate hb_isregex([]) => hb_isregexstring() #xtranslate hb_pvalue([]) => pvalue() #xtranslate hb_methodName([]) => methodName() @@ -161,6 +164,9 @@ #xtranslate MaxRow(.T.) => hb_gtInfo( HB_GTI_VIEWPORTHEIGHT ) #xtranslate MaxCol(.T.) => hb_gtInfo( HB_GTI_VIEWPORTWIDTH ) + #xtranslate hb_openProcess([]) => hb_processOpen() + #xtranslate hb_closeProcess([]) => hb_processClose() + #xtranslate hb_isregexstring([]) => hb_isregex() #xtranslate pvalue([]) => hb_pvalue() #xtranslate methodName([]) => hb_methodName() diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h index e54ad8165a..c1ead666c4 100644 --- a/harbour/include/hbapifs.h +++ b/harbour/include/hbapifs.h @@ -290,12 +290,12 @@ extern HB_EXPORT BOOL hb_fsFindNext( PHB_FFIND ffind ); extern HB_EXPORT void hb_fsFindClose( PHB_FFIND ffind ); /* functions to create, wait and terminate processes */ -HB_FHANDLE hb_fsOpenProcess( const char *pszFilename, +HB_FHANDLE hb_fsProcessOpen( const char *pszFilename, HB_FHANDLE *phStdin, HB_FHANDLE *phStdout, HB_FHANDLE *phStderr, BOOL fDetach, ULONG *pulPID ); -int hb_fsProcessValue( HB_FHANDLE hProcess, BOOL fWait ); -BOOL hb_fsCloseProcess( HB_FHANDLE hProcess, BOOL fGentle ); +int hb_fsProcessValue( HB_FHANDLE hProcess, BOOL fWait ); +BOOL hb_fsProcessClose( HB_FHANDLE hProcess, BOOL fGentle ); /* Misc helper functions */ extern ULONG hb_fsAttrFromRaw( ULONG raw_attr ); diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index 3129cf1493..2b566ac086 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -1144,9 +1144,9 @@ EXTERNAL HB_FNAMEEXISTS EXTERNAL HB_FNAMEMERGE EXTERNAL HB_FNAMESPLIT EXTERNAL HB_DIRSCAN -EXTERNAL HB_OPENPROCESS +EXTERNAL HB_PROCESSOPEN EXTERNAL HB_PROCESSVALUE -EXTERNAL HB_CLOSEPROCESS +EXTERNAL HB_PROCESSCLOSE EXTERNAL HB_GCALL EXTERNAL HB_KEYCLEAR EXTERNAL HB_KEYPUT diff --git a/harbour/source/rtl/hbproces.c b/harbour/source/rtl/hbproces.c index 5e5f1a7ed4..7c3abb41c1 100644 --- a/harbour/source/rtl/hbproces.c +++ b/harbour/source/rtl/hbproces.c @@ -179,14 +179,14 @@ static void hb_freeArgs( char ** argv ) #endif -HB_FHANDLE hb_fsOpenProcess( const char *pszFilename, +HB_FHANDLE hb_fsProcessOpen( const char *pszFilename, HB_FHANDLE *phStdin, HB_FHANDLE *phStdout, HB_FHANDLE *phStderr, BOOL fDetach, ULONG *pulPID ) { HB_FHANDLE hResult = FS_ERROR; - HB_TRACE(HB_TR_DEBUG, ("hb_fsOpenProcess(%s, %p, %p, %p, %d, %p)", pszFilename, phStdin, phStdout, phStderr, fDetach, pulPID)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsProcessOpen(%s, %p, %p, %p, %d, %p)", pszFilename, phStdin, phStdout, phStderr, fDetach, pulPID)); #if defined( HB_IO_WIN ) { @@ -673,11 +673,11 @@ int hb_fsProcessValue( HB_FHANDLE hProcess, BOOL fWait ) /* Closes/kills process. The handle is still valid until you * catch it with hb_fsProcessValue. */ -BOOL hb_fsCloseProcess( HB_FHANDLE hProcess, BOOL fGentle ) +BOOL hb_fsProcessClose( HB_FHANDLE hProcess, BOOL fGentle ) { BOOL fResult = FALSE; - HB_TRACE(HB_TR_DEBUG, ("hb_fsCloseProcess(%p, %d)", ( void * ) ( HB_PTRDIFF ) hProcess, fGentle)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsProcessClose(%p, %d)", ( void * ) ( HB_PTRDIFF ) hProcess, fGentle)); #if defined( HB_IO_WIN ) { diff --git a/harbour/source/rtl/hbprocfn.c b/harbour/source/rtl/hbprocfn.c index db36d7eaf8..07503a43ac 100644 --- a/harbour/source/rtl/hbprocfn.c +++ b/harbour/source/rtl/hbprocfn.c @@ -57,7 +57,7 @@ #include "hbapifs.h" #include "hbapierr.h" -HB_FUNC( HB_OPENPROCESS ) +HB_FUNC( HB_PROCESSOPEN ) { const char *szName = hb_parc( 1 ); PHB_ITEM pStdIn = hb_param( 2, HB_IT_BYREF ); @@ -80,7 +80,7 @@ HB_FUNC( HB_OPENPROCESS ) phStdOut = pStdOut ? &hStdOut : NULL; phStdErr = pStdErr ? ( pStdOut == pStdErr ? phStdOut : &hStdErr ) : NULL; - hProcess = hb_fsOpenProcess( szName, phStdIn, phStdOut, phStdErr, + hProcess = hb_fsProcessOpen( szName, phStdIn, phStdOut, phStdErr, fDetach, &ulPID ); if( hProcess != FS_ERROR ) { @@ -108,12 +108,12 @@ HB_FUNC( HB_PROCESSVALUE ) hb_errRT_BASE_SubstR( EG_ARG, 4001, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -HB_FUNC( HB_CLOSEPROCESS ) +HB_FUNC( HB_PROCESSCLOSE ) { HB_FHANDLE hProcess = hb_numToHandle( hb_parnint( 1 ) ); if( hProcess != 0 && hProcess != FS_ERROR && ( hb_pcount() < 2 || ISLOG( 2 ) ) ) - hb_retl( hb_fsCloseProcess( hProcess, hb_pcount() < 2 || hb_parl( 2 ) ) ); + hb_retl( hb_fsProcessClose( hProcess, hb_pcount() < 2 || hb_parl( 2 ) ) ); else hb_errRT_BASE_SubstR( EG_ARG, 4001, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); }