diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a30e963d0b..ef7fd41d5c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,38 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-06-03 23:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + * Minor cleanup to previous commits. + + + contrib/hbodbc/hbodbc.hbp + + contrib/hbsqlit3/hbsqlit3.hbp + + contrib/hbbz2/hbbz2.hbp + + contrib/hbhpdf/hbhpdf.hbp + + contrib/sddsqlt3/sddsqlt3.hbp + + contrib/sddodbc/sddodbc.hbp + + Added hbmk2 make files to remaining contribs. + + * contrib/hbmysql/hbmysql.hbp + * contrib/gtalleg/gtalleg.hbp + * contrib/sddmy/sddmy.hbp + * contrib/sddfb/sddfb.hbp + * contrib/hbmzip/hbmzip.hbp + * contrib/hbqt/hbqt_common.hbm + * contrib/hbfbird/hbfbird.hbp + * contrib/sddpg/sddpg.hbp + * contrib/hbcurl/hbcurl.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 + * contrib/hbssl/hbssl.hbp + + Updated hbmk2 make file dependency detection + option to latest hbmk2 changes. + 2010-06-03 23:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed silly typo in last commit. (missing ! operator in IF condition) diff --git a/harbour/contrib/gtalleg/gtalleg.hbp b/harbour/contrib/gtalleg/gtalleg.hbp index c09eb193f6..3e547d45bd 100644 --- a/harbour/contrib/gtalleg/gtalleg.hbp +++ b/harbour/contrib/gtalleg/gtalleg.hbp @@ -13,11 +13,10 @@ -stop{pocc|pocc64|poccarm|xcc|dmc|watcom|mingwarm|msvcarm} --reqheader=allegro.h - --inctrypath=${HB_WITH_ALLEGRO} --inctrypath=/usr/include --inctrypath=/opt/local/include +-depkeyhead=allegro:allegro.h +-depcontrol=allegro:${HB_WITH_ALLEGRO} +-depincpath=allegro:/usr/include +-depincpath=allegro:/opt/local/include gtalleg.c ssf.c diff --git a/harbour/contrib/hbbz2/hbbz2.hbp b/harbour/contrib/hbbz2/hbbz2.hbp new file mode 100644 index 0000000000..d3849143b2 --- /dev/null +++ b/harbour/contrib/hbbz2/hbbz2.hbp @@ -0,0 +1,20 @@ +# +# $Id$ +# + +-hblib +-inc +-nohbc + +-o${hb_name} + +-w3 -es2 + +-stop{wce} + +-depkeyhead=bzip2:bzlib.h +-depcontrol=bzip2:${HB_WITH_BZIP2} +-depincpath=bzip2:/usr/include +-depincpathlocal=bzip2:../../external/bzip2 + +hbbz2.c diff --git a/harbour/contrib/hbcairo/hbcairo.hbp b/harbour/contrib/hbcairo/hbcairo.hbp index 6cca3b0b0a..b2f2d75b9c 100644 --- a/harbour/contrib/hbcairo/hbcairo.hbp +++ b/harbour/contrib/hbcairo/hbcairo.hbp @@ -10,11 +10,10 @@ -w3 -es2 --reqheader=cairo.h - --inctrypath=${HB_WITH_CAIRO} --inctrypath=/usr/include/cairo --inctrypath=/opt/local/include/cairo +-depkeyhead=cairo:cairo.h +-depcontrol=cairo:${HB_WITH_CAIRO} +-depincpath=cairo:/usr/include/cairo +-depincpath=cairo:/opt/local/include/cairo context.c core.c diff --git a/harbour/contrib/hbcups/hbcups.hbp b/harbour/contrib/hbcups/hbcups.hbp index b05642e354..64ad388249 100644 --- a/harbour/contrib/hbcups/hbcups.hbp +++ b/harbour/contrib/hbcups/hbcups.hbp @@ -10,9 +10,8 @@ -w3 -es2 --reqheader=cups/cups.h - --inctrypath=${HB_WITH_CUPS} --inctrypath=/usr/include +-depkeyhead=cups:cups/cups.h +-depcontrol=cups:${HB_WITH_CUPS} +-depincpath=cups:/usr/include hbcups.c diff --git a/harbour/contrib/hbcurl/hbcurl.hbp b/harbour/contrib/hbcurl/hbcurl.hbp index 4cccaf7054..b9972689f2 100644 --- a/harbour/contrib/hbcurl/hbcurl.hbp +++ b/harbour/contrib/hbcurl/hbcurl.hbp @@ -11,9 +11,8 @@ -w3 -es2 --reqheader=curl/curl.h - --inctrypath=${HB_WITH_CURL} --inctrypath=/usr/include +-depkeyhead=curl:curl/curl.h +-depcontrol=curl:${HB_WITH_CURL} +-depincpath=curl:/usr/include hbcurl.c diff --git a/harbour/contrib/hbfbird/hbfbird.hbp b/harbour/contrib/hbfbird/hbfbird.hbp index ee8ee79579..007a8b4166 100644 --- a/harbour/contrib/hbfbird/hbfbird.hbp +++ b/harbour/contrib/hbfbird/hbfbird.hbp @@ -15,9 +15,8 @@ tfirebrd.prg -stop{pocc64|poccarm} --reqheader=ibase.h - --inctrypath=${HB_WITH_FIREBIRD} --inctrypath=/usr/include --inctrypath=/opt/firebird/include --inctrypath=/Library/Frameworks/Firebird.framework/Headers +-depkeyhead=firebird:ibase.h +-depcontrol=firebird:${HB_WITH_FIREBIRD} +-depincpath=firebird:/usr/include +-depincpath=firebird:/opt/firebird/include +-depincpath=firebird:/Library/Frameworks/Firebird.framework/Headers diff --git a/harbour/contrib/hbfimage/hbfimage.hbp b/harbour/contrib/hbfimage/hbfimage.hbp index 7487db5fe6..ba5069c6a5 100644 --- a/harbour/contrib/hbfimage/hbfimage.hbp +++ b/harbour/contrib/hbfimage/hbfimage.hbp @@ -12,11 +12,10 @@ -stop{dos|os2} --reqheader=FreeImage.h - --inctrypath=${HB_WITH_FREEIMAGE} --inctrypath=/usr/include --inctrypath=/opt/local/include +-depkeyhead=freeimage:FreeImage.h +-depcontrol=freeimage:${HB_WITH_FREEIMAGE} +-depincpath=freeimage:/usr/include +-depincpath=freeimage:/opt/local/include -cflag=-DHB_LEGACY_TYPES_OFF diff --git a/harbour/contrib/hbgd/hbgd.hbp b/harbour/contrib/hbgd/hbgd.hbp index 3cbad9307d..5e9d503eff 100644 --- a/harbour/contrib/hbgd/hbgd.hbp +++ b/harbour/contrib/hbgd/hbgd.hbp @@ -10,13 +10,11 @@ -w3 -es2 --reqpkg=gd|gd-devel|gd.h - --reqheader=gd.h - --inctrypath=${HB_WITH_GD} --inctrypath=/usr/include --inctrypath=/opt/local/include +-deppkgname=gd:gd-devel +-depkeyhead=gd:gd.h +-depcontrol=gd:${HB_WITH_GD} +-depincpath=gd:/usr/include +-depincpath=gd:/opt/local/include gdwrp.c diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbp b/harbour/contrib/hbhpdf/hbhpdf.hbp new file mode 100644 index 0000000000..b47edbbfaf --- /dev/null +++ b/harbour/contrib/hbhpdf/hbhpdf.hbp @@ -0,0 +1,19 @@ +# +# $Id$ +# + +-hblib +-inc +-nohbc + +-o${hb_name} + +-w3 -es2 + +-depkeyhead=libharu:hpdf.h +-depcontrol=libharu:${HB_WITH_LIBHARU} +-depincpath=libharu:/usr/include +-depincpath=libharu:/usr/local/include +-depincpathlocal=libharu:../../external/libhpdf + +harupdf.c diff --git a/harbour/contrib/hbmysql/hbmysql.hbp b/harbour/contrib/hbmysql/hbmysql.hbp index 860ccf5ca1..615a2e1841 100644 --- a/harbour/contrib/hbmysql/hbmysql.hbp +++ b/harbour/contrib/hbmysql/hbmysql.hbp @@ -10,11 +10,10 @@ -w3 -es2 --reqheader=mysql.h - --inctrypath=${HB_WITH_MYSQL} --inctrypath=/usr/include/mysql --inctrypath=/opt/local/include/mysql5/mysql +-depkeyhead=mysql:mysql.h +-depcontrol=mysql:${HB_WITH_MYSQL} +-depincpath=mysql:/usr/include/mysql +-depincpath=mysql:/opt/local/include/mysql5/mysql mysql.c mysqlold.c diff --git a/harbour/contrib/hbmzip/hbmzip.hbp b/harbour/contrib/hbmzip/hbmzip.hbp index 79c3d5df24..f12a7f9097 100644 --- a/harbour/contrib/hbmzip/hbmzip.hbp +++ b/harbour/contrib/hbmzip/hbmzip.hbp @@ -10,8 +10,6 @@ -w3 -es2 -hbmzip.c - -depkeyhead=minizip:zip.h -depcontrol=minizip:${HB_WITH_MINIZIP} -depincpath=minizip:/usr/include @@ -25,3 +23,5 @@ hbmzip.c -depincpath=zlib:/usr/local/include -depincpath=zlib:/boot/develop/headers/3rdparty -depincpathlocal=zlib:../../external/zlib + +hbmzip.c diff --git a/harbour/contrib/hbodbc/hbodbc.hbp b/harbour/contrib/hbodbc/hbodbc.hbp new file mode 100644 index 0000000000..10e82f1218 --- /dev/null +++ b/harbour/contrib/hbodbc/hbodbc.hbp @@ -0,0 +1,25 @@ +# +# $Id$ +# + +-hblib +-inc +-nohbc + +-o${hb_name} + +-w3 -es2 + +-stop{dos|os2|rsxnt} + +-depkeyhead=odbc:sql.h +{!(win|wce)}-depcontrol=odbc:${HB_WITH_ODBC} +{(win|wce)&!msvcarm}-depcontrol=odbc:force +-depincpath=odbc:/usr/include +-depincpath=odbc:/usr/local/include + +odbc.c +odbcold.c + +todbc.prg +browodbc.prg diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbp b/harbour/contrib/hbpgsql/hbpgsql.hbp index ce87174787..2e001c9e8d 100644 --- a/harbour/contrib/hbpgsql/hbpgsql.hbp +++ b/harbour/contrib/hbpgsql/hbpgsql.hbp @@ -10,17 +10,16 @@ -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 +-depkeyhead=pgsql:libpq-fe.h +-depcontrol=pgsql:${HB_WITH_PGSQL} +-depincpath=pgsql:/usr/include +-depincpath=pgsql:/usr/local/pgsql/include +-depincpath=pgsql:/usr/local/pgsql/include/libpq +-depincpath=pgsql:/usr/include/pgsql +-depincpath=pgsql:/usr/include/postgresql +-depincpath=pgsql:/postgres/include +-depincpath=pgsql:/opt/local/include/postgresql84 +-depincpath=pgsql:/opt/local/include/postgresql83 postgres.c diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm index facf67f3a5..7845be61c2 100644 --- a/harbour/contrib/hbqt/hbqt_common.hbm +++ b/harbour/contrib/hbqt/hbqt_common.hbm @@ -12,13 +12,15 @@ -plugin=plug_moc.prg -{!darwin|HB_WITH_QT}-reqheader=QtCore/qglobal.h -{!darwin|HB_WITH_QT}-inctrypath=${HB_WITH_QT} -{!darwin}-inctrypath=/usr/include/qt4 -{!darwin}-inctrypath=/usr/lib/qt4/include -{!darwin}-inctrypath=/usr/include -{!darwin}-inctrypath=/Developer/qt/include +-depcontrol=qt:${HB_WITH_QT} -{darwin&!HB_WITH_QT}-reqheader=QtCore -{darwin&!HB_WITH_QT}-inctrypath=/Library/Frameworks/QtCore.framework/Headers -{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtCore.framework/Headers +{!darwin}-depkeyhead=qt:QtCore/qglobal.h +{!darwin}-depincpath=qt:/usr/include/qt4 +{!darwin}-depincpath=qt:/usr/lib/qt4/include +{!darwin}-depincpath=qt:/usr/include +{!darwin}-depincpath=qt:/Developer/qt/include + +# TOFIX: Use the same header for detection on darwin +{darwin}-depkeyhead=qt:QtCore +{darwin}-depincpath=qt:/Library/Frameworks/QtCore.framework/Headers +{darwin}-cflag=-I/Library/Frameworks/QtCore.framework/Headers diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbp b/harbour/contrib/hbsqlit3/hbsqlit3.hbp new file mode 100644 index 0000000000..54432bddb6 --- /dev/null +++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbp @@ -0,0 +1,19 @@ +# +# $Id$ +# + +-hblib +-inc +-nohbc + +-o${hb_name} + +-w3 -es2 + +-depkeyhead=sqlite3:sqlite3.h +-depcontrol=sqlite3:${HB_WITH_SQLITE3} +-depincpath=sqlite3:/usr/include +-depincpath=sqlite3:/boot/common/include +-depincpathlocal=sqlite3:../../external/sqlite3 + +hbsqlit3.c diff --git a/harbour/contrib/hbssl/hbssl.hbp b/harbour/contrib/hbssl/hbssl.hbp index b0cc255896..1b08f58b70 100644 --- a/harbour/contrib/hbssl/hbssl.hbp +++ b/harbour/contrib/hbssl/hbssl.hbp @@ -13,13 +13,12 @@ -w3 -es2 --reqheader=openssl/ssl.h - --inctrypath=${HB_WITH_OPENSSL} --inctrypath=/usr/include --inctrypath=/usr/local/include --inctrypath=/usr/local/ssl/include --inctrypath=/boot/common/include +-depkeyhead=openssl:openssl/ssl.h +-depcontrol=openssl:${HB_WITH_OPENSSL} +-depincpath=openssl:/usr/include +-depincpath=openssl:/usr/local/include +-depincpath=openssl:/usr/local/ssl/include +-depincpath=openssl:/boot/common/include {darwin}-cflag=-DOPENSSL_NO_SHA256 {darwin}-cflag=-DOPENSSL_NO_SHA512 diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp index 873a2072a3..8e6575f5c6 100644 --- a/harbour/contrib/rddads/rddads.hbp +++ b/harbour/contrib/rddads/rddads.hbp @@ -12,11 +12,10 @@ -stop{dos|os2} --reqheader=ace.h - --inctrypath=${HB_WITH_ADS} --inctrypath=/usr/local/ads/acesdk --inctrypath=${HOME}/ads/acesdk +-depkeyhead=ads:ace.h +-depcontrol=ads:${HB_WITH_ADS} +-depincpath=ads:/usr/local/ads/acesdk +-depincpath=ads:${HOME}/ads/acesdk ads1.c adsfunc.c diff --git a/harbour/contrib/sddfb/sddfb.hbp b/harbour/contrib/sddfb/sddfb.hbp index 500a4717f0..40e78a27f0 100644 --- a/harbour/contrib/sddfb/sddfb.hbp +++ b/harbour/contrib/sddfb/sddfb.hbp @@ -14,11 +14,10 @@ -stop{pocc64|poccarm} --reqheader=ibase.h - --inctrypath=${HB_WITH_FIREBIRD} --inctrypath=/usr/include --inctrypath=/opt/firebird/include --inctrypath=/Library/Frameworks/Firebird.framework/Headers +-depkeyhead=firebird:ibase.h +-depcontrol=firebird:${HB_WITH_FIREBIRD} +-depincpath=firebird:/usr/include +-depincpath=firebird:/opt/firebird/include +-depincpath=firebird:/Library/Frameworks/Firebird.framework/Headers sddfb.c diff --git a/harbour/contrib/sddmy/sddmy.hbp b/harbour/contrib/sddmy/sddmy.hbp index fe7707d528..9a566214b2 100644 --- a/harbour/contrib/sddmy/sddmy.hbp +++ b/harbour/contrib/sddmy/sddmy.hbp @@ -12,10 +12,9 @@ ../rddsql/rddsql.hbc --reqheader=mysql.h - --inctrypath=${HB_WITH_MYSQL} --inctrypath=/usr/include/mysql --inctrypath=/opt/local/include/mysql5/mysql +-depkeyhead=mysql:mysql.h +-depcontrol=mysql:${HB_WITH_MYSQL} +-depincpath=mysql:/usr/include/mysql +-depincpath=mysql:/opt/local/include/mysql5/mysql sddmy.c diff --git a/harbour/contrib/sddoci/sddoci.hbp b/harbour/contrib/sddoci/sddoci.hbp index a979f7ac63..88f07e4749 100644 --- a/harbour/contrib/sddoci/sddoci.hbp +++ b/harbour/contrib/sddoci/sddoci.hbp @@ -14,10 +14,9 @@ -stop{dos|os2|wce} --reqheader=ocilib.h - --inctrypath=${HB_WITH_OCILIB} --inctrypath=/usr/include --inctrypath=/usr/local/include +-depkeyhead=ocilib:ocilib.h +-depcontrol=ocilib:${HB_WITH_OCILIB} +-depincpath=ocilib:/usr/include +-depincpath=ocilib:/usr/local/include sddoci.c diff --git a/harbour/contrib/sddodbc/sddodbc.hbp b/harbour/contrib/sddodbc/sddodbc.hbp new file mode 100644 index 0000000000..b8476e594e --- /dev/null +++ b/harbour/contrib/sddodbc/sddodbc.hbp @@ -0,0 +1,23 @@ +# +# $Id$ +# + +-hblib +-inc +-nohbc + +-o${hb_name} + +-w3 -es2 + +../rddsql/rddsql.hbc + +-stop{dos|os2|rsxnt} + +-depkeyhead=odbc:sql.h +{!(win|wce)}-depcontrol=odbc:${HB_WITH_ODBC} +{(win|wce)&!msvcarm}-depcontrol=odbc:force +-depincpath=odbc:/usr/include +-depincpath=odbc:/usr/local/include + +sddodbc.c diff --git a/harbour/contrib/sddpg/sddpg.hbp b/harbour/contrib/sddpg/sddpg.hbp index ba90dfba39..38dcb7ccd6 100644 --- a/harbour/contrib/sddpg/sddpg.hbp +++ b/harbour/contrib/sddpg/sddpg.hbp @@ -12,16 +12,15 @@ ../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 +-depkeyhead=pgsql:libpq-fe.h +-depcontrol=pgsql:${HB_WITH_PGSQL} +-depincpath=pgsql:/usr/include +-depincpath=pgsql:/usr/local/pgsql/include +-depincpath=pgsql:/usr/local/pgsql/include/libpq +-depincpath=pgsql:/usr/include/pgsql +-depincpath=pgsql:/usr/include/postgresql +-depincpath=pgsql:/postgres/include +-depincpath=pgsql:/opt/local/include/postgresql84 +-depincpath=pgsql:/opt/local/include/postgresql83 sddpg.c diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbp b/harbour/contrib/sddsqlt3/sddsqlt3.hbp new file mode 100644 index 0000000000..f7b5649172 --- /dev/null +++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbp @@ -0,0 +1,21 @@ +# +# $Id$ +# + +-hblib +-inc +-nohbc + +-o${hb_name} + +-w3 -es2 + +../rddsql/rddsql.hbc + +-depkeyhead=sqlite3:sqlite3.h +-depcontrol=sqlite3:${HB_WITH_SQLITE3} +-depincpath=sqlite3:/usr/include +-depincpath=sqlite3:/boot/common/include +-depincpathlocal=sqlite3:../../external/sqlite3 + +sddsqlt3.c diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index f4592df49b..e082892c57 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2452,7 +2452,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) /* Process any package requirements */ FOR EACH tmp IN hbmk[ _HBMK_hDEP ] - pkg_try_detection( hbmk, tmp ) + dep_try_pkg_detection( hbmk, tmp ) NEXT ENDIF @@ -5984,7 +5984,7 @@ STATIC PROCEDURE dep_postprocess( hbmk ) dep[ _HBMKDEP_aINCPATHLOCAL ] := {} dep[ _HBMKDEP_cFound ] := "." dep[ _HBMKDEP_lFound ] := .T. - dep[ _HBMKDEP_lFoundLOCAL ] := .T. + dep[ _HBMKDEP_lFoundLOCAL ] := .F. dep[ _HBMKDEP_lForced ] := .T. AAdd( hbmk[ _HBMK_aOPTC ], "-D" + _HBMK_HAS_PREF + StrToDefine( dep:__enumKey() ) ) EXIT @@ -6033,7 +6033,7 @@ STATIC FUNCTION dep_evaluate( hbmk ) FOR EACH dep IN hbmk[ _HBMK_hDEP ] IF dep[ _HBMKDEP_lFound ] - IF hbmk[ _HBMK_lInfo ] + IF ! hbmk[ _HBMK_lQuiet ] hbmk_OutStd( hbmk, hb_StrFormat( I_( "Dependency '%1$s' found: %2$s%3$s%4$s%5$s" ),; dep[ _HBMKDEP_cName ],; dep[ _HBMKDEP_cFound ],; @@ -6079,7 +6079,7 @@ STATIC FUNCTION dep_evaluate( hbmk ) RETURN .T. /* Try '*-config' and 'pkg-config *' detection */ -STATIC PROCEDURE pkg_try_detection( hbmk, dep ) +STATIC PROCEDURE dep_try_pkg_detection( hbmk, dep ) LOCAL cStdOut LOCAL cErrOut LOCAL cItem @@ -6183,20 +6183,24 @@ STATIC FUNCTION FindHeader( hbmk, cFileName, cParentDir, lIncTry, lSystemHeader LOCAL tmp /* Check in current dir */ - IF ! lSystemHeader .AND. hb_FileExists( cFileName ) - RETURN cFileName + IF ! lSystemHeader .AND. hb_FileExists( PathSepToSelf( cFileName ) ) + RETURN PathSepToSelf( cFileName ) ENDIF /* Check in parent dir */ - IF ! lSystemHeader .AND. hb_FileExists( DirAddPathSep( PathSepToSelf( cParentDir ) ) + cFileName ) - RETURN DirAddPathSep( PathSepToSelf( cParentDir ) ) + cFileName + IF ! lSystemHeader + tmp := DirAddPathSep( PathSepToSelf( cParentDir ) ) + PathSepToSelf( cFileName ) + IF hb_FileExists( tmp ) + RETURN tmp + ENDIF ENDIF /* Check in include path list specified via -incpath options */ FOR EACH cDir IN hbmk[ _HBMK_aINCPATH ] - IF hb_FileExists( DirAddPathSep( PathSepToSelf( cDir ) ) + cFileName ) - RETURN DirAddPathSep( PathSepToSelf( cDir ) ) + cFileName + tmp := DirAddPathSep( PathSepToSelf( cDir ) ) + PathSepToSelf( cFileName ) + IF hb_FileExists( tmp ) + RETURN tmp ENDIF NEXT @@ -6209,9 +6213,9 @@ STATIC FUNCTION FindHeader( hbmk, cFileName, cParentDir, lIncTry, lSystemHeader FOR EACH aINCPATH IN { dep[ _HBMKDEP_aINCPATH ],; dep[ _HBMKDEP_aINCPATHLOCAL ] } FOR EACH cDir IN aINCPATH - tmp := DirAddPathSep( PathSepToSelf( cDir ) ) + cFileName + tmp := DirAddPathSep( PathSepToSelf( cDir ) ) + PathSepToSelf( cFileName ) IF hb_FileExists( tmp ) - dep[ _HBMKDEP_cFound ] := tmp + dep[ _HBMKDEP_cFound ] := DirDelPathSep( PathSepToSelf( cDir ) ) dep[ _HBMKDEP_lFound ] := .T. dep[ _HBMKDEP_lFoundLOCAL ] := ( cDir:__enumIndex() == 2 ) IF hbmk[ _HBMK_lDEBUGDEPD ] @@ -9814,12 +9818,12 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-[no]minipo" , I_( "do (not) add Harbour version number and source file reference to .po (default: add them)" ) },; { "-rebuildpo" , I_( "recreate .po file, thus removing all obsolete entries in it" ) },; NIL,; - { "-deppkgname=" , I_( " is the name of the dependecy. name of the package depedency. Can be specified multiple times." ) },; - { "-depkeyhead=" , I_( " is the name of the dependecy. is the key header (.h) of the package dependency. Only one can be speficied." ) },; - { "-depoptional=" , I_( " is the name of the dependecy. can be 'yes' or 'no', specifies whether the dependency is optional. Default: no" ) },; - { "-depcontrol=" , I_( " is the name of the dependecy. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_" ) },; - { "-depincpath=" , I_( " is the name of the dependecy. Add to the header detection path list" ) },; - { "-depincpathlocal= " , I_( " is the name of the dependecy. Add to the header detection path list, where is pointing to a directory local to the project and containing an embedded (or locally hosted) dependency." ) },; + { "-deppkgname=" , I_( " is the name of the dependency. name of the package depedency. Can be specified multiple times." ) },; + { "-depkeyhead=" , I_( " is the name of the dependency. is the key header (.h) of the package dependency. Only one can be speficied." ) },; + { "-depoptional=" , I_( " is the name of the dependency. can be 'yes' or 'no', specifies whether the dependency is optional. Default: no" ) },; + { "-depcontrol=" , I_( " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_" ) },; + { "-depincpath=" , I_( " is the name of the dependency. Add to the header detection path list" ) },; + { "-depincpathlocal= " , I_( " is the name of the dependency. Add to the header detection path list, where is pointing to a directory local to the project and containing an embedded (or locally hosted) dependency." ) },; NIL,; { "-plugin=<.prg|.hrb>", I_( "add plugin (EXPERIMENTAL)" ) },; { "-pi=" , I_( "pass input file to plugins (EXPERIMENTAL)" ) },;