From 36633f27b1bd51a08213359ecbc94665df46ba16 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 22 Aug 2008 06:52:56 +0000 Subject: [PATCH] 2008-08-22 08:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * common.mak * make_b32.mak * make_gcc.mak * make_vc.mak * make_vcce.mak * utils/hbdoc/Makefile * utils/hbdoc/bld_b32.bat * utils/hbdoc/bld_vc.bat * utils/hbdoc/hbdoc.prg * utils/hbmake/Makefile * utils/hbmake/bld_b32.bat * utils/hbmake/bld_vc.bat * utils/hbmake/hbmake.prg % Reduced executable size of hbmake and hbdoc (by 20%) by excluding unused libs and RDD stuff. % Optimized local non-GNU make files to work faster and generate faster executables. * utils/hbdoc/hbdocdef.ch % Removed unused macro. * minor formatting. --- harbour/ChangeLog | 23 ++++++++++++++++ harbour/common.mak | 10 +++++++ harbour/make_b32.mak | 4 +-- harbour/make_gcc.mak | 5 ++-- harbour/make_vc.mak | 4 +-- harbour/make_vcce.mak | 4 +-- harbour/utils/hbdoc/Makefile | 4 +-- harbour/utils/hbdoc/bld_b32.bat | 46 +++----------------------------- harbour/utils/hbdoc/bld_vc.bat | 39 +++------------------------ harbour/utils/hbdoc/hbdoc.prg | 2 ++ harbour/utils/hbdoc/hbdocdef.ch | 28 +++++++++---------- harbour/utils/hbmake/Makefile | 4 +-- harbour/utils/hbmake/bld_b32.bat | 22 +++------------ harbour/utils/hbmake/bld_vc.bat | 15 +++-------- harbour/utils/hbmake/hbmake.prg | 2 ++ 15 files changed, 73 insertions(+), 139 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 494a890289..decde54c4e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,29 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-22 08:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * common.mak + * make_b32.mak + * make_gcc.mak + * make_vc.mak + * make_vcce.mak + * utils/hbdoc/Makefile + * utils/hbdoc/bld_b32.bat + * utils/hbdoc/bld_vc.bat + * utils/hbdoc/hbdoc.prg + * utils/hbmake/Makefile + * utils/hbmake/bld_b32.bat + * utils/hbmake/bld_vc.bat + * utils/hbmake/hbmake.prg + % Reduced executable size of hbmake and hbdoc + (by 20%) by excluding unused libs and RDD stuff. + % Optimized local non-GNU make files to work + faster and generate faster executables. + + * utils/hbdoc/hbdocdef.ch + % Removed unused macro. + * minor formatting. + 2008-08-21 18:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * common.mak * utils/hbdoc/Makefile diff --git a/harbour/common.mak b/harbour/common.mak index 936fc0f2d7..069927dc36 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -287,6 +287,16 @@ HB_GT_LIB = gtstd #********************************************************** #********************************************************** +# Minimal Libs for HB-based executables +MINIMAL_STATIC_HBLIBS = \ + $(COMMON_LIB) \ + $(VM_LIB) \ + $(RTL_LIB) \ + $(HB_GT_LIBS) \ + $(NULSYS_LIB) \ + $(MACRO_LIB) \ + $(DEBUG_LIB) \ + # Standard Libs for HB-based executables STANDARD_STATIC_HBLIBS = \ $(COMMON_LIB) \ diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index f0a59f9b1e..6b9bf6b1e5 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -510,7 +510,7 @@ $(CFLAGS) -e$(HBDOC_EXE) $(**: = ^ ) -$(STANDARD_STATIC_HBLIBS) $(HBDOC_LIBS) +$(MINIMAL_STATIC_HBLIBS) $(HBDOC_LIBS) ! #********************************************************** # HBMAKE build rule @@ -523,7 +523,7 @@ $(CFLAGS) -e$(HBMAKE_EXE) $(**: = ^ ) -$(STANDARD_STATIC_HBLIBS) +$(MINIMAL_STATIC_HBLIBS) ! #********************************************************** diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak index 9230b99f14..d96052e347 100644 --- a/harbour/make_gcc.mak +++ b/harbour/make_gcc.mak @@ -291,6 +291,7 @@ all : $(HB_DEST_DIRS) $(HB_BUILD_TARGETS) BasicLibs : $(COMMON_LIB) $(HBPP_EXE) $(PP_LIB) $(COMPILER_LIB) BasicExes : BasicLibs $(HB) StdLibs : BasicExes $(STANDARD_STATIC_HBLIBS) +MinLibs : $(MINIMAL_STATIC_HBLIBS) #********************************************************** @@ -424,11 +425,11 @@ $(HBTEST_EXE) :: $(StdLibs) $(HBTEST_EXE) :: $(HBTEST_EXE_OBJS) $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) #********************************************************** -$(HBDOC_EXE) :: $(StdLibs) +$(HBDOC_EXE) :: $(MinLibs) $(HBDOC_EXE) :: $(HBDOC_EXE_OBJS) $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) #********************************************************** -$(HBMAKE_EXE) :: $(StdLibs) +$(HBMAKE_EXE) :: $(MinLibs) $(HBMAKE_EXE) :: $(HBMAKE_EXE_OBJS) $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) #********************************************************** diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 915924945e..26d37bb99d 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -815,7 +815,7 @@ $(LDFLAGS) /OUT:$(HBDOC_EXE) $(**: = ^ ) -$(STANDARD_STATIC_HBLIBS) +$(MINIMAL_STATIC_HBLIBS) $(HBDOC_LIBS) user32.lib winspool.lib <<$(HB_KEEPSTATE) @@ -829,7 +829,7 @@ $(LDFLAGS) /OUT:$(HBMAKE_EXE) $(**: = ^ ) -$(STANDARD_STATIC_HBLIBS) +$(MINIMAL_STATIC_HBLIBS) user32.lib winspool.lib <<$(HB_KEEPSTATE) #********************************************************** diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index 474fb5f70d..edfbac314b 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -843,7 +843,7 @@ $(LDFLAGS) /OUT:$(HBDOC_EXE) $(**: = ^ ) -$(STANDARD_STATIC_HBLIBS) +$(MINIMAL_STATIC_HBLIBS) $(HBDOC_LIBS) coredll.lib corelibc.lib winsock.lib ws2.lib <<$(HB_KEEPSTATE) @@ -857,7 +857,7 @@ $(LDFLAGS) /OUT:$(HBMAKE_EXE) $(**: = ^ ) -$(STANDARD_STATIC_HBLIBS) +$(MINIMAL_STATIC_HBLIBS) coredll.lib corelibc.lib winsock.lib ws2.lib <<$(HB_KEEPSTATE) #********************************************************** diff --git a/harbour/utils/hbdoc/Makefile b/harbour/utils/hbdoc/Makefile index 670218078f..dbc0307528 100644 --- a/harbour/utils/hbdoc/Makefile +++ b/harbour/utils/hbdoc/Makefile @@ -33,12 +33,10 @@ LIBS=\ hbdebug \ hbvm \ hbrtl \ - hbrdd \ + hbnulrdd \ hbrtl \ hbvm \ hbmacro \ - hbpp \ - hblang \ hbcommon \ include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/utils/hbdoc/bld_b32.bat b/harbour/utils/hbdoc/bld_b32.bat index fefc21d96d..31ca9614a0 100644 --- a/harbour/utils/hbdoc/bld_b32.bat +++ b/harbour/utils/hbdoc/bld_b32.bat @@ -3,23 +3,7 @@ rem rem $Id$ rem -..\..\bin\harbour /n hbdoc /i..\..\include -..\..\bin\harbour /n ft_funcs /i..\..\include -..\..\bin\harbour /n genasc /i..\..\include -..\..\bin\harbour /n genchm /i..\..\include -..\..\bin\harbour /n genhpc /i..\..\include -..\..\bin\harbour /n genhtm /i..\..\include -..\..\bin\harbour /n genng /i..\..\include -..\..\bin\harbour /n genos2 /i..\..\include -..\..\bin\harbour /n genpdf1 /i..\..\include -..\..\bin\harbour /n genrtf /i..\..\include -..\..\bin\harbour /n gentrf /i..\..\include -..\..\bin\harbour /n html /i..\..\include -..\..\bin\harbour /n ng /i..\..\include -..\..\bin\harbour /n os2 /i..\..\include -..\..\bin\harbour /n rtf /i..\..\include -..\..\bin\harbour /n teeasc /i..\..\include -..\..\bin\harbour /n troff /i..\..\include +..\..\bin\harbour /q /n /gc0 /km /i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf html ng os2 rtf teeasc troff echo -O2 -I..\..\include -L..\..\lib > build.tmp @@ -41,39 +25,15 @@ echo rtf.c >> build.tmp echo teeasc.c >> build.tmp echo troff.c >> build.tmp -echo hbdebug.lib >> build.tmp echo hbvm.lib >> build.tmp echo hbrtl.lib >> build.tmp echo gtwin.lib >> build.tmp -echo hblang.lib >> build.tmp -echo hbrdd.lib >> build.tmp +echo hbnulrdd.lib >> build.tmp echo hbmacro.lib >> build.tmp -echo hbpp.lib >> build.tmp -echo rddntx.lib >> build.tmp -echo rddcdx.lib >> build.tmp -echo rddfpt.lib >> build.tmp -echo hbsix.lib >> build.tmp echo hbcommon.lib >> build.tmp bcc32 @build.tmp del build.tmp del *.obj - -del hbdoc.c -del ft_funcs.c -del genasc.c -del genchm.c -del genhpc.c -del genhtm.c -del genng.c -del genos2.c -del genpdf1.c -del genrtf.c -del gentrf.c -del html.c -del ng.c -del os2.c -del rtf.c -del teeasc.c -del troff.c +del hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c html.c ng.c os2.c rtf.c teeasc.c troff.c diff --git a/harbour/utils/hbdoc/bld_vc.bat b/harbour/utils/hbdoc/bld_vc.bat index 52cf1d2dda..5445b3d4b4 100644 --- a/harbour/utils/hbdoc/bld_vc.bat +++ b/harbour/utils/hbdoc/bld_vc.bat @@ -3,42 +3,9 @@ rem rem $Id$ rem -..\..\bin\harbour /n hbdoc /i..\..\include -..\..\bin\harbour /n ft_funcs /i..\..\include -..\..\bin\harbour /n genasc /i..\..\include -..\..\bin\harbour /n genchm /i..\..\include -..\..\bin\harbour /n genhpc /i..\..\include -..\..\bin\harbour /n genhtm /i..\..\include -..\..\bin\harbour /n genng /i..\..\include -..\..\bin\harbour /n genos2 /i..\..\include -..\..\bin\harbour /n genpdf1 /i..\..\include -..\..\bin\harbour /n genrtf /i..\..\include -..\..\bin\harbour /n gentrf /i..\..\include -..\..\bin\harbour /n html /i..\..\include -..\..\bin\harbour /n ng /i..\..\include -..\..\bin\harbour /n os2 /i..\..\include -..\..\bin\harbour /n rtf /i..\..\include -..\..\bin\harbour /n teeasc /i..\..\include -..\..\bin\harbour /n troff /i..\..\include +..\..\bin\harbour /q /n /gc0 /km /i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf html ng os2 rtf teeasc troff -cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c html.c ng.c os2.c rtf.c teeasc.c troff.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib +cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c html.c ng.c os2.c rtf.c teeasc.c troff.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib winspool.lib del *.obj - -del hbdoc.c -del ft_funcs.c -del genasc.c -del genchm.c -del genhpc.c -del genhtm.c -del genng.c -del genos2.c -del genpdf1.c -del genrtf.c -del gentrf.c -del html.c -del ng.c -del os2.c -del rtf.c -del teeasc.c -del troff.c +del hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c html.c ng.c os2.c rtf.c teeasc.c troff.c diff --git a/harbour/utils/hbdoc/hbdoc.prg b/harbour/utils/hbdoc/hbdoc.prg index 4563ad4f12..2a8b053e58 100644 --- a/harbour/utils/hbdoc/hbdoc.prg +++ b/harbour/utils/hbdoc/hbdoc.prg @@ -108,6 +108,8 @@ * Fixed the help text when hbdoc is called with out any parameter */ +ANNOUNCE RDDSYS + #include "directry.ch" #include "fileio.ch" #include "inkey.ch" diff --git a/harbour/utils/hbdoc/hbdocdef.ch b/harbour/utils/hbdoc/hbdocdef.ch index 0062abd9c7..fd5f7a5dc2 100644 --- a/harbour/utils/hbdoc/hbdocdef.ch +++ b/harbour/utils/hbdoc/hbdocdef.ch @@ -53,21 +53,19 @@ #ifndef _HBDOCDEF_CH_ #define _HBDOCDEF_CH_ -#define D_NORMAL 1 -#define D_ARG 2 -#define D_SYNTAX 3 -#define D_IGNORE 4 -#define D_SEEALSO 5 -#define D_INCLUDE 6 -#define D_ONELINE 7 -#define D_STATUS 8 -#define D_DATALINK 10 -#define D_METHODLINK 11 -#define D_EXAMPLE 12 +#define D_NORMAL 1 +#define D_ARG 2 +#define D_SYNTAX 3 +#define D_IGNORE 4 +#define D_SEEALSO 5 +#define D_INCLUDE 6 +#define D_ONELINE 7 +#define D_STATUS 8 +#define D_DATALINK 10 +#define D_METHODLINK 11 +#define D_EXAMPLE 12 #define D_DESCRIPTION 13 -#define D_RETURN 14 -#define D_COMPLIANCE 15 - -#define pBUFFER_LENGTH 4096 +#define D_RETURN 14 +#define D_COMPLIANCE 15 #endif diff --git a/harbour/utils/hbmake/Makefile b/harbour/utils/hbmake/Makefile index 2a5521c000..2b0c70bb9b 100644 --- a/harbour/utils/hbmake/Makefile +++ b/harbour/utils/hbmake/Makefile @@ -27,12 +27,10 @@ LIBS=\ hbdebug \ hbvm \ hbrtl \ - hbrdd \ + hbnulrdd \ hbrtl \ hbvm \ hbmacro \ - hbpp \ - hblang \ hbcommon \ include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/utils/hbmake/bld_b32.bat b/harbour/utils/hbmake/bld_b32.bat index 00cc32094c..0a950b738a 100644 --- a/harbour/utils/hbmake/bld_b32.bat +++ b/harbour/utils/hbmake/bld_b32.bat @@ -3,11 +3,7 @@ rem rem $Id$ rem -..\..\bin\harbour /n hbmake /i..\..\include -..\..\bin\harbour /n ft_funcs /i..\..\include -..\..\bin\harbour /n hbmutils /i..\..\include -..\..\bin\harbour /n pickarry /i..\..\include -..\..\bin\harbour /n tmake /i..\..\include +..\..\bin\harbour /q /n /gc0 /km /i..\..\include hbmake ft_funcs hbmutils pickarry tmake echo -O2 -I..\..\include -L..\..\lib > build.tmp @@ -21,27 +17,15 @@ echo hbmfrdln.c >> build.tmp echo hbmgauge.c >> build.tmp echo hbmlang.c >> build.tmp -echo hbdebug.lib >> build.tmp echo hbvm.lib >> build.tmp echo hbrtl.lib >> build.tmp echo gtwin.lib >> build.tmp -echo hblang.lib >> build.tmp -echo hbrdd.lib >> build.tmp +echo hbnulrdd.lib >> build.tmp echo hbmacro.lib >> build.tmp -echo hbpp.lib >> build.tmp -echo rddntx.lib >> build.tmp -echo rddcdx.lib >> build.tmp -echo rddfpt.lib >> build.tmp -echo hbsix.lib >> build.tmp echo hbcommon.lib >> build.tmp bcc32 @build.tmp del build.tmp del *.obj - -del hbmake.c -del ft_funcs.c -del hbmutils.c -del pickarry.c -del tmake.c +del hbmake.c ft_funcs.c hbmutils.c pickarry.c tmake.c diff --git a/harbour/utils/hbmake/bld_vc.bat b/harbour/utils/hbmake/bld_vc.bat index 7e1bb1233d..1bcbf0f8bb 100644 --- a/harbour/utils/hbmake/bld_vc.bat +++ b/harbour/utils/hbmake/bld_vc.bat @@ -3,18 +3,9 @@ rem rem $Id$ rem -..\..\bin\harbour /n hbmake /i..\..\include -..\..\bin\harbour /n ft_funcs /i..\..\include -..\..\bin\harbour /n hbmutils /i..\..\include -..\..\bin\harbour /n pickarry /i..\..\include -..\..\bin\harbour /n tmake /i..\..\include +..\..\bin\harbour /q /n /gc0 /km /i..\..\include hbmake ft_funcs hbmutils pickarry tmake -cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbmake.c ft_funcs.c hbmutils.c pickarry.c tmake.c hbmfrdln.c hbmgauge.c hbmlang.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib +cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbmake.c ft_funcs.c hbmutils.c pickarry.c tmake.c hbmfrdln.c hbmgauge.c hbmlang.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib winspool.lib del *.obj - -del hbmake.c -del ft_funcs.c -del hbmutils.c -del pickarry.c -del tmake.c +del hbmake.c ft_funcs.c hbmutils.c pickarry.c tmake.c diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index 67f68a9760..6a90a85353 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -55,6 +55,8 @@ * added suport to OS Unix */ +ANNOUNCE RDDSYS + #include "fileio.ch" #include "common.ch" #include "inkey.ch"