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

2011-02-05 16:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/make.hbs
    + Updated to use hbmk2 to create hbx files.

  * contrib/3rd/sqlite3/sqlite3.hbc
    * Fix for Minix. From Tamas.

  * contrib/hbblink/hbblink.hbx
    * Updated.

  * utils/hbmk2/hbmk2.prg
    * Refinements in hbx related console feedback.
This commit is contained in:
Viktor Szakats
2011-02-05 15:53:17 +00:00
parent 54e339c0af
commit 775f8ef05a
5 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -16,6 +16,19 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-02-05 16:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/make.hbs
+ Updated to use hbmk2 to create hbx files.
* contrib/3rd/sqlite3/sqlite3.hbc
* Fix for Minix. From Tamas.
* contrib/hbblink/hbblink.hbx
* Updated.
* utils/hbmk2/hbmk2.prg
* Refinements in hbx related console feedback.
2011-02-05 14:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbplist
+ Added hbrunext to contrib list, so it's now built for everyone.

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

@@ -3,3 +3,5 @@
#
libs=${hb_name}
cflags=-DSQLITE_OMIT_LOAD_EXTENSION=1{minix}

3
harbour/contrib/hbblink/hbblink.hbx
View File

@@ -11,8 +11,7 @@
/* -------------------------------------------------------------------- */
/* WARNING: Automatically generated code below. DO NOT EDIT! */
/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */
/* compiler family. [vszakats] */
/* Regenerate using hbmk2 '-hbx=' option. */
/* -------------------------------------------------------------------- */
#ifndef __HBEXTERN_CH__HBBLINK__

23
harbour/contrib/make.hbs
View File

@@ -430,7 +430,8 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
lPrimary := cProject $ hProjectReqList
lContainer := "lFromContainer" $ hProjectList[ cProject ]
IF ( nErrorLevel := call_hbmk2( cProjectPath, iif( lPrimary .OR. lContainer, iif( lContainer, cOptions, cOptions + cOptionsUser ), " -inc" ), NIL ) ) == 0
IF ( nErrorLevel := call_hbmk2( cProjectPath, iif( lPrimary .OR. lContainer, iif( lContainer, cOptions, cOptions + cOptionsUser ), " -inc" ) +;
iif( GetEnv( "HB_REBUILD_EXTERN" ) == "yes" .AND. ( lPrimary .OR. lContainer ), " -hbx=" + FNameExtSet( cProjectPath, ".hbx" ), "" ), NIL ) ) == 0
/* Build dynamic lib */
IF GetEnv( "HB_BUILD_CONTRIB_DYN" ) == "yes" .AND. hProjectList[ cProject ][ "cType" ] == "hblib"
@@ -453,12 +454,6 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
IF lInstall
mk_hbd( FNameDirGet( PathSepToSelf( cProjectPath ) ) )
ENDIF
/* Create EXTERN list */
IF hProjectList[ cProject ][ "cType" ] $ "hblib|hbdyn"
mk_extern_lib( PathSepToSelf( hProjectList[ cProject ][ "cOutputName" ] ),;
FNameExtSet( PathSepToSelf( cProjectPath ), ".hbx" ) )
ENDIF
ENDIF
ELSE
/* Ignore certain non-fatal hbmk2 return values */
@@ -580,18 +575,6 @@ STATIC FUNCTION mk_hb_processRun( cCommand, ... )
RETURN hb_processRun( cCommand, ... )
STATIC FUNCTION mk_extern_lib( cInputName, cOutputName )
LOCAL aExtern
IF GetEnv( "HB_REBUILD_EXTERN" ) == "yes"
IF ( aExtern := __hb_extern_get_list( cInputName ) ) != NIL
OutStd( hb_StrFormat( "! Generating extern header: %1$s", cOutputName ) + hb_eol() )
RETURN __hb_extern_gen( aExtern, cOutputName )
ENDIF
ENDIF
RETURN .F.
STATIC FUNCTION mk_hbd( cDir )
LOCAL cName
LOCAL cDocDir
@@ -887,5 +870,3 @@ PROCEDURE LoadProjectListFromString( hProjectList, cString )
NEXT
RETURN
#include "../config/hbextern.hbs"

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

@@ -11270,13 +11270,7 @@ STATIC FUNCTION mk_extern( hbmk, cInputName, cBin_LibHBX, cOpt_LibHBX, cLibHBX_R
LOCAL aExtern
IF ( aExtern := __hb_extern_get_list( hbmk, cInputName, cBin_LibHBX, cOpt_LibHBX, cLibHBX_Regex ) ) != NIL
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Creating extern header... %1$s" ), cOutputName ) )
ENDIF
__hb_extern_gen( aExtern, cOutputName )
__hb_extern_gen( hbmk, aExtern, cOutputName )
RETURN .T.
ENDIF
@@ -11353,7 +11347,7 @@ STATIC PROCEDURE __hb_extern_get_exception_list( cInputName, /* @ */ aInclude, /
RETURN
STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName )
STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName )
LOCAL aExtern
LOCAL cExtern
LOCAL tmp
@@ -11446,7 +11440,17 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName )
RETURN .T.
ENDIF
RETURN hb_MemoWrit( cOutputName, cExtern )
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Updating extern header: %1$s" ), cOutputName ) )
ENDIF
IF hb_MemoWrit( cOutputName, cExtern )
RETURN .T.
ENDIF
hbmk_OutErr( hbmk, I_( "Error: Updating extern header." ) )
RETURN .F.
STATIC PROCEDURE convert_hbmake_to_hbp( hbmk, cSrcName, cDstName )
LOCAL cSrc := MemoRead( cSrcName )