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

2010-06-01 01:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Will now ignore current and host directory when looking
      for system headers (<>) in header dependency finder code.

  + contrib/hbmysql/hbmysql.hbp
  + contrib/sddmy/sddmy.hbp
  + contrib/sddfb/sddfb.hbp
  + contrib/sddpg/sddpg.hbp
  + contrib/hbcups/hbcups.hbp
  + contrib/hbpgsql/hbpgsql.hbp
  + contrib/rddads/rddads.hbp
  + contrib/hbfimage/hbfimage.hbp
  + contrib/hbgd/hbgd.hbp
  + contrib/sddoci/sddoci.hbp
  + contrib/hbcairo/hbcairo.hbp
    + Added new hbmk2 make files.

  * contrib/hbgd/Makefile
    - Deleted some information from cmoment. (now included in INSTALL)

  * contrib/hbcairo/hbcairo.h
    * Formatting.
This commit is contained in:
Viktor Szakats
2010-05-31 23:47:15 +00:00
parent 2baf88201f
commit 10c88f316c
15 changed files with 306 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
harbour/ChangeLog
View File

@@ -17,6 +17,30 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-06-01 01:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Will now ignore current and host directory when looking
for system headers (<>) in header dependency finder code.
+ contrib/hbmysql/hbmysql.hbp
+ contrib/sddmy/sddmy.hbp
+ contrib/sddfb/sddfb.hbp
+ contrib/sddpg/sddpg.hbp
+ contrib/hbcups/hbcups.hbp
+ contrib/hbpgsql/hbpgsql.hbp
+ contrib/rddads/rddads.hbp
+ contrib/hbfimage/hbfimage.hbp
+ contrib/hbgd/hbgd.hbp
+ contrib/sddoci/sddoci.hbp
+ contrib/hbcairo/hbcairo.hbp
+ Added new hbmk2 make files.
* contrib/hbgd/Makefile
- Deleted some information from cmoment. (now included in INSTALL)
* contrib/hbcairo/hbcairo.h
* Formatting.
2010-06-01 01:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/common/hbver.c
+ Applied patch sent by Tamas Tevesz to clean up LLVM/Clang

1
harbour/contrib/hbcairo/hbcairo.h
View File

@@ -55,6 +55,7 @@
#include "hbapi.h"
#include "hbstack.h"
#include "cairo.h"
HB_EXTERN_BEGIN

28
harbour/contrib/hbcairo/hbcairo.hbp Normal file
View File

@@ -0,0 +1,28 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
-reqheader=cairo.h
-inctrypath=${HB_WITH_CAIRO}
-inctrypath=/usr/include/cairo
-inctrypath=/opt/local/include/cairo
context.c
core.c
image.c
paths.c
pdf.c
png.c
surface.c
text.c
transfor.c
util.c

18
harbour/contrib/hbcups/hbcups.hbp Normal file
View File

@@ -0,0 +1,18 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
-reqheader=cups/cups.h
-inctrypath=${HB_WITH_CUPS}
-inctrypath=/usr/include
hbcups.c

24
harbour/contrib/hbfimage/hbfimage.hbp Normal file
View File

@@ -0,0 +1,24 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
-stop{dos|os2}
-reqheader=FreeImage.h
-inctrypath=${HB_WITH_FREEIMAGE}
-inctrypath=/usr/include
-inctrypath=/opt/local/include
-cflag=-DHB_LEGACY_TYPES_OFF
fi_winfu.c
fi_wrp.c

6
harbour/contrib/hbgd/Makefile
View File

@@ -2,12 +2,6 @@
# $Id$
#
# You can get the library from this link:
# http://www.libgd.org/Downloads
# On Linux you'll need these packages:
# gd, gd-devel
ROOT := ../../
include $(TOP)$(ROOT)config/global.mk

27
harbour/contrib/hbgd/hbgd.hbp Normal file
View File

@@ -0,0 +1,27 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
-reqpkg=gd|gd-devel|gd.h
-reqheader=gd.h
-inctrypath=${HB_WITH_GD}
-inctrypath=/usr/include
-inctrypath=/opt/local/include
gdwrp.c
gd.prg
gdbar.prg
gdchart.prg
gdimage.prg
gdbarcod.prg

23
harbour/contrib/hbmysql/hbmysql.hbp Normal file
View File

@@ -0,0 +1,23 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
-reqheader=mysql.h
-inctrypath=${HB_WITH_MYSQL}
-inctrypath=/usr/include/mysql
-inctrypath=/opt/local/include/mysql5/mysql
mysql.c
mysqlold.c
tmysql.prg
tsqlbrw.prg

28
harbour/contrib/hbpgsql/hbpgsql.hbp Normal file
View File

@@ -0,0 +1,28 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
-reqheader=libpq-fe.h
-inctrypath=${HB_WITH_PGSQL}
-inctrypath=/usr/include
-inctrypath=/usr/local/pgsql/include
-inctrypath=/usr/local/pgsql/include/libpq
-inctrypath=/usr/include/pgsql
-inctrypath=/usr/include/postgresql
-inctrypath=/postgres/include
-inctrypath=/opt/local/include/postgresql84
-inctrypath=/opt/local/include/postgresql83
postgres.c
tpostgre.prg
pgrdd.prg

24
harbour/contrib/rddads/rddads.hbp Normal file
View File

@@ -0,0 +1,24 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
-stop{dos|os2}
-reqheader=ace.h
-inctrypath=${HB_WITH_ADS}
-inctrypath=/usr/local/ads/acesdk
-inctrypath=${HOME}/ads/acesdk
ads1.c
adsfunc.c
adsmgmnt.c
adsx.c

24
harbour/contrib/sddfb/sddfb.hbp Normal file
View File

@@ -0,0 +1,24 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
../rddsql/rddsql.hbc
-stop{pocc64|poccarm}
-reqheader=ibase.h
-inctrypath=${HB_WITH_FIREBIRD}
-inctrypath=/usr/include
-inctrypath=/opt/firebird/include
-inctrypath=/Library/Frameworks/Firebird.framework/Headers
sddfb.c

21
harbour/contrib/sddmy/sddmy.hbp Normal file
View File

@@ -0,0 +1,21 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
../rddsql/rddsql.hbc
-reqheader=mysql.h
-inctrypath=${HB_WITH_MYSQL}
-inctrypath=/usr/include/mysql
-inctrypath=/opt/local/include/mysql5/mysql
sddmy.c

23
harbour/contrib/sddoci/sddoci.hbp Normal file
View File

@@ -0,0 +1,23 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
../rddsql/rddsql.hbc
-stop{dos|os2|wce}
-reqheader=ocilib.h
-inctrypath=${HB_WITH_OCILIB}
-inctrypath=/usr/include
-inctrypath=/usr/local/include
sddoci.c

27
harbour/contrib/sddpg/sddpg.hbp Normal file
View File

@@ -0,0 +1,27 @@
#
# $Id$
#
-hblib
-inc
-nohbc
-o${hb_name}
-w3 -es2
../rddsql/rddsql.hbc
-reqheader=libpq-fe.h
-inctrypath=${HB_WITH_PGSQL}
-inctrypath=/usr/include
-inctrypath=/usr/local/pgsql/include
-inctrypath=/usr/local/pgsql/include/libpq
-inctrypath=/usr/include/pgsql
-inctrypath=/usr/include/postgresql
-inctrypath=/postgres/include
-inctrypath=/opt/local/include/postgresql84
-inctrypath=/opt/local/include/postgresql83
sddpg.c

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

@@ -3907,7 +3907,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF ! hb_FGetDateTime( FN_DirExtSet( tmp, hbmk[ _HBMK_cWorkDir ], cObjExt ), @tmp2 ) .OR. ;
! hb_FGetDateTime( tmp, @tmp1 ) .OR. ;
tmp1 > tmp2 .OR. ;
( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, tmp2, ! Empty( hbmk[ _HBMK_aINCTRYPATH ] ), .T., cBin_CompC, @headstate ) )
( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, .F., tmp2, ! Empty( hbmk[ _HBMK_aINCTRYPATH ] ), .T., cBin_CompC, @headstate ) )
AAdd( l_aC_TODO, tmp )
ENDIF
NEXT
@@ -3918,7 +3918,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
/* Header dir detection if needed and if FindNewerHeaders() wasn't called yet. */
IF ! Empty( hbmk[ _HBMK_aINCTRYPATH ] ) .AND. ! Empty( l_aC_TODO ) .AND. headstate == NIL
FOR EACH tmp IN l_aC_TODO
FindNewerHeaders( hbmk, tmp, NIL, NIL, .T., .T., cBin_CompC, @headstate )
FindNewerHeaders( hbmk, tmp, NIL, .F., NIL, .T., .T., cBin_CompC, @headstate )
NEXT
ENDIF
ENDIF
@@ -3938,7 +3938,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF ! hb_FGetDateTime( FN_DirExtSet( tmp, hbmk[ _HBMK_cWorkDir ], cObjExt ), @tmp2 ) .OR. ;
! hb_FGetDateTime( tmp, @tmp1 ) .OR. ;
tmp1 > tmp2 .OR. ;
( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, tmp2, ! Empty( hbmk[ _HBMK_aINCTRYPATH ] ), .T., cBin_CompCPP, @headstate ) )
( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, .F., tmp2, ! Empty( hbmk[ _HBMK_aINCTRYPATH ] ), .T., cBin_CompCPP, @headstate ) )
AAdd( l_aCPP_TODO, tmp )
ENDIF
NEXT
@@ -3949,7 +3949,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
/* Header dir detection if needed and if FindNewerHeaders() wasn't called yet. */
IF ! Empty( hbmk[ _HBMK_aINCTRYPATH ] ) .AND. ! Empty( l_aCPP_TODO ) .AND. headstate == NIL
FOR EACH tmp IN l_aCPP_TODO
FindNewerHeaders( hbmk, tmp, NIL, NIL, .T., .T., cBin_CompCPP, @headstate )
FindNewerHeaders( hbmk, tmp, NIL, .F., NIL, .T., .T., cBin_CompCPP, @headstate )
NEXT
ENDIF
ENDIF
@@ -3983,7 +3983,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF ! hb_FGetDateTime( FN_DirExtSet( tmp3, cHarbourOutputDir, cHarbourOutputExt ), @tmp2 ) .OR. ;
! hb_FGetDateTime( tmp3, @tmp1 ) .OR. ;
tmp1 > tmp2 .OR. ;
( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, tmp2, .F., .F., cBin_CompC, @headstate ) )
( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, .F., tmp2, .F., .F., cBin_CompC, @headstate ) )
AAdd( l_aPRG_TODO, tmp )
ENDIF
NEXT
@@ -4516,7 +4516,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF ! hb_FGetDateTime( FN_DirExtSet( tmp, hbmk[ _HBMK_cWorkDir ], cResExt ), @tmp2 ) .OR. ;
! hb_FGetDateTime( tmp, @tmp1 ) .OR. ;
tmp1 > tmp2 .OR. ;
( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, tmp2, .F., .T., cBin_CompC, @headstate ) )
( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, .F., tmp2, .F., .T., cBin_CompC, @headstate ) )
AAdd( l_aRESSRC_TODO, tmp )
ENDIF
NEXT
@@ -5481,7 +5481,7 @@ STATIC FUNCTION SetupForGT( cGT_New, /* @ */ cGT, /* @ */ lGUI )
#define _HEADSTATE_lAnyNewer 2
#define _HEADSTATE_MAX_ 2
STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lIncTry, lCMode, cBin_CompC, /* @ */ headstate, nNestingLevel )
STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, lSystemHeader, tTimeParent, lIncTry, lCMode, cBin_CompC, /* @ */ headstate, nNestingLevel )
LOCAL cFile
LOCAL fhnd
LOCAL nPos
@@ -5521,7 +5521,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc
ENDIF
IF nNestingLevel > 1
cFileName := FindHeader( hbmk, cFileName, cParentDir, iif( lIncTry, hbmk[ _HBMK_aINCTRYPATH ], NIL ) )
cFileName := FindHeader( hbmk, cFileName, cParentDir, iif( lIncTry, hbmk[ _HBMK_aINCTRYPATH ], NIL ), lSystemHeader )
IF Empty( cFileName )
RETURN .F.
ENDIF
@@ -5682,7 +5682,8 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc
tmp := SubStr( cFile, nPos, 1 )
++nPos
IF tmp $ '"<'
IF ( tmp := hb_At( iif( tmp == "<", ">", '"' ), cFile, nPos ) ) > 0
lSystemHeader := ( tmp == "<" )
IF ( tmp := hb_At( iif( lSystemHeader, ">", '"' ), cFile, nPos ) ) > 0
cHeader := SubStr( cFile, nPos, tmp - nPos )
nPos := tmp
ENDIF
@@ -5692,7 +5693,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc
ENDIF
IF cHeader != NIL .AND. ;
FindNewerHeaders( hbmk, cHeader, iif( lCMode, FN_DirGet( cFileName ), cParentDir ), tTimeParent, lIncTry, lCMode, cBin_CompC, @headstate, nNestingLevel + 1 )
FindNewerHeaders( hbmk, cHeader, iif( lCMode, FN_DirGet( cFileName ), cParentDir ), lSystemHeader, tTimeParent, lIncTry, lCMode, cBin_CompC, @headstate, nNestingLevel + 1 )
headstate[ _HEADSTATE_lAnyNewer ] := .T.
/* Let it continue if we want to scan for header locations */
IF ! lIncTry
@@ -5898,17 +5899,17 @@ STATIC FUNCTION AMerge( aDst, aSrc )
RETURN aDst
STATIC FUNCTION FindHeader( hbmk, cFileName, cParentDir, aINCTRYPATH )
STATIC FUNCTION FindHeader( hbmk, cFileName, cParentDir, aINCTRYPATH, lSystemHeader )
LOCAL cDir
/* Check in current dir */
IF hb_FileExists( cFileName )
IF ! lSystemHeader .AND. hb_FileExists( cFileName )
RETURN cFileName
ENDIF
/* Check in parent dir */
IF hb_FileExists( DirAddPathSep( PathSepToSelf( cParentDir ) ) + cFileName )
IF ! lSystemHeader .AND. hb_FileExists( DirAddPathSep( PathSepToSelf( cParentDir ) ) + cFileName )
RETURN DirAddPathSep( PathSepToSelf( cParentDir ) ) + cFileName
ENDIF