From 10c88f316c35e9d019bd7436bba6e198212e0bbb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 31 May 2010 23:47:15 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 24 +++++++++++++++++++++++ harbour/contrib/hbcairo/hbcairo.h | 1 + harbour/contrib/hbcairo/hbcairo.hbp | 28 +++++++++++++++++++++++++++ harbour/contrib/hbcups/hbcups.hbp | 18 +++++++++++++++++ harbour/contrib/hbfimage/hbfimage.hbp | 24 +++++++++++++++++++++++ harbour/contrib/hbgd/Makefile | 6 ------ harbour/contrib/hbgd/hbgd.hbp | 27 ++++++++++++++++++++++++++ harbour/contrib/hbmysql/hbmysql.hbp | 23 ++++++++++++++++++++++ harbour/contrib/hbpgsql/hbpgsql.hbp | 28 +++++++++++++++++++++++++++ harbour/contrib/rddads/rddads.hbp | 24 +++++++++++++++++++++++ harbour/contrib/sddfb/sddfb.hbp | 24 +++++++++++++++++++++++ harbour/contrib/sddmy/sddmy.hbp | 21 ++++++++++++++++++++ harbour/contrib/sddoci/sddoci.hbp | 23 ++++++++++++++++++++++ harbour/contrib/sddpg/sddpg.hbp | 27 ++++++++++++++++++++++++++ harbour/utils/hbmk2/hbmk2.prg | 27 +++++++++++++------------- 15 files changed, 306 insertions(+), 19 deletions(-) create mode 100644 harbour/contrib/hbcairo/hbcairo.hbp create mode 100644 harbour/contrib/hbcups/hbcups.hbp create mode 100644 harbour/contrib/hbfimage/hbfimage.hbp create mode 100644 harbour/contrib/hbgd/hbgd.hbp create mode 100644 harbour/contrib/hbmysql/hbmysql.hbp create mode 100644 harbour/contrib/hbpgsql/hbpgsql.hbp create mode 100644 harbour/contrib/rddads/rddads.hbp create mode 100644 harbour/contrib/sddfb/sddfb.hbp create mode 100644 harbour/contrib/sddmy/sddmy.hbp create mode 100644 harbour/contrib/sddoci/sddoci.hbp create mode 100644 harbour/contrib/sddpg/sddpg.hbp diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1edea457d5..b1705e22f0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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 diff --git a/harbour/contrib/hbcairo/hbcairo.h b/harbour/contrib/hbcairo/hbcairo.h index bb121c6fe7..77cc4a7429 100644 --- a/harbour/contrib/hbcairo/hbcairo.h +++ b/harbour/contrib/hbcairo/hbcairo.h @@ -55,6 +55,7 @@ #include "hbapi.h" #include "hbstack.h" + #include "cairo.h" HB_EXTERN_BEGIN diff --git a/harbour/contrib/hbcairo/hbcairo.hbp b/harbour/contrib/hbcairo/hbcairo.hbp new file mode 100644 index 0000000000..6cca3b0b0a --- /dev/null +++ b/harbour/contrib/hbcairo/hbcairo.hbp @@ -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 diff --git a/harbour/contrib/hbcups/hbcups.hbp b/harbour/contrib/hbcups/hbcups.hbp new file mode 100644 index 0000000000..b05642e354 --- /dev/null +++ b/harbour/contrib/hbcups/hbcups.hbp @@ -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 diff --git a/harbour/contrib/hbfimage/hbfimage.hbp b/harbour/contrib/hbfimage/hbfimage.hbp new file mode 100644 index 0000000000..7487db5fe6 --- /dev/null +++ b/harbour/contrib/hbfimage/hbfimage.hbp @@ -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 diff --git a/harbour/contrib/hbgd/Makefile b/harbour/contrib/hbgd/Makefile index 43b1a1f256..1f5a25ea23 100644 --- a/harbour/contrib/hbgd/Makefile +++ b/harbour/contrib/hbgd/Makefile @@ -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 diff --git a/harbour/contrib/hbgd/hbgd.hbp b/harbour/contrib/hbgd/hbgd.hbp new file mode 100644 index 0000000000..3cbad9307d --- /dev/null +++ b/harbour/contrib/hbgd/hbgd.hbp @@ -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 diff --git a/harbour/contrib/hbmysql/hbmysql.hbp b/harbour/contrib/hbmysql/hbmysql.hbp new file mode 100644 index 0000000000..860ccf5ca1 --- /dev/null +++ b/harbour/contrib/hbmysql/hbmysql.hbp @@ -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 diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbp b/harbour/contrib/hbpgsql/hbpgsql.hbp new file mode 100644 index 0000000000..ce87174787 --- /dev/null +++ b/harbour/contrib/hbpgsql/hbpgsql.hbp @@ -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 diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp new file mode 100644 index 0000000000..873a2072a3 --- /dev/null +++ b/harbour/contrib/rddads/rddads.hbp @@ -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 diff --git a/harbour/contrib/sddfb/sddfb.hbp b/harbour/contrib/sddfb/sddfb.hbp new file mode 100644 index 0000000000..500a4717f0 --- /dev/null +++ b/harbour/contrib/sddfb/sddfb.hbp @@ -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 diff --git a/harbour/contrib/sddmy/sddmy.hbp b/harbour/contrib/sddmy/sddmy.hbp new file mode 100644 index 0000000000..fe7707d528 --- /dev/null +++ b/harbour/contrib/sddmy/sddmy.hbp @@ -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 diff --git a/harbour/contrib/sddoci/sddoci.hbp b/harbour/contrib/sddoci/sddoci.hbp new file mode 100644 index 0000000000..a979f7ac63 --- /dev/null +++ b/harbour/contrib/sddoci/sddoci.hbp @@ -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 diff --git a/harbour/contrib/sddpg/sddpg.hbp b/harbour/contrib/sddpg/sddpg.hbp new file mode 100644 index 0000000000..ba90dfba39 --- /dev/null +++ b/harbour/contrib/sddpg/sddpg.hbp @@ -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 diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 338a0f9d7d..017e6a5a23 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -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