From 9ddccee5ca3d239ca75cf8ed1d2c759b232b62fb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 26 Jun 2010 17:30:17 +0000 Subject: [PATCH] 2010-06-26 19:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/utils/hbqtui.prg * contrib/hbqt/utils/hbqtui.hbp - Deleted HBQT dependency. It's not needed for this tool. * contrib/makefile.prg + Rearranged build order to satisfy dependencies. --- harbour/ChangeLog | 8 ++ harbour/contrib/hbqt/utils/hbqtui.hbp | 2 - harbour/contrib/hbqt/utils/hbqtui.prg | 3 +- harbour/contrib/makefile.prg | 130 +++++++++++++------------- 4 files changed, 74 insertions(+), 69 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3f9987db98..a884e37851 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-26 19:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/utils/hbqtui.prg + * contrib/hbqt/utils/hbqtui.hbp + - Deleted HBQT dependency. It's not needed for this tool. + + * contrib/makefile.prg + + Rearranged build order to satisfy dependencies. + 2010-06-26 18:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Added internal ${hb_workdynsub} variable to return subdir of diff --git a/harbour/contrib/hbqt/utils/hbqtui.hbp b/harbour/contrib/hbqt/utils/hbqtui.hbp index 43350a6a9b..334d9bd167 100644 --- a/harbour/contrib/hbqt/utils/hbqtui.hbp +++ b/harbour/contrib/hbqt/utils/hbqtui.hbp @@ -2,8 +2,6 @@ # $Id$ # -../hbqt.hbc - -w3 -es2 hbqtui.prg diff --git a/harbour/contrib/hbqt/utils/hbqtui.prg b/harbour/contrib/hbqt/utils/hbqtui.prg index 1e7d086d3d..15632fc6df 100644 --- a/harbour/contrib/hbqt/utils/hbqtui.prg +++ b/harbour/contrib/hbqt/utils/hbqtui.prg @@ -67,12 +67,11 @@ #include "hbclass.ch" #include "common.ch" -#include "hbqt.ch" /*----------------------------------------------------------------------*/ #define STRINGIFY( cStr ) '"' + cStr + '"' -#define PAD_30( cStr ) pad( cStr, max( len( cStr ), 20 ) ) +#define PAD_30( cStr ) padr( cStr, max( len( cStr ), 20 ) ) #define STRIP_SQ( cStr ) strtran( strtran( strtran( strtran( s, "[", " " ), "]", " " ), "\n", " " ), chr( 10 ), " " ) /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/makefile.prg b/harbour/contrib/makefile.prg index f105477ca6..2f9f2125c8 100644 --- a/harbour/contrib/makefile.prg +++ b/harbour/contrib/makefile.prg @@ -29,67 +29,6 @@ PROCEDURE Main( ... ) LOCAL cBase := "contrib/" - LOCAL aLibs := {; - "gtwvg/gtwvg.hbp" ,; - "hbblink/hbblink.hbp" ,; - "hbbz2/hbbz2.hbp" ,; - "hbclipsm/hbclipsm.hbp" ,; - "hbcomm/hbcomm.hbp" ,; - "hbct/hbct.hbp" ,; - "hbfoxpro/hbfoxpro.hbp" ,; - "hbfship/hbfship.hbp" ,; - "hbgt/hbgt.hbp" ,; - "hbmemio/hbmemio.hbp" ,; - "hbmisc/hbmisc.hbp" ,; - "hbmzip/hbmzip.hbp" ,; - "hbnetio/hbnetio.hbp" ,; - "hbnf/hbnf.hbp" ,; - "hbodbc/hbodbc.hbp" ,; - "hbsms/hbsms.hbp" ,; - "hbsqlit3/hbsqlit3.hbp" ,; - "hbtip/hbtip.hbp" ,; - "hbtip/hbtipssl.hbp" ,; - "hbtpathy/hbtpathy.hbp" ,; - "hbwin/hbwin.hbp" ,; - "hbxpp/hbxpp.hbp" ,; - "hbziparc/hbziparc.hbp" ,; - "rddbmcdx/hbbmcdx.hbp" ,; - "xhb/xhb.hbp" } - - LOCAL aLibDeps := {; - "gtalleg/gtalleg.hbp" ,; - "gtalleg/gtallegs.hbp" ,; - "hbblat/hbblat.hbp" ,; - "hbcairo/hbcairo.hbp" ,; - "hbcups/hbcups.hbp" ,; - "hbcurl/hbcurl.hbp" ,; - "hbcurl/hbcurls.hbp" ,; - "hbfbird/hbfbird.hbp" ,; - "hbfimage/hbfimage.hbp" ,; - "hbgd/hbgd.hbp" ,; - "hbhpdf/hbhpdf.hbp" ,; - "hbmysql/hbmysql.hbp" ,; - "hbpgsql/hbpgsql.hbp" ,; - "hbqt/hbqt.hbp" ,; - "hbqt/hbqtcore.hbp" ,; - "hbqt/hbqtcores.hbp" ,; - "hbqt/hbqtgui.hbp" ,; - "hbqt/hbqtguis.hbp" ,; - "hbqt/hbqtnetwork.hbp" ,; - "hbqt/hbqtnetworks.hbp" ,; - "hbqt/hbqts.hbp" ,; - "hbssl/hbssl.hbp" ,; - "hbssl/hbssls.hbp" ,; - "hbxbp/hbxbp.hbp" ,; - "rddads/rddads.hbp" ,; - "rddsql/rddsql.hbp" ,; - "sddfb/sddfb.hbp" ,; - "sddmy/sddmy.hbp" ,; - "sddoci/sddoci.hbp" ,; - "sddodbc/sddodbc.hbp" ,; - "sddpg/sddpg.hbp" ,; - "sddsqlt3/sddsqlt3.hbp" } - LOCAL aImpLibs := {; "gtalleg/gtalleg.hbi" ,; "hbblat/hbblat.hbi" ,; @@ -108,15 +47,76 @@ PROCEDURE Main( ... ) "sddoci/sddoci.hbi" ,; "sddpg/sddpg.hbi" } + LOCAL aLibPass1 := {; + "gtalleg/gtalleg.hbp" ,; + "gtalleg/gtallegs.hbp" ,; + "hbblat/hbblat.hbp" ,; + "hbcairo/hbcairo.hbp" ,; + "hbcups/hbcups.hbp" ,; + "hbcurl/hbcurl.hbp" ,; + "hbcurl/hbcurls.hbp" ,; + "hbfbird/hbfbird.hbp" ,; + "hbfimage/hbfimage.hbp" ,; + "hbgd/hbgd.hbp" ,; /* uses: hbct */ + "hbhpdf/hbhpdf.hbp" ,; + "hbmysql/hbmysql.hbp" ,; + "hbpgsql/hbpgsql.hbp" ,; + "hbqt/hbqt.hbp" ,; + "hbqt/hbqtcore.hbp" ,; + "hbqt/hbqtcores.hbp" ,; + "hbqt/hbqtgui.hbp" ,; + "hbqt/hbqtguis.hbp" ,; + "hbqt/hbqtnetwork.hbp" ,; + "hbqt/hbqtnetworks.hbp" ,; + "hbqt/hbqts.hbp" ,; + "hbssl/hbssl.hbp" ,; + "hbssl/hbssls.hbp" ,; + "hbxbp/hbxbp.hbp" ,; /* uses: hbqt */ + "rddads/rddads.hbp" ,; + "rddsql/rddsql.hbp" ,; + "sddfb/sddfb.hbp" ,; /* uses: rddsql */ + "sddmy/sddmy.hbp" ,; /* uses: rddsql */ + "sddoci/sddoci.hbp" ,; /* uses: rddsql */ + "sddodbc/sddodbc.hbp" ,; /* uses: rddsql */ + "sddpg/sddpg.hbp" ,; /* uses: rddsql */ + "sddsqlt3/sddsqlt3.hbp" } /* uses: rddsql */ + + LOCAL aLibsPass2 := {; + "hbblink/hbblink.hbp" ,; + "hbbz2/hbbz2.hbp" ,; + "hbclipsm/hbclipsm.hbp" ,; + "hbcomm/hbcomm.hbp" ,; + "hbct/hbct.hbp" ,; + "hbfoxpro/hbfoxpro.hbp" ,; + "hbfship/hbfship.hbp" ,; + "hbgt/hbgt.hbp" ,; + "hbmemio/hbmemio.hbp" ,; + "hbmisc/hbmisc.hbp" ,; + "hbmzip/hbmzip.hbp" ,; + "hbnetio/hbnetio.hbp" ,; + "hbnf/hbnf.hbp" ,; + "hbodbc/hbodbc.hbp" ,; + "hbsms/hbsms.hbp" ,; + "hbsqlit3/hbsqlit3.hbp" ,; + "hbtip/hbtip.hbp" ,; + "hbtip/hbtipssl.hbp" ,; /* uses: hbssl */ + "hbtpathy/hbtpathy.hbp" ,; + "hbwin/hbwin.hbp" ,; + "hbxpp/hbxpp.hbp" ,; + "hbziparc/hbziparc.hbp" ,; /* uses: hbmzip */ + "rddbmcdx/hbbmcdx.hbp" ,; + "xhb/xhb.hbp" ,; /* uses: hbct, hbtip, hbwin */ + "gtwvg/gtwvg.hbp" } /* uses: hbwin */ + LOCAL aUtils := {; - "hbnetio/utils/netiosrv.hbp" ,; + "hbnetio/utils/netiosrv.hbp" ,; /* uses: hbnetio */ "hbqt/utils/hbqtui.hbp" ,; - "hbide/hbide.hbp" } + "hbide/hbide.hbp" } /* uses: hbxbp, hbqt */ LOCAL aAll := {; aImpLibs ,; - aLibs ,; - aLibDeps ,; + aLibsPass1 ,; + aLibsPass2 ,; aUtils,; hb_ATokens( GetEnv( "HB_ADDONS_LIB" ),, .T. ),; hb_ATokens( GetEnv( "HB_ADDONS_BIN" ),, .T. ) }