diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 32aad5dfc9..66543fe2ca 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,25 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-13 16:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/hbmk.bat + + Added detection for .PRG written in uppercase. + (needed for DBU original sources.) + ! Fixed to set 'echo off' + + * contrib/examples/guestbk/hbmk_b32.bat + * contrib/examples/guestbk/hbmk_vc.bat + * contrib/examples/dbu/hbmk_b32.bat + * contrib/examples/dbu/hbmk_vc.bat + * utils/hbdoc/hbmk_b32.bat + * utils/hbdoc/hbmk_vc.bat + * utils/hbmake/hbmk_b32.bat + * utils/hbmake/hbmk_vc.bat + % Switched to use hbmk instead of using local logic. + + * ChangeLog + + Added one item to previous entry. + 2009-02-13 16:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/hbmk.bat + Added autodetection of Harbour dirs. So this batch will @@ -23,6 +42,7 @@ The first will be the main program. + Added support to supply .c files on the command line. [these features need Windows NT or upper] + - Removed compatibility support for HB_MT=mt. Use HB_MT=yes. ; TODO: Test OpenWatcom. I had to remove -fo and FILE directives from script, if this was required we need to find a solution to support multiple diff --git a/harbour/bin/hbmk.bat b/harbour/bin/hbmk.bat index 7219c595a5..ac046601ba 100644 --- a/harbour/bin/hbmk.bat +++ b/harbour/bin/hbmk.bat @@ -1,4 +1,4 @@ -rem @echo off +@echo off rem rem $Id$ rem @@ -159,7 +159,9 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt set _HB_P_OPT= :_P_SORT_R - if not "%~x1" == ".prg" goto _P_SORT_NP + set _HB_P_TMP=%~x1 + if "%_HB_P_TMP%" == ".PRG" set _HB_P_TMP=.prg + if not "%_HB_P_TMP%" == ".prg" goto _P_SORT_NP if "%_HB_P_PRG_MAIN%" == "" set _HB_P_PRG_MAIN=%~dpn1 set _HB_P_PRG=%_HB_P_PRG% %1 set _HB_P_PRG_C=%_HB_P_PRG_C% %~dpn1.c diff --git a/harbour/contrib/examples/dbu/hbmk_b32.bat b/harbour/contrib/examples/dbu/hbmk_b32.bat index e410f66179..9b738b9dd8 100644 --- a/harbour/contrib/examples/dbu/hbmk_b32.bat +++ b/harbour/contrib/examples/dbu/hbmk_b32.bat @@ -9,9 +9,9 @@ set HB_DIR_DBU=. if exist "%HB_DIR_DBU%\DBU.PRG" goto DIR_OK_LOCAL echo --------------------------------------------------------------- -echo IMPORTANT: You'll either need to copy the original CA-Cl*pper -echo DBU sources to this directory, or set the location of -echo your original CA-Cl*pper installation (with DBU sources +echo IMPORTANT: You'll either need to copy the original CA-Cl*pper +echo DBU sources to this directory, or set the location of +echo your original CA-Cl*pper installation (with DBU sources echo in SOURCE\DBU): echo set CLIPPER_DIR=C:\CLIPPER5 echo --------------------------------------------------------------- @@ -23,29 +23,7 @@ if exist hb_dbu.dif patch -N -i hb_dbu.dif :DIR_OK -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBU.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUCOPY.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUEDIT.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUHELP.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUINDX.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUNET.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUSTRU.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUUTIL.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUVIEW.PRG - -bcc32 -O2 -I..\..\..\include -L..\..\..\lib dbu.c dbucopy.c dbuedit.c dbuhelp.c dbuindx.c dbunet.c dbustru.c dbuutil.c dbuview.c hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib - -del *.obj - -del dbu.c -del dbucopy.c -del dbuedit.c -del dbuhelp.c -del dbuindx.c -del dbunet.c -del dbustru.c -del dbuutil.c -del dbuview.c +..\..\..\bin\hbmk_b32 %HB_DIR_DBU%\dbu.prg %HB_DIR_DBU%\dbucopy.prg %HB_DIR_DBU%\dbuedit.prg %HB_DIR_DBU%\dbuhelp.prg %HB_DIR_DBU%\dbuindx.prg %HB_DIR_DBU%\dbunet.prg %HB_DIR_DBU%\dbustru.prg %HB_DIR_DBU%\dbuutil.prg %HB_DIR_DBU%\dbuview.prg dbu diff --git a/harbour/contrib/examples/dbu/hbmk_vc.bat b/harbour/contrib/examples/dbu/hbmk_vc.bat index 3468c11c9f..f7c613fb4a 100644 --- a/harbour/contrib/examples/dbu/hbmk_vc.bat +++ b/harbour/contrib/examples/dbu/hbmk_vc.bat @@ -9,9 +9,9 @@ set HB_DIR_DBU=. if exist "%HB_DIR_DBU%\DBU.PRG" goto DIR_OK_LOCAL echo --------------------------------------------------------------- -echo IMPORTANT: You'll either need to copy the original CA-Cl*pper -echo DBU sources to this directory, or set the location of -echo your original CA-Cl*pper installation (with DBU sources +echo IMPORTANT: You'll either need to copy the original CA-Cl*pper +echo DBU sources to this directory, or set the location of +echo your original CA-Cl*pper installation (with DBU sources echo in SOURCE\DBU): echo set CLIPPER_DIR=C:\CLIPPER5 echo --------------------------------------------------------------- @@ -23,29 +23,7 @@ if exist hb_dbu.dif patch -N -i hb_dbu.dif :DIR_OK -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBU.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUCOPY.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUEDIT.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUHELP.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUINDX.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUNET.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUSTRU.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUUTIL.PRG -..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUVIEW.PRG - -cl -nologo -O2 -W3 -I..\..\..\include dbu.c dbucopy.c dbuedit.c dbuhelp.c dbuindx.c dbunet.c dbustru.c dbuutil.c dbuview.c /link /libpath:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib gtwvt.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 gdi32.lib - -del *.obj - -del dbu.c -del dbucopy.c -del dbuedit.c -del dbuhelp.c -del dbuindx.c -del dbunet.c -del dbustru.c -del dbuutil.c -del dbuview.c +..\..\..\bin\hbmk_vc %HB_DIR_DBU%\dbu.prg %HB_DIR_DBU%\dbucopy.prg %HB_DIR_DBU%\dbuedit.prg %HB_DIR_DBU%\dbuhelp.prg %HB_DIR_DBU%\dbuindx.prg %HB_DIR_DBU%\dbunet.prg %HB_DIR_DBU%\dbustru.prg %HB_DIR_DBU%\dbuutil.prg %HB_DIR_DBU%\dbuview.prg dbu diff --git a/harbour/contrib/examples/guestbk/hbmk_b32.bat b/harbour/contrib/examples/guestbk/hbmk_b32.bat index 2013d1b073..713a78e89b 100644 --- a/harbour/contrib/examples/guestbk/hbmk_b32.bat +++ b/harbour/contrib/examples/guestbk/hbmk_b32.bat @@ -3,11 +3,6 @@ rem rem $Id$ rem -..\..\..\bin\harbour /n /i..\..\..\include\ guestbk inifiles testcgi - -bcc32 -O2 -I..\..\..\include -L..\..\..\lib guestbk.c inifiles.c testcgi.c 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 - -del *.obj -del guestbk.c inifiles.c testcgi.c +..\..\..\bin\hbmk_b32 guestbk.prg inifiles.prg testcgi.prg guestbk diff --git a/harbour/contrib/examples/guestbk/hbmk_vc.bat b/harbour/contrib/examples/guestbk/hbmk_vc.bat index 8698e84b76..9ce5e205ff 100644 --- a/harbour/contrib/examples/guestbk/hbmk_vc.bat +++ b/harbour/contrib/examples/guestbk/hbmk_vc.bat @@ -3,11 +3,6 @@ rem rem $Id$ rem -..\..\..\bin\harbour /n /i..\..\..\include\ guestbk inifiles testcgi - -cl -nologo -O2 -W3 -I..\..\..\include guestbk.c inifiles.c testcgi.c /link /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 gdi32.lib - -del *.obj -del guestbk.c inifiles.c testcgi.c +..\..\..\bin\hbmk_vc guestbk.prg inifiles.prg testcgi.prg guestbk diff --git a/harbour/utils/hbdoc/hbmk_b32.bat b/harbour/utils/hbdoc/hbmk_b32.bat index 1c0408daab..ecd7197dff 100644 --- a/harbour/utils/hbdoc/hbmk_b32.bat +++ b/harbour/utils/hbdoc/hbmk_b32.bat @@ -3,9 +3,4 @@ rem rem $Id$ rem -..\..\bin\harbour -w3 -q -n -km -l -i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf - -bcc32 -O2 -I..\..\include -L..\..\lib hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c hbdfrdln.c hbvm.lib hbrtl.lib gtwin.lib gtwvt.lib hbnulrdd.lib hbmacro.lib hbcommon.lib - -del *.obj -del hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c +..\..\bin\hbmk_b32 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/hbdoc/hbmk_vc.bat b/harbour/utils/hbdoc/hbmk_vc.bat index 3602be5958..c0211006e0 100644 --- a/harbour/utils/hbdoc/hbmk_vc.bat +++ b/harbour/utils/hbdoc/hbmk_vc.bat @@ -3,9 +3,4 @@ rem rem $Id$ rem -..\..\bin\harbour -w3 -q -n -km -l -i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf - -cl -nologo -O2 -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 hbdfrdln.c /link /libpath:..\..\lib hbvm.lib hbrtl.lib gtwin.lib gtwvt.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib - -del *.obj -del hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c +..\..\bin\hbmk_vc 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/hbmake/hbmk_b32.bat b/harbour/utils/hbmake/hbmk_b32.bat index 401e3289a3..e087d87b8d 100644 --- a/harbour/utils/hbmake/hbmk_b32.bat +++ b/harbour/utils/hbmake/hbmk_b32.bat @@ -3,9 +3,4 @@ rem rem $Id$ rem -..\..\bin\harbour -w3 -q -n -km -l -i..\..\include hbmake - -bcc32 -O2 -I..\..\include -L..\..\lib hbmake.c hbmfrdln.c hbmgauge.c hbmlang.c hbvm.lib hbrtl.lib gtwin.lib gtwvt.lib hbnulrdd.lib hbmacro.lib hbcommon.lib - -del *.obj -del hbmake.c +..\..\bin\hbmk_b32 hbmake.prg hbmfrdln.c hbmgauge.c hbmlang.c diff --git a/harbour/utils/hbmake/hbmk_vc.bat b/harbour/utils/hbmake/hbmk_vc.bat index f56392f603..46f0a3b09c 100644 --- a/harbour/utils/hbmake/hbmk_vc.bat +++ b/harbour/utils/hbmake/hbmk_vc.bat @@ -3,9 +3,4 @@ rem rem $Id$ rem -..\..\bin\harbour -w3 -q -n -km -l -i..\..\include hbmake - -cl -nologo -O2 -W3 -I..\..\include hbmake.c hbmfrdln.c hbmgauge.c hbmlang.c /link /libpath:..\..\lib hbvm.lib hbrtl.lib gtwin.lib gtwvt.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib - -del *.obj -del hbmake.c +..\..\bin\hbmk_vc hbmake.prg hbmfrdln.c hbmgauge.c hbmlang.c