From a4f90ee0fb68398f612520eba28b3742c87136dd Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 10 Jun 2009 07:48:17 +0000 Subject: [PATCH] 2009-06-10 09:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Added comp.lang.clipper as public forum. * make_gnu.bat ! Minor. * source/pp/hbpp.c ! Added version status to banner. * examples/superlib/hbsuper.hbp * examples/superlib/hbsuper.dif * examples/superlib/readme.txt * examples/dbu/dbu.hbp - examples/dbu/dbu.dif + examples/dbu/dbu52.dif + examples/dbu/dbu53.dif * examples/dbu/readme.txt * examples/rl/rl.hbp * examples/rl/rl.dif * examples/rl/readme.txt * Updated instructions: New item for *nix users to convert to lowercase and native EOL format, added hbmk2 command for all projects, separate 5.2/5.3 DBU patches. + Added separate patch for C53 version of DBU sources. * Converted all original filename references to lowercase. ! Fixed a few bugs in previous patches. ! Fixed .dif files to work on both *nix and non-*nix systems (had to create them on *nix then convert them to have consistent EOLs) --- harbour/ChangeLog | 30 ++ harbour/INSTALL | 18 +- harbour/examples/dbu/dbu.hbp | 18 +- harbour/examples/dbu/{dbu.dif => dbu52.dif} | 42 +- harbour/examples/dbu/dbu53.dif | 287 ++++++++++++++ harbour/examples/dbu/readme.txt | 23 +- harbour/examples/rl/readme.txt | 18 +- harbour/examples/rl/rl.dif | 58 ++- harbour/examples/rl/rl.hbp | 6 +- harbour/examples/superlib/hbsuper.dif | 414 ++++++++++---------- harbour/examples/superlib/hbsuper.hbp | 408 +++++++++---------- harbour/examples/superlib/readme.txt | 9 +- harbour/make_gnu.bat | 6 +- harbour/source/pp/hbpp.c | 4 +- 14 files changed, 861 insertions(+), 480 deletions(-) rename harbour/examples/dbu/{dbu.dif => dbu52.dif} (83%) create mode 100644 harbour/examples/dbu/dbu53.dif diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3cd6f9c664..acff4e47de 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,36 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-10 09:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + + Added comp.lang.clipper as public forum. + + * make_gnu.bat + ! Minor. + + * source/pp/hbpp.c + ! Added version status to banner. + + * examples/superlib/hbsuper.hbp + * examples/superlib/hbsuper.dif + * examples/superlib/readme.txt + * examples/dbu/dbu.hbp + - examples/dbu/dbu.dif + + examples/dbu/dbu52.dif + + examples/dbu/dbu53.dif + * examples/dbu/readme.txt + * examples/rl/rl.hbp + * examples/rl/rl.dif + * examples/rl/readme.txt + * Updated instructions: New item for *nix users to convert + to lowercase and native EOL format, added hbmk2 command + for all projects, separate 5.2/5.3 DBU patches. + + Added separate patch for C53 version of DBU sources. + * Converted all original filename references to lowercase. + ! Fixed a few bugs in previous patches. + ! Fixed .dif files to work on both *nix and non-*nix systems + (had to create them on *nix then convert them to have consistent EOLs) + 2009-06-09 22:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * mpkg_deb.sh + Added hbqt lib. Submitted by Davor Siklic. Thank you. diff --git a/harbour/INSTALL b/harbour/INSTALL index dc0265732d..4a68c790ea 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -561,25 +561,25 @@ FOR MORE INFORMATION Home: http://www.harbour-project.org/ - Mailing lists: - http://www.harbour-project.org/mailing.html - - Developers' mail archives: + Developers' Mail Archives: http://lists.harbour-project.org/pipermail/harbour/ - Users' mail archives: + Users' Mail Archives: http://lists.harbour-project.org/pipermail/harbour-users/ - Sourceforge page: + Public Newsgroup: + http://groups.google.com/group/comp.lang.clipper/ + + Sourceforge Page: http://sourceforge.net/projects/harbour-project/ - Development timeline: + Development Timeline: http://apps.sourceforge.net/trac/harbour-project/timeline - Source repository browser: + Source Repository Browser: http://harbour-project.svn.sourceforge.net/viewvc/harbour-project/ - Source repository checkout (anonymous): + Source Repository Checkout (anonymous): svn co https://harbour-project.svn.sourceforge.net/svnroot/harbour-project harbour-project Miscellaneous documents: diff --git a/harbour/examples/dbu/dbu.hbp b/harbour/examples/dbu/dbu.hbp index fc30b60c30..6307403efc 100644 --- a/harbour/examples/dbu/dbu.hbp +++ b/harbour/examples/dbu/dbu.hbp @@ -2,12 +2,12 @@ # $Id$ # -DBU.PRG -DBUCOPY.PRG -DBUEDIT.PRG -DBUHELP.PRG -DBUINDX.PRG -DBUNET.PRG -DBUSTRU.PRG -DBUUTIL.PRG -DBUVIEW.PRG +dbu.prg +dbucopy.prg +dbuedit.prg +dbuhelp.prg +dbuindx.prg +dbunet.prg +dbustru.prg +dbuutil.prg +dbuview.prg diff --git a/harbour/examples/dbu/dbu.dif b/harbour/examples/dbu/dbu52.dif similarity index 83% rename from harbour/examples/dbu/dbu.dif rename to harbour/examples/dbu/dbu52.dif index 4c69b0dad9..27dc5f9534 100644 --- a/harbour/examples/dbu/dbu.dif +++ b/harbour/examples/dbu/dbu52.dif @@ -1,6 +1,6 @@ -diff -u -x make_dif.bat ..\ori_src\DBU.PRG .\DBU.PRG ---- ..\ori_src\DBU.PRG Thu Mar 04 04:20:00 1993 -+++ .\DBU.PRG Fri Dec 19 12:56:30 2008 +diff -u dbu52ori/dbu.prg dbu52pat/dbu.prg +--- dbu52ori/dbu.prg 1993-03-04 04:20:00.000000000 +0100 ++++ dbu52pat/dbu.prg 2009-06-10 01:37:40.000000000 +0200 @@ -60,6 +60,9 @@ SAVE SCREEN && the screen you save... SET SCOREBOARD OFF && who's keeping score, anyhow @@ -38,9 +38,9 @@ diff -u -x make_dif.bat ..\ori_src\DBU.PRG .\DBU.PRG * assume a valid .VEW file view_file = com_line set_from(.F.) && restore view -diff -u -x make_dif.bat ..\ori_src\DBUCOPY.PRG .\DBUCOPY.PRG ---- ..\ori_src\DBUCOPY.PRG Thu Mar 04 04:20:00 1993 -+++ .\DBUCOPY.PRG Fri May 30 14:41:33 2008 +diff -u dbu52ori/dbucopy.prg dbu52pat/dbucopy.prg +--- dbu52ori/dbucopy.prg 1993-03-04 04:20:00.000000000 +0100 ++++ dbu52pat/dbucopy.prg 2009-06-10 01:37:40.000000000 +0200 @@ -104,7 +104,7 @@ * DBF for normal mode @@ -95,9 +95,9 @@ diff -u -x make_dif.bat ..\ori_src\DBUCOPY.PRG .\DBUCOPY.PRG filelist(1) && display new list ENDIF -diff -u -x make_dif.bat ..\ori_src\DBUINDX.PRG .\DBUINDX.PRG ---- ..\ori_src\DBUINDX.PRG Thu Mar 04 04:20:00 1993 -+++ .\DBUINDX.PRG Fri May 30 14:40:42 2008 +diff -u dbu52ori/dbuindx.prg dbu52pat/dbuindx.prg +--- dbu52ori/dbuindx.prg 1993-03-04 04:20:00.000000000 +0100 ++++ dbu52pat/dbuindx.prg 2009-06-10 01:37:40.000000000 +0200 @@ -240,7 +240,7 @@ INDEX ON &k_exp TO &filename CLOSE INDEX @@ -107,9 +107,9 @@ diff -u -x make_dif.bat ..\ori_src\DBUINDX.PRG .\DBUINDX.PRG FILE(name(M->filename) + INDEXEXT()) .AND. M->add_name * add only .ntx files in the current directory -diff -u -x make_dif.bat ..\ori_src\DBUSTRU.PRG .\DBUSTRU.PRG ---- ..\ori_src\DBUSTRU.PRG Thu Mar 04 04:20:00 1993 -+++ .\DBUSTRU.PRG Fri May 30 14:34:49 2008 +diff -u dbu52ori/dbustru.prg dbu52pat/dbustru.prg +--- dbu52ori/dbustru.prg 1993-03-04 04:20:00.000000000 +0100 ++++ dbu52pat/dbustru.prg 2009-06-10 01:39:17.000000000 +0200 @@ -811,7 +811,7 @@ is_insert = .F. filename = stru_name @@ -143,18 +143,20 @@ diff -u -x make_dif.bat ..\ori_src\DBUSTRU.PRG .\DBUSTRU.PRG IF FILE(dbt_spec) * data file contains memo fields -@@ -1321,7 +1321,7 @@ +@@ -1320,8 +1320,8 @@ + CREATE &filename FROM ddbbuuuu.ext ALIAS cAlias USE - IF AT(".DBF", filename) = LEN(filename) - 3 .AND.; +- IF AT(".DBF", filename) = LEN(filename) - 3 .AND.; - FILE(name(filename) + ".DBF") .AND. add_name ++ IF AT(".dbf", Lower(filename)) = LEN(filename) - 3 .AND.; + FILE(name(filename) + ".dbf") .AND. add_name * add only .dbf files in the current directory i = afull(dbf_list) + 1 -diff -u -x make_dif.bat ..\ori_src\DBUUTIL.PRG .\DBUUTIL.PRG ---- ..\ori_src\DBUUTIL.PRG Thu Mar 04 04:20:00 1993 -+++ .\DBUUTIL.PRG Fri May 30 14:36:26 2008 +diff -u dbu52ori/dbuutil.prg dbu52pat/dbuutil.prg +--- dbu52ori/dbuutil.prg 1993-03-04 04:20:00.000000000 +0100 ++++ dbu52pat/dbuutil.prg 2009-06-10 01:37:40.000000000 +0200 @@ -2152,7 +2152,7 @@ IF FILE(M->filename) * only if the file exists @@ -164,9 +166,9 @@ diff -u -x make_dif.bat ..\ori_src\DBUUTIL.PRG .\DBUUTIL.PRG * Clipper index file format k_pos = 23 -diff -u -x make_dif.bat ..\ori_src\DBUVIEW.PRG .\DBUVIEW.PRG ---- ..\ori_src\DBUVIEW.PRG Thu Mar 04 04:20:00 1993 -+++ .\DBUVIEW.PRG Fri May 30 14:36:04 2008 +diff -u dbu52ori/dbuview.prg dbu52pat/dbuview.prg +--- dbu52ori/dbuview.prg 1993-03-04 04:20:00.000000000 +0100 ++++ dbu52pat/dbuview.prg 2009-06-10 01:37:40.000000000 +0200 @@ -1110,7 +1110,7 @@ IF .NOT. (RAT(".", M->filename) > RAT("\", M->filename)) diff --git a/harbour/examples/dbu/dbu53.dif b/harbour/examples/dbu/dbu53.dif new file mode 100644 index 0000000000..0a019c5ea3 --- /dev/null +++ b/harbour/examples/dbu/dbu53.dif @@ -0,0 +1,287 @@ +diff -u dbu53ori/dbu.prg dbu53pat/dbu.prg +--- dbu53ori/dbu.prg 1996-05-20 05:31:00.000000000 +0200 ++++ dbu53pat/dbu.prg 2009-06-10 01:43:32.000000000 +0200 +@@ -9,8 +9,8 @@ + * + ***/ + +-#include "Inkey.Ch" +-#include "Set.Ch" ++#include "inkey.ch" ++#include "set.ch" + + // Uncomment to update the obsolete declaration: + #xtranslate DECLARE => PRIVATE +@@ -71,6 +71,9 @@ + SET SCOREBOARD OFF // who's keeping score, anyhow + SET KEY 28 TO // some folks need help + ++ SET DATE ANSI ++ SET CENTURY ON ++ + IF (ISCOLOR() .OR. "/C" $ UPPER(param2)) .AND. .NOT. "/M" $ UPPER(param2) + // make it pretty + color1 := "W+/B,N/W,B" // normal +@@ -360,14 +363,14 @@ + help_title[22] := "REPLACE" + + // arrays for file names in default directory +- DECLARE dbf_list[adir("*.DBF") + 20] // directory of data files ++ DECLARE dbf_list[adir("*.dbf") + 20] // directory of data files + DECLARE ntx_list[adir("*" + INDEXEXT()) + 20] // directory of index files +- DECLARE vew_list[adir("*.VEW") + 20] // directory of view files ++ DECLARE vew_list[adir("*.vew") + 20] // directory of view files + + // fill the arrays with filenames +- array_dir("*.DBF",dbf_list) ++ array_dir("*.dbf",dbf_list) + array_dir("*" + INDEXEXT(),ntx_list) +- array_dir("*.VEW",vew_list) ++ array_dir("*.vew",vew_list) + + // default to set view + local_func := 0 // local menu +@@ -392,13 +395,13 @@ + + ENDIF + +- CASE FILE(com_line + ".VEW") ++ CASE FILE(com_line + ".vew") + // look for file name with .VEW extension +- com_line := com_line + ".VEW" ++ com_line := com_line + ".vew" + +- CASE FILE(com_line + ".DBF") ++ CASE FILE(com_line + ".dbf") + // look for file name with .DBF extension +- com_line := com_line + ".DBF" ++ com_line := com_line + ".dbf" + + OTHERWISE + // file not found..ignore command line +@@ -409,14 +412,14 @@ + IF .NOT. EMPTY(com_line) + // command line file exists + +- IF RAT(".VEW", com_line) = LEN(com_line) - 3 ++ IF RAT(".vew", Lower(com_line)) = LEN(com_line) - 3 + // assume a valid .VEW file + view_file := com_line + set_from(.F.) // restore view + KEYBOARD CHR(-4) + CHR(24) + CHR(13) // browse view + + ELSE +- // assume a valid .DBF file ++ // assume a valid .dbf file + dbf[1] := com_line // primary database + + IF NetUse( com_line ) +@@ -708,18 +711,18 @@ + @ 3,0 CLEAR + + // rebuild directory arrays..must keep current +- DECLARE dbf_list[adir("*.DBF") + 20] ++ DECLARE dbf_list[adir("*.dbf") + 20] + DECLARE ntx_list[adir("*" + INDEXEXT()) + 20] +- DECLARE vew_list[adir("*.VEW") + 20] ++ DECLARE vew_list[adir("*.vew") + 20] + + // fill the arrays with filenames..data files +- array_dir("*.DBF",dbf_list) ++ array_dir("*.dbf",dbf_list) + + // index files + array_dir("*" + INDEXEXT(),ntx_list) + + // view files +- array_dir("*.VEW",vew_list) ++ array_dir("*.vew",vew_list) + cur_area := 0 // re-draw view screen + sysfunc := 0 // back to the main view screen + +diff -u dbu53ori/dbucopy.prg dbu53pat/dbucopy.prg +--- dbu53ori/dbucopy.prg 1996-05-20 05:31:00.000000000 +0200 ++++ dbu53pat/dbucopy.prg 2009-06-10 01:35:15.000000000 +0200 +@@ -62,8 +62,8 @@ + filename = "" + + * only copy and append use a list of text files +- DECLARE txt_list[adir("*.TXT") + 20] && directory of text files +- array_dir("*.TXT",txt_list) && fill array with filenames ++ DECLARE txt_list[adir("*.txt") + 20] && directory of text files ++ array_dir("*.txt",txt_list) && fill array with filenames + + * set up for multi-box + DECLARE boxarray[10] +@@ -104,7 +104,7 @@ + + * DBF for normal mode + files = "dbf_list" +- def_ext = ".DBF" ++ def_ext = ".dbf" + + * when is a filename acceptable? + fi_done = "not_empty('filename')" +@@ -742,7 +742,7 @@ + cur_el = 1 + rel_row = 0 + files = "dbf_list" +- def_ext = ".DBF" ++ def_ext = ".dbf" + filelist(1) && display new list + + ELSE +@@ -757,7 +757,7 @@ + cur_el = 1 + rel_row = 0 + files = "txt_list" +- def_ext = ".TXT" ++ def_ext = ".txt" + filelist(1) && display new list + + ENDIF +@@ -820,7 +820,7 @@ + cur_el = 1 + rel_row = 0 + files = "dbf_list" +- def_ext = ".DBF" ++ def_ext = ".dbf" + filelist(1) && display new list + + ELSE +@@ -835,7 +835,7 @@ + cur_el = 1 + rel_row = 0 + files = "txt_list" +- def_ext = ".TXT" ++ def_ext = ".txt" + filelist(1) && display new list + + ENDIF +diff -u dbu53ori/dbustru.prg dbu53pat/dbustru.prg +--- dbu53ori/dbustru.prg 1996-05-20 05:31:00.000000000 +0200 ++++ dbu53pat/dbustru.prg 2009-06-10 01:43:02.000000000 +0200 +@@ -811,7 +811,7 @@ + is_insert = .F. + filename = stru_name + +- IF filebox(".DBF", "dbf_list", "stru_title",; ++ IF filebox(".dbf", "dbf_list", "stru_title",; + "do_modstru", .T., 13) <> 0 + * structure created or altered + stru_name = filename +@@ -1215,7 +1215,7 @@ + USE + + * remember if file existed in current directory before +- add_name = .NOT. FILE(name(filename) + ".DBF") ++ add_name = .NOT. FILE(name(filename) + ".dbf") + + IF FILE(filename) + * file exists..modify structure and save old data +@@ -1236,11 +1236,11 @@ + + * establish temp filespec and dbt specs in same directory + name_temp = SUBSTR(filename, 1, RAT("\", filename)) +; +- "DDBBUUUU.TMP" ++ "ddbbuuuu.tmp" + dbt_spec = SUBSTR(filename, 1, RAT(".", filename)) +; +- "DBT" ++ "dbt" + dbt_temp = SUBSTR(name_temp, 1, RAT(".", name_temp)) +; +- "DBT" ++ "dbt" + + IF FILE(dbt_spec) + * data file contains memo fields +@@ -1320,8 +1320,8 @@ + CREATE &filename FROM ddbbuuuu.ext ALIAS cAlias + USE + +- IF AT(".DBF", filename) = LEN(filename) - 3 .AND.; +- FILE(name(filename) + ".DBF") .AND. add_name ++ IF AT(".dbf", Lower(filename)) = LEN(filename) - 3 .AND.; ++ FILE(name(filename) + ".dbf") .AND. add_name + * add only .dbf files in the current directory + i = afull(dbf_list) + 1 + +diff -u dbu53ori/dbuutil.prg dbu53pat/dbuutil.prg +--- dbu53ori/dbuutil.prg 1996-05-20 05:31:00.000000000 +0200 ++++ dbu53pat/dbuutil.prg 2009-06-10 01:02:54.000000000 +0200 +@@ -2152,7 +2152,7 @@ + IF FILE(M->filename) + * only if the file exists + +- IF INDEXEXT() = ".NTX" ++ IF INDEXEXT() = ".ntx" + * Clipper index file format + k_pos = 23 + +diff -u dbu53ori/dbuview.prg dbu53pat/dbuview.prg +--- dbu53ori/dbuview.prg 1996-05-20 05:31:00.000000000 +0200 ++++ dbu53pat/dbuview.prg 2009-06-10 01:42:42.000000000 +0200 +@@ -1110,7 +1110,7 @@ + + IF .NOT. (RAT(".", M->filename) > RAT("\", M->filename)) + * no extension entered..provide default +- filename = M->filename + ".DBF" ++ filename = M->filename + ".dbf" + + ENDIF + +@@ -1141,7 +1141,7 @@ + + ELSE + * insert or enter or menu selection..use filebox +- ret_val = filebox(".DBF", "dbf_list", "dopen_titl",; ++ ret_val = filebox(".dbf", "dbf_list", "dopen_titl",; + "do_opendbf", .F., 8) <> 0 + + ENDIF +@@ -2789,7 +2789,7 @@ + * get user entered file name..will default to primary + ".VEW" + IF EMPTY(M->view_file) .AND. .NOT. EMPTY(dbf[1]) + * default to name of primary data file +- filename = name(dbf[1]) + ".VEW" ++ filename = name(dbf[1]) + ".vew" + + ELSE + * whatever the last view was +@@ -2798,7 +2798,7 @@ + ENDIF + + * it's better in a box +-filebox(".VEW", "vew_list", "vcrea_titl", "do_creavew", .T., 8) ++filebox(".vew", "vew_list", "vcrea_titl", "do_creavew", .T., 8) + + * restore help code + help_code = M->old_help +@@ -2840,7 +2840,7 @@ + stat_msg("Generating View File") + + * add new .VEW files to vew_list if created in current directory only +-add_name = .NOT. FILE(name(filename) + ".VEW") ++add_name = .NOT. FILE(name(filename) + ".vew") + + * create structure extended template + CREATE ddbbuuuu.ext +@@ -3009,8 +3009,8 @@ + USE + + * add file name to array of view files +-IF AT(".VEW", filename) = LEN(filename) - 3 .AND.; +- FILE(name(filename) + ".VEW") .AND. add_name ++IF AT(".vew", Lower(filename)) = LEN(filename) - 3 .AND.; ++ FILE(name(filename) + ".vew") .AND. add_name + * add only new .VEW files in the current directory + + * determine number of first empty element +@@ -3080,7 +3080,7 @@ + IF M->from_view + * called from set_view + +- IF filebox(".VEW", "vew_list", "vopen_titl", "do_openvew", .F., 8) <> 0 ++ IF filebox(".vew", "vew_list", "vopen_titl", "do_openvew", .F., 8) <> 0 + * indicate new View has been set + keystroke = 13 + diff --git a/harbour/examples/dbu/readme.txt b/harbour/examples/dbu/readme.txt index 7a3c6f6284..3fa1060a12 100644 --- a/harbour/examples/dbu/readme.txt +++ b/harbour/examples/dbu/readme.txt @@ -2,14 +2,23 @@ * $Id$ */ -Copy the full content of /SOURCE/DBU from your original -CA-Cl*pper installation, and run the batch file to compile. +1.) Copy the full content of /SOURCE/DBU from your original + CA-Cl*pper installation. -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 GNU Patch to apply -this patch, with this command: +2.) *nix users will need convert original filenames to lowercase + and EOLs to native format (f.e. with dos2unix). -patch -N -i dbu.dif +3.) Apply supplied patch to the source using GNU Patch: + + For CA-Cl*pper 5.2e sources: + patch -N -i dbu52.dif + + For CA-Cl*pper 5.3b sources: + patch -N -i dbu53.dif + +4.) Build it: + hbmk2 dbu.hbp + +5.) You're done. [vszakats] diff --git a/harbour/examples/rl/readme.txt b/harbour/examples/rl/readme.txt index 463dfea1fb..f8cddb51f0 100644 --- a/harbour/examples/rl/readme.txt +++ b/harbour/examples/rl/readme.txt @@ -2,14 +2,18 @@ * $Id$ */ -Copy the full content of /SOURCE/RL from your original -CA-Cl*pper installation, and run the batch file to compile. +1.) Copy the full content of /SOURCE/RL from your original + CA-Cl*pper installation. -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 GNU Patch to apply -this patch, with this command: +2.) *nix users will need convert original filenames to lowercase + and EOLs to native format (f.e. with dos2unix). -patch -N -i rl.dif +3.) Apply supplied patch to the source using GNU Patch: + patch -N -i rl.dif + +4.) Build it: + hbmk2 rl.hbp + +5.) You're done. [vszakats] diff --git a/harbour/examples/rl/rl.dif b/harbour/examples/rl/rl.dif index 43fd50bf44..00aa498fd8 100644 --- a/harbour/examples/rl/rl.dif +++ b/harbour/examples/rl/rl.dif @@ -1,6 +1,6 @@ -diff -u ori_src\RLBACK.PRG .\RLBACK.PRG ---- ori_src\RLBACK.PRG Mon May 20 05:31:00 1996 -+++ .\RLBACK.PRG Wed Jun 03 11:30:32 2009 +diff -u rlori/rlback.prg rlpat/rlback.prg +--- rlori/rlback.prg 1996-05-20 05:31:00.000000000 +0200 ++++ rlpat/rlback.prg 2009-06-10 08:24:18.000000000 +0200 @@ -312,10 +312,10 @@ sub_hdr_offset, page_width_offset, lns_per_page_offset, left_mrgn_offset,; right_mgrn_offset, col_count_offset, dbl_space_offset,; @@ -185,9 +185,42 @@ diff -u ori_src\RLBACK.PRG .\RLBACK.PRG frm_pe +; CHR(plus_byte) write_len = LEN(write_item) -diff -u ori_src\RLFRONT.PRG .\RLFRONT.PRG ---- ori_src\RLFRONT.PRG Mon May 20 05:31:00 1996 -+++ .\RLFRONT.PRG Wed Jun 03 11:31:30 2009 +@@ -1296,7 +1296,7 @@ + + ** NO extension ** + IF AT(".", file) = 0 +- file = TRIM(file) + ".DBF" ++ file = TRIM(file) + ".dbf" + ENDIF + + ** Calculate record_size, field_count and data_offset ** +diff -u rlori/rlfront.prg rlpat/rlfront.prg +--- rlori/rlfront.prg 1996-05-20 05:31:00.000000000 +0200 ++++ rlpat/rlfront.prg 2009-06-10 08:23:53.000000000 +0200 +@@ -158,9 +158,9 @@ + CASE rl_choice == 1 + + // Select REPORT FORM +- DECLARE files[adir("*.FRM") + 1] ++ DECLARE files[adir("*.frm") + 1] + afill(files,"") +- adir("*.FRM", files) ++ adir("*.frm", files) + + IF multibox(7, 17, 7, 5, file_box) = 0 // or cancel? + LOOP +@@ -172,9 +172,9 @@ + CASE rl_choice == 2 + + // Select LABEL FORM +- DECLARE files[adir("*.LBL") + 1] ++ DECLARE files[adir("*.lbl") + 1] + afill(files,"") +- adir("*.LBL", files) ++ adir("*.lbl", files) + + IF multibox(7, 17, 7, 5, file_box) = 0 // or cancel? + LOOP @@ -828,10 +828,10 @@ // translate semicolons into lines and stuff array @@ -350,3 +383,16 @@ diff -u ori_src\RLFRONT.PRG .\RLFRONT.PRG @ 19,25 GET frm_subhdr READ +@@ -1913,10 +1913,10 @@ + + IF AT(".", fname) == 0 + IF type == "L" +- open = TRIM(fname) + ".LBL" ++ open = TRIM(fname) + ".lbl" + ENDIF + IF type == "R" +- open = TRIM(fname) + ".FRM" ++ open = TRIM(fname) + ".frm" + ENDIF + ELSE + open = TRIM(fname) diff --git a/harbour/examples/rl/rl.hbp b/harbour/examples/rl/rl.hbp index 3916e2ff8c..f447094014 100644 --- a/harbour/examples/rl/rl.hbp +++ b/harbour/examples/rl/rl.hbp @@ -6,6 +6,6 @@ -m -n -main=setup -RLBACK.PRG -RLDIALG.PRG -RLFRONT.PRG +rlfront.prg +rlback.prg +rldialg.prg diff --git a/harbour/examples/superlib/hbsuper.dif b/harbour/examples/superlib/hbsuper.dif index 338464d78b..602eaea245 100644 --- a/harbour/examples/superlib/hbsuper.dif +++ b/harbour/examples/superlib/hbsuper.dif @@ -1,6 +1,6 @@ -diff -u ori_src\BETWEEN.C .\BETWEEN.C ---- ori_src\BETWEEN.C Thu Aug 19 10:28:38 1993 -+++ .\BETWEEN.C Thu May 28 17:56:25 2009 +diff -u superori/between.c superpat/between.c +--- superori/between.c 1993-08-19 10:28:38.000000000 +0200 ++++ superpat/between.c 2009-06-10 08:44:26.000000000 +0200 @@ -63,7 +63,7 @@ if (strend >= strstart && (fnd)) { @@ -10,9 +10,9 @@ diff -u ori_src\BETWEEN.C .\BETWEEN.C for(i = strstart; i <= strend ;i++) result[knt++] = string[i]; result[knt] = NIL; -diff -u ori_src\MLINE.C .\MLINE.C ---- ori_src\MLINE.C Tue Sep 14 14:17:34 1993 -+++ .\MLINE.C Thu May 28 17:54:46 2009 +diff -u superori/mline.c superpat/mline.c +--- superori/mline.c 1993-09-14 14:17:34.000000000 +0200 ++++ superpat/mline.c 2009-06-10 08:44:26.000000000 +0200 @@ -1,19 +1,19 @@ -#include "extend.api" -#include "vm.api" @@ -157,9 +157,9 @@ diff -u ori_src\MLINE.C .\MLINE.C + + hb_xfree(outstr); } -diff -u ori_src\R_HCODE.PRG .\R_HCODE.PRG ---- ori_src\R_HCODE.PRG Fri Oct 08 12:30:40 1993 -+++ .\R_HCODE.PRG Thu May 28 17:54:46 2009 +diff -u superori/r_hcode.prg superpat/r_hcode.prg +--- superori/r_hcode.prg 1993-10-08 11:30:40.000000000 +0100 ++++ superpat/r_hcode.prg 2009-06-10 08:44:26.000000000 +0200 @@ -121,7 +121,7 @@ local cShowBox // variable to hold makebox() // screen @@ -169,9 +169,9 @@ diff -u ori_src\R_HCODE.PRG .\R_HCODE.PRG MSG("No Report file present") return '' endif -diff -u ori_src\R_PRINTR.PRG .\R_PRINTR.PRG ---- ori_src\R_PRINTR.PRG Thu Nov 02 16:11:18 1995 -+++ .\R_PRINTR.PRG Thu May 28 17:54:46 2009 +diff -u superori/r_printr.prg superpat/r_printr.prg +--- superori/r_printr.prg 1995-11-02 16:11:18.000000000 +0100 ++++ superpat/r_printr.prg 2009-06-10 08:44:26.000000000 +0200 @@ -48,7 +48,7 @@ ÔÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ */ @@ -181,9 +181,9 @@ diff -u ori_src\R_PRINTR.PRG .\R_PRINTR.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\R_QUIKR.PRG .\R_QUIKR.PRG ---- ori_src\R_QUIKR.PRG Fri Oct 08 12:30:42 1993 -+++ .\R_QUIKR.PRG Thu May 28 17:54:46 2009 +diff -u superori/r_quikr.prg superpat/r_quikr.prg +--- superori/r_quikr.prg 1993-10-08 11:30:42.000000000 +0100 ++++ superpat/r_quikr.prg 2009-06-10 08:44:26.000000000 +0200 @@ -134,7 +134,7 @@ @@ -193,9 +193,9 @@ diff -u ori_src\R_QUIKR.PRG .\R_QUIKR.PRG MSG("No Report file present") return '' elseif!used() -diff -u ori_src\R_REPORT.PRG .\R_REPORT.PRG ---- ori_src\R_REPORT.PRG Thu Nov 02 16:13:54 1995 -+++ .\R_REPORT.PRG Thu May 28 17:54:46 2009 +diff -u superori/r_report.prg superpat/r_report.prg +--- superori/r_report.prg 1995-11-02 16:13:54.000000000 +0100 ++++ superpat/r_report.prg 2009-06-10 08:44:26.000000000 +0200 @@ -194,7 +194,7 @@ next @@ -214,9 +214,9 @@ diff -u ori_src\R_REPORT.PRG .\R_REPORT.PRG nSelection := RAT_MENU2({; {2,3 ,'Load REPORT '},; -diff -u ori_src\S_1LABEL.PRG .\S_1LABEL.PRG ---- ori_src\S_1LABEL.PRG Thu Nov 02 16:59:32 1995 -+++ .\S_1LABEL.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_1label.prg superpat/s_1label.prg +--- superori/s_1label.prg 1995-11-02 16:59:32.000000000 +0100 ++++ superpat/s_1label.prg 2009-06-10 08:44:26.000000000 +0200 @@ -6,7 +6,7 @@ static nDimLinesBetween @@ -226,9 +226,9 @@ diff -u ori_src\S_1LABEL.PRG .\S_1LABEL.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_2DBRZ.PRG .\S_2DBRZ.PRG ---- ori_src\S_2DBRZ.PRG Thu Nov 02 16:59:32 1995 -+++ .\S_2DBRZ.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_2dbrz.prg superpat/s_2dbrz.prg +--- superori/s_2dbrz.prg 1995-11-02 16:59:32.000000000 +0100 ++++ superpat/s_2dbrz.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,6 +1,6 @@ static nElement @@ -237,18 +237,18 @@ diff -u ori_src\S_2DBRZ.PRG .\S_2DBRZ.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_ACHOI.PRG .\S_ACHOI.PRG ---- ori_src\S_ACHOI.PRG Thu Nov 02 16:59:32 1995 -+++ .\S_ACHOI.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_achoi.prg superpat/s_achoi.prg +--- superori/s_achoi.prg 1995-11-02 16:59:32.000000000 +0100 ++++ superpat/s_achoi.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,4 +1,4 @@ -#include "inKey.ch" +#include "inkey.ch" #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_APPEND.PRG .\S_APPEND.PRG ---- ori_src\S_APPEND.PRG Thu Nov 02 16:59:30 1995 -+++ .\S_APPEND.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_append.prg superpat/s_append.prg +--- superori/s_append.prg 1995-11-02 16:59:30.000000000 +0100 ++++ superpat/s_append.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -265,9 +265,9 @@ diff -u ori_src\S_APPEND.PRG .\S_APPEND.PRG if !file(cFromAlias) msg(cFromAlias,"does not exist") cFromAlias := "" -diff -u ori_src\S_APPT.PRG .\S_APPT.PRG ---- ori_src\S_APPT.PRG Thu Nov 02 16:59:30 1995 -+++ .\S_APPT.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_appt.prg superpat/s_appt.prg +--- superori/s_appt.prg 1995-11-02 16:59:30.000000000 +0100 ++++ superpat/s_appt.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -290,18 +290,18 @@ diff -u ori_src\S_APPT.PRG .\S_APPT.PRG lOk := .t. else msg("Problem finding/creating Appointments file") -diff -u ori_src\S_BDELIM.PRG .\S_BDELIM.PRG ---- ori_src\S_BDELIM.PRG Thu Nov 02 16:59:30 1995 -+++ .\S_BDELIM.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_bdelim.prg superpat/s_bdelim.prg +--- superori/s_bdelim.prg 1995-11-02 16:59:30.000000000 +0100 ++++ superpat/s_bdelim.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,4 +1,4 @@ -#include "inKey.ch" +#include "inkey.ch" #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_BLDBF.PRG .\S_BLDBF.PRG ---- ori_src\S_BLDBF.PRG Fri Oct 08 12:30:34 1993 -+++ .\S_BLDBF.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_bldbf.prg superpat/s_bldbf.prg +--- superori/s_bldbf.prg 1993-10-08 11:30:34.000000000 +0100 ++++ superpat/s_bldbf.prg 2009-06-10 08:44:26.000000000 +0200 @@ -80,8 +80,8 @@ RETURN .F. ENDIF @@ -313,9 +313,9 @@ diff -u ori_src\S_BLDBF.PRG .\S_BLDBF.PRG endif if !("\"$cDbfName .or. ":"$cDbfName) -diff -u ori_src\S_BLDNDX.PRG .\S_BLDNDX.PRG ---- ori_src\S_BLDNDX.PRG Thu Nov 02 16:59:28 1995 -+++ .\S_BLDNDX.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_bldndx.prg superpat/s_bldndx.prg +--- superori/s_bldndx.prg 1995-11-02 16:59:28.000000000 +0100 ++++ superpat/s_bldndx.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -323,9 +323,9 @@ diff -u ori_src\S_BLDNDX.PRG .\S_BLDNDX.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_BRSDF.PRG .\S_BRSDF.PRG ---- ori_src\S_BRSDF.PRG Thu Nov 02 16:59:28 1995 -+++ .\S_BRSDF.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_brsdf.prg superpat/s_brsdf.prg +--- superori/s_brsdf.prg 1995-11-02 16:59:28.000000000 +0100 ++++ superpat/s_brsdf.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -333,9 +333,9 @@ diff -u ori_src\S_BRSDF.PRG .\S_BRSDF.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_BUILD.PRG .\S_BUILD.PRG ---- ori_src\S_BUILD.PRG Thu Nov 02 16:59:28 1995 -+++ .\S_BUILD.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_build.prg superpat/s_build.prg +--- superori/s_build.prg 1995-11-02 16:59:28.000000000 +0100 ++++ superpat/s_build.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -343,9 +343,9 @@ diff -u ori_src\S_BUILD.PRG .\S_BUILD.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_BUNGEE.PRG .\S_BUNGEE.PRG ---- ori_src\S_BUNGEE.PRG Thu Nov 02 17:11:04 1995 -+++ .\S_BUNGEE.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_bungee.prg superpat/s_bungee.prg +--- superori/s_bungee.prg 1995-11-02 17:11:04.000000000 +0100 ++++ superpat/s_bungee.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,7 +1,7 @@ @@ -364,9 +364,9 @@ diff -u ori_src\S_BUNGEE.PRG .\S_BUNGEE.PRG CASE aCurrentPrompts[nCurrentOption,PROMPTTYPE]==TYPEDROPDOWN MSG("Submenu currently inactive") -diff -u ori_src\S_BXX.PRG .\S_BXX.PRG ---- ori_src\S_BXX.PRG Fri Oct 08 12:30:36 1993 -+++ .\S_BXX.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_bxx.prg superpat/s_bxx.prg +--- superori/s_bxx.prg 1993-10-08 11:30:36.000000000 +0100 ++++ superpat/s_bxx.prg 2009-06-10 08:44:26.000000000 +0200 @@ -79,17 +79,17 @@ dispbox(nTop,nLeft,nBottom,nRight,cFrame,cColorString) @@ -397,9 +397,9 @@ diff -u ori_src\S_BXX.PRG .\S_BXX.PRG + att(nTop,nLeft-1,nBottom-1,nLeft-1,nShadowAttribute) ENDCASE return '' -diff -u ori_src\S_CALCVW.PRG .\S_CALCVW.PRG ---- ori_src\S_CALCVW.PRG Fri Oct 08 12:30:40 1993 -+++ .\S_CALCVW.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_calcvw.prg superpat/s_calcvw.prg +--- superori/s_calcvw.prg 1993-10-08 11:30:40.000000000 +0100 ++++ superpat/s_calcvw.prg 2009-06-10 08:44:26.000000000 +0200 @@ -1,6 +1,6 @@ -#include "Inkey.ch" @@ -409,9 +409,9 @@ diff -u ori_src\S_CALCVW.PRG .\S_CALCVW.PRG /* ÕìÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ -diff -u ori_src\S_CLAB.PRG .\S_CLAB.PRG ---- ori_src\S_CLAB.PRG Thu Nov 02 17:02:54 1995 -+++ .\S_CLAB.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_clab.prg superpat/s_clab.prg +--- superori/s_clab.prg 1995-11-02 17:02:54.000000000 +0100 ++++ superpat/s_clab.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,4 +1,4 @@ -#include "inKey.ch" +#include "inkey.ch" @@ -463,9 +463,9 @@ diff -u ori_src\S_CLAB.PRG .\S_CLAB.PRG local nOldArea := select() local cAlias := ALIAS() local nSelection := 0 -diff -u ori_src\S_CLRFUN.PRG .\S_CLRFUN.PRG ---- ori_src\S_CLRFUN.PRG Wed Oct 26 17:30:30 1994 -+++ .\S_CLRFUN.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_clrfun.prg superpat/s_clrfun.prg +--- superori/s_clrfun.prg 1994-10-26 16:30:30.000000000 +0100 ++++ superpat/s_clrfun.prg 2009-06-10 08:44:27.000000000 +0200 @@ -49,7 +49,7 @@ ÔíÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ */ @@ -520,9 +520,9 @@ diff -u ori_src\S_CLRFUN.PRG .\S_CLRFUN.PRG local cSetName := padr(iif(cSetName==nil,"DEFAULT",cSetName),40) aSelections := {} aRecnos := {} -diff -u ori_src\S_COPY.PRG .\S_COPY.PRG ---- ori_src\S_COPY.PRG Fri Jan 21 08:55:22 1994 -+++ .\S_COPY.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_copy.prg superpat/s_copy.prg +--- superori/s_copy.prg 1994-01-21 08:55:22.000000000 +0100 ++++ superpat/s_copy.prg 2009-06-10 08:44:27.000000000 +0200 @@ -115,7 +115,7 @@ EXIT ENDIF @@ -532,9 +532,9 @@ diff -u ori_src\S_COPY.PRG .\S_COPY.PRG *- if it already exists, don't overwrite it *- loop around and get another filespec -diff -u ori_src\S_COPYF.PRG .\S_COPYF.PRG ---- ori_src\S_COPYF.PRG Fri Oct 08 12:30:50 1993 -+++ .\S_COPYF.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_copyf.prg superpat/s_copyf.prg +--- superori/s_copyf.prg 1993-10-08 11:30:50.000000000 +0100 ++++ superpat/s_copyf.prg 2009-06-10 08:44:27.000000000 +0200 @@ -174,7 +174,7 @@ EXIT ENDIF @@ -544,9 +544,9 @@ diff -u ori_src\S_COPYF.PRG .\S_COPYF.PRG *- if it already exists, don't overwrite it *- loop around and get another filespec -diff -u ori_src\S_CVTDEL.PRG .\S_CVTDEL.PRG ---- ori_src\S_CVTDEL.PRG Thu Nov 02 17:02:52 1995 -+++ .\S_CVTDEL.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_cvtdel.prg superpat/s_cvtdel.prg +--- superori/s_cvtdel.prg 1995-11-02 17:02:52.000000000 +0100 ++++ superpat/s_cvtdel.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -563,9 +563,9 @@ diff -u ori_src\S_CVTDEL.PRG .\S_CVTDEL.PRG IF FILE(cDbfName) msg("Database "+cDbfName+" already exists - ",; "Use another name","Or delete that file first") -diff -u ori_src\S_DATVW.PRG .\S_DATVW.PRG ---- ori_src\S_DATVW.PRG Fri Oct 08 12:30:48 1993 -+++ .\S_DATVW.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_datvw.prg superpat/s_datvw.prg +--- superori/s_datvw.prg 1993-10-08 11:30:48.000000000 +0100 ++++ superpat/s_datvw.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "Inkey.ch" -#include "Getexit.ch" @@ -574,9 +574,9 @@ diff -u ori_src\S_DATVW.PRG .\S_DATVW.PRG //------------------------------------------------------------------------ /* -diff -u ori_src\S_DBSTAT.PRG .\S_DBSTAT.PRG ---- ori_src\S_DBSTAT.PRG Mon Nov 08 14:58:00 1993 -+++ .\S_DBSTAT.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_dbstat.prg superpat/s_dbstat.prg +--- superori/s_dbstat.prg 1993-11-08 14:58:00.000000000 +0100 ++++ superpat/s_dbstat.prg 2009-06-10 08:44:27.000000000 +0200 @@ -143,17 +143,17 @@ @ 12,23 SAY "³ of ³" @ 13,23 SAY "ÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ" @@ -598,9 +598,9 @@ diff -u ori_src\S_DBSTAT.PRG .\S_DBSTAT.PRG nVariance := nVariance/nCount nStd := sqrt(nVariance) endif -diff -u ori_src\S_DPOPS.PRG .\S_DPOPS.PRG ---- ori_src\S_DPOPS.PRG Thu Nov 02 17:02:52 1995 -+++ .\S_DPOPS.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_dpops.prg superpat/s_dpops.prg +--- superori/s_dpops.prg 1995-11-02 17:02:52.000000000 +0100 ++++ superpat/s_dpops.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -608,9 +608,9 @@ diff -u ori_src\S_DPOPS.PRG .\S_DPOPS.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_DUPH.PRG .\S_DUPH.PRG ---- ori_src\S_DUPH.PRG Thu Nov 02 17:02:52 1995 -+++ .\S_DUPH.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_duph.prg superpat/s_duph.prg +--- superori/s_duph.prg 1995-11-02 17:02:52.000000000 +0100 ++++ superpat/s_duph.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -627,9 +627,9 @@ diff -u ori_src\S_DUPH.PRG .\S_DUPH.PRG *- if it already exists, don't overwrite it *- loop around and get another filespec -diff -u ori_src\S_EDITM.PRG .\S_EDITM.PRG ---- ori_src\S_EDITM.PRG Thu Nov 02 17:02:50 1995 -+++ .\S_EDITM.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_editm.prg superpat/s_editm.prg +--- superori/s_editm.prg 1995-11-02 17:02:50.000000000 +0100 ++++ superpat/s_editm.prg 2009-06-10 08:44:27.000000000 +0200 @@ -2,7 +2,7 @@ static lImport,lExport,lChanged,lDone static nBoxTop,nBoxLeft, lDoEdit, nBoxBot @@ -639,9 +639,9 @@ diff -u ori_src\S_EDITM.PRG .\S_EDITM.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_EDITMV.PRG .\S_EDITMV.PRG ---- ori_src\S_EDITMV.PRG Thu Nov 02 17:02:50 1995 -+++ .\S_EDITMV.PRG Thu May 28 17:54:46 2009 +diff -u superori/s_editmv.prg superpat/s_editmv.prg +--- superori/s_editmv.prg 1995-11-02 17:02:50.000000000 +0100 ++++ superpat/s_editmv.prg 2009-06-10 08:44:27.000000000 +0200 @@ -3,7 +3,7 @@ static nBoxTop,nBoxLeft, nBoxRight, lDoEdit, nBoxBot @@ -651,9 +651,9 @@ diff -u ori_src\S_EDITMV.PRG .\S_EDITMV.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_EXPORT.PRG .\S_EXPORT.PRG ---- ori_src\S_EXPORT.PRG Fri Oct 08 12:30:44 1993 -+++ .\S_EXPORT.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_export.prg superpat/s_export.prg +--- superori/s_export.prg 1993-10-08 11:30:44.000000000 +0100 ++++ superpat/s_export.prg 2009-06-10 08:44:27.000000000 +0200 @@ -147,7 +147,7 @@ nRecordSele := menu_v("[Write ASCII file from:]",; "Tagged Records","Records meeting Query",; @@ -663,9 +663,9 @@ diff -u ori_src\S_EXPORT.PRG .\S_EXPORT.PRG do case case nRecordSele = REC_TAGGED tagit(aTagged,aFieldNames,aFieldDesc,"Merge Records") -diff -u ori_src\S_FILER.PRG .\S_FILER.PRG ---- ori_src\S_FILER.PRG Mon Sep 12 17:20:02 1994 -+++ .\S_FILER.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_filer.prg superpat/s_filer.prg +--- superori/s_filer.prg 1994-09-12 17:20:02.000000000 +0200 ++++ superpat/s_filer.prg 2009-06-10 08:44:27.000000000 +0200 @@ -69,7 +69,7 @@ local lMarking := .f. local nMarkStart := 0, nMarkEnd := 0 @@ -675,9 +675,9 @@ diff -u ori_src\S_FILER.PRG .\S_FILER.PRG local nTbottom local cInstruct1, cInstruct2, nInstruct1, nInstruct2 local nAtArrows, nAtPgup, nAtPgdn, nAtHome, nAtEnd, nAtEsc, nAtSearch, nAtMark -diff -u ori_src\S_FORML.PRG .\S_FORML.PRG ---- ori_src\S_FORML.PRG Thu Nov 02 17:02:50 1995 -+++ .\S_FORML.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_forml.prg superpat/s_forml.prg +--- superori/s_forml.prg 1995-11-02 17:02:50.000000000 +0100 ++++ superpat/s_forml.prg 2009-06-10 08:44:27.000000000 +0200 @@ -6,7 +6,7 @@ #define MAXFORMSIZE 4000 @@ -696,9 +696,9 @@ diff -u ori_src\S_FORML.PRG .\S_FORML.PRG blddbf(cFormsFile,"DESCRIPT,C,50:MEMO_ORIG,M:") ENDIF *- open forms.dbf -diff -u ori_src\S_FORMU.PRG .\S_FORMU.PRG ---- ori_src\S_FORMU.PRG Thu Nov 02 17:02:48 1995 -+++ .\S_FORMU.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_formu.prg superpat/s_formu.prg +--- superori/s_formu.prg 1995-11-02 17:02:48.000000000 +0100 ++++ superpat/s_formu.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -706,9 +706,9 @@ diff -u ori_src\S_FORMU.PRG .\S_FORMU.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_FREQ.PRG .\S_FREQ.PRG ---- ori_src\S_FREQ.PRG Thu Nov 02 17:13:40 1995 -+++ .\S_FREQ.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_freq.prg superpat/s_freq.prg +--- superori/s_freq.prg 1995-11-02 17:13:40.000000000 +0100 ++++ superpat/s_freq.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -725,9 +725,9 @@ diff -u ori_src\S_FREQ.PRG .\S_FREQ.PRG IF FILE(cPermDbf) msg("Database "+cPermDbf+" already exists - ","Use another name") cPermDbf = '' -diff -u ori_src\S_FULLD.PRG .\S_FULLD.PRG ---- ori_src\S_FULLD.PRG Thu Nov 02 17:02:48 1995 -+++ .\S_FULLD.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_fulld.prg superpat/s_fulld.prg +--- superori/s_fulld.prg 1995-11-02 17:02:48.000000000 +0100 ++++ superpat/s_fulld.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,12 +1,12 @@ -#include "inKey.ch" @@ -761,9 +761,9 @@ diff -u ori_src\S_FULLD.PRG .\S_FULLD.PRG Fileread(2,2,23,78,cFileName) ENDIF RETURN nil -diff -u ori_src\S_GETDAT.PRG .\S_GETDAT.PRG ---- ori_src\S_GETDAT.PRG Thu Nov 02 17:02:48 1995 -+++ .\S_GETDAT.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_getdat.prg superpat/s_getdat.prg +--- superori/s_getdat.prg 1995-11-02 17:02:48.000000000 +0100 ++++ superpat/s_getdat.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -771,9 +771,9 @@ diff -u ori_src\S_GETDAT.PRG .\S_GETDAT.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_GLOBAL.PRG .\S_GLOBAL.PRG ---- ori_src\S_GLOBAL.PRG Thu Nov 10 11:02:38 1994 -+++ .\S_GLOBAL.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_global.prg superpat/s_global.prg +--- superori/s_global.prg 1994-11-10 11:02:38.000000000 +0100 ++++ superpat/s_global.prg 2009-06-10 08:44:27.000000000 +0200 @@ -212,7 +212,7 @@ ³ ³ @@ -783,9 +783,9 @@ diff -u ori_src\S_GLOBAL.PRG .\S_GLOBAL.PRG ³ sls_FRAME(B_SINGLE+" ") ³ ³ Notes: -diff -u ori_src\S_HELP.PRG .\S_HELP.PRG ---- ori_src\S_HELP.PRG Mon Mar 28 10:25:20 1994 -+++ .\S_HELP.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_help.prg superpat/s_help.prg +--- superori/s_help.prg 1994-03-28 10:25:20.000000000 +0200 ++++ superpat/s_help.prg 2009-06-10 08:44:27.000000000 +0200 @@ -84,9 +84,9 @@ select 0 @@ -798,9 +798,9 @@ diff -u ori_src\S_HELP.PRG .\S_HELP.PRG .F.,5,.T.,"Network error opening HELP file. Keep trying?") else set index to (cHelpFile) -diff -u ori_src\S_HELPM.PRG .\S_HELPM.PRG ---- ori_src\S_HELPM.PRG Thu Nov 02 17:06:02 1995 -+++ .\S_HELPM.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_helpm.prg superpat/s_helpm.prg +--- superori/s_helpm.prg 1995-11-02 17:06:02.000000000 +0100 ++++ superpat/s_helpm.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,6 +1,6 @@ #include "memoedit.ch" @@ -823,9 +823,9 @@ diff -u ori_src\S_HELPM.PRG .\S_HELPM.PRG IF SNET_USE(cHelpFile,"__HELP",.F.,5,.T.,"Network error opening HELP file. Keep trying?") if !FILE( cHelpFile+INDEXEXT() ) INDEX ON __HELP->h_mod+__HELP->h_var TO (cHelpFile) -diff -u ori_src\S_LIST.PRG .\S_LIST.PRG ---- ori_src\S_LIST.PRG Thu Nov 02 17:06:02 1995 -+++ .\S_LIST.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_list.prg superpat/s_list.prg +--- superori/s_list.prg 1995-11-02 17:06:02.000000000 +0100 ++++ superpat/s_list.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,4 +1,4 @@ -#include "inKey.ch" +#include "inkey.ch" @@ -868,9 +868,9 @@ diff -u ori_src\S_LIST.PRG .\S_LIST.PRG msg("No lists stored in this directory") elseif SNET_USE(cListFile,"__LIST",.F.,5,.T.,; "Network error opening LIST file. Keep trying?") -diff -u ori_src\S_LOTMEN.PRG .\S_LOTMEN.PRG ---- ori_src\S_LOTMEN.PRG Thu Nov 02 17:06:00 1995 -+++ .\S_LOTMEN.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_lotmen.prg superpat/s_lotmen.prg +--- superori/s_lotmen.prg 1995-11-02 17:06:00.000000000 +0100 ++++ superpat/s_lotmen.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -878,9 +878,9 @@ diff -u ori_src\S_LOTMEN.PRG .\S_LOTMEN.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_MAILM.PRG .\S_MAILM.PRG ---- ori_src\S_MAILM.PRG Mon Jan 03 10:36:58 1994 -+++ .\S_MAILM.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_mailm.prg superpat/s_mailm.prg +--- superori/s_mailm.prg 1994-01-03 10:36:58.000000000 +0100 ++++ superpat/s_mailm.prg 2009-06-10 08:44:27.000000000 +0200 @@ -135,7 +135,7 @@ nRecordSele := menu_v("[Write Mailmerge Files from:]",; "Tagged Records","Records meeting Query",; @@ -890,9 +890,9 @@ diff -u ori_src\S_MAILM.PRG .\S_MAILM.PRG do case case nRecordSele = REC_TAGGED tagit(aTagged,aFieldNames,aFieldDesc,"Merge Records") -diff -u ori_src\S_MCHOI.PRG .\S_MCHOI.PRG ---- ori_src\S_MCHOI.PRG Thu Nov 02 17:06:00 1995 -+++ .\S_MCHOI.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_mchoi.prg superpat/s_mchoi.prg +--- superori/s_mchoi.prg 1995-11-02 17:06:00.000000000 +0100 ++++ superpat/s_mchoi.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -900,9 +900,9 @@ diff -u ori_src\S_MCHOI.PRG .\S_MCHOI.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_MMEMO.PRG .\S_MMEMO.PRG ---- ori_src\S_MMEMO.PRG Thu Nov 02 16:06:32 1995 -+++ .\S_MMEMO.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_mmemo.prg superpat/s_mmemo.prg +--- superori/s_mmemo.prg 1995-11-02 16:06:32.000000000 +0100 ++++ superpat/s_mmemo.prg 2009-06-10 08:44:27.000000000 +0200 @@ -44,7 +44,7 @@ */ @@ -912,9 +912,9 @@ diff -u ori_src\S_MMEMO.PRG .\S_MMEMO.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_MODIFY.PRG .\S_MODIFY.PRG ---- ori_src\S_MODIFY.PRG Thu Nov 02 17:14:48 1995 -+++ .\S_MODIFY.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_modify.prg superpat/s_modify.prg +--- superori/s_modify.prg 1995-11-02 17:14:48.000000000 +0100 ++++ superpat/s_modify.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,7 +1,7 @@ memvar getlist @@ -944,9 +944,9 @@ diff -u ori_src\S_MODIFY.PRG .\S_MODIFY.PRG ELSE msg("No DBFs in this directory") EXIT -diff -u ori_src\S_MOOSE.PRG .\S_MOOSE.PRG ---- ori_src\S_MOOSE.PRG Thu Nov 02 16:17:08 1995 -+++ .\S_MOOSE.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_moose.prg superpat/s_moose.prg +--- superori/s_moose.prg 1995-11-02 16:17:08.000000000 +0100 ++++ superpat/s_moose.prg 2009-06-10 08:44:27.000000000 +0200 @@ -98,7 +98,7 @@ */ @@ -965,9 +965,9 @@ diff -u ori_src\S_MOOSE.PRG .\S_MOOSE.PRG ³ @10,10 say " ³ @11,10 say "" ³ aHotAreas := { {10,10,10,13}, {11,10,11,18} } -diff -u ori_src\S_MULMYN.PRG .\S_MULMYN.PRG ---- ori_src\S_MULMYN.PRG Thu Nov 02 17:05:58 1995 -+++ .\S_MULMYN.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_mulmyn.prg superpat/s_mulmyn.prg +--- superori/s_mulmyn.prg 1995-11-02 17:05:58.000000000 +0100 ++++ superpat/s_mulmyn.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -975,9 +975,9 @@ diff -u ori_src\S_MULMYN.PRG .\S_MULMYN.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_OLD.PRG .\S_OLD.PRG ---- ori_src\S_OLD.PRG Thu Oct 14 13:42:10 1993 -+++ .\S_OLD.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_old.prg superpat/s_old.prg +--- superori/s_old.prg 1993-10-14 12:42:10.000000000 +0100 ++++ superpat/s_old.prg 2009-06-10 08:44:27.000000000 +0200 @@ -277,7 +277,7 @@ local lOpened := .f. local cDocDbf := SLSF_OLD() @@ -987,9 +987,9 @@ diff -u ori_src\S_OLD.PRG .\S_OLD.PRG dbcreate(cDocDbf,{; {"TOPIC","C",35,0},; {"KEYS","M",10,0},; -diff -u ori_src\S_PCSEL.PRG .\S_PCSEL.PRG ---- ori_src\S_PCSEL.PRG Thu Nov 02 17:05:58 1995 -+++ .\S_PCSEL.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_pcsel.prg superpat/s_pcsel.prg +--- superori/s_pcsel.prg 1995-11-02 17:05:58.000000000 +0100 ++++ superpat/s_pcsel.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -997,9 +997,9 @@ diff -u ori_src\S_PCSEL.PRG .\S_PCSEL.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_POPDIR.PRG .\S_POPDIR.PRG ---- ori_src\S_POPDIR.PRG Thu Nov 02 17:05:58 1995 -+++ .\S_POPDIR.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_popdir.prg superpat/s_popdir.prg +--- superori/s_popdir.prg 1995-11-02 17:05:58.000000000 +0100 ++++ superpat/s_popdir.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -1025,9 +1025,9 @@ diff -u ori_src\S_POPDIR.PRG .\S_POPDIR.PRG Fileread(2,2,23,78,cFileName) ENDIF SELECT (nSelect) -diff -u ori_src\S_PULLDN.PRG .\S_PULLDN.PRG ---- ori_src\S_PULLDN.PRG Fri Oct 08 12:30:50 1993 -+++ .\S_PULLDN.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_pulldn.prg superpat/s_pulldn.prg +--- superori/s_pulldn.prg 1993-10-08 11:30:50.000000000 +0100 ++++ superpat/s_pulldn.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,6 +1,6 @@ // slight behavior change - boxes are 1 character wider. @@ -1036,9 +1036,9 @@ diff -u ori_src\S_PULLDN.PRG .\S_PULLDN.PRG #define A_BOXTOPBAR 1 #define A_TOPBARCOLOR 2 #define A_MENUBOXCOLOR 3 -diff -u ori_src\S_QUERY.PRG .\S_QUERY.PRG ---- ori_src\S_QUERY.PRG Thu Nov 02 17:05:56 1995 -+++ .\S_QUERY.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_query.prg superpat/s_query.prg +--- superori/s_query.prg 1995-11-02 17:05:56.000000000 +0100 ++++ superpat/s_query.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -1088,9 +1088,9 @@ diff -u ori_src\S_QUERY.PRG .\S_QUERY.PRG local nOldarea := SELECT() IF FILE(cQueryFile) SELECT 0 -diff -u ori_src\S_READRS.PRG .\S_READRS.PRG ---- ori_src\S_READRS.PRG Thu Nov 02 17:09:12 1995 -+++ .\S_READRS.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_readrs.prg superpat/s_readrs.prg +--- superori/s_readrs.prg 1995-11-02 17:09:12.000000000 +0100 ++++ superpat/s_readrs.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,7 +1,7 @@ //------------------------------------------------------------------------ @@ -1100,9 +1100,9 @@ diff -u ori_src\S_READRS.PRG .\S_READRS.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_RMENU2.PRG .\S_RMENU2.PRG ---- ori_src\S_RMENU2.PRG Thu Nov 02 17:09:12 1995 -+++ .\S_RMENU2.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_rmenu2.prg superpat/s_rmenu2.prg +--- superori/s_rmenu2.prg 1995-11-02 17:09:12.000000000 +0100 ++++ superpat/s_rmenu2.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -1110,9 +1110,9 @@ diff -u ori_src\S_RMENU2.PRG .\S_RMENU2.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_RREAD.PRG .\S_RREAD.PRG ---- ori_src\S_RREAD.PRG Thu Nov 02 17:09:12 1995 -+++ .\S_RREAD.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_rread.prg superpat/s_rread.prg +--- superori/s_rread.prg 1995-11-02 17:09:12.000000000 +0100 ++++ superpat/s_rread.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,12 +1,12 @@ -#include "inKey.ch" @@ -1128,9 +1128,9 @@ diff -u ori_src\S_RREAD.PRG .\S_RREAD.PRG #define K_UNDO K_CTRL_U -diff -u ori_src\S_SCMOD.PRG .\S_SCMOD.PRG ---- ori_src\S_SCMOD.PRG Fri Oct 08 12:30:46 1993 -+++ .\S_SCMOD.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_scmod.prg superpat/s_scmod.prg +--- superori/s_scmod.prg 1993-10-08 11:30:46.000000000 +0100 ++++ superpat/s_scmod.prg 2009-06-10 08:44:27.000000000 +0200 @@ -82,7 +82,7 @@ SELECT 0 @@ -1149,9 +1149,9 @@ diff -u ori_src\S_SCMOD.PRG .\S_SCMOD.PRG if !empty(cTempFile) cTempfile := left(cTempfile,at(".",cTempFile)-1) if cTempFile==cAlias -diff -u ori_src\S_SCRBUF.C .\S_SCRBUF.C ---- ori_src\S_SCRBUF.C Mon Nov 02 17:15:40 1992 -+++ .\S_SCRBUF.C Thu May 28 17:54:47 2009 +diff -u superori/s_scrbuf.c superpat/s_scrbuf.c +--- superori/s_scrbuf.c 1992-11-02 17:15:40.000000000 +0100 ++++ superpat/s_scrbuf.c 2009-06-10 08:44:27.000000000 +0200 @@ -20,7 +20,7 @@ getrow = _parni(6)-1; top = top*80; @@ -1179,9 +1179,9 @@ diff -u ori_src\S_SCRBUF.C .\S_SCRBUF.C for(i=0; i< columns;i++) { -diff -u ori_src\S_SCROLL.PRG .\S_SCROLL.PRG ---- ori_src\S_SCROLL.PRG Fri Oct 08 12:30:34 1993 -+++ .\S_SCROLL.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_scroll.prg superpat/s_scroll.prg +--- superori/s_scroll.prg 1993-10-08 11:30:34.000000000 +0100 ++++ superpat/s_scroll.prg 2009-06-10 08:44:27.000000000 +0200 @@ -107,7 +107,7 @@ cProcVar := iif("->"$cProcVar,SUBST(cProcVar,AT(">",cProcVar)+1),cProcVar) @@ -1191,9 +1191,9 @@ diff -u ori_src\S_SCROLL.PRG .\S_SCROLL.PRG msg("Lookup definition file missing - "+slsf_scroll()) RETURN '' ENDIF -diff -u ori_src\S_SETCOL.PRG .\S_SETCOL.PRG ---- ori_src\S_SETCOL.PRG Thu Nov 02 17:09:10 1995 -+++ .\S_SETCOL.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_setcol.prg superpat/s_setcol.prg +--- superori/s_setcol.prg 1995-11-02 17:09:10.000000000 +0100 ++++ superpat/s_setcol.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -1201,9 +1201,9 @@ diff -u ori_src\S_SETCOL.PRG .\S_SETCOL.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_SMGETS.PRG .\S_SMGETS.PRG ---- ori_src\S_SMGETS.PRG Fri Oct 08 12:30:46 1993 -+++ .\S_SMGETS.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_smgets.prg superpat/s_smgets.prg +--- superori/s_smgets.prg 1993-10-08 11:30:46.000000000 +0100 ++++ superpat/s_smgets.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "Inkey.ch" -#include "Getexit.ch" @@ -1212,9 +1212,9 @@ diff -u ori_src\S_SMGETS.PRG .\S_SMGETS.PRG //------------------------------------------------------------------------ -diff -u ori_src\S_TABMEN.PRG .\S_TABMEN.PRG ---- ori_src\S_TABMEN.PRG Thu Nov 02 17:09:10 1995 -+++ .\S_TABMEN.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_tabmen.prg superpat/s_tabmen.prg +--- superori/s_tabmen.prg 1995-11-02 17:09:10.000000000 +0100 ++++ superpat/s_tabmen.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -1222,9 +1222,9 @@ diff -u ori_src\S_TABMEN.PRG .\S_TABMEN.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_TAG.PRG .\S_TAG.PRG ---- ori_src\S_TAG.PRG Thu Nov 02 17:09:10 1995 -+++ .\S_TAG.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_tag.prg superpat/s_tag.prg +--- superori/s_tag.prg 1995-11-02 17:09:10.000000000 +0100 ++++ superpat/s_tag.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -1232,9 +1232,9 @@ diff -u ori_src\S_TAG.PRG .\S_TAG.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_TAGA.PRG .\S_TAGA.PRG ---- ori_src\S_TAGA.PRG Thu Nov 02 17:09:08 1995 -+++ .\S_TAGA.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_taga.prg superpat/s_taga.prg +--- superori/s_taga.prg 1995-11-02 17:09:08.000000000 +0100 ++++ superpat/s_taga.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -1242,9 +1242,9 @@ diff -u ori_src\S_TAGA.PRG .\S_TAGA.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_TIME.PRG .\S_TIME.PRG ---- ori_src\S_TIME.PRG Thu Nov 02 17:09:08 1995 -+++ .\S_TIME.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_time.prg superpat/s_time.prg +--- superori/s_time.prg 1995-11-02 17:09:08.000000000 +0100 ++++ superpat/s_time.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,13 +1,13 @@ //--------------------------------------------------------------------- @@ -1288,9 +1288,9 @@ diff -u ori_src\S_TIME.PRG .\S_TIME.PRG IF !FILE(cDbfName) DBCREATE(cDbfName,aStruc) USE (cDbfName) -diff -u ori_src\S_TODO.PRG .\S_TODO.PRG ---- ori_src\S_TODO.PRG Thu Nov 02 17:09:08 1995 -+++ .\S_TODO.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_todo.prg superpat/s_todo.prg +--- superori/s_todo.prg 1995-11-02 17:09:08.000000000 +0100 ++++ superpat/s_todo.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,6 +1,6 @@ @@ -1308,9 +1308,9 @@ diff -u ori_src\S_TODO.PRG .\S_TODO.PRG BLDDBF(cTodoFile,"CATEGORY,C,10:ITEM,C,60:PRIORITY,C,2:DOBY,D:DONE,L:LONG_DESC,C,231") endif -diff -u ori_src\S_VIEWP.PRG .\S_VIEWP.PRG ---- ori_src\S_VIEWP.PRG Thu Nov 02 17:09:08 1995 -+++ .\S_VIEWP.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_viewp.prg superpat/s_viewp.prg +--- superori/s_viewp.prg 1995-11-02 17:09:08.000000000 +0100 ++++ superpat/s_viewp.prg 2009-06-10 08:44:27.000000000 +0200 @@ -4,7 +4,7 @@ #include "getexit.ch" @@ -1320,9 +1320,9 @@ diff -u ori_src\S_VIEWP.PRG .\S_VIEWP.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_VMEMO.PRG .\S_VMEMO.PRG ---- ori_src\S_VMEMO.PRG Thu Nov 02 17:09:06 1995 -+++ .\S_VMEMO.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_vmemo.prg superpat/s_vmemo.prg +--- superori/s_vmemo.prg 1995-11-02 17:09:06.000000000 +0100 ++++ superpat/s_vmemo.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,5 +1,5 @@ -#include "inKey.ch" @@ -1330,9 +1330,9 @@ diff -u ori_src\S_VMEMO.PRG .\S_VMEMO.PRG #ifndef K_LBUTTONDOWN #define K_LBUTTONDOWN 1002 // mouse left key press #define K_RBUTTONDOWN 1004 // mouse right key press -diff -u ori_src\S_VVIEW.PRG .\S_VVIEW.PRG ---- ori_src\S_VVIEW.PRG Thu Nov 02 17:11:06 1995 -+++ .\S_VVIEW.PRG Thu May 28 17:54:47 2009 +diff -u superori/s_vview.prg superpat/s_vview.prg +--- superori/s_vview.prg 1995-11-02 17:11:06.000000000 +0100 ++++ superpat/s_vview.prg 2009-06-10 08:44:27.000000000 +0200 @@ -1,4 +1,4 @@ -#include "inKey.ch" +#include "inkey.ch" diff --git a/harbour/examples/superlib/hbsuper.hbp b/harbour/examples/superlib/hbsuper.hbp index 62df9c9e21..115fe7fe55 100644 --- a/harbour/examples/superlib/hbsuper.hbp +++ b/harbour/examples/superlib/hbsuper.hbp @@ -9,208 +9,208 @@ hbsuper.prg -BETWEEN.C -MLINE.C -NEXTLS.C -S_SCRBUF.C +between.c +mline.c +nextls.c +s_scrbuf.c -CURD.PRG -R_HCODE.PRG -R_PRINTR.PRG -R_QUIKR.PRG -R_REPORT.PRG -S_1LABEL.PRG -S_2DBRZ.PRG -S_AASKIP.PRG -S_ABORT.PRG -S_ACHOI.PRG -S_ADDSP.PRG -S_AEXTRA.PRG -S_AFTYPE.PRG -S_AKOUNT.PRG -S_ALENG.PRG -S_ALLBUT.PRG -S_AMSG.PRG -S_AMSORT.PRG -S_AMSTAT.PRG -S_APPEND.PRG -S_APPT.PRG -S_ARRANG.PRG -S_ASCII.PRG -S_ASTATS.PRG -S_AT2C.PRG -S_ATT.PRG -S_BDELIM.PRG -S_BEGEND.PRG -S_BIGEL.PRG -S_BLANKS.PRG -S_BLDAR.PRG -S_BLDBF.PRG -S_BLDNDX.PRG -S_BOM.PRG -S_BOXES.PRG -S_BOYEAR.PRG -S_BRSDF.PRG -S_BUILD.PRG -S_BUNGDE.PRG -S_BUNGEE.PRG -S_BXX.PRG -S_CALCK.PRG -S_CALCVW.PRG -S_CENTR.PRG -S_CLAB.PRG -S_CLRFUN.PRG -S_CLS.PRG -S_COLPIK.PRG -S_COPY.PRG -S_COPYF.PRG -S_CRUNCH.PRG -S_CTRLW.PRG -S_CVTDEL.PRG -S_DATCAL.PRG -S_DATEK.PRG -S_DATVW.PRG -S_DAYSIN.PRG -S_DBARR.PRG -S_DBSTAT.PRG -S_DELAR.PRG -S_DELET.PRG -S_DOYEAR.PRG -S_DPOPS.PRG -S_DTDIFF.PRG -S_DTOW.PRG -S_DUP.PRG -S_DUPH.PRG -S_EDIT.PRG -S_EDITM.PRG -S_EDITMV.PRG -S_EDPICT.PRG -S_ENDSW.PRG -S_ENHAN.PRG -S_EVALQ.PRG -S_EXPORT.PRG -S_FFORM.PRG -S_FIELDS.PRG -S_FILEIN.PRG -S_FILER.PRG -S_FILLAR.PRG -S_FM2N.PRG -S_FM2P.PRG -S_FORML.PRG -S_FORMU.PRG -S_FREADL.PRG -S_FREQ.PRG -S_FULLD.PRG -S_GENED.PRG -S_GENVA.PRG -S_GETCAL.PRG -S_GETDAT.PRG -S_GETDFP.PRG -S_GETKEY.PRG -S_GETMAN.PRG -S_GLOBAL.PRG -S_GLOBR.PRG -S_HARDC.PRG -S_HELP.PRG -S_HELPM.PRG -S_HPLAS.PRG -S_INIT.PRG -S_INLOOK.PRG -S_ISLOAD.PRG -S_ISPART.PRG -S_ISVALF.PRG -S_KBDESC.PRG -S_LIST.PRG -S_LJUST.PRG -S_LOTMEN.PRG -S_MAILM.PRG -S_MAKEB.PRG -S_MCHOI.PRG -S_MEAS.PRG -S_MENUV.PRG -S_MESSYN.PRG -S_MFLD.PRG -S_MFLDT.PRG -S_MMEMO.PRG -S_MODIFY.PRG -S_MOOSE.PRG -S_MSG.PRG -S_MULMYN.PRG -S_NBR2ST.PRG -S_NKEY.PRG -S_NOTDUP.PRG -S_NOZDIV.PRG -S_OLD.PRG -S_OLDMOD.PRG -S_ONER.PRG -S_OPENIN.PRG -S_PATHS.PRG -S_PCSEL.PRG -S_PICKND.PRG -S_PLSW.PRG -S_POPDIR.PRG -S_POPEX.PRG -S_POPORD.PRG -S_POPR.PRG -S_POPUPK.PRG -S_POPVW.PRG -S_PREAD.PRG -S_PRNPOR.PRG -S_PRNT.PRG -S_PRNTF.PRG -S_PROG.PRG -S_PROPER.PRG -S_PSEEK.PRG -S_PULLDN.PRG -S_PURGEM.PRG -S_QUERY.PRG -S_READRS.PRG -S_RJUST.PRG -S_RMENU2.PRG -S_RREAD.PRG -S_SADDR.PRG -S_SCMOD.PRG -S_SCREEN.PRG -S_SCROLL.PRG -S_SEARCH.PRG -S_SETCEN.PRG -S_SETCOL.PRG -S_SETDAT.PRG -S_SETEX.PRG -S_SETKEY.PRG -S_SFILOK.PRG -S_SMAL.PRG -S_SMALK.PRG -S_SMGETS.PRG -S_SNETU.PRG -S_SRECLO.PRG -S_STAN.PRG -S_STARTS.PRG -S_STOD.PRG -S_STRETC.PRG -S_STRPAT.PRG -S_STRPUL.PRG -S_SUBPLU.PRG -S_SUMAV.PRG -S_SUPER.PRG -S_TABMEN.PRG -S_TAG.PRG -S_TAGA.PRG -S_TAGAM.PRG -S_TAGF.PRG -S_TIME.PRG -S_TODO.PRG -S_TRUEVA.PRG -S_UNBOX.PRG -S_UNIQF.PRG -S_UNSEL.PRG -S_VAR2.PRG -S_VARLEN.PRG -S_VIEWP.PRG -S_VMEMO.PRG -S_VVIEW.PRG -S_WILD.PRG -S_WOMON.PRG -S_WOYEAR.PRG -S_WRITEF.PRG -S_XBXX.PRG +curd.prg +r_hcode.prg +r_printr.prg +r_quikr.prg +r_report.prg +s_1label.prg +s_2dbrz.prg +s_aaskip.prg +s_abort.prg +s_achoi.prg +s_addsp.prg +s_aextra.prg +s_aftype.prg +s_akount.prg +s_aleng.prg +s_allbut.prg +s_amsg.prg +s_amsort.prg +s_amstat.prg +s_append.prg +s_appt.prg +s_arrang.prg +s_ascii.prg +s_astats.prg +s_at2c.prg +s_att.prg +s_bdelim.prg +s_begend.prg +s_bigel.prg +s_blanks.prg +s_bldar.prg +s_bldbf.prg +s_bldndx.prg +s_bom.prg +s_boxes.prg +s_boyear.prg +s_brsdf.prg +s_build.prg +s_bungde.prg +s_bungee.prg +s_bxx.prg +s_calck.prg +s_calcvw.prg +s_centr.prg +s_clab.prg +s_clrfun.prg +s_cls.prg +s_colpik.prg +s_copy.prg +s_copyf.prg +s_crunch.prg +s_ctrlw.prg +s_cvtdel.prg +s_datcal.prg +s_datek.prg +s_datvw.prg +s_daysin.prg +s_dbarr.prg +s_dbstat.prg +s_delar.prg +s_delet.prg +s_doyear.prg +s_dpops.prg +s_dtdiff.prg +s_dtow.prg +s_dup.prg +s_duph.prg +s_edit.prg +s_editm.prg +s_editmv.prg +s_edpict.prg +s_endsw.prg +s_enhan.prg +s_evalq.prg +s_export.prg +s_fform.prg +s_fields.prg +s_filein.prg +s_filer.prg +s_fillar.prg +s_fm2n.prg +s_fm2p.prg +s_forml.prg +s_formu.prg +s_freadl.prg +s_freq.prg +s_fulld.prg +s_gened.prg +s_genva.prg +s_getcal.prg +s_getdat.prg +s_getdfp.prg +s_getkey.prg +s_getman.prg +s_global.prg +s_globr.prg +s_hardc.prg +s_help.prg +s_helpm.prg +s_hplas.prg +s_init.prg +s_inlook.prg +s_isload.prg +s_ispart.prg +s_isvalf.prg +s_kbdesc.prg +s_list.prg +s_ljust.prg +s_lotmen.prg +s_mailm.prg +s_makeb.prg +s_mchoi.prg +s_meas.prg +s_menuv.prg +s_messyn.prg +s_mfld.prg +s_mfldt.prg +s_mmemo.prg +s_modify.prg +s_moose.prg +s_msg.prg +s_mulmyn.prg +s_nbr2st.prg +s_nkey.prg +s_notdup.prg +s_nozdiv.prg +s_old.prg +s_oldmod.prg +s_oner.prg +s_openin.prg +s_paths.prg +s_pcsel.prg +s_picknd.prg +s_plsw.prg +s_popdir.prg +s_popex.prg +s_popord.prg +s_popr.prg +s_popupk.prg +s_popvw.prg +s_pread.prg +s_prnpor.prg +s_prnt.prg +s_prntf.prg +s_prog.prg +s_proper.prg +s_pseek.prg +s_pulldn.prg +s_purgem.prg +s_query.prg +s_readrs.prg +s_rjust.prg +s_rmenu2.prg +s_rread.prg +s_saddr.prg +s_scmod.prg +s_screen.prg +s_scroll.prg +s_search.prg +s_setcen.prg +s_setcol.prg +s_setdat.prg +s_setex.prg +s_setkey.prg +s_sfilok.prg +s_smal.prg +s_smalk.prg +s_smgets.prg +s_snetu.prg +s_sreclo.prg +s_stan.prg +s_starts.prg +s_stod.prg +s_stretc.prg +s_strpat.prg +s_strpul.prg +s_subplu.prg +s_sumav.prg +s_super.prg +s_tabmen.prg +s_tag.prg +s_taga.prg +s_tagam.prg +s_tagf.prg +s_time.prg +s_todo.prg +s_trueva.prg +s_unbox.prg +s_uniqf.prg +s_unsel.prg +s_var2.prg +s_varlen.prg +s_viewp.prg +s_vmemo.prg +s_vview.prg +s_wild.prg +s_womon.prg +s_woyear.prg +s_writef.prg +s_xbxx.prg diff --git a/harbour/examples/superlib/readme.txt b/harbour/examples/superlib/readme.txt index 0b36d52590..c0ac3fc005 100644 --- a/harbour/examples/superlib/readme.txt +++ b/harbour/examples/superlib/readme.txt @@ -7,12 +7,15 @@ 2.) Unzip SOURCE.ZIP to this directory. -3.) Apply supplied patch to the source using GNU Patch: +3.) *nix users will need convert original filenames to lowercase + and EOLs to native format (f.e. with dos2unix). + +4.) Apply supplied patch to the source using GNU Patch: patch -N -i hbsuper.dif -4.) Build it: +5.) Build it: hbmk2 hbsuper.hbp -5.) You're done. +6.) You're done. [vszakats] diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index 69dd7911a4..bd7f0a423c 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -22,6 +22,9 @@ if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp :CONTINUE_MAKE + if "%HB_ARCHITECTURE%" == "" goto BAD_ARCH + if "%HB_COMPILER%" == "" goto BAD_COMP + if "%HB_INSTALL_PREFIX%" == "" if "%OS%" == "Windows_NT" set HB_INSTALL_PREFIX=%~dp0 rem Set to constant value. @@ -36,9 +39,6 @@ if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp if not exist %HB_INC_INSTALL%\*.* md %HB_INC_INSTALL% if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL% - if "%HB_ARCHITECTURE%" == "" goto BAD_ARCH - if "%HB_COMPILER%" == "" goto BAD_COMP - goto MAKE :WIN_AUTODETECT diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c index ccd827518a..8ec5ea2e9c 100644 --- a/harbour/source/pp/hbpp.c +++ b/harbour/source/pp/hbpp.c @@ -701,8 +701,8 @@ int main( int argc, char * argv[] ) if( iQuiet < 2 ) { - printf( "Harbour Preprocessor %d.%d.%d\n", - HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE ); + printf( "Harbour Preprocessor %d.%d.%d%s\n", + HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE, HB_VER_STATUS ); printf( "Copyright (c) 1999-2009, http://www.harbour-project.org/\n" ); }