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

2010-08-03 16:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/make.hbs
    + Will now automatically generate EXTERN lists for libs if
      using HB_REBUILD_EXTERN=yes setting and GCC compiler.
      Pls note that after regeneration a new build pass is
      required to reflect the changes in final binaries.
      NOTE: I chose the .hbx extension for EXPORT code.
            Pls comment on it (adding a postfix to regular
            .prg or .ch extension is not an option as it won't
            fit the 8.3 filename limit).
    * Changed --hbinfo call to pass parameters just like the
      "real" hbmk2 call, to get correct information about
      the project.
    % Minor optimizations.

  * utils/hbmk2/hbmk2.prg
    + --hbinfo extended to return 'outputname'.

  * INSTALL
    + Documented HB_REBUILD_EXTERN
This commit is contained in:
Viktor Szakats
2010-08-03 14:00:52 +00:00
parent 4502935000
commit 3ab717ad6e
4 changed files with 85 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/ChangeLog
View File

@@ -16,6 +16,27 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-08-03 16:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/make.hbs
+ Will now automatically generate EXTERN lists for libs if
using HB_REBUILD_EXTERN=yes setting and GCC compiler.
Pls note that after regeneration a new build pass is
required to reflect the changes in final binaries.
NOTE: I chose the .hbx extension for EXPORT code.
Pls comment on it (adding a postfix to regular
.prg or .ch extension is not an option as it won't
fit the 8.3 filename limit).
* Changed --hbinfo call to pass parameters just like the
"real" hbmk2 call, to get correct information about
the project.
% Minor optimizations.
* utils/hbmk2/hbmk2.prg
+ --hbinfo extended to return 'outputname'.
* INSTALL
+ Documented HB_REBUILD_EXTERN
2010-08-03 14:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/qtwebkit/hbqtwebkit.hbm
+ Added QtWebKit detection.

4
harbour/INSTALL
View File

@@ -706,6 +706,10 @@ HARBOUR
may fail, like detection of 3rd party libraries with
locally hosted sources.
With newer make versions, this variable is ignored.
- HB_REBUILD_EXTERN=yes Rebuild extern headers. Requires GCC compiler.
This is typically used by developers after code
modifications or before release.
Default: no
- HB_REBUILD_PARSER=yes Rebuild language parser sources. Typically
you only need this if your are Harbour core
developer modifying grammar rules (.y).

79
harbour/contrib/make.hbs
View File

@@ -435,22 +435,16 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
IF lInstall .AND. lPrimary
mk_hbd( FNameDirGet( PathSepToSelf( cProjectPath ) ) )
ENDIF
/* Create EXTERN list */
IF lPrimary
mk_extern( hProjectList[ cProject ][ "cOutputName" ], FNameExtSet( cProjectPath, ".hbx" ) )
ENDIF
ENDIF
NEXT
RETURN
STATIC PROCEDURE clear_hbmk2_envvars()
/* Making sure that user settings do not interfere with the std build process. */
hb_setenv( "HBMK_OPTIONS" )
hb_setenv( "HARBOUR" )
hb_setenv( "HARBOURCMD" )
hb_setenv( "CLIPPER" )
hb_setenv( "CLIPPERCMD" )
RETURN
STATIC FUNCTION call_hbmk2_hbinfo( cProjectPath, hProject )
LOCAL cStdOut
LOCAL cDir
@@ -459,14 +453,12 @@ STATIC FUNCTION call_hbmk2_hbinfo( cProjectPath, hProject )
hProject[ "cType" ] := ""
hProject[ "aDept" ] := {}
clear_hbmk2_envvars()
hProject[ "lChecked" ] := NIL
IF hb_processRun( s_cBinDir + "hbmk2 --hbinfo " + StrTran( cProjectPath, "\", "/" ),, @cStdOut ) == 0
IF call_hbmk2( cProjectPath, " --hbinfo", .F.,, @cStdOut )
hProject[ "cType" ] := hbmk2_hbinfo_getitem( cStdOut, "targettype" )
hProject[ "cOutputName" ] := hbmk2_hbinfo_getitem( cStdOut, "outputname" )
FOR EACH tmp IN hb_ATokens( hbmk2_hbinfo_getitem( cStdOut, "hbctree", .T. ), Chr( 10 ) )
IF ! Empty( tmp )
@@ -512,11 +504,16 @@ STATIC FUNCTION DepListToStr( aDeptHBC )
RETURN cOptionsLibDyn
STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, lLibDyn )
STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, lLibDyn, cStdErr, cStdOut )
LOCAL nErrorLevel
LOCAL cOptionsLibDyn := ""
clear_hbmk2_envvars()
/* Making sure that user settings do not interfere with the std build process. */
hb_setenv( "HBMK_OPTIONS" )
hb_setenv( "HARBOUR" )
hb_setenv( "HARBOURCMD" )
hb_setenv( "CLIPPER" )
hb_setenv( "CLIPPERCMD" )
IF lLibDyn
hb_setenv( "__HB_DYN__", "_dll" ) /* Request dll version of Harbour contrib dependencies (the implibs) to be linked (experimental) */
@@ -536,7 +533,7 @@ STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, lLibDyn )
cOptionsPre +;
" " + StrTran( cProjectPath, "\", "/" ) +;
" @" + StrTran( s_cHome, "\", "/" ) + "hbpost" +;
cOptionsLibDyn )
cOptionsLibDyn, @cStdErr, @cStdOut )
IF nErrorLevel != 0
OutStd( hb_StrFormat( "! '%1$s' returned status: %2$s", cProjectPath, hb_ntos( nErrorLevel ) ) + hb_eol() )
@@ -551,6 +548,42 @@ STATIC FUNCTION mk_hb_processRun( cCommand, ... )
RETURN hb_processRun( cCommand, ... )
STATIC FUNCTION mk_extern( cLibName, cOutputName )
LOCAL cExtern
LOCAL cStdOut
LOCAL hRegex, tmp
LOCAL aResult
IF GetEnv( "HB_REBUILD_EXTERN" ) == "yes" .AND. ;
GetEnv( "HB_COMPILER" ) $ "gcc|mingw|mingw64|cygwin"
IF hb_processRun( "nm -g --defined-only -C " + cLibName,, @cStdOut ) == 0
IF ! Empty( hRegex := hb_regexComp( '[[:blank:]]HB_FUN_(.*)[[:space:]]', .T., .T. ) )
IF ! Empty( aResult := hb_regexAll( hRegex, StrTran( cStdOut, Chr( 13 ) ),,,,, .T. ) )
ASort( aResult,,, {| tmp, tmp1 | tmp[ 2 ] < tmp1[ 2 ] } )
cExtern := "/*" + hb_eol()
cExtern += " * $" + "Id" + "$" + hb_eol()
cExtern += " */" + hb_eol()
cExtern += hb_eol()
cExtern += "/* -------------------------------------------------------------------- */" + hb_eol()
cExtern += "/* WARNING: Automatically generated code. DO NOT EDIT! */" + hb_eol()
cExtern += "/* Regenerate with HB_REBUILD_EXTERN=yes while using GCC */" + hb_eol()
cExtern += "/* compiler family. */" + hb_eol()
cExtern += "/* -------------------------------------------------------------------- */" + hb_eol()
cExtern += hb_eol()
cExtern += "ANNOUNCE " + "__" + Upper( FNameNameGet( cOutputName ) ) + "_EXTERN__" + hb_eol()
cExtern += hb_eol()
FOR EACH tmp IN aResult
cExtern += "EXTERNAL " + tmp[ 2 ] + hb_eol()
NEXT
RETURN hb_MemoWrit( cOutputName, cExtern )
ENDIF
ENDIF
ENDIF
ENDIF
RETURN .F.
STATIC FUNCTION mk_hbd( cDir )
LOCAL cName
LOCAL tmp
@@ -588,6 +621,13 @@ STATIC FUNCTION mk_hbd( cDir )
STATIC FUNCTION AScanL( aArray, cString )
RETURN AScan( aArray, {| tmp | Lower( tmp ) == cString } )
STATIC FUNCTION FNameNameGet( cFileName )
LOCAL cName
hb_FNameSplit( cFileName,, @cName )
RETURN cName
STATIC FUNCTION FNameDirGet( cFileName )
LOCAL cDir
@@ -826,10 +866,9 @@ PROCEDURE AddProject( hProjectList, cFileName )
RETURN
PROCEDURE LoadProjectListFromFile( hProjectList, cFileName )
LOCAL cFile := StrTran( MemoRead( cFileName ), Chr( 13 ) )
LOCAL cItem
FOR EACH cItem IN hb_ATokens( cFile, Chr( 10 ) )
FOR EACH cItem IN hb_ATokens( StrTran( MemoRead( cFileName ), Chr( 13 ) ), Chr( 10 ) )
IF "#" $ cItem
cItem := Left( cItem, At( "#", cItem ) - 1 )
ENDIF

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

@@ -101,14 +101,6 @@
/* TOFIX: -autohbc with -inc mode */
/* Extracting list of Harbour functions from binaries (using GCC toolchain):
From .a library:
nm libhbct.a |grep " T HB_FUN_"|sed "s/.*HB_FUN_\(.*\)/EXTERNAL \1/g"
From .o files:
nm *.o |grep " T HB_FUN_"|sed "s/.*HB_FUN_\(.*\)/EXTERNAL \1/g"
*/
/* TODO: Next gen compiler autodetection:
1. Gather supported compilers by Harbour installation
(look for lib/<plat>/*[/<name>] subdirs)
@@ -4600,6 +4592,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
IF lDumpInfo
OutStd( "{{{" + hb_eol() )
OutStd( "outputname{{" + PathSepToForward( hbmk[ _HBMK_cPROGNAME ] ) + "}}" + hb_eol() )
OutStd( "targetname{{" + hbmk_TARGETNAME( hbmk ) + "}}" + hb_eol() )
OutStd( "targettype{{" + hbmk_TARGETTYPE( hbmk ) + "}}" + hb_eol() )
OutStd( "inc{{" + iif( hbmk[ _HBMK_lINC ], "yes", "no" ) + "}}" + hb_eol() )