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

2011-04-20 11:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + -depincpath= now supports multiple paths separated by ';'
      (on all platforms)

  * contrib/3rd/sqlite3/sqlite3.hbp
    ! Fixed wrong hbmk2 filter expression.

  * contrib/hbmzip/3rd/minizip/minizip.hbp
  * contrib/rddads/rddads.hbp
  * contrib/hbpre.hbm
    * -std=c89/gnu89 -> -std=c90/gnu90. same, but gcc recommends the latter.

  * contrib/hbhpdf/core.c
  * contrib/rddsql/sqlmix.c
    ! Fixed C++ comments.

  * contrib/hbmxml/hbmxml.hbp
  * contrib/hbmxml/3rd/minixml/mxml.hbp
    ! -std=gnu90 for strdup()

  * contrib/hbbz2/3rd/bz2/bz2.hbp
  * contrib/hbssl/hbssl.hbm
    ! -std=gnu90 for fileno

  * contrib/hbfimage/hbfimage.hbp
  * contrib/gtalleg/gtalleg.hbm
    ! -std=gnu90 for 3rd party headers.

  * contrib/hbbz2/3rd/bz2/bz2.hbp
    % Enabled BZ_STRICT_ANSI. This effectively disanled bzdopen(),
      so if anyone needs it, speak up.

  * contrib/hbqt/hbqt_common.hbm
    ! Temp hack to override -std option for C++.
This commit is contained in:
Viktor Szakats
2011-04-20 09:27:44 +00:00
parent 443ac3a1ae
commit d552b5476b
15 changed files with 70 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
harbour/ChangeLog
View File

@@ -16,6 +16,42 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-04-20 11:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ -depincpath= now supports multiple paths separated by ';'
(on all platforms)
* contrib/3rd/sqlite3/sqlite3.hbp
! Fixed wrong hbmk2 filter expression.
* contrib/hbmzip/3rd/minizip/minizip.hbp
* contrib/rddads/rddads.hbp
* contrib/hbpre.hbm
* -std=c89/gnu89 -> -std=c90/gnu90. same, but gcc recommends the latter.
* contrib/hbhpdf/core.c
* contrib/rddsql/sqlmix.c
! Fixed C++ comments.
* contrib/hbmxml/hbmxml.hbp
* contrib/hbmxml/3rd/minixml/mxml.hbp
! -std=gnu90 for strdup()
* contrib/hbbz2/3rd/bz2/bz2.hbp
* contrib/hbssl/hbssl.hbm
! -std=gnu90 for fileno
* contrib/hbfimage/hbfimage.hbp
* contrib/gtalleg/gtalleg.hbm
! -std=gnu90 for 3rd party headers.
* contrib/hbbz2/3rd/bz2/bz2.hbp
% Enabled BZ_STRICT_ANSI. This effectively disanled bzdopen(),
so if anyone needs it, speak up.
* contrib/hbqt/hbqt_common.hbm
! Temp hack to override -std option for C++.
2011-04-20 03:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ new filter values: lngcpp and lngc. Can be used to

2
harbour/contrib/3rd/sqlite3/sqlite3.hbp
View File

@@ -6,7 +6,7 @@
-stop{poccarm}
# NOTE: old msvcarm can't cope with some PP directives. [vszakats]
-stop{msvcarm&HB_COMP_VER!='1200'&HB_COMP_VER!='1300'&HB_COMP_VER!='1310')}
-stop{msvcarm&(HB_COMP_VER='1200')&!(HB_COMP_VER='1300')&!(HB_COMP_VER='1310')}
# NOTE: dos based watcom runs out of memory. [vszakats]
-stop{HB_HOST_PLAT='dos'&watcom}
# NOTE: disable *nix builds on non-*nix platforms; [vszakats]

3
harbour/contrib/gtalleg/gtalleg.hbm
View File

@@ -21,5 +21,8 @@
-iflag={bcc}-a
# For allegro headers
-cflag=-std=gnu90{!lngcpp&allgcc}
gtalleg.c
ssf.c

4
harbour/contrib/hbbz2/3rd/bz2/bz2.hbp
View File

@@ -25,6 +25,10 @@ randtabl.c
{bcc}-aflag=/C
-cflag=-DBZ_STRICT_ANSI
# For fileno()
-cflag=-std=gnu90{!lngcpp&allgcc}
# ORIGIN http://www.bzip.org/
# VER 1.0.6
# URL http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz

3
harbour/contrib/hbfimage/hbfimage.hbp
View File

@@ -23,6 +23,9 @@
-instfile=inc:freeimag.ch
-instfile=inc:hbfimage.hbx
# For FreeImage headers
-cflag=-std=gnu90{!lngcpp&allgcc}
hbfimage.hbx
fi_winfu.c

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

@@ -1573,7 +1573,7 @@ HB_FUNC( HPDF_VERSION_TEXT )
hb_retc_const( HPDF_VERSION_TEXT );
}
/*----------------------------------------------------------------------*/
// New Functions in LibHaru 2.2.0
/* New Functions in LibHaru 2.2.0 */
/*----------------------------------------------------------------------*/
/*
HPDF_EXPORT(HPDF_STATUS)

3
harbour/contrib/hbmxml/3rd/minixml/mxml.hbp
View File

@@ -16,6 +16,9 @@
{win}-cflag=-DWIN32 -DWIN
{win|dos|os2}-cflag=-D_EOL_CRLF
# For strdup()
-cflag=-std=gnu90{!lngcpp&allgcc}
mxml_att.c
mxml_ent.c
mxml_fil.c

3
harbour/contrib/hbmxml/hbmxml.hbp
View File

@@ -19,6 +19,9 @@
-instfile=inc:hbmxml.ch
-instfile=inc:hbmxml.hbx
# For strdup()
-cflag=-std=gnu90{!lngcpp&allgcc}
hbmxml.hbx
core.c

2
harbour/contrib/hbmzip/3rd/minizip/minizip.hbp
View File

@@ -14,7 +14,7 @@
-pic
# for f*64() functions
-cflag=-std=gnu89{!lngcpp&allgcc}
-cflag=-std=gnu90{!lngcpp&allgcc}
ioapi.c
zip.c

2
harbour/contrib/hbpre.hbm
View File

@@ -17,6 +17,6 @@
{_HB_BUILD_LIBDYN}-hbdyn
-cflag=-std=c89{!lngcpp&allgcc}
-cflag=-std=c90{!lngcpp&allgcc}
-warn=yes

2
harbour/contrib/hbqt/hbqt_common.hbm
View File

@@ -17,6 +17,8 @@
-w3 -es2
-cflag=-std=gnu++98{allgcc}
-i.
-stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64|pcc}

3
harbour/contrib/hbssl/hbssl.hbm
View File

@@ -31,6 +31,9 @@
# Patent will expire in 2010/2011
-cflag=-DOPENSSL_NO_IDEA
# For _fileno() in openssl/applink.c
-cflag=-std=gnu90{!lngcpp&allgcc}
-instfile=inc:hbssl.ch
-instfile=inc:hbssl.hbx

6
harbour/contrib/rddads/rddads.hbp
View File

@@ -9,9 +9,6 @@
-w3 -es2
# for ADS headers
-cflag=-std=gnu89{!lngcpp&allgcc}
-stop{!(linux|win)}
-depkeyhead=ads:ace.h
@@ -30,6 +27,9 @@
# To avoid a warning in ACE header
-cflag=-Wno-pragmas{allmingw}
# for ADS headers
-cflag=-std=gnu90{!lngcpp&allgcc}
rddads.hbx
ads1.c

4
harbour/contrib/rddsql/sqlmix.c
View File

@@ -575,7 +575,7 @@ static void hb_mixTagAddKeyPos( PMIXTAG pTag, PMIXNODE pNode, unsigned int uiPos
MIX_COPY_CHILDS_EXTERNAL( pTag, pNewNode, 1, pNode, k + 1, MIX_NODE_ORDER - k );
for ( j = 1; j <= MIX_NODE_ORDER - k; j++ )
{
pNewNode->Child[ j ]->Parent = pNewNode; // Do NOT forget to re-parent
pNewNode->Child[ j ]->Parent = pNewNode; /* Do NOT forget to re-parent */
}
}
pNode->KeyCount = k;
@@ -1887,7 +1887,7 @@ static HB_ERRCODE sqlmixOrderInfo( SQLMIXAREAP pArea, HB_USHORT uiIndex, LPDBORD
break;
case DBOI_NUMBER:
pOrderInfo->itmResult = hb_itemPutNI( pOrderInfo->itmResult, uiTag ); // kitaip
pOrderInfo->itmResult = hb_itemPutNI( pOrderInfo->itmResult, uiTag ); /* kitaip */
break;
case DBOI_ISCOND:

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

@@ -2732,7 +2732,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
cParam := MacroProc( hbmk, SubStr( cParam, Len( "-depincpath=" ) + 1 ), aParam[ _PAR_cFileName ] )
IF dep_split_arg( hbmk, cParam, @cParam, @tmp )
AAddNew( hbmk[ _HBMK_hDEP ][ cParam ][ _HBMKDEP_aINCPATH ], hb_PathNormalize( PathMakeAbsolute( PathSepToSelf( tmp ), aParam[ _PAR_cFileName ] ) ) )
FOR EACH tmp1 IN hb_ATokens( tmp, ";" )
AAddNew( hbmk[ _HBMK_hDEP ][ cParam ][ _HBMKDEP_aINCPATH ], hb_PathNormalize( PathMakeAbsolute( PathSepToSelf( tmp1 ), aParam[ _PAR_cFileName ] ) ) )
NEXT
ENDIF
CASE Left( cParam, Len( "-depincpathlocal=" ) ) == "-depincpathlocal="
@@ -12006,7 +12008,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
{ "-depkeyhead=<d:h>" , I_( "<d> is the name of the dependency. <h> is the key header (.h) of the package dependency. Multiple alternative headers can be specified." ) },;
{ "-depoptional=<d:f>" , I_( "<d> is the name of the dependency. <f> can be 'yes' or 'no', specifies whether the dependency is optional. Default: no" ) },;
{ "-depcontrol=<d:v>" , I_( "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_<d>" ) },;
{ "-depincpath=<d:i>" , I_( "<d> is the name of the dependency. Add <i> to the header detection path list" ) },;
{ "-depincpath=<d:i>" , I_( "<d> is the name of the dependency. Add <i> to the header detection path list. May be ';' delimited list of paths." ) },;
{ "-depincpathlocal= <d:i>" , I_( "<d> is the name of the dependency. Add <i> to the header detection path list, where <i> is pointing to a directory local to the project and containing an embedded (or locally hosted) dependency." ) },;
{ "-depimplibs=<d:dll>" , I_( "<d> is the name of the dependency. Add <dll> to the import library source list" ) },;
{ "-depimplibd=<d:lib>" , I_( "<d> is the name of the dependency. Set generated import library name to <lib>" ) },;