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

2009-05-03 10:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Added experimental and partial support to build using/for xhb.
      This is to help some 3rd party lib developers who'd like to
      target both compilers. Some aspects of xhb support aren't working
      or working slightly differently: Default Harbour switch is
      -n instead of -n2 which isn't supported in xhb. Everything
      related to dll handling won't currently work. Cross-compiling
      won't work either due to at least differences in __PLATFORM__
      macros. Anyway, play with it and tweak the source if needed.
      I hope we can add support without adding too much hacks into
      hbmk2 source, if however we need to bend logic too far, I'd
      rather leave those problematic parts of to keep the code
      maintainable. F.e. xhb compatible COMP/ARCH values aren't
      supported and I don't plan to add them.
      Enable support by renaming hbmk2 to have an 'x' prefix: xhbmk2,
      or use -xhb command line switch. The only intent is be able
      to use hbmk2 to build binaries from sources using xhb compiler
      and libs. Also notice that I've made just very light tests
      only with bcc55 compiler.
      [ notice: xhb support doesn't mean you can compile hbmk2 with
        xhb. This wasn't intented or planned. ]

  * utils/hbmk2/examples/contribf.hbp
    ! Fixes.
This commit is contained in:
Viktor Szakats
2009-05-03 08:37:13 +00:00
parent 614d45c3dc
commit 17e3ec3462
3 changed files with 248 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
harbour/ChangeLog
View File

@@ -17,6 +17,32 @@
past entries belonging to these authors: Viktor Szakats.
*/
2009-05-03 10:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
+ Added experimental and partial support to build using/for xhb.
This is to help some 3rd party lib developers who'd like to
target both compilers. Some aspects of xhb support aren't working
or working slightly differently: Default Harbour switch is
-n instead of -n2 which isn't supported in xhb. Everything
related to dll handling won't currently work. Cross-compiling
won't work either due to at least differences in __PLATFORM__
macros. Anyway, play with it and tweak the source if needed.
I hope we can add support without adding too much hacks into
hbmk2 source, if however we need to bend logic too far, I'd
rather leave those problematic parts of to keep the code
maintainable. F.e. xhb compatible COMP/ARCH values aren't
supported and I don't plan to add them.
Enable support by renaming hbmk2 to have an 'x' prefix: xhbmk2,
or use -xhb command line switch. The only intent is be able
to use hbmk2 to build binaries from sources using xhb compiler
and libs. Also notice that I've made just very light tests
only with bcc55 compiler.
[ notice: xhb support doesn't mean you can compile hbmk2 with
xhb. This wasn't intented or planned. ]
* utils/hbmk2/examples/contribf.hbp
! Fixes.
2009-05-02 22:09 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
* Cleanup: Added few internal constants.

18
harbour/utils/hbmk2/examples/contribf.hbp
View File

@@ -12,12 +12,12 @@ libs=hbbmcdx hbbtree hbclipsm hbcrypt hbct hbgt hbmisc hbmzip hbnf hbvpdf hbzipa
libs=hbcurl hbfbird hbgd hbmsql hbmysql hbpgsql sddfb sddmy sddpg
# contribs with limited availability (some with external dependencies):
{!pocc&!xcc&!dmc&!owatcom} libs=gtalleg
{!dos} libs=hbapollo hbfimage hbhpdf hbssl hbtip rddads
{linux|win|os2} libs=hbtpathy
{win} libs=gtwvg hbblat hbgfwin hbole hbwin rddado
{win&!dmc} libs=hbwhat
{linux} libs=hbgfgtk
{os2} libs=hbgfos2
{!rsxnt} libs=hbodbc
{!dos&!bsd&!hpux&!pocc} libs=hbsqlit3
{!pocc&!xcc&!dmc&!owatcom}libs=gtalleg
{!dos}libs=hbapollo hbfimage hbhpdf hbssl hbtip rddads
{linux|win|os2}libs=hbtpathy
{win}libs=gtwvg hbblat hbgfwin hbole hbwin rddado
{win&!dmc}libs=hbwhat
{linux}libs=hbgfgtk
{os2}libs=hbgfos2
{!rsxnt}libs=hbodbc
{!dos&!bsd&!hpux&!pocc}libs=hbsqlit3

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

@@ -96,10 +96,6 @@
/* TODO: Add a way to fallback to stop if required headers couldn't be found.
This needs a way to spec what key headers to look for. */
#ifndef HBMK_INTEGRATED_COMPILER
#define HBMK_INTEGRATED_COMPILER
#endif
#define I_( x ) hb_i18n_gettext( x )
#define _PAR_cParam 1
@@ -150,6 +146,7 @@ STATIC s_aINCTRYPATH
STATIC s_lREBUILD := .F.
STATIC s_lTRACE := .F.
STATIC s_lDONTEXEC := .F.
STATIC s_lXHB := .F.
STATIC s_lDEBUGTIME := .F.
STATIC s_lDEBUGINC := .F.
@@ -174,6 +171,12 @@ PROCEDURE Main( ... )
hb_FNameSplit( hb_argv( 0 ),, @cName )
tmp := Lower( cName )
IF Left( tmp, 1 ) == "x"
tmp := SubStr( tmp, 2 )
AAdd( aArgs, "-xhb" )
ENDIF
DO CASE
CASE Right( tmp, 5 ) == "hbcmp" .OR. ;
Left( tmp, 5 ) == "hbcmp" .OR. ;
@@ -220,53 +223,18 @@ STATIC FUNCTION hbmk_run( cCmd )
FUNCTION hbmk( aArgs )
LOCAL aLIB_BASE1 := {;
"hbcpage" ,;
"hblang" ,;
"hbcommon" }
/* NOTE: All base GTs should come here. */
LOCAL aLIB_BASE2 := {;
"hbrtl" ,;
"hbpp" ,;
"hbmacro" ,;
"hbextern" }
LOCAL aLIB_BASE_GT := {;
"gtcgi" ,;
"gtpca" ,;
"gtstd" }
LOCAL aLIB_BASE_PCRE := {;
"hbpcre" }
LOCAL aLIB_BASE_ZLIB := {;
"hbzlib" }
LOCAL aLIB_BASE_DEBUG := {;
"hbdebug" }
LOCAL aLIB_BASE_CPLR := {;
"hbcplr" }
LOCAL aLIB_BASE_ST := {;
"hbvm" }
LOCAL aLIB_BASE_MT := {;
"hbvmmt" }
LOCAL aLIB_BASE_NULRDD := {;
"hbnulrdd" }
LOCAL aLIB_BASE_RDD := {;
"hbrdd" ,;
"hbusrrdd" ,;
"hbuddall" ,;
"hbhsx" ,;
"hbsix" ,;
"rddntx" ,;
"rddnsx" ,;
"rddcdx" ,;
"rddfpt" }
LOCAL aLIB_BASE1
LOCAL aLIB_BASE2
LOCAL aLIB_BASE_GT
LOCAL aLIB_BASE_PCRE
LOCAL aLIB_BASE_ZLIB
LOCAL aLIB_BASE_DEBUG
LOCAL aLIB_BASE_CPLR
LOCAL aLIB_BASE_ST
LOCAL aLIB_BASE_MT
LOCAL aLIB_BASE_NULRDD
LOCAL aLIB_BASE_RDD_ST
LOCAL aLIB_BASE_RDD_MT
LOCAL s_cGT
LOCAL s_cCSTUB
@@ -368,9 +336,7 @@ FUNCTION hbmk( aArgs )
LOCAL cOpt_Post
LOCAL cCommand
#if defined( HBMK_INTEGRATED_COMPILER )
LOCAL aCommand
#endif
LOCAL cOpt_CompC
LOCAL cOpt_CompCLoop
LOCAL cOpt_Link
@@ -475,6 +441,7 @@ FUNCTION hbmk( aArgs )
cParamL == "-exospace" .OR. ;
cParamL == "-blinker" ; s_lInfo := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .F. ; lAcceptLDClipper := .T.
CASE cParamL == "-info" ; s_lInfo := .T.
CASE cParamL == "-xhb" ; s_lXHB := .T.
CASE cParamL == "-help" .OR. ;
cParamL == "--help"
@@ -490,6 +457,119 @@ FUNCTION hbmk( aArgs )
ENDCASE
NEXT
/* Initalize Harbour libs */
IF ! s_lXHB
aLIB_BASE1 := {;
"hbcpage" ,;
"hblang" ,;
"hbcommon" }
aLIB_BASE2 := {;
"hbrtl" ,;
"hbpp" ,;
"hbmacro" ,;
"hbextern" }
aLIB_BASE_GT := {;
"gtcgi" ,;
"gtpca" ,;
"gtstd" }
aLIB_BASE_PCRE := {;
"hbpcre" }
aLIB_BASE_ZLIB := {;
"hbzlib" }
aLIB_BASE_DEBUG := {;
"hbdebug" }
aLIB_BASE_CPLR := {;
"hbcplr" }
aLIB_BASE_ST := {;
"hbvm" }
aLIB_BASE_MT := {;
"hbvmmt" }
aLIB_BASE_NULRDD := {;
"hbnulrdd" }
aLIB_BASE_RDD_ST := {;
"hbrdd" ,;
"hbusrrdd" ,;
"hbuddall" ,;
"hbhsx" ,;
"hbsix" ,;
"rddntx" ,;
"rddnsx" ,;
"rddcdx" ,;
"rddfpt" }
aLIB_BASE_RDD_MT := aLIB_BASE_RDD_ST
ELSE
aLIB_BASE1 := {;
"codepage" ,;
"lang" ,;
"common" }
aLIB_BASE2 := {}
aLIB_BASE_GT := {;
"gtcgi" ,;
"gtpca" ,;
"gtstd" }
aLIB_BASE_PCRE := {;
"pcrepos" }
aLIB_BASE_ZLIB := {;
"zlib" }
aLIB_BASE_DEBUG := {;
"debug" }
aLIB_BASE_CPLR := {}
aLIB_BASE_ST := {;
"vm" ,;
"rtl" ,;
"macro" ,;
"pp" }
aLIB_BASE_MT := {;
"vmmt" ,;
"rtlmt" ,;
"macromt" ,;
"ppmt" }
aLIB_BASE_NULRDD := {;
"nulsys" }
aLIB_BASE_RDD_ST := {;
"rdd" ,;
"usrrdd" ,;
"rdds" ,;
"hsx" ,;
"hbsix" ,;
"dbfntx" ,;
"dbfcdx" ,;
"dbffpt" }
aLIB_BASE_RDD_MT := {;
"rddmt" ,;
"usrrddmt" ,;
"rddsmt" ,;
"hsxmt" ,;
"hbsixmt" ,;
"dbfntxmt" ,;
"dbfcdxmt" ,;
"dbffptmt" }
ENDIF
/* Load architecture / compiler settings (compatibility) */
IF Empty( s_cARCH )
@@ -956,6 +1036,7 @@ FUNCTION hbmk( aArgs )
cParamL == "-hbcc" .OR. ;
cParamL == "-hblnk" .OR. ;
cParamL == "-nohbp" .OR. ;
cParamL == "-xhb" .OR. ;
cParamL == "-clipper" .OR. ;
cParamL == "-rtlink" .OR. ;
cParamL == "-blinker" .OR. ;
@@ -2356,8 +2437,13 @@ FUNCTION hbmk( aArgs )
ENDCASE
IF lCreateDyn .AND. s_cARCH $ "win|wce"
AAdd( s_aOPTC, "-DHB_DYNLIB" )
AAdd( aLIB_BASE1, "hbmaindllp" )
IF s_lXHB
AAdd( s_aOPTC, "-D__EXPORT__" )
AAdd( aLIB_BASE1, "dllmain" ) /* TOFIX */
ELSE
AAdd( s_aOPTC, "-DHB_DYNLIB" )
AAdd( aLIB_BASE1, "hbmaindllp" )
ENDIF
ENDIF
ENDIF
@@ -2479,76 +2565,81 @@ FUNCTION hbmk( aArgs )
PlatformPRGFlags( s_aOPTPRG )
#if defined( HBMK_INTEGRATED_COMPILER )
aThreads := {}
FOR EACH aTODO IN ArraySplit( s_aPRG_TODO, s_nJOBS )
aCommand := ArrayAJoin( { { iif( lCreateLib .OR. lCreateDyn, "-n1", "-n2" ) },;
aTODO,;
iif( s_lBLDFLGP, { " " + cSelfFlagPRG }, {} ),;
ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),;
s_aOPTPRG } )
IF ! s_lXHB
/* Use integrated compiler */
aThreads := {}
FOR EACH aTODO IN ArraySplit( s_aPRG_TODO, s_nJOBS )
aCommand := ArrayAJoin( { { iif( lCreateLib .OR. lCreateDyn, "-n1", iif( s_lXHB, "-n", "-n2" ) ) },;
aTODO,;
iif( s_lBLDFLGP, { " " + cSelfFlagPRG }, {} ),;
ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),;
s_aOPTPRG } )
IF s_lTRACE
IF ! s_lQuiet
IF hb_mtvm()
OutStd( hb_StrFormat( I_( "hbmk: Harbour compiler command (internal) job #%1$s:" ), hb_ntos( aTODO:__enumIndex() ) ), hb_osNewLine() )
ELSE
OutStd( I_( "hbmk: Harbour compiler command (internal):" ), hb_osNewLine() )
ENDIF
ENDIF
OutStd( DirAddPathSep( PathSepToSelf( s_cHB_BIN_INSTALL ) ) + cBin_CompPRG +;
" " + ArrayToList( aCommand ), hb_osNewLine() )
ENDIF
IF ! s_lDONTEXEC
IF hb_mtvm()
AAdd( aThreads, { hb_threadStart( @hb_compile(), "", aCommand ), aCommand } )
ELSE
IF ( tmp := hb_compile( "", aCommand ) ) != 0
OutErr( hb_StrFormat( "hbmk: Error: Running Harbour compiler. %1$s", hb_ntos( tmp ) ), hb_osNewLine() )
OutErr( ArrayToList( aCommand ), hb_osNewLine() )
RETURN 6
ENDIF
ENDIF
ENDIF
NEXT
IF hb_mtvm()
FOR EACH thread IN aThreads
hb_threadJoin( thread[ 1 ], @tmp )
IF tmp != 0
OutErr( hb_StrFormat( "hbmk: Error: Running Harbour compiler job #%1$s. %2$s", hb_ntos( thread:__enumIndex() ), hb_ntos( tmp ) ), hb_osNewLine() )
OutErr( ArrayToList( thread[ 2 ] ), hb_osNewLine() )
RETURN 6
ENDIF
NEXT
ENDIF
ELSE
/* Use external compiler */
cCommand := DirAddPathSep( PathSepToSelf( s_cHB_BIN_INSTALL ) ) +;
cBin_CompPRG +;
" " + iif( lCreateLib .OR. lCreateDyn, "-n1", iif( s_lXHB, "-n", "-n2" ) ) +;
" " + ArrayToList( s_aPRG_TODO ) +;
iif( s_lBLDFLGP, " " + cSelfFlagPRG, "" ) +;
iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) +;
iif( ! Empty( s_aOPTPRG ), " " + ArrayToList( s_aOPTPRG ), "" )
cCommand := AllTrim( cCommand )
IF s_lTRACE
IF ! s_lQuiet
IF hb_mtvm()
OutStd( hb_StrFormat( I_( "hbmk: Harbour compiler command (internal) job #%1$s:" ), hb_ntos( aTODO:__enumIndex() ) ), hb_osNewLine() )
ELSE
OutStd( I_( "hbmk: Harbour compiler command (internal):" ), hb_osNewLine() )
ENDIF
OutStd( I_( "hbmk: Harbour compiler command:" ), hb_osNewLine() )
ENDIF
OutStd( DirAddPathSep( PathSepToSelf( s_cHB_BIN_INSTALL ) ) + cBin_CompPRG +;
" " + ArrayToList( aCommand ), hb_osNewLine() )
OutStd( cCommand, hb_osNewLine() )
ENDIF
IF ! s_lDONTEXEC
IF hb_mtvm()
AAdd( aThreads, { hb_threadStart( @hb_compile(), "", aCommand ), aCommand } )
ELSE
IF ( tmp := hb_compile( "", aCommand ) ) != 0
OutErr( hb_StrFormat( "hbmk: Error: Running Harbour compiler. %1$s", hb_ntos( tmp ) ), hb_osNewLine() )
OutErr( ArrayToList( aCommand ), hb_osNewLine() )
RETURN 6
ENDIF
IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
OutErr( hb_StrFormat( "hbmk: Error: Running Harbour compiler. %1$s:", hb_ntos( tmp ) ), hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand, hb_osNewLine() )
ENDIF
RETURN 6
ENDIF
NEXT
IF hb_mtvm()
FOR EACH thread IN aThreads
hb_threadJoin( thread[ 1 ], @tmp )
IF tmp != 0
OutErr( hb_StrFormat( "hbmk: Error: Running Harbour compiler job #%1$s. %2$s", hb_ntos( thread:__enumIndex() ), hb_ntos( tmp ) ), hb_osNewLine() )
OutErr( ArrayToList( thread[ 2 ] ), hb_osNewLine() )
RETURN 6
ENDIF
NEXT
ENDIF
#else
cCommand := DirAddPathSep( PathSepToSelf( s_cHB_BIN_INSTALL ) ) +;
cBin_CompPRG +;
" " + iif( lCreateLib .OR. lCreateDyn, "-n1", "-n2" ) +;
" " + ArrayToList( s_aPRG_TODO ) +;
iif( s_lBLDFLGP, " " + cSelfFlagPRG, "" ) +;
iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) +;
iif( ! Empty( s_aOPTPRG ), " " + ArrayToList( s_aOPTPRG ), "" )
cCommand := AllTrim( cCommand )
IF s_lTRACE
IF ! s_lQuiet
OutStd( I_( "hbmk: Harbour compiler command:" ), hb_osNewLine() )
ENDIF
OutStd( cCommand, hb_osNewLine() )
ENDIF
IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
OutErr( hb_StrFormat( "hbmk: Error: Running Harbour compiler. %1$s:", hb_ntos( tmp ) ), hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand, hb_osNewLine() )
ENDIF
RETURN 6
ENDIF
#endif
ENDIF
IF ! lStopAfterInit .AND. ! lStopAfterHarbour
@@ -2669,7 +2760,7 @@ FUNCTION hbmk( aArgs )
aLIB_BASE_CPLR,;
aLIB_BASE_DEBUG,;
s_aLIBVM,;
iif( s_lNULRDD, aLIB_BASE_NULRDD, aLIB_BASE_RDD ),;
iif( s_lNULRDD, aLIB_BASE_NULRDD, iif( s_lMT, aLIB_BASE_RDD_MT, aLIB_BASE_RDD_ST ) ),;
aLIB_BASE2,;
iif( s_lHB_PCRE, aLIB_BASE_PCRE, {} ),;
iif( s_lHB_ZLIB, aLIB_BASE_ZLIB, {} ) } )
@@ -5172,6 +5263,10 @@ FUNCTION hbmk_KEYW( cKeyword )
RETURN .T.
ENDIF
IF ( cKeyword == "xhb" .AND. s_lXHB )
RETURN .T.
ENDIF
IF cKeyword == hbmk_CPU()
RETURN .T.
ENDIF
@@ -5272,6 +5367,7 @@ STATIC PROCEDURE ShowHelp( lLong )
{ "-hblnk" , I_( "accept raw linker flags" ) },;
{ "-hblib" , I_( "create static library" ) },;
{ "-hbdyn" , I_( "create dynamic library" ) },;
{ "-xhb" , I_( "enable xhb mode (experimental)" ) },;
{ "-rtlink" , I_( " " ) },;
{ "-blinker" , I_( " " ) },;
{ "-exospace" , I_( "emulate Clipper compatible linker behavior\ncreate link/copy hbmk to rtlink/blinker/exospace for the same effect" ) },;