diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 03c9340288..530c0d8e78 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-21 22:11 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + + contrib/examples/dbu/dbu.hbm + - contrib/examples/dbu/hbmk.bat + * contrib/examples/dbu/readme.txt + + contrib/examples/rl/rl.hbm + - contrib/examples/rl/hbmk.bat + * contrib/examples/rl/readme.txt + + Replace Win/DOS specific batch files with hbmk make + file, so now all platforms are equally supported. + + - contrib/examples/dbu/hb_dbu.dif + + contrib/examples/dbu/dbu.dif + * Renamed. + 2009-02-21 13:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/wvgsink.c * harbour/contrib/gtwvg/wvgutils.c @@ -189,8 +203,8 @@ 2009-02-21 08:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/hbfimage/fi_wrp.c ! Added hack to trick around FreeImage.h header not to - #include on Borland compilers. Maybe newers - than 5.8.1 versions have it, so this can be made BCC version + #include on Borland compilers. Maybe newer + than 5.8.2 versions have it, so this can be made BCC version dependend. 2009-02-21 08:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu) @@ -242,7 +256,7 @@ "hbsc_2nwvzg.obj : warning LNK4217: locally defined symbol \ _hb_vm_pszLinkedMain imported in function __hb_hbmk_setdef_" [FIXED] - + Added code to only accept valid Harbour identified as + + Added code to only accept valid Harbour identifier as -main= value. + Added first module detection. + Enabled code to automatically find entry function in first diff --git a/harbour/contrib/examples/dbu/hb_dbu.dif b/harbour/contrib/examples/dbu/dbu.dif similarity index 100% rename from harbour/contrib/examples/dbu/hb_dbu.dif rename to harbour/contrib/examples/dbu/dbu.dif diff --git a/harbour/contrib/examples/dbu/dbu.hbm b/harbour/contrib/examples/dbu/dbu.hbm new file mode 100644 index 0000000000..fc30b60c30 --- /dev/null +++ b/harbour/contrib/examples/dbu/dbu.hbm @@ -0,0 +1,13 @@ +# +# $Id$ +# + +DBU.PRG +DBUCOPY.PRG +DBUEDIT.PRG +DBUHELP.PRG +DBUINDX.PRG +DBUNET.PRG +DBUSTRU.PRG +DBUUTIL.PRG +DBUVIEW.PRG diff --git a/harbour/contrib/examples/dbu/hbmk.bat b/harbour/contrib/examples/dbu/hbmk.bat deleted file mode 100644 index 1577e6f27a..0000000000 --- a/harbour/contrib/examples/dbu/hbmk.bat +++ /dev/null @@ -1,29 +0,0 @@ -@rem -@rem $Id$ -@rem - -@echo off - -set HB_DIR_DBU=%CLIPPER_DIR%\SOURCE\DBU -if exist "%HB_DIR_DBU%\DBU.PRG" goto DIR_OK -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 in SOURCE\DBU): -echo set CLIPPER_DIR=C:\CLIPPER5 -echo --------------------------------------------------------------- -goto EXIT - -:DIR_OK_LOCAL - -if exist hb_dbu.dif patch -N -i hb_dbu.dif - -:DIR_OK - -..\..\..\bin\hbmk %1 %2 %3 %4 %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 - -:EXIT diff --git a/harbour/contrib/examples/dbu/readme.txt b/harbour/contrib/examples/dbu/readme.txt index 52b0a1dccc..1538cc498d 100644 --- a/harbour/contrib/examples/dbu/readme.txt +++ b/harbour/contrib/examples/dbu/readme.txt @@ -2,12 +2,14 @@ * $Id$ */ -Copy the full content of /SOURCE/DBU from your original +Copy the full content of /SOURCE/DBU 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_dbu.dif to make the original code run better -under various platforms. This patch is optional, you can -delete it if you want. +It's recommended to patch original source code with +included in this dir .dif file, to make it run smoother +under various platforms. You can use this command to +apply the patch: + +patch -N -i dbu.dif [vszakats] diff --git a/harbour/contrib/examples/rl/hbmk.bat b/harbour/contrib/examples/rl/hbmk.bat deleted file mode 100644 index f20040f6b2..0000000000 --- a/harbour/contrib/examples/rl/hbmk.bat +++ /dev/null @@ -1,29 +0,0 @@ -@rem -@rem $Id$ -@rem - -@echo off - -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\hbmk %1 %2 %3 %4 %HB_DIR_RL%\RLBACK.PRG %HB_DIR_RL%\RLDIALG.PRG %HB_DIR_RL%\RLFRONT.PRG - -:EXIT diff --git a/harbour/contrib/examples/rl/readme.txt b/harbour/contrib/examples/rl/readme.txt index c303e40b0d..ec8d473506 100644 --- a/harbour/contrib/examples/rl/readme.txt +++ b/harbour/contrib/examples/rl/readme.txt @@ -2,12 +2,7 @@ * $Id$ */ -Copy the full content of /SOURCE/RL from your original +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/contrib/examples/rl/rl.hbm b/harbour/contrib/examples/rl/rl.hbm new file mode 100644 index 0000000000..8b59b44088 --- /dev/null +++ b/harbour/contrib/examples/rl/rl.hbm @@ -0,0 +1,7 @@ +# +# $Id$ +# + +RLBACK.PRG +RLDIALG.PRG +RLFRONT.PRG