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

2010-06-26 19:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2010-06-26 17:30:17 +00:00
parent d0c69a84f2
commit 9ddccee5ca
4 changed files with 74 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -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

2
harbour/contrib/hbqt/utils/hbqtui.hbp
View File

@@ -2,8 +2,6 @@
# $Id$
#
../hbqt.hbc
-w3 -es2
hbqtui.prg

3
harbour/contrib/hbqt/utils/hbqtui.prg
View File

@@ -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 ), " " )
/*----------------------------------------------------------------------*/

130
harbour/contrib/makefile.prg
View File

@@ -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. ) }