diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 9bb26809dd..87c001648b 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,46 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-02-25 12:51 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.*.po + * utils/hbmk2/hbmk2.prg + + added 'description' section to help (visible in -longhelp[md]) + + moved examples (and one note) from README.txt to hbmk2 help + ! grammar cleanup and typos in help + * formatting + + - website/license.html + * website/*.html + ! deleted another obsolete copy of the license and replaced + with links directly to COPYING.txt in repository + + * contrib/hbsqlit3/hbsqlit3.ch + * contrib/hbsqlit3/hdbc.prg + * contrib/xhb/cgi.ch + * contrib/xhb/*.prg + * extras/gtwvw/docs/gtwvw.txt + * extras/gtwvw/*.c + ! fixed obsolete license references + + * tests/inherit.prg + * tests/stripem.prg + * contrib/xhb/*.prg + * use hb_default(), misc cleanups, html closing tags + + * config/aix/libs.mk + * doc/xhb-diff.txt + * src/common/hbfsapi.c + * src/rtl/gtcrs/hb-charmap.def + * src/rtl/strcase.c + * website/download.htm + ! deleted line ending spaces + + * website/download.htm + * doc/gmake.txt + * doc/tracing.txt + * utils/hbmk2/Makefile + * cleanups + 2013-02-25 10:49 UTC+0100 Tamas TEVESZ (ice extreme.hu) - config/minix/ack.mk * config/global.mk diff --git a/harbour/README.txt b/harbour/README.txt index 17afebf0e8..e79a70882e 100644 --- a/harbour/README.txt +++ b/harbour/README.txt @@ -1426,70 +1426,15 @@ TABLE OF CONTENT which will automatically be used, so you don't have to make any extra steps here. - Examples to start with Harbour: + It's recommended (but not required) to put hbmk2 into the PATH + (f.e. by using 'set PATH=C:\harbour\bin;%PATH%' on Windows). - - To run the interactive shell ('dot' prompt): - 'hbmk2 .' - - To run a Harbour script: - 'hbmk2 script.hb []' + Then run: + hbmk2 -help + or + hbmk2 -longhelp > hbmk2.txt - Examples to build and run Harbour portable binary - (aka precompiled Harbour script): - - - To build: - 'hbmk2 -gh script.hb' - - To run result of above: - 'hbmk2 script.hrb []' - - NOTE: .hb and .hrb scripts are started in UTF-8 mode. - - Examples to build a Harbour application: - - - To build one simple .prg: - 'hbmk2 hello.prg' - - To build multiple .prg sources into one application: - 'hbmk2 mymain.prg client.prg' - - To build an application using a project file: - 'hbmk2 myapp.hbp' - - To build an application using incremental mode: - 'hbmk2 myapp.hbp -inc' - - To build an application which uses a contrib package or - 3rd party (addon) package that provides an .hbc file: - 'hbmk2 myapp.prg hbct.hbc' - - To build an application which uses a raw library: - 'hbmk2 myapp.prg -lmylib -L' - - To build an application which uses Windows resources: - 'hbmk2 mymain.prg client.prg myres.rc' - - To build an application which links against Harbour dynamic libraries: - 'hbmk2 -shared hello.prg' - - To build an application out of all .prg and .c sources residing - in 'source' subdir: - 'hbmk2 -omyapp src/*.prg src/*.c' - - Examples to build a Harbour static library: - - - To build library 'mylib' from sources: - 'hbmk2 mylibsrc.prg -omylib -hblib' - - To build library 'mylib' from sources using incremental mode: - 'hbmk2 mylibsrc.prg -omylib -hblib -inc' - - NOTES: - Most of the above features can be combined. F.e. to use - incremental build in any of the above commands, just add - '-inc' switch. - - List all available options: - 'hbmk2 -help' - Besides the ones listed, you can use all regular Harbour - compiler command line options, f.e.: - '-l', '-b', '-n', '-w3' (etc...) - - To make it easier to work with Harbour, it's recommended to - put Harbour binary directory into the PATH: - set PATH=C:\harbour\bin;%PATH% (on Windows) - (this is not a requirement though) - - You can access hbmk2 using absolute or relative paths, and - it will work equally well: - 'C:\hb\bin\hbmk2 hello.prg' - - GNU Make, MSYS, or any other extra tool is *not* needed - to build a Harbour application with above methods. + You will find examples in the help. 12. BUILD HOST-PLATFORM/SHELL - TARGET-PLATFORM/COMPILER COMPATIBILITY MATRIX diff --git a/harbour/config/aix/libs.mk b/harbour/config/aix/libs.mk index 713af76e7e..4e3979ca82 100644 --- a/harbour/config/aix/libs.mk +++ b/harbour/config/aix/libs.mk @@ -2,7 +2,7 @@ # $Id$ # -# When compiling and linking with -pthread, the library search path should +# When compiling and linking with -pthread, the library search path should # include -L/usr/lib/threads at the beginning of the path. # http://www.ibm.com/developerworks/aix/library/au-gnu.html # (libc is there) diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.ch b/harbour/contrib/hbsqlit3/hbsqlit3.ch index fbb14f11f2..8b6fc8ddf0 100644 --- a/harbour/contrib/hbsqlit3/hbsqlit3.ch +++ b/harbour/contrib/hbsqlit3/hbsqlit3.ch @@ -47,8 +47,6 @@ * whether to permit this exception to apply to your modifications. * If you do not wish that, delete this exception notice. * - * See doc/license.txt for licensing terms. - * */ #ifndef HBSQLIT3_CH_ @@ -64,9 +62,9 @@ #define SQLITE3_TEXT SQLITE_TEXT #define SQLITE_BLOB 4 #define SQLITE_NULL 5 - + #define SQLITE_OK 0 /* Successful result */ -/* Beginning-of-Error-Codes */ +/* Beginning-of-Error-Codes */ #define SQLITE_ERROR 1 /* SQL error or missing database */ #define SQLITE_INTERNAL 2 /* NOT USED. Internal logic error in SQLite */ #define SQLITE_PERM 3 /* Access permission denied */ @@ -149,8 +147,8 @@ #define SQLITE_DROP_VTABLE 30 /* Table Name Module Name */ #define SQLITE_FUNCTION 31 /* NULL Function Name */ #define SQLITE_SAVEPOINT 32 /* Operation Savepoint Name */ - -/* Authorizer Return Codes */ + +/* Authorizer Return Codes */ #define SQLITE_DENY 1 /* Abort the SQL statement with an error */ #define SQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */ diff --git a/harbour/contrib/hbsqlit3/hdbc.prg b/harbour/contrib/hbsqlit3/hdbc.prg index 0a45a78c02..1b78b34413 100644 --- a/harbour/contrib/hbsqlit3/hdbc.prg +++ b/harbour/contrib/hbsqlit3/hdbc.prg @@ -48,8 +48,6 @@ * whether to permit this exception to apply to your modifications. * If you do not wish that, delete this exception notice. * - * See doc/license.txt for licensing terms. - * */ #include "hbclass.ch" diff --git a/harbour/contrib/xhb/cgi.ch b/harbour/contrib/xhb/cgi.ch index c2ed8c7ac4..51413cabe1 100644 --- a/harbour/contrib/xhb/cgi.ch +++ b/harbour/contrib/xhb/cgi.ch @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ @@ -76,7 +93,7 @@ "A:hover {text-decoration:none;color:white;background:black;} "+; " -->" -#define _HTML_SPACE Chr( 38 ) + "nbsp;" +#define _HTML_SPACE " " #define CLR_LIGHT_YELLOW "#fffffc0" #define CLR_DARK_YELLOW "#fffffcc" diff --git a/harbour/contrib/xhb/hjwindow.prg b/harbour/contrib/xhb/hjwindow.prg index 1b1877f0e9..e82acf1a4e 100644 --- a/harbour/contrib/xhb/hjwindow.prg +++ b/harbour/contrib/xhb/hjwindow.prg @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/hterrsys.prg b/harbour/contrib/xhb/hterrsys.prg index 2acbb22136..ee5929127b 100644 --- a/harbour/contrib/xhb/hterrsys.prg +++ b/harbour/contrib/xhb/hterrsys.prg @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/htjlist.prg b/harbour/contrib/xhb/htjlist.prg index 4d1dd33c79..959a35b819 100644 --- a/harbour/contrib/xhb/htjlist.prg +++ b/harbour/contrib/xhb/htjlist.prg @@ -8,22 +8,15 @@ * (see the website/jList dir for an example) * * Uses list.js and resize.js (heavily modified) found at - * developer.Netscape.com + * developer.netscape.com * * Copyright 2000 Manos Aspradakis * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -31,9 +24,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -44,7 +61,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ @@ -139,7 +156,7 @@ METHOD New( name, lOpen, width, height, bgColor, ; cStr += hb_ntos( height ) + "," cStr += '"' + BGCOLOR + '"' + ");" + CRLF() cStr += "" // Space( 10 ) - cStr += name + [.SetFont("","");] + CRLF() + cStr += name + '.SetFont("","");' + CRLF() ::nItems++ AAdd( ::aScript, cStr ) @@ -183,18 +200,18 @@ METHOD NewNode( name, lOpen, width, height, bgColor ) CLASS TJSList METHOD SetFont( name, font, fntColor, fntSize ) CLASS TJSList - LOCAL cStr := "" + LOCAL cStr __defaultNIL( @name, ::cCurrentNode ) __defaultNIL( @FONT, ::font ) __defaultNIL( @fntColor, ::fontColor ) __defaultNIL( @fntSize, ::Size ) - cStr += name + [.SetFont(" ","");] + CRLF() + ' > ","");' + CRLF() AAdd( ::aScript, cStr ) @@ -208,13 +225,13 @@ METHOD SetFont( name, font, fntColor, fntSize ) CLASS TJSList METHOD AddItem( name, url, bgColor ) CLASS TJSList - LOCAL cStr := "" + LOCAL cStr LOCAL cUrl __defaultNIL( @name, "o" ) __defaultNIL( @url, "" ) - cUrl := [" + htmlSpace( 2 ) + name + htmlSpace( 2 ) - cStr += ::cCurrentNode + '.addItem( "' + cUrl + '"' + iif( bgColor != NIL, ',"' + bgColor + '"', "" ) + ');' + CRLF() + cUrl := "" + htmlSpace( 2 ) + name + htmlSpace( 2 ) + cStr := ::cCurrentNode + '.addItem( "' + cUrl + '"' + iif( bgColor != NIL, ',"' + bgColor + '"', "" ) + ');' + CRLF() ::nItems++ AAdd( ::aScript, cStr ) @@ -228,14 +245,14 @@ METHOD AddItem( name, url, bgColor ) CLASS TJSList METHOD AddLink( name, url, img, bgColor ) CLASS TJSList - LOCAL cStr := "" + LOCAL cStr LOCAL cUrl __defaultNIL( @name, "o" ) __defaultNIL( @url, "" ) __defaultNIL( @img, "webpage.jpg" ) cUrl := "" + htmlSpace( 2 ) + name + htmlSpace( 2 ) - cStr += ::cCurrentNode + '.addItem( "' + curl + '"' + iif( bgColor != NIL, ',"' + bgColor + '"', "" ) + ');' + CRLF() + cStr := ::cCurrentNode + '.addItem( "' + curl + '"' + iif( bgColor != NIL, ',"' + bgColor + '"', "" ) + ');' + CRLF() ::nItems++ AAdd( ::aScript, cStr ) @@ -243,10 +260,10 @@ METHOD AddLink( name, url, img, bgColor ) CLASS TJSList METHOD EndNode( name, caption ) CLASS TJSList - LOCAL cStr := "" + LOCAL cStr ::cCurrentNode := ::cMainNode - cStr += ::cMainNode + ".addList( " + name + ", '" + caption + "' );" + CRLF() + cStr := ::cMainNode + ".addList( " + name + ", '" + caption + "' );" + CRLF() ::nItems++ AAdd( ::aScript, cStr ) @@ -286,7 +303,7 @@ METHOD Build( xPos, yPos ) CLASS TJSList #endif FOR i := 0 TO ::nItems - cStr += '
' + CRLF() + cStr += '
' + CRLF() NEXT cStr += "" + CRLF() diff --git a/harbour/contrib/xhb/html.ch b/harbour/contrib/xhb/html.ch index 9eaef867be..52576c6d7b 100644 --- a/harbour/contrib/xhb/html.ch +++ b/harbour/contrib/xhb/html.ch @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/htmlclrs.ch b/harbour/contrib/xhb/htmlclrs.ch index 6302c32055..e648d4fe26 100644 --- a/harbour/contrib/xhb/htmlclrs.ch +++ b/harbour/contrib/xhb/htmlclrs.ch @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/htmlform.ch b/harbour/contrib/xhb/htmlform.ch index 82fb40b677..b8c067c60d 100644 --- a/harbour/contrib/xhb/htmlform.ch +++ b/harbour/contrib/xhb/htmlform.ch @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/htmutil.prg b/harbour/contrib/xhb/htmutil.prg index af4c6f2254..5c50d95cc0 100644 --- a/harbour/contrib/xhb/htmutil.prg +++ b/harbour/contrib/xhb/htmutil.prg @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/tcgi.prg b/harbour/contrib/xhb/tcgi.prg index 6858d7cb6a..302d3563ec 100644 --- a/harbour/contrib/xhb/tcgi.prg +++ b/harbour/contrib/xhb/tcgi.prg @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/tedit.prg b/harbour/contrib/xhb/tedit.prg index 8c0f8a2423..123ea1ecd9 100644 --- a/harbour/contrib/xhb/tedit.prg +++ b/harbour/contrib/xhb/tedit.prg @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/tfile.prg b/harbour/contrib/xhb/tfile.prg index 8ff45d11bc..fab3829134 100644 --- a/harbour/contrib/xhb/tfile.prg +++ b/harbour/contrib/xhb/tfile.prg @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/tframe.prg b/harbour/contrib/xhb/tframe.prg index e7bfab41af..90add1eee9 100644 --- a/harbour/contrib/xhb/tframe.prg +++ b/harbour/contrib/xhb/tframe.prg @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,7 +57,7 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/contrib/xhb/thtm.prg b/harbour/contrib/xhb/thtm.prg index 64a294b7da..d2de561394 100644 --- a/harbour/contrib/xhb/thtm.prg +++ b/harbour/contrib/xhb/thtm.prg @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ @@ -40,16 +57,16 @@ * Copyright 2000 Luiz Rafael Culik * Porting this library to Harbour * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * */ #include "hbclass.ch" #include "cgi.ch" -THREAD STATIC t_nHtm := NIL -THREAD STATIC t_cForm := 0 -THREAD STATIC t_oPage := 0 +THREAD STATIC t_nHtm := NIL +THREAD STATIC t_cForm := 0 +THREAD STATIC t_oPage := 0 /**** * @@ -106,15 +123,15 @@ CREATE CLASS THtml METHOD CGIClose() - METHOD SetPageColor( cColor, lBody ) INLINE Default( lBody, .T. ), ::cStr += iif( lBody, '', ' bgcolor="' + cColor + '" ' ) + METHOD SetPageColor( cColor, lBody ) INLINE hb_default( @lBody, .T. ), ::cStr += iif( lBody, '', ' bgcolor="' + cColor + '" ' ) - METHOD SetTextColor( cColor, lBody ) INLINE Default( lBody, .T. ), ::cStr += iif( lBody, '', ' text="' + cColor + '" ' ) + METHOD SetTextColor( cColor, lBody ) INLINE hb_default( @lBody, .T. ), ::cStr += iif( lBody, '', ' text="' + cColor + '" ' ) - METHOD SetBgImage( cImage, lBody ) INLINE Default( lBody, .T. ), ::cStr += iif( lBody, '', ' background="' + cImage + '" ' ) + METHOD SetBgImage( cImage, lBody ) INLINE hb_default( @lBody, .T. ), ::cStr += iif( lBody, '', ' background="' + cImage + '" ' ) METHOD Close() - METHOD SetCenter( lOn ) INLINE ::cStr += iif( lOn, "
", "
" ) + METHOD SetCenter( lOn ) INLINE ::cStr += iif( lOn, "
", "
" ) METHOD SetFont( cFont, lBold, lItalic, lULine, nSize, cColor, lSet ) @@ -126,42 +143,42 @@ CREATE CLASS THtml METHOD Say( str, font, size, type, color, style ) - METHOD QQOut( c ) INLINE Default( c, "" ), ::cStr += c + METHOD QQOut( c ) INLINE hb_default( @c, "" ), ::cStr += c - METHOD QOut( c ) INLINE Default( c, "" ), ::cStr += CRLF() + c + '
' + CRLF() + METHOD QOut( c ) INLINE hb_default( @c, "" ), ::cStr += CRLF() + c + "
" + CRLF() - METHOD Write( c ) INLINE Default( c, "" ), ::cStr += c + METHOD Write( c ) INLINE hb_default( @c, "" ), ::cStr += c - METHOD WriteLN( c ) INLINE Default( c, "" ), ::cStr += CRLF() + c + '
' + CRLF() + METHOD WriteLN( c ) INLINE hb_default( @c, "" ), ::cStr += CRLF() + c + "
" + CRLF() - METHOD SayColor( t, c ) INLINE Default( t, "" ), Default( c, "black" ), ; - ::cStr += '' + t + '' + METHOD SayColor( t, c ) INLINE hb_default( @t, "" ), hb_default( @c, "black" ), ; + ::cStr += '' + t + "" - METHOD Space( n ) INLINE Default( n, 1 ), ::cStr += Replicate( " ", n ) + METHOD Space( n ) INLINE hb_default( @n, 1 ), ::cStr += Replicate( " ", n ) METHOD PutImage( cImage, nBorder, nHeight, cOnclick, cOnMsOver, cOnMsOut, ; cName, cAlt, cTarget, nWidth, lBreak, ID, MAP, ALING, HSPACE ) - METHOD Text( cText, nCols, lWrap ) INLINE Default( lWrap, .T. ), Default( nCols, 80 ), ; - ::cStr += "", ">" ) + CRLF() + cText + CRLF() + "" + CRLF() + METHOD Text( cText, nCols, lWrap ) INLINE hb_default( @lWrap, .T. ), hb_default( @nCols, 80 ), ; + ::cStr += "", ">" ) + CRLF() + cText + CRLF() + "" + CRLF() - METHOD MultiCol( txt, cols, gutter, width ) INLINE Default( txt, "" ), ; - Default( cols, 2 ), ; - Default( gutter, 5 ), ; - Default( width, 100 ), ; - ::cStr += '', ; - ::cStr += txt, ; - ::cStr += "" + METHOD MultiCol( txt, cols, gutter, width ) INLINE hb_default( @txt, "" ), ; + hb_default( @cols, 2 ), ; + hb_default( @gutter, 5 ), ; + hb_default( @width, 100 ), ; + ::cStr += '', ; + ::cStr += txt, ; + ::cStr += "" METHOD PutHeading( cText, nWeight, lCentered ) METHOD HLine( nSize, nWidth, lShade, cColor ) - METHOD PutParagraph() INLINE ::cStr += "

" + CRLF() + METHOD PutParagraph() INLINE ::cStr += "

" + CRLF() METHOD Paragraph( lStart, cAlign, cStyle ) - METHOD PutBreak() INLINE ::cStr += "
" + CRLF() + METHOD PutBreak() INLINE ::cStr += "
" + CRLF() METHOD Marquee( cText, cFont, cFntColor, nFntSize, cAlign, nWidth, nHeight, cbgColor, ; cBehavior, cDirection, nScrollAmt, nScrollDelay, LOOP, ; @@ -197,11 +214,11 @@ CREATE CLASS THtml METHOD EndTable() - METHOD NewList() INLINE ::cStr += "
    " + CRLF() + METHOD NewList() INLINE ::cStr += "
      " + CRLF() - METHOD ListItem() INLINE ::cStr += "
    • " + METHOD ListItem() INLINE ::cStr += "
    • " - METHOD EndList() INLINE ::cStr += "
    " + METHOD EndList() INLINE ::cStr += "
" METHOD NewForm( cMethod, cAction, cName ) @@ -213,11 +230,11 @@ CREATE CLASS THtml METHOD FormSubmit( cText ) - METHOD FormQOut( c ) INLINE ::cStr += c + '
' + CRLF() + METHOD FormQOut( c ) INLINE ::cStr += c + "
" + CRLF() - METHOD FormQQOut( c ) INLINE ::cStr += c + CRLF() + METHOD FormQQOut( c ) INLINE ::cStr += c + CRLF() - METHOD EndForm() INLINE ::cStr += CRLF() + "" + CRLF() + METHOD EndForm() INLINE ::cStr += CRLF() + "" + CRLF() METHOD PushButton( cName, cCaption, cCgiApp, cOnClick, cOnFocus, cOnBlur, cOnMsOver, cOnMsOut, style, ID ) @@ -227,15 +244,15 @@ CREATE CLASS THtml METHOD iFrame( name, src, border, marginwidth, marginheight, scrolling, align, WIDTH, HEIGHT ) - METHOD StartJava() INLINE ::cStr += '" + CRLF() + METHOD EndJava() INLINE ::cStr += " //-->" + CRLF() + "" + CRLF() - METHOD serverCode( c ) INLINE ::cStr += "" + Space( 9 ) + c + CRLF() + "" + CRLF() + METHOD serverCode( c ) INLINE ::cStr += "" + Space( 9 ) + c + CRLF() + "" + CRLF() METHOD FWrite( c ) INLINE FWrite( ::nH, c ) @@ -257,13 +274,13 @@ CREATE CLASS THtml METHOD PutLinkName( cName ) - METHOD NewMap( cName ) INLINE ::cStr += "" + METHOD NewMap( cName ) INLINE ::cStr += "" METHOD MapArea( Shape, Alt, Coord, Url ) INLINE ; ::cStr += " + alt + " + CRLF() - METHOD EndMap() INLINE ::cStr += "" + METHOD EndMap() INLINE ::cStr += "" ENDCLASS @@ -334,41 +351,41 @@ METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ; ::FName := cFile ENDIF IF lCgi - ::cStr += 'Content-Type: text/html' + CRLF() + CRLF() + ::cStr += "Content-Type: text/html" + CRLF() + CRLF() FWrite( ::nh, ::cStr ) ENDIF ::cStr := '' - ::cStr += '' + CRLF() + ; - '' + CRLF() + ; - ' ' + cTitle + ' ' + CRLF() + ::cStr += '' + CRLF() + ; + "" + CRLF() + ; + " " + cTitle + "" + CRLF() IF cBaseURL != NIL - ::cStr += "' + CRLF() + ; - ' ' + CRLF() ) + ' ' + CRLF() ) #endif IF cStyleScr != NIL - ::cStr += ' " + CRLF() + ::cStr += ' " + CRLF() ENDIF IF nRefresh != NIL - ::cStr += [ ] + ::cStr += ' ' ENDIF IF lnocache - ::cStr += [ ] + ::cStr += ' ' ENDIF IF aJsCode != NIL @@ -378,8 +395,8 @@ METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ; IF aScriptSrc != NIL FOR i := 1 TO Len( aScriptSrc ) - ::cStr += ; - '' + CRLF() + ::cStr += ; + '' + CRLF() + ::cStr += ; + '' + CRLF() + ::cStr += "" + CRLF() + ::cStr += Space( 5 ) + "// Function to 'activate' images." + CRLF() + ::cStr += Space( 5 ) + "function imageOn(imgName) {" + CRLF() + ::cStr += Space( 5 ) + " if (document.images) {" + CRLF() + ::cStr += Space( 5 ) + ' imgOn=eval(imgName + "on.src");' + CRLF() + ::cStr += Space( 5 ) + ' document[imgName].src = imgOn;' + CRLF() + ::cStr += Space( 5 ) + " }" + CRLF() + ::cStr += Space( 5 ) + "}" + CRLF() + ::cStr += CRLF() + ::cStr += Space( 5 ) + "// Function to 'deactivate' images." + CRLF() + ::cStr += Space( 5 ) + "function imageOff(imgName) {" + CRLF() + ::cStr += Space( 5 ) + " if (document.images) {" + CRLF() + ::cStr += Space( 5 ) + ' imgOff = eval(imgName + "off.src");' + CRLF() + ::cStr += Space( 5 ) + ' document[imgName].src = imgOff;' + CRLF() + ::cStr += Space( 5 ) + " }" + CRLF() + ::cStr += Space( 5 ) + "}" + CRLF() + ::cStr += CRLF() + ::cStr += Space( 5 ) + "// Function for 'pressed' images." + CRLF() + ::cStr += Space( 5 ) + "function imagePress(imgName) {" + CRLF() + ::cStr += Space( 5 ) + " if (document.images) {" + CRLF() + ::cStr += Space( 5 ) + ' imgPress = eval(imgName + "press.src");' + CRLF() + ::cStr += Space( 5 ) + ' document[imgName].src = imgPress;' + CRLF() + ::cStr += Space( 5 ) + " }" + CRLF() + ::cStr += Space( 5 ) + "}" + CRLF() + ::cStr += CRLF() + ::cStr += '//-->' + CRLF() + ::cStr += '' + CRLF() ENDIF IF cStyle != NIL - ::cStr += "" + CRLF() + ::cStr += "" + CRLF() ENDIF - ::cStr += ; + ::cStr += ; '' + CRLF() + ; '' ELSE - cOut += '>' + cOut += ">" ENDIF ENDIF @@ -810,7 +827,7 @@ METHOD Say( str, font, size, type, color, style ) CLASS THtml cOut += "" ENDIF - ::cStr += cOut + CRLF() + ::cStr += cOut + CRLF() RETURN Self @@ -842,7 +859,7 @@ METHOD Paragraph( lStart, cAlign, cStyle ) CLASS THtml ENDIF cStr += CRLF() - ::cStr += cStr + ::cStr += cStr RETURN Self @@ -860,11 +877,11 @@ METHOD HLine( nSize, nWidth, lShade, cColor ) CLASS THtml __defaultNIL( @lShade, .T. ) IF lShade - ::cStr += CRLF() + ; + ::cStr += CRLF() + ; "
" + ::cStr += "
" ENDIF - ::cStr += "" + cText + "" + CRLF() + ::cStr += "" + cText + "" + CRLF() IF lCentered - ::cStr += "
" + ::cStr += "" ENDIF RETURN Self @@ -910,29 +927,29 @@ METHOD PutTextUrl( cText, cUrl, cOnClick, cOnMsOver, cOnMsout, cTarget, font, cl __defaultNIL( @bld, .F. ) __defaultNIL( @lBreak, .F. ) - ::cStr += ; + ::cStr += ; '' + cText + cStr += ">" + cText ELSE cStr += cText ENDIF - ::cStr += ; - '>' + cStr + ::cStr += ; + ">" + cStr IF FONT != NIL .OR. clr != NIL .OR. size != NIL .OR. style != NIL - ::cStr += ; + ::cStr += ; '' ENDIF IF bld - ::cStr += ; + ::cStr += ; '' ENDIF - ::cStr += ; - '' + iif( lBreak, '
' + CRLF(), CRLF() ) + ::cStr += ; + '' + iif( lBreak, "
" + CRLF(), CRLF() ) RETURN Self @@ -1052,9 +1069,9 @@ METHOD PutImageUrl( cImage, nBorder, nHeight, cUrl, ; cStr += " hSpace= " + hb_ntos( hSpace ) + " " ENDIF - ::cStr += ; + ::cStr += ; '' + iif( lBreak, '
' + CRLF(), "" ) + cStr + '>' + iif( lBreak, "
" + CRLF(), "" ) RETURN Self @@ -1104,9 +1121,9 @@ METHOD PutTextImageUrl( cImage, nBorder, nHeight, cUrl, ; cStr += ' target=' + cTarget ENDIF - ::cStr += ; - '' + cText + '' + iif( lBreak, '
' + CRLF(), "" ) + ::cStr += ; + '" + cText + '' + iif( lBreak, "
" + CRLF(), "" ) RETURN Self @@ -1183,9 +1200,9 @@ METHOD PutImage( cImage, nBorder, nHeight, ; cStr += " hSpace= " + hb_ntos( hSpace ) + " " ENDIF - ::cStr += ; + ::cStr += ; '' + iif( lBreak, "
" + CRLF(), "" ) + cStr + ">" + iif( lBreak, "
" + CRLF(), "" ) RETURN Self @@ -1253,14 +1270,14 @@ METHOD DefineTable( nCols, nBorder, nWidth, nHeight, ColorFore, ColorBG, ; __defaultNIL( @lRuleRows, .F. ) IF ColorFore != NIL - cStr += " bordercolor=" + ColorFore + ' ' + cStr += " bordercolor=" + ColorFore + " " ENDIF IF Colorbg != NIL - cStr += " bgcolor=" + ColorBG + ' ' + cStr += " bgcolor=" + ColorBG + " " ENDIF - cStr += iif( nBorder = NIL, "border ", "border=" + hb_ntos( nBorder ) + ' ' ) + cStr += iif( nBorder = NIL, "border ", "border=" + hb_ntos( nBorder ) + " " ) IF ncellpadding != NIL cStr += ' CellPadding=' + hb_ntos( nCellPadding ) @@ -1330,7 +1347,7 @@ METHOD DefineTable( nCols, nBorder, nWidth, nHeight, ColorFore, ColorBG, ; cStr += ">" + CRLF() - ::cStr += cStr + CRLF() + ::cStr += cStr + CRLF() RETURN Self @@ -1385,7 +1402,7 @@ METHOD TableHead( cHead, cColor, cAlign, ; cStr += cHead + iif( cFont != NIL, '', "" ) + "" + CRLF() - ::cStr += cStr + ::cStr += cStr RETURN Self @@ -1414,7 +1431,7 @@ METHOD NewTableRow( cColor, vAling, aLing ) CLASS THtml ENDIF cStr += ">" + CRLF() - ::cStr += cStr + ::cStr += cStr RETURN Self @@ -1428,7 +1445,7 @@ METHOD NewTableRow( cColor, vAling, aLing ) CLASS THtml METHOD EndTableRow() CLASS THtml - ::cStr += Space( 5 ) + "" + CRLF() + ::cStr += Space( 5 ) + "" + CRLF() RETURN Self @@ -1537,7 +1554,7 @@ METHOD NewTableCell( cAlign, cColor, ; ::lFont := .T. ENDIF - ::cStr += cStr + ::cStr += cStr RETURN Self @@ -1552,9 +1569,9 @@ METHOD NewTableCell( cAlign, cColor, ; METHOD EndTableCell() CLASS THtml IF ::lFont - ::cStr += "" + CRLF() + ::cStr += "" + CRLF() ELSE - ::cStr += "" + CRLF() + ::cStr += "" + CRLF() ENDIF ::lFont := .F. @@ -1570,8 +1587,8 @@ METHOD EndTableCell() CLASS THtml METHOD EndTable() CLASS THtml - ::cStr += "" + CRLF() - ::cStr += CRLF() + CRLF() + CRLF() + ::cStr += "" + CRLF() + ::cStr += CRLF() + CRLF() + CRLF() RETURN Self @@ -1589,21 +1606,21 @@ METHOD NewForm( cMethod, cAction, cName ) CLASS THtml __defaultNIL( @cMethod, "POST" ) __defaultNIL( @cName, "newForm" ) - ::cStr += CRLF() + "' + CRLF() + ::cStr += '' + CRLF() RETURN Self @@ -1665,7 +1682,7 @@ METHOD FormImage( cText, name, file ) CLASS THtml HB_SYMBOL_UNUSED( cText ) - ::cStr += '' + CRLF() + ::cStr += '' + CRLF() RETURN Self @@ -1679,7 +1696,7 @@ METHOD FormImage( cText, name, file ) CLASS THtml METHOD FormReset( cText ) CLASS THtml - ::cStr += '' + CRLF() + ::cStr += '' + CRLF() RETURN Self @@ -1743,7 +1760,7 @@ METHOD PushButton( cName, cCaption, ; cStr += ' onClick="location.href=' + cCgiApp + ';"' ENDIF - ::cStr += cStr + ">" + ::cStr += cStr + ">" RETURN Self @@ -1798,7 +1815,7 @@ METHOD Button( cName, cCaption, ; cStr += ' onClick="location.href=' + cCgiApp + ';"' ENDIF - ::cStr += cStr + ">" + CRLF() + ::cStr += cStr + ">" + CRLF() RETURN Self @@ -1812,7 +1829,7 @@ METHOD Button( cName, cCaption, ; METHOD EndButton() CLASS THtml - ::cStr += CRLF() + CRLF() + "" + CRLF() + ::cStr += CRLF() + CRLF() + "" + CRLF() RETURN Self @@ -1845,24 +1862,24 @@ METHOD Marquee( cText, cFont, cFntColor, nFntSize, ; ::StartFont( cFont, , , , nFntSize, cFntColor ) - ::cStr += '' + ; + ">" + ; CRLF() ::cStr += cStr @@ -1926,7 +1943,7 @@ METHOD StartMarquee( cFont, cFntColor, nFntSize, ; METHOD EndMarquee() CLASS THtml - ::cStr += "" + CRLF() + ::cStr += "" + CRLF() RETURN Self @@ -1989,7 +2006,7 @@ METHOD iFrame( name, src, border, marginwidth, marginheight, ; cStr += ">" + CRLF() cStr += "" + CRLF() - ::cStr += cStr + ::cStr += cStr RETURN Self @@ -2003,7 +2020,7 @@ METHOD Span( c, Style ) CLASS THtml cStr += ' style ="' + Style + '"' ENDIF cStr += ">" + c + '' - ::cStr += cStr + ::cStr += cStr RETURN Self @@ -2012,7 +2029,7 @@ METHOD Comment( cText ) CLASS THtml LOCAL cStr := CRLF() + "" - ::cStr += cStr + ::cStr += cStr RETURN Self @@ -2061,27 +2078,25 @@ METHOD AddObject( cType, cClassid, cAling, cCode, lDisable, cCodeBase, cName, nW ENDIF cStr += " >" - ::cStr += cStr + CRLF() + ::cStr += cStr + CRLF() RETURN Self METHOD EndObject() CLASS THtml - ::cStr += "" + CRLF() + ::cStr += "" + CRLF() RETURN Self METHOD ADDPARAM( cType, cValue ) CLASS THtml - ::cStr += '' + CRLF() + ::cStr += '' + CRLF() RETURN Self METHOD PutLinkName( cName ) CLASS THtml - LOCAL cStr := '' - - ::cStr += cStr + ::cStr += '' RETURN Self diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index 4a38bbc2b5..22b0b16f7a 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -136,7 +136,7 @@ system. To check this, type "make -v"; you should see Then, you must set a couple of environment variables that indicate your platform and compiler. -For gcc on Win95/WinNT with the Cygwin library: +For gcc on Windows with the Cygwin library: Notes: The CYGWIN environment variable must include "noglob" in order to avoid having Harbour or programs created with Harbour expand wildcard command line arguments (this is checked at run-time!) @@ -144,11 +144,11 @@ For gcc on Win95/WinNT with the Cygwin library: HB_COMPILER gcc CYGWIN noglob -For gcc on Win95/WinNT with the MinGW library: +For gcc on Windows with the MinGW library: HB_PLATFORM win HB_COMPILER mingw -For MSVC on Win95/WinNT: +For MSVC on Windows: Notes: gnu make is case sensitive! If your editor converts harbour.c to HARBOUR.C when it saves the file, then gnu make _will_not_work. diff --git a/harbour/doc/tracing.txt b/harbour/doc/tracing.txt index 6731810d0b..328109c777 100644 --- a/harbour/doc/tracing.txt +++ b/harbour/doc/tracing.txt @@ -14,7 +14,7 @@ TRACING Harbour implements tracing by adding calls to the following macro in the C code: - HB_TRACE(level, ("printf-style parameters", arg1, arg2)); + HB_TRACE( level, ( "printf-style parameters", arg1, arg2 ) ); The level specified for the HB_TRACE call affects harbour in two ways: compilation time and run time. @@ -90,7 +90,7 @@ HB_TR_LEVEL_WARNING they have no performance effect; only effect, since the code was compiled with a lower tracing level. -For example, I compile Harbour on WinNT with gcc (mingw), so I +For example, I compile Harbour on Windows with gcc (mingw), so I usually set the HB_USER_CFLAGS environment variable like this: export HB_USER_CFLAGS='-DHB_TR_LEVEL=HB_TR_INFO' @@ -122,7 +122,7 @@ to compile a regular Harbour application, the app will output LOTS of tracing information to stderr. If you are using a sensible command shell (such as bash) you can redirect stderr to a file like this: - my_app 2>trace.txt + my_app 2> trace.txt REDIRECTION @@ -194,5 +194,5 @@ query and set the trace level. From C code: There are wrapper functions callable from Clipper code: - current_state := hb_traceState( [new_state] ) - current_level := hb_traceLevel( [new_level] ) + current_state := hb_traceState( [] ) + current_level := hb_traceLevel( [] ) diff --git a/harbour/doc/xhb-diff.txt b/harbour/doc/xhb-diff.txt index c27df3a816..825e69b17b 100644 --- a/harbour/doc/xhb-diff.txt +++ b/harbour/doc/xhb-diff.txt @@ -2060,8 +2060,8 @@ using known from xBase++ zero space. In xBase++ each thread can move his work area to zero space using: DbRelease( [|], [] ) --> lSuccess Then this work area can be attached by other thread using: - DbRequest( [], [], ; - [<@bAreaBlock>], [] ) --> lSuccess + DbRequest( [], [], ; + [<@bAreaBlock>], [] ) --> lSuccess In Harbour above functions are available in XPP emulation library. There are also core Harbour functions giving this functionality: hb_dbDetach( [|], [] ) -> diff --git a/harbour/extras/gtwvw/docs/gtwvw.txt b/harbour/extras/gtwvw/docs/gtwvw.txt index b40a951e0c..752c30fbd2 100644 --- a/harbour/extras/gtwvw/docs/gtwvw.txt +++ b/harbour/extras/gtwvw/docs/gtwvw.txt @@ -77,7 +77,7 @@ www - http://www.harbour-project.org Copyright 1999 David G. Holm hb_gt_Tone() -See doc/license.txt for licensing terms. +See COPYING.txt for licensing terms. www - http://www.harbour-project.org diff --git a/harbour/extras/gtwvw/gtwvwd.c b/harbour/extras/gtwvw/gtwvwd.c index 8690ff60de..dc9a76d1d9 100644 --- a/harbour/extras/gtwvw/gtwvwd.c +++ b/harbour/extras/gtwvw/gtwvwd.c @@ -30,7 +30,7 @@ * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * * www - http://harbour-project.org * diff --git a/harbour/extras/gtwvw/wvwcheck.c b/harbour/extras/gtwvw/wvwcheck.c index 686f810fe9..b238d59231 100644 --- a/harbour/extras/gtwvw/wvwcheck.c +++ b/harbour/extras/gtwvw/wvwcheck.c @@ -30,7 +30,7 @@ * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * * www - http://harbour-project.org * diff --git a/harbour/extras/gtwvw/wvwdraw.c b/harbour/extras/gtwvw/wvwdraw.c index 114d8b28ec..22fd3f9338 100644 --- a/harbour/extras/gtwvw/wvwdraw.c +++ b/harbour/extras/gtwvw/wvwdraw.c @@ -30,7 +30,7 @@ * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * * www - http://harbour-project.org * diff --git a/harbour/extras/gtwvw/wvwedit.c b/harbour/extras/gtwvw/wvwedit.c index 70a76aa952..18340fa113 100644 --- a/harbour/extras/gtwvw/wvwedit.c +++ b/harbour/extras/gtwvw/wvwedit.c @@ -30,7 +30,7 @@ * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * * www - http://harbour-project.org * diff --git a/harbour/extras/gtwvw/wvwfuncs.c b/harbour/extras/gtwvw/wvwfuncs.c index fe467e5445..0bfd8365bf 100644 --- a/harbour/extras/gtwvw/wvwfuncs.c +++ b/harbour/extras/gtwvw/wvwfuncs.c @@ -30,7 +30,7 @@ * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * * www - http://harbour-project.org * diff --git a/harbour/extras/gtwvw/wvwmenu.c b/harbour/extras/gtwvw/wvwmenu.c index 016b86ab3d..1fe6f7345b 100644 --- a/harbour/extras/gtwvw/wvwmenu.c +++ b/harbour/extras/gtwvw/wvwmenu.c @@ -30,7 +30,7 @@ * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * * www - http://harbour-project.org * diff --git a/harbour/extras/gtwvw/wvwpush.c b/harbour/extras/gtwvw/wvwpush.c index 331b24ad6b..1cea4b4b08 100644 --- a/harbour/extras/gtwvw/wvwpush.c +++ b/harbour/extras/gtwvw/wvwpush.c @@ -30,7 +30,7 @@ * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * * www - http://harbour-project.org * diff --git a/harbour/extras/gtwvw/wvwstbar.c b/harbour/extras/gtwvw/wvwstbar.c index 3fe053c6df..af8ec968cd 100644 --- a/harbour/extras/gtwvw/wvwstbar.c +++ b/harbour/extras/gtwvw/wvwstbar.c @@ -30,7 +30,7 @@ * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * * www - http://harbour-project.org * diff --git a/harbour/extras/gtwvw/wvwtbar.c b/harbour/extras/gtwvw/wvwtbar.c index 5322faf0b7..004338d6c2 100644 --- a/harbour/extras/gtwvw/wvwtbar.c +++ b/harbour/extras/gtwvw/wvwtbar.c @@ -30,7 +30,7 @@ * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See doc/license.txt for licensing terms. + * See COPYING.txt for licensing terms. * * www - http://harbour-project.org * diff --git a/harbour/src/common/hbfsapi.c b/harbour/src/common/hbfsapi.c index 0d4e40821f..14fe50d024 100644 --- a/harbour/src/common/hbfsapi.c +++ b/harbour/src/common/hbfsapi.c @@ -141,8 +141,8 @@ PHB_FNAME hb_fsFNameSplit( const char * pszFileName ) /* Grab memory, set defaults */ pFileName = ( PHB_FNAME ) hb_xgrab( sizeof( HB_FNAME ) ); - pFileName->szPath = - pFileName->szName = + pFileName->szPath = + pFileName->szName = pFileName->szExtension = pFileName->szDrive = NULL; diff --git a/harbour/src/rtl/gtcrs/hb-charmap.def b/harbour/src/rtl/gtcrs/hb-charmap.def index 704da7acf7..2bd0b62337 100644 --- a/harbour/src/rtl/gtcrs/hb-charmap.def +++ b/harbour/src/rtl/gtcrs/hb-charmap.def @@ -32,7 +32,7 @@ # example: # 'A'-'Z': *|0x20 1 # makes all output chars lower -# +# # Harbour program is looking for this file in $HB_CHARMAP, # $HB_ROOT/etc/harbour/hb-charmap.def, /etc/harbour/hb-charmap.def # terminal name is taken from 'HB_TERM' or 'TERM' environment variable diff --git a/harbour/src/rtl/strcase.c b/harbour/src/rtl/strcase.c index 55a9817a55..dec934ef2e 100644 --- a/harbour/src/rtl/strcase.c +++ b/harbour/src/rtl/strcase.c @@ -63,7 +63,7 @@ HB_FUNC( LOWER ) if( pText ) { HB_SIZE nLen = hb_itemGetCLen( pText ); - char * pszBuffer = hb_cdpnDupLower( hb_vmCDP(), + char * pszBuffer = hb_cdpnDupLower( hb_vmCDP(), hb_itemGetCPtr( pText ), &nLen ); hb_retclen_buffer( pszBuffer, nLen ); } @@ -79,7 +79,7 @@ HB_FUNC( UPPER ) if( pText ) { HB_SIZE nLen = hb_itemGetCLen( pText ); - char * pszBuffer = hb_cdpnDupUpper( hb_vmCDP(), + char * pszBuffer = hb_cdpnDupUpper( hb_vmCDP(), hb_itemGetCPtr( pText ), &nLen ); hb_retclen_buffer( pszBuffer, nLen ); } diff --git a/harbour/tests/inherit.prg b/harbour/tests/inherit.prg index 543aeb4f61..33a23af8a5 100644 --- a/harbour/tests/inherit.prg +++ b/harbour/tests/inherit.prg @@ -15,8 +15,6 @@ * Placed in the public domain */ -#xtranslate Default( , ) => iif( == NIL, , ) - PROCEDURE Main() LOCAL oFrom @@ -143,11 +141,14 @@ FUNCTION New( cFileName, cMode, nBlock ) LOCAL self := QSelf() // Get self + hb_default( @cMode, "R" ) + hb_default( @nBlock, 4096 ) + ::nLine := 0 ::lEoF := .F. ::cBlock := "" ::cFileName := cFileName - ::cMode := Default( cMode, "R" ) + ::cMode := cMode IF ::cMode == "R" ::hFile := FOpen( cFileName ) @@ -162,7 +163,7 @@ FUNCTION New( cFileName, cMode, nBlock ) ::lEoF := .T. ? "Error ", ::nError ENDIF - ::nBlockSize := Default( nBlock, 4096 ) + ::nBlockSize := nBlock RETURN self @@ -268,8 +269,9 @@ FUNCTION WriteLn( xTxt, lCRLF ) ELSEIF !( ::cMode == "W" ) ? "File ", ::cFileName, " not opened for writing" ELSE + hb_default( @lCRLF, .T. ) cBlock := hb_ValToExp( xTxt ) // Convert to string - IF Default( lCRLF, .T. ) + IF lCRLF cBlock += hb_eol() ENDIF FWrite( ::hFile, cBlock, Len( cBlock ) ) diff --git a/harbour/tests/stripem.prg b/harbour/tests/stripem.prg index 222d73819f..748caf4cf7 100644 --- a/harbour/tests/stripem.prg +++ b/harbour/tests/stripem.prg @@ -5,8 +5,6 @@ #include "fileio.ch" #include "hbclass.ch" -#xtranslate Default( , ) => iif( == NIL, , ) - // // The Harbour stripping command // @@ -30,8 +28,8 @@ PROCEDURE Main( cFrom, cTo ) LOCAL oTo LOCAL cOut - cFrom := Default( cFrom, __FILE__ ) - cTo := Default( cTo, "strip.out" ) + hb_default( @cFrom, __FILE__ ) + hb_default( @cTo, "strip.out" ) oFrom := TTextFile() // ? hb_ValToExp( __objGetMethodList( oFrom ) ) @@ -89,11 +87,14 @@ END CLASS METHOD New( cFileName, cMode, nBlock ) CLASS TTextFile + hb_default( @cMode, "R" ) + hb_default( @nBlock, 4096 ) + ::nLine := 0 ::lEoF := .F. ::cBlock := "" ::cFileName := cFileName - ::cMode := Default( cMode, "R" ) + ::cMode := cMode IF ::cMode == "R" ::hFile := FOpen( cFileName ) @@ -108,7 +109,7 @@ METHOD New( cFileName, cMode, nBlock ) CLASS TTextFile ::lEoF := .T. ? "Error ", ::nError ENDIF - ::nBlockSize := Default( nBlock, 4096 ) + ::nBlockSize := nBlock RETURN self @@ -197,8 +198,9 @@ METHOD WriteLn( xTxt, lCRLF ) CLASS TTextFile ELSEIF !( ::cMode == "W" ) ? "File ", ::cFileName, " not opened for writing" ELSE + hb_default( @lCRLF, .T. ) cBlock := hb_ValToExp( xTxt ) // Convert to string - IF Default( lCRLF, .T. ) + IF lCRLF cBlock += hb_eol() ENDIF FWrite( ::hFile, cBlock, Len( cBlock ) ) diff --git a/harbour/utils/hbmk2/Makefile b/harbour/utils/hbmk2/Makefile index c42e1958ab..181d08823c 100644 --- a/harbour/utils/hbmk2/Makefile +++ b/harbour/utils/hbmk2/Makefile @@ -28,7 +28,7 @@ endif # Not possible to override default entry # function cleanly when using plain GNU Make # to build, so we're using _APPMAIN(), which -# is better than MAIN() +# is better than Main() HB_PRGFLAGS += -DHBMK_USE_APPMAIN HB_PRGFLAGS += -DHBMK_WITH_ALL_EMBEDDED_HEADERS diff --git a/harbour/utils/hbmk2/hbmk2.es_PE.po b/harbour/utils/hbmk2/hbmk2.es_PE.po index 2913fbc2f5..aaf25c641c 100644 --- a/harbour/utils/hbmk2/hbmk2.es_PE.po +++ b/harbour/utils/hbmk2/hbmk2.es_PE.po @@ -528,7 +528,7 @@ msgstr "control y análisis de encabezado de código fuente (en el modo de compi #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\n-lng=en,hu-HU,de" +msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separated list:\n-lng=en,hu-HU,de" msgstr "lista de idiomas a ser reemplazados en %1$s macros en archivos .pot/.po y nombres de archivos y salida .hbl/.po. Lista separada por comas:\n-lng=en,hu-HU,de" #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102 @@ -1393,7 +1393,7 @@ msgstr "salida de información de la compilación de Harbour. La salida es en fo #: hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_" +msgid " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of environment variable HBMK_WITH_" msgstr " es el nombre de la dependencia. es un valor que controla como se hace la detección. Valores aceptados: no, yes, force, nolocal, local. Por defecto: contenido de envvar HBMK_WITH_" #: hbmk2.prg:11512 hbmk2.prg:12970 diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index a5d10e724d..75196ad558 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -684,7 +684,7 @@ msgstr "Fordítás..." #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\n-lng=en,hu-HU,de" +msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separated list:\n-lng=en,hu-HU,de" msgstr "nyelvek listája, amelyek a .pot/.po és .hbl/.po állományokban levő %1$s makrókba kerülnek behelyettesítésre. Vesszővel elválasztott lista:\n-lng=en,hu-HU,de" #: hbmk2.prg:7959 hbmk2.prg:11650 hbmk2.prg:13120 @@ -1314,7 +1314,7 @@ msgstr "" #: hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "copy target to . if is a directory, it should end with path separatorm, in this case files specified by -instfile option will also be copied. can be specified multiple times. is an optional copy group, it must be at least two characters long. Build target will be automatically copied to default (empty) copy group." +msgid "copy target to . if is a directory, it should end with path separator, in this case files specified by -instfile option will also be copied. can be specified multiple times. is an optional copy group, it must be at least two characters long. Build target will be automatically copied to default (empty) copy group." msgstr "" #: hbmk2.prg:11633 hbmk2.prg:13102 @@ -1389,7 +1389,7 @@ msgstr "" #: hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_" +msgid " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of environment variable HBMK_WITH_" msgstr "" #: hbmk2.prg:11512 hbmk2.prg:12970 @@ -1404,7 +1404,7 @@ msgstr "" #: hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid " is the name of the dependency. name of the package depedency. Can be specified multiple times." +msgid " is the name of the dependency. name of the package dependency. Can be specified multiple times." msgstr "" #: hbmk2.prg:11633 diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index a2776aab1a..1147cc825a 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -598,8 +598,8 @@ EXTERNAL hb_HKeepOrder EXTERNAL hb_FGetAttr EXTERNAL hb_FSetAttr -#define HB_HISTORY_LEN 500 -#define HB_LINE_LEN 256 +#define HB_HISTORY_LEN 500 +#define HB_LINE_LEN 256 /* For hbshell */ #define _HBSH_cDirBase 1 @@ -11748,31 +11748,31 @@ STATIC PROCEDURE PlatformPRGFlags( hbmk, aOPTPRG ) STATIC PROCEDURE rtlnk_libtrans( aLibList ) STATIC s_hTrans := { ; - "CT" => "hbct" , ; - "CTP" => "hbct" , ; - "CLASSY" => NIL , ; - "CSYINSP" => NIL , ; - "SIX3" => NIL , ; - "NOMACH6" => NIL , ; - "BLXRATEX" => NIL , ; - "BLXCLP50" => NIL , ; - "BLXCLP52" => NIL , ; - "BLXCLP53" => NIL , ; - "EXOSPACE" => NIL , ; - "CLIPPER" => NIL , ; - "EXTEND" => NIL , ; - "TERMINAL" => NIL , ; - "PCBIOS" => NIL , ; - "ANSITERM" => NIL , ; - "DBFBLOB" => NIL , ; - "DBFMEMO" => NIL , ; - "DBFNTX" => NIL , ; - "DBFCDX" => NIL , ; - "_DBFCDX" => NIL , ; - "CLD" => NIL , ; - "CLDR" => NIL , ; - "LLIBCE" => NIL , ; - "LLIBCA" => NIL } + "CT" => "hbct", ; + "CTP" => "hbct", ; + "CLASSY" => NIL, ; + "CSYINSP" => NIL, ; + "SIX3" => NIL, ; + "NOMACH6" => NIL, ; + "BLXRATEX" => NIL, ; + "BLXCLP50" => NIL, ; + "BLXCLP52" => NIL, ; + "BLXCLP53" => NIL, ; + "EXOSPACE" => NIL, ; + "CLIPPER" => NIL, ; + "EXTEND" => NIL, ; + "TERMINAL" => NIL, ; + "PCBIOS" => NIL, ; + "ANSITERM" => NIL, ; + "DBFBLOB" => NIL, ; + "DBFMEMO" => NIL, ; + "DBFNTX" => NIL, ; + "DBFCDX" => NIL, ; + "_DBFCDX" => NIL, ; + "CLD" => NIL, ; + "CLDR" => NIL, ; + "LLIBCE" => NIL, ; + "LLIBCA" => NIL } LOCAL cLib FOR EACH cLib IN aLibList DESCEND @@ -11792,27 +11792,27 @@ STATIC PROCEDURE rtlnk_libtrans( aLibList ) STATIC PROCEDURE rtlnk_filetrans( aFileList ) STATIC s_hTrans := { ; - "CTUS" => NIL , ; - "CTUSP" => NIL , ; - "CTINT" => NIL , ; - "CTINTP" => NIL , ; - "__WAIT" => NIL , ; - "__WAIT_4" => NIL , ; - "__WAIT_B" => NIL , ; - "BLXCLP50" => NIL , ; - "BLXCLP52" => NIL , ; - "BLXCLP53" => NIL , ; - "BLDCLP50" => NIL , ; - "BLDCLP52" => NIL , ; - "BLDCLP53" => NIL , ; - "SIXCDX" => NIL , ; - "SIXNSX" => NIL , ; - "SIXNTX" => NIL , ; - "DBT" => NIL , ; - "FPT" => NIL , ; - "SMT" => NIL , ; - "NOMEMO" => NIL , ; - "CLD.LIB" => NIL } + "CTUS" => NIL, ; + "CTUSP" => NIL, ; + "CTINT" => NIL, ; + "CTINTP" => NIL, ; + "__WAIT" => NIL, ; + "__WAIT_4" => NIL, ; + "__WAIT_B" => NIL, ; + "BLXCLP50" => NIL, ; + "BLXCLP52" => NIL, ; + "BLXCLP53" => NIL, ; + "BLDCLP50" => NIL, ; + "BLDCLP52" => NIL, ; + "BLDCLP53" => NIL, ; + "SIXCDX" => NIL, ; + "SIXNSX" => NIL, ; + "SIXNTX" => NIL, ; + "DBT" => NIL, ; + "FPT" => NIL, ; + "SMT" => NIL, ; + "NOMEMO" => NIL, ; + "CLD.LIB" => NIL } LOCAL cFile FOR EACH cFile IN aFileList DESCEND @@ -14504,57 +14504,57 @@ STATIC FUNCTION __hbshell_win_reg_app( lRegister, lAllUser, cAppPath ) a full-screen CUI ("interactive") app */ STATIC FUNCTION __hbshell_detect_CUI_extern_positive() RETURN { ; - "COL" => NIL , ; - "DISPBEGIN" => NIL , ; - "DISPBOX" => NIL , ; - "DISPCOUNT" => NIL , ; - "DISPEND" => NIL , ; - "DISPOUT" => NIL , ; - "DISPOUTAT" => NIL , ; - "HB_CLRAREA" => NIL , ; - "HB_DISPBOX" => NIL , ; - "HB_DISPOUTAT" => NIL , ; - "HB_DISPOUTATBOX" => NIL , ; - "HB_KEYCLEAR" => NIL , ; - "HB_KEYINS" => NIL , ; - "HB_KEYLAST" => NIL , ; - "HB_KEYNEXT" => NIL , ; - "HB_KEYPUT" => NIL , ; - "HB_KEYSETLAST" => NIL , ; - "HB_KEYSTD" => NIL , ; - "HB_MGETBOUNDS" => NIL , ; - "HB_MMIDDLEDOWN" => NIL , ; - "HB_SCRMAXCOL" => NIL , ; - "HB_SCRMAXROW" => NIL , ; - "HB_SCROLL" => NIL , ; - "HB_SHADOW" => NIL , ; - "INKEY" => NIL , ; - "LASTKEY" => NIL , ; - "MAXCOL" => NIL , ; - "MAXROW" => NIL , ; - "MCOL" => NIL , ; - "MDBLCLK" => NIL , ; - "MHIDE" => NIL , ; - "MLEFTDOWN" => NIL , ; - "MPRESENT" => NIL , ; - "MRESTSTATE" => NIL , ; - "MRIGHTDOWN" => NIL , ; - "MROW" => NIL , ; - "MSAVESTATE" => NIL , ; - "MSETBOUNDS" => NIL , ; - "MSETCURSOR" => NIL , ; - "MSETPOS" => NIL , ; - "MSHOW" => NIL , ; - "NEXTKEY" => NIL , ; - "RESTSCREEN" => NIL , ; - "ROW" => NIL , ; - "SAVESCREEN" => NIL , ; - "SCROLL" => NIL , ; - "SETCOLOR" => NIL , ; - "SETCURSOR" => NIL , ; - "SETMODE" => NIL , ; - "SETPOS" => NIL , ; - "SETPOSBS" => NIL } + "COL" => NIL , ; + "DISPBEGIN" => NIL , ; + "DISPBOX" => NIL , ; + "DISPCOUNT" => NIL , ; + "DISPEND" => NIL , ; + "DISPOUT" => NIL , ; + "DISPOUTAT" => NIL , ; + "HB_CLRAREA" => NIL , ; + "HB_DISPBOX" => NIL , ; + "HB_DISPOUTAT" => NIL , ; + "HB_DISPOUTATBOX" => NIL , ; + "HB_KEYCLEAR" => NIL , ; + "HB_KEYINS" => NIL , ; + "HB_KEYLAST" => NIL , ; + "HB_KEYNEXT" => NIL , ; + "HB_KEYPUT" => NIL , ; + "HB_KEYSETLAST" => NIL , ; + "HB_KEYSTD" => NIL , ; + "HB_MGETBOUNDS" => NIL , ; + "HB_MMIDDLEDOWN" => NIL , ; + "HB_SCRMAXCOL" => NIL , ; + "HB_SCRMAXROW" => NIL , ; + "HB_SCROLL" => NIL , ; + "HB_SHADOW" => NIL , ; + "INKEY" => NIL , ; + "LASTKEY" => NIL , ; + "MAXCOL" => NIL , ; + "MAXROW" => NIL , ; + "MCOL" => NIL , ; + "MDBLCLK" => NIL , ; + "MHIDE" => NIL , ; + "MLEFTDOWN" => NIL , ; + "MPRESENT" => NIL , ; + "MRESTSTATE" => NIL , ; + "MRIGHTDOWN" => NIL , ; + "MROW" => NIL , ; + "MSAVESTATE" => NIL , ; + "MSETBOUNDS" => NIL , ; + "MSETCURSOR" => NIL , ; + "MSETPOS" => NIL , ; + "MSHOW" => NIL , ; + "NEXTKEY" => NIL , ; + "RESTSCREEN" => NIL , ; + "ROW" => NIL , ; + "SAVESCREEN" => NIL , ; + "SCROLL" => NIL , ; + "SETCOLOR" => NIL , ; + "SETCURSOR" => NIL , ; + "SETMODE" => NIL , ; + "SETPOS" => NIL , ; + "SETPOSBS" => NIL } STATIC FUNCTION __hbshell_detect_CUI_extern_negative() RETURN { ; @@ -15311,12 +15311,10 @@ STATIC FUNCTION ExitCodeStr( nResult ) STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) - LOCAL aHdr_Opt := { ; + LOCAL aHdr_Syntax := { ; I_( "Syntax:" ), ; "", ; - hb_StrFormat( I_( " %1$s [options] [] " ), _SELF_NAME_ ), ; - "", ; - I_( "Options:" ) } + hb_StrFormat( I_( " %1$s [options] [] " ), _SELF_NAME_ ) } LOCAL aHdr_Supp := { ; NIL, ; @@ -15342,6 +15340,10 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) { "aix" , "gcc" }, ; { "sunos" , "gcc, sunpro" } } + LOCAL aHdr_Opt := { ; + "", ; + I_( "Options:" ) } + LOCAL aLst_Opt_Basic := { ; NIL, ; { "-o" , I_( "output file name" ) }, ; @@ -15400,7 +15402,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) { "-sign=" , I_( "sign executable with (Windows and Darwin only)" ) }, ; { "-signpw=" , I_( "use as password when signing executable (Windows and Darwin only)" ) }, ; { "-instfile=" , I_( "add in to the list of files to be copied to path specified by -instpath option. is an optional copy group (case sensitive), it must be at least two characters long. In case you do not specify , the list of files in that group will be emptied." ) }, ; - { "-instpath=" , I_( "copy target to . if is a directory, it should end with path separatorm, in this case files specified by -instfile option will also be copied. can be specified multiple times. is an optional copy group, it must be at least two characters long. Build target will be automatically copied to default (empty) copy group. There exist following built-in groups: 'depimplib' for import libraries and 'depimplibsrc' for import library source (.dll) files, both belonging to dependencies." ) }, ; + { "-instpath=" , I_( "copy target to . if is a directory, it should end with path separator, in this case files specified by -instfile option will also be copied. can be specified multiple times. is an optional copy group, it must be at least two characters long. Build target will be automatically copied to default (empty) copy group. There exist following built-in groups: 'depimplib' for import libraries and 'depimplibsrc' for import library source (.dll) files, both belonging to dependencies." ) }, ; { "-instforce[-]" , I_( "copy target to install path even if it is up to date" ) }, ; { "-depimplib[-]" , I_( "enable (or disable) import library generation for import library sources specified in -depimplibs= options (default: yes)" ) }, ; { "-stop[=]" , I_( "stop without doing anything and display if specified" ) }, ; @@ -15437,7 +15439,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) { "-hbimplib" , I_( "create import library (Windows only)" ) }, ; NIL, ; { "-hbl[=]" , hb_StrFormat( I_( "output .hbl filename. %1$s macro is accepted in filename" ), _LNG_MARKER ) }, ; - { "-lng=" , hb_StrFormat( I_( e"list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\n-lng=en,hu-HU,de" ), _LNG_MARKER ) }, ; + { "-lng=" , hb_StrFormat( I_( e"list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separated list:\n-lng=en,hu-HU,de" ), _LNG_MARKER ) }, ; { "-po=" , I_( "create/update .po file from source. Merge it with previous .po file of the same name" ) }, ; { "-minipo[-]" , I_( "do (not) add Harbour version number and source file reference to .po (default: add them)" ) }, ; { "-rebuildpo" , I_( "recreate .po file, thus removing all obsolete entries in it" ) }, ; @@ -15445,10 +15447,10 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) { "-hbx=[<.ch>]" , I_( "Create Harbour header (in .hbx format) with all external symbols. Empty parameter will disable it." ) }, ; { "-autohbc=<.ch:.hbc>", I_( "<.ch> is a header file name. <.hbc> is a .hbc filename to be automatically included in case the header is found in any of the compiled sources. (EXPERIMENTAL)" ) }, ; NIL, ; - { "-deppkgname=" , I_( " is the name of the dependency. name of the package depedency. Can be specified multiple times." ) }, ; + { "-deppkgname=" , I_( " is the name of the dependency. name of the package dependency. Can be specified multiple times." ) }, ; { "-depkeyhead=" , I_( " is the name of the dependency. is the key header (.h) of the package dependency. Multiple alternative headers can be specified." ) }, ; { "-depoptional=" , I_( " is the name of the dependency. can be 'yes' or 'no', specifies whether the dependency is optional. Default: no" ) }, ; - { "-depcontrol=" , I_( " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_" ) }, ; + { "-depcontrol=" , I_( " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of environment variable HBMK_WITH_" ) }, ; { "-depincroot=" , I_( " is the name of the dependency. Set as root directory for paths specified in -depincpath options." ) }, ; { "-depincpath=" , I_( " is the name of the dependency. Add to the header detection path list." ) }, ; { "-depincpathlocal=" , I_( " is the name of the dependency. Add to the header detection path list, where is pointing to a directory local to the project and containing an embedded (aka. 'locally hosted') dependency." ) }, ; @@ -15559,7 +15561,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) { "HB_CCPREFIX" , I_( "override C compiler executable prefix (gcc compiler families only)" ) }, ; { "HB_CCSUFFIX" , I_( "override C compiler executable suffix (gcc compiler families only)" ) }, ; { _HBMK_ENV_INSTALL_PFX, I_( "override Harbour base installation directory" ) }, ; - { "HB_INSTALL_ADDONS" , I_( "override Harbour base addons directory" ) } } + { "HB_INSTALL_ADDONS" , I_( "override Harbour base add-ons directory" ) } } LOCAL aHdr_File := { ; "", ; @@ -15617,7 +15619,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) { "${hb_lib3rd}" , I_( "Harbour 3rd party static library directory" ) }, ; { "${hb_dyn}" , I_( "Harbour dynamic library directory" ) }, ; { "${hb_inc}" , I_( "Harbour header directory" ) }, ; - { "${hb_addons}" , I_( "Harbour addons base directory" ) }, ; + { "${hb_addons}" , I_( "Harbour add-ons base directory" ) }, ; { "${hb_first}" , I_( "Name of source file that holds the entry function (without directory and extension)" ) }, ; { "${hb_outputdir}" , I_( "Directory of the output" ) }, ; { "${hb_outputname}" , I_( "Name of the output (without extension)" ) }, ; @@ -15793,12 +15795,39 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) I_( e"Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][|||]}. Filters can be combined using '&', '|' operators and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}" ), ; I_( "Most .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=) and corresponding command line parameters will accept macro variables. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ), ; I_( 'Options accepting macro variables also support command substitution. Enclose command inside ``, and, if the command contains space, also enclose in double quotes. F.e. "-cflag=`wx-config --cflags`", or ldflags={unix&gcc}"`wx-config --libs`".' ), ; - I_( "Libraries and object files built with/for CA-Cl*pper will not work with any supported platform/compiler." ) , ; - I_( "Defaults and feature support may vary by platform/compiler." ) , ; + I_( "Libraries and object files built with/for CA-Cl*pper will not work with any supported platform/compiler." ), ; + I_( "Defaults and feature support may vary by platform/compiler." ), ; + hb_StrFormat( I_( "GNU Make or any C compiler specific make tool and MSYS (on Windows) are not needed to run %1$s." ), _SELF_NAME_ ), ; hb_StrFormat( I_( ".hb or .hrb file passed as first parameter will be run as Harbour script. Note, for Harbour scripts, the codepage is set to UTF-8 by default. The default core header 'hb.ch' is automatically #included. The default GT is '%1$s', unless full-screen CUI calls are detected, when '%2$s' [*] is automatically selected." ), Lower( _HBMK_GT_DEF_ ), Lower( __hbshell_gtDefault() ) ) , ; - I_( ". (dot) passed as first parameter will enter the interactive Harbour shell." ) , ; + I_( ". (dot) passed as first parameter will enter the interactive Harbour shell." ), ; hb_StrFormat( I_( "Values marked with [*] may be host platform and/or configuration dependent. This help was generated on '%1$s' host platform." ), Lower( hb_Version( HB_VERSION_PLATFORM ) ) ) } + LOCAL aHdr_Desc := { ; + "", ; + I_( "Description:" ) } + + LOCAL cDesc := hb_StrFormat( I_( ; + e"%1$s is an integrated and portable build tool, making it possible to " + ; + e"create various types of executable binaries (executable, dynamic library, " + ; + e"static library, Harbour portable binary) out of multiple types of source " + ; + e"files (C, C++, Objective C, Harbour, gettext translations, Windows " + ; + e"resources). 'Integrated' means that a single %1$s project file can " + ; + e"control all or most aspects of the build process. 'Portable' means that " + ; + e"a single %1$s project file can control the build on all supported OS " + ; + e"platforms and across all supported C compilers. It also aims to cover " + ; + e"the majority of build tasks via short and simple project files (options). " + ; + e"%1$s supports pure -non-Harbour- C/C++/Objective C projects as well. " + ; + e"In order to achieve above goals, %1$s will autodetect Harbour, C compiler " + ; + e"and other required tools and call them appropriately. " + ; + e"%1$s allows to extend the types of supported source files via plugins.\n" + ; + e"Besides building executables, %1$s is able to run Harbour scripts directly, " + ; + e"and it also features an integrated shell prompt." + ; + e"" ), _SELF_NAME_ ) + + LOCAL aLst_Desc := { ; + NIL, ; + cDesc } + LOCAL aHdr_Auth := { ; "", ; I_( "Author:" ) } @@ -15807,6 +15836,53 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) NIL, ; { "Viktor Szakáts (harbour syenar.net)", "" } } + // ; Examples + + LOCAL aHdr_ExampleBasic := { ; + "", ; + { "", hb_StrFormat( I_( "Examples to start with %1$s:" ), _SELF_NAME_ ) } } + + LOCAL aLst_ExampleBasic := { ; + NIL, ; + { I_( "To run the interactive shell ('dot' prompt)" ) , hb_StrFormat( I_( "%1$s ." ), _SELF_NAME_ ) }, ; + { I_( "To run a Harbour script" ) , hb_StrFormat( I_( "%1$s myscript.hb []" ), _SELF_NAME_ ) } } + + LOCAL aHdr_ExampleHRB := { ; + "", ; + { "", I_( "Examples to build and run Harbour portable binary (aka precompiled Harbour script):" ) } } + + LOCAL aLst_ExampleHRB := { ; + NIL, ; + { I_( "To build" ) , hb_StrFormat( I_( "%1$s -gh myscript.hb" ), _SELF_NAME_ ) }, ; + { I_( "To run result of above" ) , hb_StrFormat( I_( "%1$s myscript.hrb []" ), _SELF_NAME_ ) } } + + LOCAL aHdr_ExampleApp := { ; + "", ; + { "", I_( "Examples to build a Harbour application:" ) } } + + LOCAL aLst_ExampleApp := { ; + NIL, ; + { I_( "To build one simple .prg" ) , hb_StrFormat( I_( "%1$s hello.prg" ), _SELF_NAME_ ) }, ; + { I_( "To build multiple .prg sources into one application in incremental mode" ) , hb_StrFormat( I_( "%1$s mymain.prg myfuncs.prg -inc" ), _SELF_NAME_ ) }, ; + { I_( "To build an application using a project file" ) , hb_StrFormat( I_( "%1$s myapp.hbp" ), _SELF_NAME_ ) }, ; + { I_( "To build an application using incremental mode" ) , hb_StrFormat( I_( "%1$s myapp.hbp -inc" ), _SELF_NAME_ ) }, ; + { I_( "To build an application which uses a contrib package or 3rd party (add-on) package that ships with an .hbc file" ), hb_StrFormat( I_( "%1$s myapp.prg hbct.hbc" ), _SELF_NAME_ ) }, ; + { I_( "To build an application which uses a raw library" ) , hb_StrFormat( I_( "%1$s myapp.prg -lmylib -L" ), _SELF_NAME_ ) }, ; + { I_( "To build an application which uses a Windows resource" ) , hb_StrFormat( I_( "%1$s mymain.prg myres.rc" ), _SELF_NAME_ ) }, ; + { I_( "To build an application which links against Harbour dynamic libraries" ) , hb_StrFormat( I_( "%1$s -shared myapp.prg" ), _SELF_NAME_ ) }, ; + { I_( "To build an application out of all .prg and .c sources residing in 'source' subdir" ), hb_StrFormat( I_( "%1$s -omyapp src/*.prg src/*.c" ), _SELF_NAME_ ) } } + + LOCAL aHdr_ExampleLib := { ; + "", ; + { "", I_( "Examples to build a Harbour static library:" ) } } + + LOCAL aLst_ExampleLib := { ; + NIL, ; + { I_( "To build library 'mylib' from sources" ) , hb_StrFormat( I_( "%1$s mylibsrc.prg -omylib -hblib" ), _SELF_NAME_ ) }, ; + { I_( "To build library 'mylib' from sources using incremental mode" ) , hb_StrFormat( I_( "%1$s mylibsrc.prg -omylib -hblib -inc" ), _SELF_NAME_ ) } } + + // ; + hb_default( @lFull, .F. ) hb_default( @lLong, .F. ) @@ -15817,7 +15893,11 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) AAdd( aLst_File, { _FNAME_HISTORY_, hb_StrFormat( I_( "stores command history for interactive Harbour shell. Resides in [*]: %1$s" ), __hbshell_ConfigDir( hbmk[ _HBMK_lMarkdown ] ) ) } ) AAdd( aLst_File, { _EXT_FILE_, hb_StrFormat( I_( "list of extensions to load in interactive Harbour shell. One extension per line, part of line beyond a '#' character is ignored. Alternate filename on %2$s: %1$s. Resides in [*]: %3$s" ), _EXT_FILE_ALT, _EXT_FILE_ALT_OS, __hbshell_ConfigDir( hbmk[ _HBMK_lMarkdown ] ) ) } ) #endif - + AEval( aHdr_Syntax, {| tmp | OutHdr( hbmk, tmp + _OUT_EOL ) } ) + IF lFull + AEval( aHdr_Desc, {| tmp | OutHdr( hbmk, tmp + _OUT_EOL ) } ) + AEval( aLst_Desc, {| tmp | OutNote( hbmk, tmp, " " ) } ) + ENDIF AEval( aHdr_Opt, {| tmp | OutHdr( hbmk, tmp + _OUT_EOL ) } ) AEval( aLst_Opt_Basic, {| tmp | OutOpt( hbmk, tmp ) } ) IF lFull @@ -15844,16 +15924,22 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong ) AEval( aLst_APIShell, {| tmp | OutOpt( hbmk, tmp, -1 ) } ) #endif /* TODO: Move to separate section from notes: - - description - filter and macro syntax, %{}, subprojects - build plugins: entry function, variables, API calls, callbacks/statuses "init" "pre_all", "pre_prg", "pre_res", "pre_c", "pre_link", "pre_lib", "pre_cleanup" "post_build", "post_all" - shell plugins - - examples (from README.txt) */ ENDIF + AEval( aHdr_ExampleBasic, {| tmp | OutOpt( hbmk, tmp, 0 ) } ) + AEval( aLst_ExampleBasic, {| tmp | OutOpt( hbmk, tmp, -1 ) } ) + AEval( aHdr_ExampleHRB, {| tmp | OutOpt( hbmk, tmp, 0 ) } ) + AEval( aLst_ExampleHRB, {| tmp | OutOpt( hbmk, tmp, -1 ) } ) + AEval( aHdr_ExampleApp, {| tmp | OutOpt( hbmk, tmp, 0 ) } ) + AEval( aLst_ExampleApp, {| tmp | OutOpt( hbmk, tmp, -1 ) } ) + AEval( aHdr_ExampleLib, {| tmp | OutOpt( hbmk, tmp, 0 ) } ) + AEval( aLst_ExampleLib, {| tmp | OutOpt( hbmk, tmp, -1 ) } ) AEval( aHdr_Exit, {| tmp | OutHdr( hbmk, tmp + _OUT_EOL ) } ) AEval( aLst_Exit, {| tmp | OutOpt( hbmk, tmp, 8 ) } ) AEval( aHdr_Notes, {| tmp | OutHdr( hbmk, tmp + _OUT_EOL ) } ) @@ -15932,7 +16018,7 @@ STATIC PROCEDURE OutOpt( hbmk, aOpt, nWidth ) RETURN -STATIC PROCEDURE OutNote( hbmk, cText ) +STATIC PROCEDURE OutNote( hbmk, cText, cPrefix ) LOCAL nLine LOCAL nLines @@ -15944,17 +16030,18 @@ STATIC PROCEDURE OutNote( hbmk, cText ) ENDIF OutStd( _OUT_EOL ) ELSE + hb_default( @cPrefix, " - " ) IF hbmk[ _HBMK_lMarkdown ] - OutStd( " - " + ToMarkdown( cText ) + _OUT_EOL ) + OutStd( cPrefix + ToMarkdown( cText ) + _OUT_EOL ) ELSE cText := StrTran( cText, e"\n", hb_eol() ) - nLines := MLCount( cText, hbmk[ _HBMK_nMaxCol ] - 4 ) + nLines := MLCount( cText, hbmk[ _HBMK_nMaxCol ] - Len( cPrefix ) ) FOR nLine := 1 TO nLines - IF ! Empty( tmp := RTrim( MemoLine( cText, hbmk[ _HBMK_nMaxCol ] - 4, nLine ) ) ) + IF ! Empty( tmp := RTrim( MemoLine( cText, hbmk[ _HBMK_nMaxCol ] - Len( cPrefix ), nLine ) ) ) IF nLine == 1 - OutStd( PadR( " -", 4 ) ) + OutStd( cPrefix ) ELSE - OutStd( Space( 4 ) ) + OutStd( Space( Len( cPrefix ) ) ) ENDIF OutStd( tmp + _OUT_EOL ) ENDIF diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po index ea9b36b673..fd60f42694 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -528,7 +528,7 @@ msgstr "controla a análise de cabeçalhos (no modo de compilação incremental) #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\n-lng=en,hu-HU,de" +msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separated list:\n-lng=en,hu-HU,de" msgstr "lista de idiomas à serem substituidos nas macros %1$s nos arquivos .pot/.po e nos nomes de arquivos de saída .hbl/.po. Lista separada por vírgula:\n-lng=en,hu-HU,de" #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102 @@ -1318,7 +1318,7 @@ msgstr "" #: hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "copy target to . if is a directory, it should end with path separatorm, in this case files specified by -instfile option will also be copied. can be specified multiple times. is an optional copy group, it must be at least two characters long. Build target will be automatically copied to default (empty) copy group." +msgid "copy target to . if is a directory, it should end with path separator, in this case files specified by -instfile option will also be copied. can be specified multiple times. is an optional copy group, it must be at least two characters long. Build target will be automatically copied to default (empty) copy group." msgstr "" #: hbmk2.prg:11633 hbmk2.prg:13102 @@ -1393,7 +1393,7 @@ msgstr "" #: hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_" +msgid " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of environment variable HBMK_WITH_" msgstr "" #: hbmk2.prg:11512 hbmk2.prg:12970 @@ -1408,7 +1408,7 @@ msgstr "" #: hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid " is the name of the dependency. name of the package depedency. Can be specified multiple times." +msgid " is the name of the dependency. name of the package dependency. Can be specified multiple times." msgstr "" #: hbmk2.prg:11633 diff --git a/harbour/website/about.html b/harbour/website/about.html index 57255396ab..2121131771 100644 --- a/harbour/website/about.html +++ b/harbour/website/about.html @@ -52,7 +52,7 @@
  • GNU/Linux,
  • Mac OSX.
    • - Harbour is a free and open-source project. It can be used to make open source applications, free or commercial products. To learn more about Harbour licence click here. + Harbour is a free and open-source project. It can be used to make open source applications, free or commercial products. To learn more about Harbour licence click here.   diff --git a/harbour/website/contact.html b/harbour/website/contact.html index ab45f4f0c1..3f371b1ca3 100644 --- a/harbour/website/contact.html +++ b/harbour/website/contact.html @@ -51,7 +51,7 @@ (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Read more » + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Read more »   diff --git a/harbour/website/download.htm b/harbour/website/download.htm index 128054340b..24f83eefa0 100644 --- a/harbour/website/download.htm +++ b/harbour/website/download.htm @@ -3,8 +3,7 @@ This page has moved! - + diff --git a/harbour/website/index.html b/harbour/website/index.html index 0250652cb9..30ea00d04a 100644 --- a/harbour/website/index.html +++ b/harbour/website/index.html @@ -162,7 +162,7 @@ Harbour is a cross-platform compiler and is known to compile and run on Windows   - Harbour is a free and open-source project. It can be used to make open source applications, free or commercial products. Read more» + Harbour is a free and open-source project. It can be used to make open source applications, free or commercial products. Read more»
    diff --git a/harbour/website/license.html b/harbour/website/license.html deleted file mode 100644 index b7bc7de5b2..0000000000 --- a/harbour/website/license.html +++ /dev/null @@ -1,217 +0,0 @@ - - - - -Harbour Project - License - - - -
    - - - -
    - - - - - - - - - - - - -
    - - - - - - -
    - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - -
     The Harbour Project Compiler License 
     Note: This license applies to most of the files in the source/compiler - directory.
    -
    - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version.
    -
    - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details.
    -
    - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - their web site at http://www.gnu.org/).    		 
     
    - - - - - - - - - - -
     The Harbour Project Library License
    		 
      Note: This license applies to most of the files in the include directory, - source directory, and subdirectories.
    -
    - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version.
    -
    - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details.
    -
    - You should have received a copy of the GNU General Public License - along with this software; see the file COPYING.txt. If not, write to - the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
    -
    - As a special exception, the Harbour Project gives permission for - additional uses of the text contained in its release of Harbour.
    -
    - The exception is that, if you link the Harbour libraries with other - files to produce an executable, this does not by itself cause the - resulting executable to be covered by the GNU General Public License. - Your use of that executable is in no way restricted on account of - linking the Harbour library code into it.
    -
    - This exception does not however invalidate any other reasons why - the executable file might be covered by the GNU General Public License.
    -
    - This exception applies only to the code released by the Harbour - Project under the name Harbour. If you copy code from other - Harbour Project or Free Software Foundation releases into a copy of - Harbour, as the General Public License permits, the exception does - not apply to the code that you add in this way. To avoid isleading
    - anyone as to the status of such modified files, you must delete - this exception notice from them.
    -
    - If you write modifications of your own for Harbour, it is your choice - whether to permit this exception to apply to your modifications. - If you do not wish that, delete this exception notice.    		 
     
    - - - - - - - - - - -
     The Old Harbour Project Library License
    		 
     Note: This license only applies to the following files:
    -
    -    source\rtl\philes.c
    -    source\rtl\binnum.c
    -    source\lang\msgeu.c
    -    source\lang\msgsl437.c
    -    source\lang\msgsl852.c
    -    source\lang\msgsliso.c
    -    source\lang\msgslwin.c
    -    source\lang\msgsr852.c
    -    source\lang\msgsriso.c
    -
    - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version, with one exception:
    -
    - The exception is that if you link the Harbour Runtime Library (HRL) - and/or the Harbour Virtual Machine (HVM) with other files to produce - an executable, this does not by itself cause the resulting executable - to be covered by the GNU General Public License. Your use of that - executable is in no way restricted on account of linking the HRL - and/or HVM code into it.
    -
    - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details.
    -
    - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - their web site at http://www.gnu.org/).    		 
     
    - - - - - - - - - - -
     The Harbour Project Contrib License
    		 
     There is no one single license that applies to the Harbour Project - contrib files. Some files use the Harbour Project Compiler license. - Some files use the Harbour Project Library license. Some files use - the old Harbour Project Library license. Some files may even use other - types of free software or open source software licenses. Some files - have been donated to the public domain. If you use any of the contrib - files, you need to investigate the license that applies to each file. 
     
    - - - - - -
    Copyright © 1999- The Harbour Project.
    Design - by Vailton Renato
    -
    - - diff --git a/harbour/website/mailing.html b/harbour/website/mailing.html index 38234c558a..45e1fdc17e 100644 --- a/harbour/website/mailing.html +++ b/harbour/website/mailing.html @@ -181,7 +181,7 @@ This mailing list is a place for users of the Harbour Project to discuss and h (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY or SUPPORT; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Read more » + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Read more »   @@ -199,9 +199,6 @@ This mailing list is a place for users of the Harbour Project to discuss and h - - -