diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 44218a8160..328933a722 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,15 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-14 20:10 UTC+0200 Pavel Tsarenko (tpe2 at mail.ru) + * contrib/hbct/screen2.c + * unicode support for SayMoveIn() and SaySpread() functions + +2013-03-14 14:58 UTC+0200 Alexey Myronenko (m.oleksa/at/ukr.net) + * doc/en/rddmisc.txt + * samples corrected for Bof() and Eof() + ! spelling + 2013-03-13 02:20 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/gtwgud.c * contrib/gtwvg/gtwvgd.c diff --git a/harbour/contrib/hbct/screen2.c b/harbour/contrib/hbct/screen2.c index 9019d090d1..285f20a07a 100644 --- a/harbour/contrib/hbct/screen2.c +++ b/harbour/contrib/hbct/screen2.c @@ -111,7 +111,21 @@ HB_FUNC( SAYDOWN ) hb_retc_null(); } -HB_FUNC( SAYSPREAD ) /* TODO: Unicode support */ +static HB_WCHAR * ct_TextToWChar( const char * szText, int * piLen ) +{ + HB_WCHAR wc; + PHB_CODEPAGE cdp = hb_gtHostCP(); + HB_SIZE nIndex = 0, nI = 0; + HB_WCHAR * pwc = ( HB_WCHAR * ) hb_xgrab( *piLen * sizeof( HB_WCHAR ) ); + + while( HB_CDPCHAR_GET( cdp, szText, *piLen, &nIndex, &wc ) ) + pwc[ nI ++ ] = wc; + *piLen = nI; + + return pwc; +} + +HB_FUNC( SAYSPREAD ) { HB_SIZE nLen = hb_parclen( 1 ); @@ -138,6 +152,8 @@ HB_FUNC( SAYSPREAD ) /* TODO: Unicode support */ int iColor = hb_gtGetCurrColor(); + HB_WCHAR * pwc = ct_TextToWChar( szText, &nLen ); + nPos = nLen >> 1; nLen = nLen & 1; if( ! nLen ) @@ -150,7 +166,7 @@ HB_FUNC( SAYSPREAD ) /* TODO: Unicode support */ do { for( ul = 0; ul < nLen && iCol + ( int ) ul <= iMaxCol; ++ul ) - hb_gtPutChar( iRow, iCol + ( int ) ul, iColor, 0, ( HB_UCHAR ) szText[ nPos + ul ] ); + hb_gtPutChar( iRow, iCol + ( int ) ul, iColor, 0, pwc[ nPos + ul ] ); nLen += 2; if( lDelay ) { @@ -162,13 +178,14 @@ HB_FUNC( SAYSPREAD ) /* TODO: Unicode support */ while( nPos-- && iCol-- ); /* CT3 does not respect iCol in the above condition */ hb_gtEndWrite(); + hb_xfree( pwc ); } } hb_retc_null(); } -HB_FUNC( SAYMOVEIN ) /* TODO: Unicode support */ +HB_FUNC( SAYMOVEIN ) { int iLen = ( int ) hb_parclen( 1 ); @@ -196,11 +213,14 @@ HB_FUNC( SAYMOVEIN ) /* TODO: Unicode support */ int iColor = hb_gtGetCurrColor(); + HB_WCHAR * pwc = ct_TextToWChar( szText, &iLen ); + HB_WCHAR * pText = pwc; + iNewCol = iCol + iLen; if( fBack ) iCol += iLen - 1; else - szText += iLen - 1; + pText += iLen - 1; nChars = 1; hb_gtBeginWrite(); @@ -211,15 +231,15 @@ HB_FUNC( SAYMOVEIN ) /* TODO: Unicode support */ if( iCol <= iMaxCol ) { for( ul = 0; ul < nChars; ++ul ) - hb_gtPutChar( iRow, iCol + ( int ) ul, iColor, 0, ( HB_UCHAR ) szText[ ul ] ); + hb_gtPutChar( iRow, iCol + ( int ) ul, iColor, 0, pText[ ul ] ); } --iCol; } else { for( ul = 0; ul < nChars; ++ul ) - hb_gtPutChar( iRow, iCol + ( int ) ul, iColor, 0, ( HB_UCHAR ) szText[ ul ] ); - --szText; + hb_gtPutChar( iRow, iCol + ( int ) ul, iColor, 0, pText[ ul ] ); + --pText; } if( ( int ) nChars + iCol <= iMaxCol ) ++nChars; @@ -234,6 +254,7 @@ HB_FUNC( SAYMOVEIN ) /* TODO: Unicode support */ while( --iLen ); hb_gtSetPos( iRow, iNewCol ); hb_gtEndWrite(); + hb_xfree( pwc ); } } diff --git a/harbour/doc/en/rddmisc.txt b/harbour/doc/en/rddmisc.txt index e0113326a8..e61bc56cb9 100644 --- a/harbour/doc/en/rddmisc.txt +++ b/harbour/doc/en/rddmisc.txt @@ -40,16 +40,16 @@ Number od fields in a database or work area $DESCRIPTION$ This function will fill a series of arrays with field - names, field types, field lenghts, and number of field + names, field types, field lengths, and number of field decimal positions for the currently selected or designed database. Each array parallels the different descriptors of a file's structure. The first array will consist of the names of the fields in the current work area. All other arrays - are optional and will be filled with the corrensponding data. + are optional and will be filled with the corresponding data. This function will return zero if no parameters are specified - or if no database is avaliable in the current work area. Otherwise, - the number of fields or the lenght of the shortest array argument, - witchever is smaller, will be returned. + or if no database is available in the current work area. Otherwise, + the number of fields or the length of the shortest array argument, + whichever is smaller, will be returned. AFields() is a compatibility function, it is superseded by dbStruct() which returns one multidimensional array. @@ -147,24 +147,26 @@ $SUBCATEGORY$ Database $ONELINER$ - Test for the beggining-of-file condition + Test for the beginning-of-file condition $SYNTAX$ Bof() --> $RETURNS$ Bof() Logical true (.T.) or false (.F.) $DESCRIPTION$ - This function determines if the beggining of the file marker has been + This function determines if the beginning of the file marker has been reached. If so, the function will return a logical true (.T.); otherwise, a logical false (.F.) will be returned. By default, Bof() will apply to the currently selected database unless the function is preceded by an alias $EXAMPLES$ PROCEDURE Main() - USE tests NEW + USE test NEW + ? "Is Bof()", Bof() dbGoTop() - ? "Is Eof()", Eof() - dbGoBottom() - ? "Is Eof()", Eof() + While !Bof() + dbSkip(-1) + ENDDO + ? "Is Bof()", Bof() USE RETURN $STATUS$ @@ -198,7 +200,7 @@ current work area. This operation also updates any index file in use at the time of this operation. In addition, this command removes all items within an associated memo file. - In a network enviroment, any file that is about to be ZAPped must + In a network environment, any file that is about to be ZAPped must be used exclusively. $EXAMPLES$ USE tests NEW INDEX tests @@ -231,9 +233,9 @@ $RETURNS$ Deleted() return a logical true (.T.) or false (.F.). $DESCRIPTION$ - This function returns a logical true (.T.) is the current record in the - selected or designated work area ha ben marked for deletion. If not, the - function will return a logical false (.F.). + This function returns a logical true (.T.) if the current record in the + selected or designated work area has been marked for deletion. If not, + the function will return a logical false (.F.). $EXAMPLES$ PROCEDURE Main() USE test NEW @@ -274,13 +276,16 @@ $DESCRIPTION$ This function determines if the end-of-file marker has been reached. If it has, the function will return a logical true (.T.); otherwise - a logical false (.F.) will be returnd + a logical false (.F.) will be returned $EXAMPLES$ PROCEDURE Main() - USE tests NEW + USE test NEW dbGoTop() ? "Is Eof()", Eof() dbGoBottom() + WHILE ! Eof() + dbSkip() + ENDDO ? "Is Eof()", Eof() USE RETURN @@ -351,7 +356,7 @@ $DESCRIPTION$ This function returns the value of the field at the th location in the selected or designed work area. If the value in does not - correspond to n avaliable field position in this work area, the function + correspond to n available field position in this work area, the function will return a NIL data type. $EXAMPLES$ PROCEDURE Main() @@ -432,8 +437,8 @@ $DESCRIPTION$ This function return the ordinal position of the specified field in the current or aliased work areaIf there isn't field under the name - of or of no database is open in the selected work area, the func- - tion will return a 0. + of or of no database is open in the selected work area, the + function will return a 0. $EXAMPLES$ PROCEDURE Main() USE test NEW @@ -471,7 +476,7 @@ $RETURNS$ Any expression $DESCRIPTION$ - This function assings the value in to the th + This function assigns the value in to the th field in the current or designated work area. If the operation is successful, the return value of the function will be the same value assigned to the specified field. If the operation is not successful, @@ -505,7 +510,7 @@ $SYNTAX$ FLock() --> lSuccess $RETURNS$ - A true (.T.) value, if the lock was successful;otherwise + A true (.T.) value, if the lock was successful; otherwise false (.F.) $DESCRIPTION$ This function returns a logical true (.T.) if a file lock is @@ -548,7 +553,7 @@ A logical true (.T.) is successful; otherwise, false (.F.) $DESCRIPTION$ This function is used to test if the previous SEEK, LOCATE, CONTINUE, - or FIND operation was successful. Each wrk area has its own Found() + or FIND operation was successful. Each work area has its own Found() flag, so that a Found() condition may be tested in unselected work areas by using an alias. $EXAMPLES$ @@ -624,7 +629,7 @@ $DESCRIPTION$ This function returns the number of records present in the database in the selected or designated work area. If no records are present - the value of this function will be 0. Additionaly, if no database is + the value of this function will be 0. Additionally, if no database is in use in the selected or designated work area, this function will return a 0 value as well. $EXAMPLES$ @@ -703,7 +708,7 @@ function. $DESCRIPTION$ This function return a logical true (.T.) is a USE, APPEND BLANK, or - a USE...EXCLUSIVE command is issue and fails in a network enviroment. + a USE...EXCLUSIVE command is issue and fails in a network environment. In the case of USE and USE...EXCLUSIVE commands, a NetErr() value of .T. would be returned if another node of the network has the exclusive use of a file. And the case of the APPEND BLANK command, @@ -711,7 +716,7 @@ is locked by another node or the value of LastRec() has been advanced The value of NetErr() may be changed via the value of . This allow the run-time error-handling system to control the way - certains errors are handled. + certain errors are handled. $EXAMPLES$ USE test NEW INDEX test IF ! NetErr() @@ -752,7 +757,7 @@ CRIPTION$* This function returns the number of records present in the database in the selected or designated work area. If no records are present - the value of this function will be 0. Additionaly, if no database is + the value of this function will be 0. Additionally, if no database is in use in the selected or designated work area, this function will return a 0 value as well. $EXAMPLES$ @@ -791,7 +796,7 @@ RecNo() The record number or identity $DESCRIPTION$ This function returns the position of the record pointer in the - currently selected ot designated work area. + currently selected of designated work area. If the database file is empty and if the RDD is the traditional .dbf file, the value of this function will be 1. @@ -830,7 +835,7 @@ $RETURNS$ The record size. $DESCRIPTION$ - This function returns the number os bytes used by a single record + This function returns the number of bytes used by a single record in the currently selected or designated database file. If no database is in use in this work area, the return value from this function will be 0. @@ -876,7 +881,7 @@ is currently locked. A record that is locked remains locked until another RLock() is issued or until an UNLOCK command is executed. - On a Network enviroment the follow command need that the record is + On a Network environment the follow command need that the record is locked: @...GET @@ -1005,7 +1010,7 @@ $DESCRIPTION$ This command removes records that were marked for deletion from the currently selected database. This command does not pack the contents - of a memo field; those files must be packed via low-level fuctions. + of a memo field; those files must be packed via low-level functions. All open index files will be automatically reindexed once PACK command has completed its operation. On completion, the record pointer is placed diff --git a/harbour/tests/hbpptest/compare.bat b/harbour/tests/hbpptest/compare.bat index e871f93861..b290e22ced 100644 --- a/harbour/tests/hbpptest/compare.bat +++ b/harbour/tests/hbpptest/compare.bat @@ -1,18 +1,18 @@ -@echo off -rem -rem $Id$ -rem - -copy pp_test.prg _pp_hb.prg -copy pp_test.prg _pp_c5x.prg - -..\..\bin\harbour -p -s -n _pp_hb.prg -clipper.exe _pp_c5x.prg /p /s /n - -del _pp_hb.prg -del _pp_c5x.prg - -diff -u -w _pp_hb.ppo _pp_c5x.ppo > pp_test.dif - -del _pp_hb.ppo -del _pp_c5x.ppo +@echo off +rem +rem $Id$ +rem + +copy pp_test.prg _pp_hb.prg +copy pp_test.prg _pp_c5x.prg + +..\..\bin\harbour -p -s -n _pp_hb.prg +clipper.exe _pp_c5x.prg /p /s /n + +del _pp_hb.prg +del _pp_c5x.prg + +diff -u -w _pp_hb.ppo _pp_c5x.ppo > pp_test.dif + +del _pp_hb.ppo +del _pp_c5x.ppo diff --git a/harbour/tests/rddtest/make_c52.bat b/harbour/tests/rddtest/make_c52.bat index ff05a6e05e..10a8e8f944 100644 --- a/harbour/tests/rddtest/make_c52.bat +++ b/harbour/tests/rddtest/make_c52.bat @@ -1,44 +1,44 @@ -@rem -@rem $Id$ -@rem - -@echo off - -rem DBFCDX -clipper rddmktst /m/n/w/es2/d_TEST_CMPDIDX_ -if errorlevel 1 goto ERROR -rtlink fi rddmktst lib dbfcdx -if errorlevel 1 goto ERROR -del *.obj -rddmktst cdxcl52.prg dbfcdx -clipper cdxcl52 /m/n/w/es2 -if errorlevel 1 goto ERROR -rtlink fi cdxcl52 lib dbfcdx -if errorlevel 1 goto ERROR - -rem DBFNTX -clipper rddmktst /m/n/w/es2 -if errorlevel 1 goto ERROR -rtlink fi rddmktst lib dbfcdx -if errorlevel 1 goto ERROR -del *.obj -rddmktst ntxcl52.prg dbfntx -clipper ntxcl52 /m/n/w/es2 -if errorlevel 1 goto ERROR -rtlink fi ntxcl52 lib dbfcdx -if errorlevel 1 goto ERROR - -rem DBFCDX for ADS RDD -clipper rddmktst /m/n/w/es2/d_TEST_ADS_ /d_TEST_CMPDIDX_ -if errorlevel 1 goto ERROR -rtlink fi rddmktst lib dbfcdx -if errorlevel 1 goto ERROR -del *.obj -rddmktst adscl52.prg dbfcdx -clipper adscl52 /m/n/w/es2 -if errorlevel 1 goto ERROR -rtlink fi adscl52 lib dbfcdx -if errorlevel 1 goto ERROR - -:ERROR -if exist *.obj del *.obj +@rem +@rem $Id$ +@rem + +@echo off + +rem DBFCDX +clipper rddmktst /m/n/w/es2/d_TEST_CMPDIDX_ +if errorlevel 1 goto ERROR +rtlink fi rddmktst lib dbfcdx +if errorlevel 1 goto ERROR +del *.obj +rddmktst cdxcl52.prg dbfcdx +clipper cdxcl52 /m/n/w/es2 +if errorlevel 1 goto ERROR +rtlink fi cdxcl52 lib dbfcdx +if errorlevel 1 goto ERROR + +rem DBFNTX +clipper rddmktst /m/n/w/es2 +if errorlevel 1 goto ERROR +rtlink fi rddmktst lib dbfcdx +if errorlevel 1 goto ERROR +del *.obj +rddmktst ntxcl52.prg dbfntx +clipper ntxcl52 /m/n/w/es2 +if errorlevel 1 goto ERROR +rtlink fi ntxcl52 lib dbfcdx +if errorlevel 1 goto ERROR + +rem DBFCDX for ADS RDD +clipper rddmktst /m/n/w/es2/d_TEST_ADS_ /d_TEST_CMPDIDX_ +if errorlevel 1 goto ERROR +rtlink fi rddmktst lib dbfcdx +if errorlevel 1 goto ERROR +del *.obj +rddmktst adscl52.prg dbfcdx +clipper adscl52 /m/n/w/es2 +if errorlevel 1 goto ERROR +rtlink fi adscl52 lib dbfcdx +if errorlevel 1 goto ERROR + +:ERROR +if exist *.obj del *.obj diff --git a/harbour/tests/rddtest/make_c53.bat b/harbour/tests/rddtest/make_c53.bat index 0e376c5ea0..fe104ef043 100644 --- a/harbour/tests/rddtest/make_c53.bat +++ b/harbour/tests/rddtest/make_c53.bat @@ -1,44 +1,44 @@ -@rem -@rem $Id$ -@rem - -@echo off - -rem DBFCDX -clipper rddmktst /m/n/w/es2/d_TEST_DESCEND_ /d_TEST_UNIQUE_ /d_TEST_SCOPE_ /d_TEST_CMPDIDX_ -if errorlevel 1 goto ERROR -exospace fi rddmktst lib _dbfcdx, dbfcdx -if errorlevel 1 goto ERROR -del *.obj -rddmktst cdxcl53.prg dbfcdx -clipper cdxcl53 /m/n/w/es2 -if errorlevel 1 goto ERROR -exospace fi cdxcl53 lib _dbfcdx, dbfcdx -if errorlevel 1 goto ERROR - -rem DBFNTX -clipper rddmktst /m/n/w/es2 -if errorlevel 1 goto ERROR -exospace fi rddmktst lib _dbfcdx, dbfcdx -if errorlevel 1 goto ERROR -del *.obj -rddmktst ntxcl53.prg dbfntx -clipper ntxcl53 /m/n/w/es2 -if errorlevel 1 goto ERROR -exospace fi ntxcl53 lib _dbfcdx, dbfcdx -if errorlevel 1 goto ERROR - -rem DBFCDX for ADS RDD -clipper rddmktst /m/n/w/es2/d_TEST_ADS_ /d_TEST_SCOPE_ /d_TEST_CMPDIDX_ -if errorlevel 1 goto ERROR -exospace fi rddmktst lib _dbfcdx, dbfcdx -if errorlevel 1 goto ERROR -del *.obj -rddmktst adscl53.prg dbfcdx -clipper adscl53 /m/n/w/es2 -if errorlevel 1 goto ERROR -exospace fi adscl53 lib _dbfcdx, dbfcdx -if errorlevel 1 goto ERROR - -:ERROR -if exist *.obj del *.obj +@rem +@rem $Id$ +@rem + +@echo off + +rem DBFCDX +clipper rddmktst /m/n/w/es2/d_TEST_DESCEND_ /d_TEST_UNIQUE_ /d_TEST_SCOPE_ /d_TEST_CMPDIDX_ +if errorlevel 1 goto ERROR +exospace fi rddmktst lib _dbfcdx, dbfcdx +if errorlevel 1 goto ERROR +del *.obj +rddmktst cdxcl53.prg dbfcdx +clipper cdxcl53 /m/n/w/es2 +if errorlevel 1 goto ERROR +exospace fi cdxcl53 lib _dbfcdx, dbfcdx +if errorlevel 1 goto ERROR + +rem DBFNTX +clipper rddmktst /m/n/w/es2 +if errorlevel 1 goto ERROR +exospace fi rddmktst lib _dbfcdx, dbfcdx +if errorlevel 1 goto ERROR +del *.obj +rddmktst ntxcl53.prg dbfntx +clipper ntxcl53 /m/n/w/es2 +if errorlevel 1 goto ERROR +exospace fi ntxcl53 lib _dbfcdx, dbfcdx +if errorlevel 1 goto ERROR + +rem DBFCDX for ADS RDD +clipper rddmktst /m/n/w/es2/d_TEST_ADS_ /d_TEST_SCOPE_ /d_TEST_CMPDIDX_ +if errorlevel 1 goto ERROR +exospace fi rddmktst lib _dbfcdx, dbfcdx +if errorlevel 1 goto ERROR +del *.obj +rddmktst adscl53.prg dbfcdx +clipper adscl53 /m/n/w/es2 +if errorlevel 1 goto ERROR +exospace fi adscl53 lib _dbfcdx, dbfcdx +if errorlevel 1 goto ERROR + +:ERROR +if exist *.obj del *.obj diff --git a/harbour/utils/hbtest/make_c5x.bat b/harbour/utils/hbtest/make_c5x.bat index 93721a4abd..3e22552476 100644 --- a/harbour/utils/hbtest/make_c5x.bat +++ b/harbour/utils/hbtest/make_c5x.bat @@ -1,59 +1,59 @@ -@rem -@rem $Id$ -@rem - -@echo off - -rem --------------------------------------------------------------- -rem ; NOTE: To compile for CA-Cl*pper 5.3, please use the -rem command line parameter "53" (without quotes). -rem --------------------------------------------------------------- - -rem --------------------------------------------------------------- -rem Copyright 1999-2008 Viktor Szakats (harbour syenar.net) -rem See COPYING.txt for licensing terms. -rem --------------------------------------------------------------- - -rem ; Settings for CA-Cl*pper 5.3 -if "%1" == "53" set HB_MSCOPT=%HB_MSCOPT% /FPi -if "%1" == "53" set HB_CLIPOPT=%HB_CLIPOPT% /DHB_COMPAT_C53 -if "%1" == "53" set HB_HBTEST=hbtest53 -if "%1" == "53" set HB_LINKER=exospace - -rem ; Settings for CA-Cl*pper 5.2 -if not "%1" == "53" set HB_MSCOPT=%HB_MSCOPT% /FPa -if not "%1" == "53" set HB_HBTEST=hbtest52 -if not "%1" == "53" set HB_LINKER=rtlink - -rem --------------------------------------------------------------- - -cl.exe /c /AL /Zl /Oalt /Gs /W3 /G2 %HB_MSCOPT% rt_miscc.c - -if exist rt_miscc.obj set HB_LINKOPT=%HB_LINKOPT% fi rt_miscc -if not exist rt_miscc.obj set HB_CLIPOPT=%HB_CLIPOPT% /DRT_NO_C - -rem --------------------------------------------------------------- - -clipper hbtest.prg /w /n %HB_CLIPOPT% -clipper rt_array.prg /w /n %HB_CLIPOPT% -clipper rt_date.prg /w /n %HB_CLIPOPT% -clipper rt_file.prg /w /n %HB_CLIPOPT% -clipper rt_hvm.prg /w /n %HB_CLIPOPT% -clipper rt_hvma.prg /w /n %HB_CLIPOPT% -clipper rt_math.prg /w /n %HB_CLIPOPT% -clipper rt_misc.prg /w /n %HB_CLIPOPT% -clipper rt_str.prg /w /n %HB_CLIPOPT% -clipper rt_stra.prg /w /n %HB_CLIPOPT% -clipper rt_trans.prg /w /n %HB_CLIPOPT% - -%HB_LINKER% out %HB_HBTEST% fi hbtest,rt_array,rt_date,rt_file,rt_hvm,rt_hvma,rt_math,rt_misc,rt_str,rt_stra,rt_trans %HB_LINKOPT% - -rem --------------------------------------------------------------- - -del *.obj - -set HB_MSCOPT= -set HB_CLIPOPT= -set HB_LINKOPT= -set HB_LINKER= -set HB_HBTEST= +@rem +@rem $Id$ +@rem + +@echo off + +rem --------------------------------------------------------------- +rem ; NOTE: To compile for CA-Cl*pper 5.3, please use the +rem command line parameter "53" (without quotes). +rem --------------------------------------------------------------- + +rem --------------------------------------------------------------- +rem Copyright 1999-2008 Viktor Szakats (harbour syenar.net) +rem See COPYING.txt for licensing terms. +rem --------------------------------------------------------------- + +rem ; Settings for CA-Cl*pper 5.3 +if "%1" == "53" set HB_MSCOPT=%HB_MSCOPT% /FPi +if "%1" == "53" set HB_CLIPOPT=%HB_CLIPOPT% /DHB_COMPAT_C53 +if "%1" == "53" set HB_HBTEST=hbtest53 +if "%1" == "53" set HB_LINKER=exospace + +rem ; Settings for CA-Cl*pper 5.2 +if not "%1" == "53" set HB_MSCOPT=%HB_MSCOPT% /FPa +if not "%1" == "53" set HB_HBTEST=hbtest52 +if not "%1" == "53" set HB_LINKER=rtlink + +rem --------------------------------------------------------------- + +cl.exe /c /AL /Zl /Oalt /Gs /W3 /G2 %HB_MSCOPT% rt_miscc.c + +if exist rt_miscc.obj set HB_LINKOPT=%HB_LINKOPT% fi rt_miscc +if not exist rt_miscc.obj set HB_CLIPOPT=%HB_CLIPOPT% /DRT_NO_C + +rem --------------------------------------------------------------- + +clipper hbtest.prg /w /n %HB_CLIPOPT% +clipper rt_array.prg /w /n %HB_CLIPOPT% +clipper rt_date.prg /w /n %HB_CLIPOPT% +clipper rt_file.prg /w /n %HB_CLIPOPT% +clipper rt_hvm.prg /w /n %HB_CLIPOPT% +clipper rt_hvma.prg /w /n %HB_CLIPOPT% +clipper rt_math.prg /w /n %HB_CLIPOPT% +clipper rt_misc.prg /w /n %HB_CLIPOPT% +clipper rt_str.prg /w /n %HB_CLIPOPT% +clipper rt_stra.prg /w /n %HB_CLIPOPT% +clipper rt_trans.prg /w /n %HB_CLIPOPT% + +%HB_LINKER% out %HB_HBTEST% fi hbtest,rt_array,rt_date,rt_file,rt_hvm,rt_hvma,rt_math,rt_misc,rt_str,rt_stra,rt_trans %HB_LINKOPT% + +rem --------------------------------------------------------------- + +del *.obj + +set HB_MSCOPT= +set HB_CLIPOPT= +set HB_LINKOPT= +set HB_LINKER= +set HB_HBTEST= diff --git a/harbour/utils/hbtest/make_xpp.bat b/harbour/utils/hbtest/make_xpp.bat index e350bbdd34..aa5b465e21 100644 --- a/harbour/utils/hbtest/make_xpp.bat +++ b/harbour/utils/hbtest/make_xpp.bat @@ -1,24 +1,24 @@ -@rem -@rem $Id$ -@rem - -@echo off - -rem ; TOFIX: Add compilation for C sources -set HB_CLIPOPT=%HB_CLIPOPT% /DRT_NO_C - -xpp hbtest.prg /w /n %HB_CLIPOPT% -xpp rt_array.prg /w /n %HB_CLIPOPT% -xpp rt_date.prg /w /n %HB_CLIPOPT% -xpp rt_file.prg /w /n %HB_CLIPOPT% -xpp rt_hvm.prg /w /n %HB_CLIPOPT% -xpp rt_hvma.prg /w /n %HB_CLIPOPT% -xpp rt_math.prg /w /n %HB_CLIPOPT% -xpp rt_misc.prg /w /n %HB_CLIPOPT% -xpp rt_str.prg /w /n %HB_CLIPOPT% -xpp rt_stra.prg /w /n %HB_CLIPOPT% -xpp rt_trans.prg /w /n %HB_CLIPOPT% - -alink hbtest rt_array rt_date rt_file rt_hvm rt_hvma rt_math rt_misc rt_str rt_stra rt_trans - -del *.obj +@rem +@rem $Id$ +@rem + +@echo off + +rem ; TOFIX: Add compilation for C sources +set HB_CLIPOPT=%HB_CLIPOPT% /DRT_NO_C + +xpp hbtest.prg /w /n %HB_CLIPOPT% +xpp rt_array.prg /w /n %HB_CLIPOPT% +xpp rt_date.prg /w /n %HB_CLIPOPT% +xpp rt_file.prg /w /n %HB_CLIPOPT% +xpp rt_hvm.prg /w /n %HB_CLIPOPT% +xpp rt_hvma.prg /w /n %HB_CLIPOPT% +xpp rt_math.prg /w /n %HB_CLIPOPT% +xpp rt_misc.prg /w /n %HB_CLIPOPT% +xpp rt_str.prg /w /n %HB_CLIPOPT% +xpp rt_stra.prg /w /n %HB_CLIPOPT% +xpp rt_trans.prg /w /n %HB_CLIPOPT% + +alink hbtest rt_array rt_date rt_file rt_hvm rt_hvma rt_math rt_misc rt_str rt_stra rt_trans + +del *.obj