From 0d04b875e1c79ebf08c19d0b043d611569fc1b67 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 22 Feb 2009 17:06:44 +0000 Subject: [PATCH] 2009-02-22 18:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/hbbtree/tests/test.hbm * contrib/examples/guestbk/guestbk.hbm * contrib/examples/pe/pe.hbm * contrib/examples/terminal/trm_appn.hbm * contrib/examples/hscript/hscript.hbm * utils/hbdoc/hbdoc.hbm + utils/hbmk2/hbmk2.hbm + Added -n switch to .hbm files. * contrib/examples/uhttpd/hbmk.bat + contrib/examples/uhttpd/uhttpd.hbm + Moved most make params to new .hbm file. --- harbour/ChangeLog | 104 ++++++++++-------- harbour/contrib/examples/guestbk/guestbk.hbm | 2 +- harbour/contrib/examples/hscript/hscript.hbm | 2 +- harbour/contrib/examples/pe/pe.hbm | 2 +- .../contrib/examples/terminal/trm_appn.hbm | 2 +- harbour/contrib/examples/uhttpd/hbmk.bat | 7 +- harbour/contrib/examples/uhttpd/uhttpd.hbm | 5 + harbour/contrib/hbbtree/tests/test.hbm | 2 +- harbour/utils/hbdoc/hbdoc.hbm | 14 ++- harbour/utils/hbmk2/hbmk2.hbm | 5 + 10 files changed, 89 insertions(+), 56 deletions(-) create mode 100644 harbour/contrib/examples/uhttpd/uhttpd.hbm create mode 100644 harbour/utils/hbmk2/hbmk2.hbm diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 87b1e65a1e..d9201bda2d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,57 +8,71 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-22 18:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbbtree/tests/test.hbm + * contrib/examples/guestbk/guestbk.hbm + * contrib/examples/pe/pe.hbm + * contrib/examples/terminal/trm_appn.hbm + * contrib/examples/hscript/hscript.hbm + * utils/hbdoc/hbdoc.hbm + + utils/hbmk2/hbmk2.hbm + + Added -n switch to .hbm files. + + * contrib/examples/uhttpd/hbmk.bat + + contrib/examples/uhttpd/uhttpd.hbm + + Moved most make params to new .hbm file. + 2009-02-22 17:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu) - * config/lib.cf - * config/bin.cf - + Added -n to Harbour flags to bin.cf. - + Added -n1 to Harbour flags to lib.cf. - ; TOFIX: The former works, the latter doesn't. - Could someone please help why is this - happening? + * config/lib.cf + * config/bin.cf + + Added -n to Harbour flags to bin.cf. + + Added -n1 to Harbour flags to lib.cf. + ; TOFIX: The former works, the latter doesn't. + Could someone please help why is this + happening? - * utils/hbmk2/hbmk2.prg - - Removed -n from default Harbour switches. - ; TODO: Add prgflags=-n to all .hbp files. - ; TODO: Add -n to all .hbm files. - ; TODO: Add .hbp file to dirs where there are .prgs - needing -n flag. + * utils/hbmk2/hbmk2.prg + - Removed -n from default Harbour switches. + ; TODO: Add prgflags=-n to all .hbp files. + ; TODO: Add -n to all .hbm files. [DONE] + ; TODO: Add .hbp file to dirs where there are .prgs + needing -n flag. - + bin/hb-mkdll.bat - + Added .dll creation for GNU-make. Not yet enabled, - only MSVC supported, and by the nature of the - wonderful world of Microsoft, whole Harbour needs - to be compiled with HB_USER_CFLAGS=-DHB_DYNLIB to - make this work. -DHB_DYNLIB has some drawbacks - though: export table will be generated for all - executables made from these .libs, .exp/.lib will - also be generated for all executables. - ; TODO: Solve to compile Harbour lib .prgs using - -n1 switch. (needed for .dll, and this - one has only befenefits for other scenarios) - ; TODO: Add hb-mkdll.bat to postinst.bat. - ; TODO: Add BCC support, if possible. - ; TODO: Rename hb-mkslib.sh to 8.3 name and sync - name with the .bat version (not necessarily - mkdll, but something short.) + + bin/hb-mkdll.bat + + Added .dll creation for GNU-make. Not yet enabled, + only MSVC supported, and by the nature of the + wonderful world of Microsoft, whole Harbour needs + to be compiled with HB_USER_CFLAGS=-DHB_DYNLIB to + make this work. -DHB_DYNLIB has some drawbacks + though: export table will be generated for all + executables made from these .libs, .exp/.lib will + also be generated for all executables. + ; TODO: Solve to compile Harbour lib .prgs using + -n1 switch. (needed for .dll, and this + one has only befenefits for other scenarios) + ; TODO: Add hb-mkdll.bat to postinst.bat. + ; TODO: Add BCC support, if possible. + ; TODO: Rename hb-mkslib.sh to 8.3 name and sync + name with the .bat version (not necessarily + mkdll, but something short.) - * bin/hb-func.sh - ! Added system libs for optional components included - in the harbour dynlib. I plan to make some more - changes here, but this should fix missing system - libs with shared option enabled in hbmk2. + * bin/hb-func.sh + ! Added system libs for optional components included + in the harbour dynlib. I plan to make some more + changes here, but this should fix missing system + libs with shared option enabled in hbmk2. - * contrib/examples/dbu/dbu.hbm - * contrib/examples/rl/rl.hbm - + Added -n. + * contrib/examples/dbu/dbu.hbm + * contrib/examples/rl/rl.hbm + + Added -n. - * utils/hbdoc/Makefile - * utils/hbmk2/Makefile - * utils/hbtest/Makefile - * utils/hbi18n/Makefile - * utils/hbrun/Makefile - - Removed explicit -gc0 -n override. - Should now be set automatically for all binaries. + * utils/hbdoc/Makefile + * utils/hbmk2/Makefile + * utils/hbtest/Makefile + * utils/hbi18n/Makefile + * utils/hbrun/Makefile + - Removed explicit -gc0 -n override. + Should now be set automatically for all binaries. 2009-02-22 14:59 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/gtxwc/gtxwc.c diff --git a/harbour/contrib/examples/guestbk/guestbk.hbm b/harbour/contrib/examples/guestbk/guestbk.hbm index 2d3586cd1e..ed64a1e84f 100644 --- a/harbour/contrib/examples/guestbk/guestbk.hbm +++ b/harbour/contrib/examples/guestbk/guestbk.hbm @@ -2,4 +2,4 @@ # $Id$ # -guestbk.prg inifiles.prg testcgi.prg +-n guestbk.prg inifiles.prg testcgi.prg diff --git a/harbour/contrib/examples/hscript/hscript.hbm b/harbour/contrib/examples/hscript/hscript.hbm index fbe7df444d..67c360464d 100644 --- a/harbour/contrib/examples/hscript/hscript.hbm +++ b/harbour/contrib/examples/hscript/hscript.hbm @@ -2,4 +2,4 @@ # $Id$ # -hscript.prg -lhbnf +-n hscript.prg -lhbnf diff --git a/harbour/contrib/examples/pe/pe.hbm b/harbour/contrib/examples/pe/pe.hbm index 02c52e7115..e92e5f6582 100644 --- a/harbour/contrib/examples/pe/pe.hbm +++ b/harbour/contrib/examples/pe/pe.hbm @@ -2,4 +2,4 @@ # $Id$ # -pe.prg editorhi.prg editorlo.c +-n pe.prg editorhi.prg editorlo.c diff --git a/harbour/contrib/examples/terminal/trm_appn.hbm b/harbour/contrib/examples/terminal/trm_appn.hbm index d3bc563e61..8e99006c2e 100644 --- a/harbour/contrib/examples/terminal/trm_appn.hbm +++ b/harbour/contrib/examples/terminal/trm_appn.hbm @@ -2,4 +2,4 @@ # $Id$ # -trm_appn.prg terminal.prg +-n trm_appn.prg terminal.prg diff --git a/harbour/contrib/examples/uhttpd/hbmk.bat b/harbour/contrib/examples/uhttpd/hbmk.bat index af6b4e733a..daa7a4333b 100644 --- a/harbour/contrib/examples/uhttpd/hbmk.bat +++ b/harbour/contrib/examples/uhttpd/hbmk.bat @@ -40,17 +40,14 @@ if %UHTTP_INET_SUPPORT%.==no. echo.Mindaugas socket echo. if %UHTTP_GD_SUPPORT%.==yes. SET UHTTP_GD_DEF=-DGD_SUPPORT -if %UHTTP_GD_SUPPORT%.==yes. SET UHTTP_GD_LIBS=hbgd bgd +if %UHTTP_GD_SUPPORT%.==yes. SET UHTTP_GD_LIBS=-lhbgd -lbgd if %UHTTP_INET_SUPPORT%.==yes. SET UHTTP_INET_DEF=-DUSE_HB_INET if %UHTTP_INET_SUPPORT%.==no. SET UHTTP_INET_SOCKET=socket.c if exist uhttpd.exe uhttpd -s -set HB_USER_PRGFLAGS=%UHTTP_GD_DEF% %UHTTP_INET_DEF% -set HB_USER_LIBS=xhb hbct %UHTTP_GD_LIBS% - -..\..\..\bin\hbmk -mt -gui %1 %2 %3 %4 uhttpd.prg cgifunc.prg cookie.prg session.prg uhttpdc.c %UHTTP_INET_SOCKET% +..\..\..\bin\hbmk uhttpd.hbm %1 %2 %3 %4 %UHTTP_GD_DEF% %UHTTP_INET_DEF% %UHTTP_INET_SOCKET% %UHTTP_GD_LIBS% if errorlevel 1 goto DOERROR if not exist uhttpd.exe goto :EXIT diff --git a/harbour/contrib/examples/uhttpd/uhttpd.hbm b/harbour/contrib/examples/uhttpd/uhttpd.hbm new file mode 100644 index 0000000000..ee0839af61 --- /dev/null +++ b/harbour/contrib/examples/uhttpd/uhttpd.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +-n -mt -gui uhttpd.prg cgifunc.prg cookie.prg session.prg uhttpdc.c -lxhb -lhbct diff --git a/harbour/contrib/hbbtree/tests/test.hbm b/harbour/contrib/hbbtree/tests/test.hbm index 7e771d2e79..38e214ba38 100644 --- a/harbour/contrib/hbbtree/tests/test.hbm +++ b/harbour/contrib/hbbtree/tests/test.hbm @@ -2,4 +2,4 @@ # $Id$ # -test.prg ttest.prg ctest.c +-n test.prg ttest.prg ctest.c diff --git a/harbour/utils/hbdoc/hbdoc.hbm b/harbour/utils/hbdoc/hbdoc.hbm index 3644ff1e69..f6d1d6d976 100644 --- a/harbour/utils/hbdoc/hbdoc.hbm +++ b/harbour/utils/hbdoc/hbdoc.hbm @@ -2,4 +2,16 @@ # $Id$ # -hbdoc.prg ft_funcs.prg genasc.prg genchm.prg genhpc.prg genhtm.prg genng.prg genos2.prg genpdf1.prg genrtf.prg gentrf.prg hbdfrdln.c +-n +hbdoc.prg +ft_funcs.prg +genasc.prg +genchm.prg +genhpc.prg +genhtm.prg +genng.prg +genos2.prg +genpdf1.prg +genrtf.prg +gentrf.prg +hbdfrdln.c diff --git a/harbour/utils/hbmk2/hbmk2.hbm b/harbour/utils/hbmk2/hbmk2.hbm new file mode 100644 index 0000000000..bc06156bb9 --- /dev/null +++ b/harbour/utils/hbmk2/hbmk2.hbm @@ -0,0 +1,5 @@ +# +# $Id$ +# + +-n hbmk2.prg