diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cc93a98195..29238836a8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,37 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-11 03:13 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + + contrib/examples/rl + + contrib/examples/rl/Makefile + + contrib/examples/rl/hbmk_b32.bat + + contrib/examples/rl/hbmk_vc.bat + + contrib/examples/rl/readme.txt + + Added build files for Clipper RL utility. + (if someone remembers :) + + * contrib/examples/guestbk/hbmk_vc.bat + * contrib/examples/pp/hbmk_vc.bat + * contrib/examples/pe/hbmk_vc.bat + * contrib/examples/dbu/hbmk_b32.bat + * contrib/examples/dbu/hbmk_vc.bat + * contrib/examples/hscript/hbmk_vc.bat + * utils/hbdoc/hbmk_b32.bat + * utils/hbdoc/hbmk_vc.bat + * utils/hbmake/hbmk_b32.bat + * utils/hbmake/hbmk_vc.bat + % Removed winspool.lib from liblists. + % Removed '/subsystem:console' from MSVC commandlines. + + Added gtwvt.lib + gdi32.lib to liblists. + (work in progress) + + * contrib/examples/dbu/readme.txt + * Minor. + + * contrib/examples/pe/editorhi.prg + ! Fixed stupid s&r error which broke compilation. + [TOMERGE 1.0] + 2008-11-11 02:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/hbmk.bat + Added '-shared' support for MSVC. diff --git a/harbour/contrib/examples/dbu/hbmk_b32.bat b/harbour/contrib/examples/dbu/hbmk_b32.bat index 476bc48c73..e410f66179 100644 --- a/harbour/contrib/examples/dbu/hbmk_b32.bat +++ b/harbour/contrib/examples/dbu/hbmk_b32.bat @@ -33,7 +33,7 @@ if exist hb_dbu.dif patch -N -i hb_dbu.dif ..\..\..\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 hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib +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 diff --git a/harbour/contrib/examples/dbu/hbmk_vc.bat b/harbour/contrib/examples/dbu/hbmk_vc.bat index 2036331613..3468c11c9f 100644 --- a/harbour/contrib/examples/dbu/hbmk_vc.bat +++ b/harbour/contrib/examples/dbu/hbmk_vc.bat @@ -33,7 +33,7 @@ if exist hb_dbu.dif patch -N -i hb_dbu.dif ..\..\..\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 /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 gdi32.lib +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 diff --git a/harbour/contrib/examples/dbu/readme.txt b/harbour/contrib/examples/dbu/readme.txt index a17c6fd8b5..52b0a1dccc 100644 --- a/harbour/contrib/examples/dbu/readme.txt +++ b/harbour/contrib/examples/dbu/readme.txt @@ -5,7 +5,7 @@ Copy the full content of /SOURCE/DBU from your original CA-Cl*pper installation, and run the batch file to compile. -If DBU source is present in this directory, it will be +If source code is present in this directory, it will be patched by hb_dbu.dif to make the original code run better under various platforms. This patch is optional, you can delete it if you want. diff --git a/harbour/contrib/examples/guestbk/hbmk_vc.bat b/harbour/contrib/examples/guestbk/hbmk_vc.bat index 4b886a3a1a..8698e84b76 100644 --- a/harbour/contrib/examples/guestbk/hbmk_vc.bat +++ b/harbour/contrib/examples/guestbk/hbmk_vc.bat @@ -5,7 +5,7 @@ rem ..\..\..\bin\harbour /n /i..\..\..\include\ guestbk inifiles testcgi -cl -nologo -O2 -W3 -I..\..\..\include guestbk.c inifiles.c testcgi.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 -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 diff --git a/harbour/contrib/examples/hscript/hbmk_vc.bat b/harbour/contrib/examples/hscript/hbmk_vc.bat index 2ec301c2d5..9dfcb20432 100644 --- a/harbour/contrib/examples/hscript/hbmk_vc.bat +++ b/harbour/contrib/examples/hscript/hbmk_vc.bat @@ -6,7 +6,7 @@ rem rem NOTE: This sample program needs hbnf.lib from contrib/hbnf ..\..\..\bin\harbour hscript /n /i..\..\..\include -cl -nologo -O2 -W3 -I..\..\..\include hscript.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 hbnf.lib user32.lib winspool.lib +cl -nologo -O2 -W3 -I..\..\..\include hscript.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 hbnf.lib user32.lib gdi32.lib del *.obj del hscript.c diff --git a/harbour/contrib/examples/pe/editorhi.prg b/harbour/contrib/examples/pe/editorhi.prg index 560e197353..e95ff9b374 100644 --- a/harbour/contrib/examples/pe/editorhi.prg +++ b/harbour/contrib/examples/pe/editorhi.prg @@ -15,8 +15,8 @@ #define EXPORT -#define IFANY( x ) IIF( (x) != NIL ) -#define IFNIL( x ) IIF( (x) == NIL ) +#define IFANY( x ) IF ( (x) != NIL ) +#define IFNIL( x ) IF ( (x) == NIL ) #define IIFNIL( isnil, notnil ) IIF(notnil==NIL, isnil, notnil) #define EDIT_LOWER 0 // convert to lowercase diff --git a/harbour/contrib/examples/pe/hbmk_vc.bat b/harbour/contrib/examples/pe/hbmk_vc.bat index eff00949db..81a526c059 100644 --- a/harbour/contrib/examples/pe/hbmk_vc.bat +++ b/harbour/contrib/examples/pe/hbmk_vc.bat @@ -5,7 +5,7 @@ rem ..\..\..\bin\harbour /n /i..\..\..\include\ pe editorhi -cl -nologo -O2 -W3 -I..\..\..\include pe.c editorhi.c editorlo.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 -nologo -O2 -W3 -I..\..\..\include pe.c editorhi.c editorlo.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 pe.c editorhi.c diff --git a/harbour/contrib/examples/pp/hbmk_vc.bat b/harbour/contrib/examples/pp/hbmk_vc.bat index 9a0d5d1f0d..0596009d2d 100644 --- a/harbour/contrib/examples/pp/hbmk_vc.bat +++ b/harbour/contrib/examples/pp/hbmk_vc.bat @@ -3,7 +3,7 @@ rem rem $Id$ rem -cl -nologo -O2 -W3 -I..\..\..\include pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c /link /subsystem:console /libpath:..\..\..\lib hbcommon.lib +cl -nologo -O2 -W3 -I..\..\..\include pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c /link /libpath:..\..\..\lib hbcommon.lib del *.obj diff --git a/harbour/contrib/examples/rl/Makefile b/harbour/contrib/examples/rl/Makefile new file mode 100644 index 0000000000..3f67dc8c04 --- /dev/null +++ b/harbour/contrib/examples/rl/Makefile @@ -0,0 +1,30 @@ +# +# $Id$ +# + +ROOT = ../../../ + +PRG_SOURCES=\ + RLBACK.PRG \ + RLDIALG.PRG \ + RLFRONT.PRG \ + +PRG_MAIN=RLFRONT.PRG + +LIBS=\ + hbdebug \ + hbvm \ + hbrtl \ + hblang \ + hbrdd \ + hbrtl \ + hbvm \ + hbmacro \ + hbpp \ + rddntx \ + rddcdx \ + rddfpt \ + hbsix \ + hbcommon \ + +include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/contrib/examples/rl/hbmk_b32.bat b/harbour/contrib/examples/rl/hbmk_b32.bat new file mode 100644 index 0000000000..c4795899d4 --- /dev/null +++ b/harbour/contrib/examples/rl/hbmk_b32.bat @@ -0,0 +1,36 @@ +@echo off +rem +rem $Id$ +rem + +set HB_DIR_RL=%CLIPPER_DIR%\SOURCE\RL +if exist "%HB_DIR_RL%\RLFRONT.PRG" goto DIR_OK +set HB_DIR_RL=. +if exist "%HB_DIR_RL%\RLFRONT.PRG" goto DIR_OK_LOCAL + +echo --------------------------------------------------------------- +echo IMPORTANT: You'll either need to copy the original CA-Cl*pper +echo RL sources to this directory, or set the location of +echo your original CA-Cl*pper installation (with RL sources +echo in SOURCE\RL): +echo set CLIPPER_DIR=C:\CLIPPER5 +echo --------------------------------------------------------------- +goto EXIT + +:DIR_OK_LOCAL + +if exist hb_rl.dif patch -N -i hb_rl.dif + +:DIR_OK + +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_RL%\RLBACK.PRG %HB_DIR_RL%\RLDIALG.PRG %HB_DIR_RL%\RLFRONT.PRG + +bcc32 -O2 -I..\..\..\include -L..\..\..\lib -erl.exe rlfront.c rlback.c rldialg.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 rlback.c rldialg.c rlfront.c + +rl + +:EXIT + diff --git a/harbour/contrib/examples/rl/hbmk_vc.bat b/harbour/contrib/examples/rl/hbmk_vc.bat new file mode 100644 index 0000000000..576ced7ba0 --- /dev/null +++ b/harbour/contrib/examples/rl/hbmk_vc.bat @@ -0,0 +1,35 @@ +@echo off +rem +rem $Id$ +rem + +set HB_DIR_RL=%CLIPPER_DIR%\SOURCE\RL +if exist "%HB_DIR_RL%\RLFRONT.PRG" goto DIR_OK +set HB_DIR_RL=. +if exist "%HB_DIR_RL%\RLFRONT.PRG" goto DIR_OK_LOCAL + +echo --------------------------------------------------------------- +echo IMPORTANT: You'll either need to copy the original CA-Cl*pper +echo RL sources to this directory, or set the location of +echo your original CA-Cl*pper installation (with RL sources +echo in SOURCE\RL): +echo set CLIPPER_DIR=C:\CLIPPER5 +echo --------------------------------------------------------------- +goto EXIT + +:DIR_OK_LOCAL + +if exist hb_rl.dif patch -N -i hb_rl.dif + +:DIR_OK + +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_RL%\RLBACK.PRG %HB_DIR_RL%\RLDIALG.PRG %HB_DIR_RL%\RLFRONT.PRG + +cl -nologo -O2 -W3 -I..\..\..\include rlfront.c rlback.c rldialg.c /link /out:rl.exe /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 rlback.c rldialg.c rlfront.c + +rl + +:EXIT diff --git a/harbour/contrib/examples/rl/readme.txt b/harbour/contrib/examples/rl/readme.txt new file mode 100644 index 0000000000..c303e40b0d --- /dev/null +++ b/harbour/contrib/examples/rl/readme.txt @@ -0,0 +1,13 @@ +/* + * $Id$ + */ + +Copy the full content of /SOURCE/RL from your original +CA-Cl*pper installation, and run the batch file to compile. + +If source code is present in this directory, it will be +patched by hb_rl.dif to make the original code run better +under various platforms. This patch is optional, you can +delete it if you want. + +[vszakats] diff --git a/harbour/utils/hbdoc/hbmk_b32.bat b/harbour/utils/hbdoc/hbmk_b32.bat index ea9ac7ba03..1c0408daab 100644 --- a/harbour/utils/hbdoc/hbmk_b32.bat +++ b/harbour/utils/hbdoc/hbmk_b32.bat @@ -5,7 +5,7 @@ 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 hbnulrdd.lib hbmacro.lib hbcommon.lib +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 diff --git a/harbour/utils/hbdoc/hbmk_vc.bat b/harbour/utils/hbdoc/hbmk_vc.bat index cc27e76ed1..3602be5958 100644 --- a/harbour/utils/hbdoc/hbmk_vc.bat +++ b/harbour/utils/hbdoc/hbmk_vc.bat @@ -5,7 +5,7 @@ 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 /subsystem:CONSOLE /libpath:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib +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 diff --git a/harbour/utils/hbmake/hbmk_b32.bat b/harbour/utils/hbmake/hbmk_b32.bat index cf0a6db44c..401e3289a3 100644 --- a/harbour/utils/hbmake/hbmk_b32.bat +++ b/harbour/utils/hbmake/hbmk_b32.bat @@ -5,7 +5,7 @@ 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 hbnulrdd.lib hbmacro.lib hbcommon.lib +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 diff --git a/harbour/utils/hbmake/hbmk_vc.bat b/harbour/utils/hbmake/hbmk_vc.bat index 506034ffac..f56392f603 100644 --- a/harbour/utils/hbmake/hbmk_vc.bat +++ b/harbour/utils/hbmake/hbmk_vc.bat @@ -5,7 +5,7 @@ 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 /subsystem:CONSOLE /libpath:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib +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