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

2009-11-30 08:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
    ! Typos in latest modification.

  * contrib/hbmisc/spd.c
    + Patch by Xavi.

  * utils/hbmk2/hbmk2.prg
    + Added one TODO.
This commit is contained in:
Viktor Szakats
2009-11-30 07:47:53 +00:00
parent ae856df100
commit dfd0b5a7ad
4 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-30 08:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
! Typos in latest modification.
* contrib/hbmisc/spd.c
+ Patch by Xavi.
* utils/hbmk2/hbmk2.prg
+ Added one TODO.
2009-11-30 04:45 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbwin/olecore.c
+ added support for passing OLE pointer item as VT_DISPATCH variants
@@ -649,6 +659,7 @@
; Old names still work, and they are guarded with HB_WIN_LEGACY_LEVEL_OFF
macro, in case someone would like to disable them.
Please use new names, old names may disappear in the future.
! Fixed WIN_OSNETREGOK() to also consider Win7 when second parameter is .T.
* contrib/hbwin/wce_simc.c
* contrib/hbwin/wce_smsc.c

34
harbour/INSTALL
View File

@@ -224,23 +224,23 @@ HARBOUR
$ ./mpkg_rpm.sh
You can fine-tune the build with these options:
--with static - link all binaries with static libs
--with mysql - build components dependent on mysql (hbmysql, sddmy)
--with pgsql - build components dependent on pgsql (hbpgsql, sddpg)
--with gd - build components dependent on gd (hbgd)
--with allegro - build components dependent on allegro (gtalleg)
--with ads - build components dependent on ads (rddads)
--with odbc - build components dependent on odbc (hbodbc, sddodbc)
--with firebird - build componetns dependent on firebird (hbfbird, sddfb)
--with curl - build componetns dependent on libcurl (hbcurl)
--with localzlib - build local copy of zlib library
--with localpcre - build local copy of pcre library
--with qt - build componetns dependent on qt (hbqt, hbxbp)
--without gpllib - do not build components which needs GPL 3rd party code (HB_COMMERCE)
--without x11 - build componetns dependent on x11 (gtxwc)
--without gpm - build gttrm, gtsln and gtcrs without gpm support
--without curses - build componetns dependent on curses (gtcrs)
--without slang - build componetns dependent on slang (gtsln)
--with static - link all binaries with static libs
--with mysql - build components dependent on mysql (hbmysql, sddmy)
--with pgsql - build components dependent on pgsql (hbpgsql, sddpg)
--with gd - build components dependent on gd (hbgd)
--with allegro - build components dependent on allegro (gtalleg)
--with ads - build components dependent on ads (rddads)
--with odbc - build components dependent on odbc (hbodbc, sddodbc)
--with firebird - build components dependent on firebird (hbfbird, sddfb)
--with curl - build components dependent on libcurl (hbcurl)
--with qt - build components dependent on qt (hbqt, hbxbp)
--with localzlib - build local copy of zlib library
--with localpcre - build local copy of pcre library
--without x11 - do not build components dependent on x11 (gtxwc)
--without curses - do not build components dependent on curses (gtcrs)
--without slang - do not build components dependent on slang (gtsln)
--without gpllib - do not build components dependent on GPL 3rd party code (HB_COMMERCE)
--without gpm - build components without gpm support (gttrm, gtsln, gtcrs)
Binary .rpm on Linux (cross-builds)
-----------------------------------

13
harbour/contrib/hbmisc/spd.c
View File

@@ -149,13 +149,13 @@ static ULONG SCItm( char *cBuffer, ULONG ulMaxBuf, char *cParFrm, int iCOut, int
* ? Sql_sprintf( "Phi = %2$0*3$.*1$f", 4, (1 + 5**0.5) / 2, 7 ) // Phi = 01.6180
*
* s converter for format Harbour data types.
* NUMERIC with FIXED DECIMALS = n | n.d STRING = String's ANSI C
* NUMERIC with FIXED DECIMALS = n | n.d STRING = String's ANSI\C
* DATE = HB_SET_DATEFORMAT DATETIME = HB_SET_DATEFORMAT hh:mm:ss
* New Internal Modifier {}. Thanks Mindaugas.
* Date and Time Format separate by first space {DD/MM/YYYY hh:mm:ss.fff pp}
* {DD/MM/YYYY} = Only Date | { hh:mm:ss.fff pp} = Only Time
* ? Sql_sprintf( "%s", Date() ) // 16/06/08
* ? Sql_sprintf( "%s", HB_DateTime() ) // 16/06/08 04:11:21
* ? Sql_sprintf( "%s", HB_DateTime() ) // 16/06/08 04:11:21.531
* ? Sql_sprintf( "%{YYYYMMDD}s", HB_DateTime() ) // 20080616
* ? Sql_sprintf( "%{ hh:mm pp}s", HB_DateTime() ) // 04:11 AM
* LOGICAL = TRUE | FALSE %d converter for LOGICAL = 1 | 0
@@ -357,7 +357,7 @@ HB_FUNC( SQL_SPRINTF )
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
hb_itemCopy( pItmCpy = hb_itemNew( NULL ), pItmPar );
pItmCpy = hb_itemNew( NULL );
# ifdef HB_IT_NULL
if( IsType == 2 && !HB_IS_NULL( pItmPar ) ) hb_itemPutCL( pItmCpy, "DEFAULT", 7 );
# else /* Print DEFAULT if NIL for T converter if not NULL, print NULL for the rest of converters */
@@ -409,11 +409,12 @@ HB_FUNC( SQL_SPRINTF )
hb_dateFormat( hb_itemGetDS( pItmPar, cDTBuf ), cDTFrm,
(s ? cIntMod : (IsType ? "YYYY-MM-DD" : hb_setGetDateFormat())) );
if( (f = i + HB_MAX(ulWidth, 27)) > ulMaxBuf ){
/* 27 + 2 if %t and change format time */
if( (f = i + HB_MAX(ulWidth, 29)) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
hb_itemCopy( pItmCpy = hb_itemNew( NULL ), pItmPar );
pItmCpy = hb_itemNew( NULL );
hb_itemPutC( pItmCpy, cDTFrm );
if( IsType ){
/* Empty DATE, DATETIME print DEFAULT for T converter or DK_EMPTYDATE, DK_EMPTYDATETIME for t converter */
@@ -452,7 +453,7 @@ HB_FUNC( SQL_SPRINTF )
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
hb_itemCopy( pItmCpy = hb_itemNew( NULL ), pItmPar );
pItmCpy = hb_itemNew( NULL );
hb_itemPutCL( pItmCpy, cTrimStr, f );
s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmCpy );
hb_itemRelease( pItmCpy ); hb_xfree( cStr );

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

@@ -121,7 +121,8 @@
- Compilers of native CPU target have higher priority. (extra)
On x64 Windows: msvc64, msvc, msvcia64, mingw64, mingw, ...
On x86 Windows: msvc, msvc64, msvcia64, mingw, mingw64, ...
On IA64 Windows: msvcia64, msvc, msvc64, mingw, mingw64, ... */
On IA64 Windows: msvcia64, msvc, msvc64, mingw, mingw64, ...
+1 Add compiler version autodetection for MSVC. */
#ifndef _HBMK_EMBEDDED_