fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2013-02-25 12:51 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* 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
This commit is contained in:
Viktor Szakats
2013-02-25 11:53:39 +00:00
parent a02c34a62a
commit 19c32d7afe
47 changed files with 910 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
harbour/ChangeLog.txt
View File

@@ -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

69
harbour/README.txt
View File

@@ -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 [<parameters>]'
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 [<parameters>]'
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<path_to_mylib>'
- 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

2
harbour/config/aix/libs.mk
View File

@@ -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)

10
harbour/contrib/hbsqlit3/hbsqlit3.ch
View File

@@ -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 */

2
harbour/contrib/hbsqlit3/hdbc.prg
View File

@@ -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"

45
harbour/contrib/xhb/cgi.ch
View File

@@ -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 <culik@sl.conex.net>
* 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 "&nbsp;"
#define CLR_LIGHT_YELLOW "#fffffc0"
#define CLR_DARK_YELLOW "#fffffcc"

43
harbour/contrib/xhb/hjwindow.prg
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

43
harbour/contrib/xhb/hterrsys.prg
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

69
harbour/contrib/xhb/htjlist.prg
View File

@@ -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 <maspr@otenet.gr>
* 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 <culik@sl.conex.net>
* 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("<font face='] + FONT + "' size=" + hb_ntos( fntSize ) + "' color='" + fntColor + ['>","</font>");] + CRLF()
cStr += name + '.SetFont("<font face=' + "'" + FONT + "' size=" + hb_ntos( fntSize ) + "' color='" + fntColor + "'" + '>","</font>");' + 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("<font ] + ;
cStr := name + '.SetFont("<font ' + ;
" face= '" + font + "' " + ;
" size= " + hb_ntos( fntSize ) + "'" + ;
" color= '" + fntColor + "' " + ;
[ > ","</font>");] + CRLF()
' > ","</font>");' + 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 := [<a href='] + url + "'>" + htmlSpace( 2 ) + name + htmlSpace( 2 )
cStr += ::cCurrentNode + '.addItem( "' + cUrl + '"' + iif( bgColor != NIL, ',"' + bgColor + '"', "" ) + ');' + CRLF()
cUrl := "<a href='" + url + "'>" + 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 := "<a href='" + url + "'><img src='" + img + "' border=0 align=absmiddle>" + 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 + ", '<b>" + caption + "</b>' );" + CRLF()
cStr := ::cMainNode + ".addList( " + name + ", '<b>" + caption + "</b>' );" + CRLF()
::nItems++
AAdd( ::aScript, cStr )
@@ -286,7 +303,7 @@ METHOD Build( xPos, yPos ) CLASS TJSList
#endif
FOR i := 0 TO ::nItems
cStr += '<div id="' + ::cMainNode + 'Item' + hb_ntos( i ) + '" name="' + ::cMainNode + 'Item' + hb_ntos( i ) + '"></div>' + CRLF()
cStr += '<div id="' + ::cMainNode + "Item" + hb_ntos( i ) + '" name="' + ::cMainNode + "Item" + hb_ntos( i ) + '"></div>' + CRLF()
NEXT
cStr += "</body></html>" + CRLF()

43
harbour/contrib/xhb/html.ch
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

43
harbour/contrib/xhb/htmlclrs.ch
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

43
harbour/contrib/xhb/htmlform.ch
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

43
harbour/contrib/xhb/htmutil.prg
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

43
harbour/contrib/xhb/tcgi.prg
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

43
harbour/contrib/xhb/tedit.prg
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

43
harbour/contrib/xhb/tfile.prg
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

43
harbour/contrib/xhb/tframe.prg
View File

@@ -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 <culik@sl.conex.net>
* Porting this library to Harbour
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
*/

423
harbour/contrib/xhb/thtm.prg
View File

@@ -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 <culik@sl.conex.net>
* 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, '<body bgcolor="' + cColor + '">', ' bgcolor="' + cColor + '" ' )
METHOD SetPageColor( cColor, lBody ) INLINE hb_default( @lBody, .T. ), ::cStr += iif( lBody, '<body bgcolor="' + cColor + '">', ' bgcolor="' + cColor + '" ' )
METHOD SetTextColor( cColor, lBody ) INLINE Default( lBody, .T. ), ::cStr += iif( lBody, '<body text="' + cColor + '">', ' text="' + cColor + '" ' )
METHOD SetTextColor( cColor, lBody ) INLINE hb_default( @lBody, .T. ), ::cStr += iif( lBody, '<body text="' + cColor + '">', ' text="' + cColor + '" ' )
METHOD SetBgImage( cImage, lBody ) INLINE Default( lBody, .T. ), ::cStr += iif( lBody, '<body background="' + cImage + '">', ' background="' + cImage + '" ' )
METHOD SetBgImage( cImage, lBody ) INLINE hb_default( @lBody, .T. ), ::cStr += iif( lBody, '<body background="' + cImage + '">', ' background="' + cImage + '" ' )
METHOD Close()
METHOD SetCenter( lOn ) INLINE ::cStr += iif( lOn, "<center>", "</center>" )
METHOD SetCenter( lOn ) INLINE ::cStr += iif( lOn, "<center>", "</center>" )
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 + '<br />' + CRLF()
METHOD QOut( c ) INLINE hb_default( @c, "" ), ::cStr += CRLF() + c + "<br />" + 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 + '<br />' + CRLF()
METHOD WriteLN( c ) INLINE hb_default( @c, "" ), ::cStr += CRLF() + c + "<br />" + CRLF()
METHOD SayColor( t, c ) INLINE Default( t, "" ), Default( c, "black" ), ;
::cStr += '<font color="' + c + '">' + t + '</font>'
METHOD SayColor( t, c ) INLINE hb_default( @t, "" ), hb_default( @c, "black" ), ;
::cStr += '<font color="' + c + '">' + t + "</font>"
METHOD Space( n ) INLINE Default( n, 1 ), ::cStr += Replicate( "&nbsp;", n )
METHOD Space( n ) INLINE hb_default( @n, 1 ), ::cStr += Replicate( "&nbsp;", 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 += "<pre" + iif( nCols != NIL, ' cols="' + hb_ntos( nCols ) + "'", "" ) + iif( lWrap, " WRAP>", ">" ) + CRLF() + cText + CRLF() + "</pre>" + CRLF()
METHOD Text( cText, nCols, lWrap ) INLINE hb_default( @lWrap, .T. ), hb_default( @nCols, 80 ), ;
::cStr += "<pre" + iif( nCols != NIL, ' cols="' + hb_ntos( nCols ) + "'", "" ) + iif( lWrap, " WRAP>", ">" ) + CRLF() + cText + CRLF() + "</pre>" + CRLF()
METHOD MultiCol( txt, cols, gutter, width ) INLINE Default( txt, "" ), ;
Default( cols, 2 ), ;
Default( gutter, 5 ), ;
Default( width, 100 ), ;
::cStr += '<multicol cols="' + hb_ntos( cols ) + '" gutter="' + hb_ntos( gutter ) + '" width="' + hb_ntos( width ) + '">', ;
::cStr += txt, ;
::cStr += "</multicol>"
METHOD MultiCol( txt, cols, gutter, width ) INLINE hb_default( @txt, "" ), ;
hb_default( @cols, 2 ), ;
hb_default( @gutter, 5 ), ;
hb_default( @width, 100 ), ;
::cStr += '<multicol cols="' + hb_ntos( cols ) + '" gutter="' + hb_ntos( gutter ) + '" width="' + hb_ntos( width ) + '">', ;
::cStr += txt, ;
::cStr += "</multicol>"
METHOD PutHeading( cText, nWeight, lCentered )
METHOD HLine( nSize, nWidth, lShade, cColor )
METHOD PutParagraph() INLINE ::cStr += "<p> </p>" + CRLF()
METHOD PutParagraph() INLINE ::cStr += "<p> </p>" + CRLF()
METHOD Paragraph( lStart, cAlign, cStyle )
METHOD PutBreak() INLINE ::cStr += "<br />" + CRLF()
METHOD PutBreak() INLINE ::cStr += "<br />" + 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 += "<ul>" + CRLF()
METHOD NewList() INLINE ::cStr += "<ul>" + CRLF()
METHOD ListItem() INLINE ::cStr += "<li> "
METHOD ListItem() INLINE ::cStr += "<li> "
METHOD EndList() INLINE ::cStr += "</ul> "
METHOD EndList() INLINE ::cStr += "</ul> "
METHOD NewForm( cMethod, cAction, cName )
@@ -213,11 +230,11 @@ CREATE CLASS THtml
METHOD FormSubmit( cText )
METHOD FormQOut( c ) INLINE ::cStr += c + '<br />' + CRLF()
METHOD FormQOut( c ) INLINE ::cStr += c + "<br />" + CRLF()
METHOD FormQQOut( c ) INLINE ::cStr += c + CRLF()
METHOD FormQQOut( c ) INLINE ::cStr += c + CRLF()
METHOD EndForm() INLINE ::cStr += CRLF() + "</form>" + CRLF()
METHOD EndForm() INLINE ::cStr += CRLF() + "</form>" + 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 += '<script language="JavaScript">' + CRLF() + "<!--" + CRLF()
METHOD StartJava() INLINE ::cStr += '<script language="JavaScript">' + CRLF() + "<!--" + CRLF()
METHOD PutJavaSource( c ) INLINE ::cStr += Space( 5 ) + 'src="' + c + '"' + CRLF()
METHOD PutJavaSource( c ) INLINE ::cStr += Space( 5 ) + 'src="' + c + '"' + CRLF()
METHOD PutJava( c ) INLINE ::cStr += Space( 5 ) + c + CRLF()
METHOD PutJava( c ) INLINE ::cStr += Space( 5 ) + c + CRLF()
METHOD EndJava() INLINE ::cStr += " //-->" + CRLF() + "</script>" + CRLF()
METHOD EndJava() INLINE ::cStr += " //-->" + CRLF() + "</script>" + CRLF()
METHOD serverCode( c ) INLINE ::cStr += "<server>" + Space( 9 ) + c + CRLF() + "</server>" + CRLF()
METHOD serverCode( c ) INLINE ::cStr += "<server>" + Space( 9 ) + c + CRLF() + "</server>" + CRLF()
METHOD FWrite( c ) INLINE FWrite( ::nH, c )
@@ -257,13 +274,13 @@ CREATE CLASS THtml
METHOD PutLinkName( cName )
METHOD NewMap( cName ) INLINE ::cStr += "<map name=" + cName + ">"
METHOD NewMap( cName ) INLINE ::cStr += "<map name=" + cName + ">"
METHOD MapArea( Shape, Alt, Coord, Url ) INLINE ;
::cStr += "<area shape=" + Shape + " alt=" + alt + " coords=" + Coord + " href=" + Url + ">" + CRLF()
METHOD EndMap() INLINE ::cStr += "</map>"
METHOD EndMap() INLINE ::cStr += "</map>"
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 += '<html>' + CRLF() + ;
'<head>' + CRLF() + ;
' <title>' + cTitle + ' </title>' + CRLF()
::cStr += '<html>' + CRLF() + ;
"<head>" + CRLF() + ;
" <title>" + cTitle + "</title>" + CRLF()
IF cBaseURL != NIL
::cStr += "<base href='" + cBaseURL + "'"
::cStr += "<base href='" + cBaseURL + "'"
IF cBaseTarget != NIL
::cStr += " target='" + cBaseTarget + "'"
::cStr += " target='" + cBaseTarget + "'"
ENDIF
::cStr += ">" + CRLF()
::cStr += ">" + CRLF()
ENDIF
#if 0
/* TOFIX: Luiz please review it */
::cStr += ;
' <link title="' + cLinkTitle + '"' + CRLF() + ;
' href="mailto:culik@sl.conex.net" >' + CRLF() + ;
' <meta http-equiv="Content-Type" content="text/html; charset=' + cCharset + '">' + CRLF() )
' <meta http-equiv="Content-Type" content="text/html; charset=' + cCharset + '" />' + CRLF() )
#endif
IF cStyleScr != NIL
::cStr += ' <link href="' + cStyleScr + '"' + " rel='STYLESHEET' type='text/css'>" + CRLF()
::cStr += ' <link href="' + cStyleScr + '"' + " rel='STYLESHEET' type='text/css' />" + CRLF()
ENDIF
IF nRefresh != NIL
::cStr += [ <meta http-equiv="Refresh" content="] + hb_ntos( nRefresh ) + [; url=] + cRefreshURL + [">]
::cStr += ' <meta http-equiv="Refresh" content="' + hb_ntos( nRefresh ) + "; url=" + cRefreshURL + '" />'
ENDIF
IF lnocache
::cStr += [ <meta http-equiv="pragma" content="no-cache"> ]
::cStr += ' <meta http-equiv="pragma" content="no-cache" />'
ENDIF
IF aJsCode != NIL
@@ -378,8 +395,8 @@ METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
IF aScriptSrc != NIL
FOR i := 1 TO Len( aScriptSrc )
::cStr += ;
'<script language=JavaScript src="' + aScriptSrc[ i ] + '"></script>' + CRLF()
::cStr += ;
'<script language=JavaScript src="' + aScriptSrc[ i ] + '" />' + CRLF()
NEXT
ENDIF
@@ -387,8 +404,8 @@ METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
IF aServerSrc != NIL
FOR i := 1 TO Len( aServerSrc )
::cStr += ;
'<script language=JavaScript src="' + aServerSrc[ i ] + '" runat=SERVER></script>' + CRLF()
::cStr += ;
'<script language=JavaScript src="' + aServerSrc[ i ] + '" runat=SERVER />' + CRLF()
NEXT
ENDIF
@@ -396,77 +413,77 @@ METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
// preload images...
IF aImages != NIL
::aImages := aImages
::cStr += ;
::cStr += ;
'<script language="JavaScript">' + CRLF()
::cStr += '<!--' + CRLF()
::cStr += "if(document.images)" + CRLF()
::cStr += "{" + CRLF()
::cStr += "<!--" + CRLF()
::cStr += "if(document.images)" + CRLF()
::cStr += "{" + CRLF()
FOR i := 1 TO Len( aImages )
::cStr += Space( 5 ) + aImages[ i, 1 ] + "=new Image(100,50);" + CRLF()
::cStr += Space( 5 ) + aImages[ i, 1 ] + '.src="' + aImages[ i, 2 ] + '";' + CRLF()
::cStr += Space( 5 ) + aImages[ i, 1 ] + "=new Image(100,50);" + CRLF()
::cStr += Space( 5 ) + aImages[ i, 1 ] + '.src="' + aImages[ i, 2 ] + '";' + CRLF()
NEXT
::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 += '</script>' + 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 += '</script>' + CRLF()
ENDIF
IF cStyle != NIL
::cStr += "<style> " + cStyle + " </style>" + CRLF()
::cStr += "<style> " + cStyle + " </style>" + CRLF()
ENDIF
::cStr += ;
::cStr += ;
'</head>' + CRLF() + ;
'<body'
IF onLoad != NIL
::cStr += ' onLoad="' + onLoad + '"'
::cStr += ' onLoad="' + onLoad + '"'
ENDIF
IF NOF != NIL
::cStr += ' nof="' + nof + '"'
::cStr += ' nof="' + nof + '"'
ENDIF
IF onUnLoad != NIL
::cStr += ' onUnload="' + onUnLoad + '"'
::cStr += ' onUnload="' + onUnLoad + '"'
ENDIF
IF cLinkClr != NIL
::cStr += ' link="' + cLinkClr + '"'
::cStr += ' link="' + cLinkClr + '"'
ENDIF
IF cVLinkClr != NIL
::cStr += ' vlnk="' + cVLinkClr + '"'
::cStr += ' vlnk="' + cVLinkClr + '"'
ENDIF
IF cALinkClr != NIL
::cStr += ' alink="' + cALinkClr + '"'
::cStr += ' alink="' + cALinkClr + '"'
ENDIF
IF BGIMAGE != NIL
@@ -482,24 +499,24 @@ METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
ENDIF
IF nMarginTop != NIL
::cStr += ' topMargin=' + hb_ntos( nMarginTop )
::cStr += ' topMargin=' + hb_ntos( nMarginTop )
ENDIF
IF nMarginLeft != NIL
::cStr += ' LeftMargin=' + hb_ntos( nMarginLeft )
::cStr += ' LeftMargin=' + hb_ntos( nMarginLeft )
ENDIF
IF nMarginHeight != NIL
::cStr += ' marginheight=' + hb_ntos( nMarginHeight )
::cStr += ' marginheight=' + hb_ntos( nMarginHeight )
ENDIF
IF nMarginWidth != NIL
::cStr += ' marginwidth=' + hb_ntos( nMarginWidth )
::cStr += ' marginwidth=' + hb_ntos( nMarginWidth )
ENDIF
::cStr += '>'
::cStr += ">"
::cStr += CRLF()
::cStr += CRLF()
t_nHtm := ::nH
@@ -510,7 +527,7 @@ METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
METHOD NewAlt( cType ) CLASS THtml
::nH := STD_OUT
::cStr += 'Content-Type: ' + cType + CRLF() + CRLF()
::cStr += 'Content-Type: ' + cType + CRLF() + CRLF()
t_nHtm := ::nH
@@ -577,7 +594,7 @@ METHOD SetFont( cFont, lBold, lItalic, lULine, nSize, cColor, lSet ) CLASS THtml
ENDIF
cStr += '</font>'
::cStr += cStr + CRLF()
::cStr += cStr + CRLF()
RETURN Self
@@ -646,7 +663,7 @@ METHOD StartFont( cFont, lBold, lItalic, lULine, nSize, cColor, lSet, lPut ) CLA
iif( lULine, cStr += '<u>', cStr += '</u>' )
ENDIF
::cStr += cStr + CRLF()
::cStr += cStr + CRLF()
RETURN Self
@@ -700,7 +717,7 @@ METHOD DefineFont( cFont, cType, nSize, cColor, lSet ) CLASS THtml
cStr += cType
ENDIF
::cStr += cStr + CRLF()
::cStr += cStr + CRLF()
RETURN Self
@@ -713,7 +730,7 @@ METHOD DefineFont( cFont, cType, nSize, cColor, lSet ) CLASS THtml
METHOD EndFont() CLASS THtml
::cStr += '</font>' + CRLF()
::cStr += '</font>' + CRLF()
RETURN Self
@@ -746,7 +763,7 @@ METHOD Say( str, font, size, type, color, style ) CLASS THtml
IF Style != NIL
cOut += '" Style="' + style + '">'
ELSE
cOut += '>'
cOut += ">"
ENDIF
ENDIF
@@ -810,7 +827,7 @@ METHOD Say( str, font, size, type, color, style ) CLASS THtml
cOut += "</font>"
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() + ;
"<hr size = " + hb_ntos( nSize ) + iif( cColor != NIL, " COLOR " + cColor, "" ) + " width= " + hb_ntos( nWidth ) + '%>' + ;
CRLF()
ELSE
::cStr += CRLF() + ;
::cStr += CRLF() + ;
"<hr noshade size = " + hb_ntos( nSize ) + iif( cColor != NIL, " COLOR " + cColor, "" ) + " width= " + hb_ntos( nWidth ) + '%>' + ;
CRLF()
ENDIF
@@ -884,13 +901,13 @@ METHOD PutHeading( cText, nWeight, lCentered ) CLASS THtml
__defaultNIL( @lCentered, .F. )
IF lCentered
::cStr += "<center>"
::cStr += "<center>"
ENDIF
::cStr += "<h" + hb_ntos( nWeight ) + ">" + cText + "</h" + hb_ntos( nWeight ) + ">" + CRLF()
::cStr += "<h" + hb_ntos( nWeight ) + ">" + cText + "</h" + hb_ntos( nWeight ) + ">" + CRLF()
IF lCentered
::cStr += "</center>"
::cStr += "</center>"
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 += ;
'<a href="' + cUrl + '"' + CRLF()
IF cOnClick != NIL
::cStr += ;
::cStr += ;
Space( 5 ) + 'onClick="' + cOnClick + '"' + CRLF()
ENDIF
IF cOnMsOver != NIL
::cStr += ;
::cStr += ;
Space( 5 ) + 'onMouseOver="' + cOnMsOver + '"' + CRLF()
ENDIF
IF cOnMsOut != NIL
::cStr += ;
::cStr += ;
Space( 5 ) + 'onMouseOut="' + cOnMsOut + '"' + CRLF()
ENDIF
IF cTarget != NIL
::cStr += ;
::cStr += ;
Space( 5 ) + 'target=' + cTarget + CRLF()
ENDIF
IF cClass != NIL
::cStr += ;
::cStr += ;
Space( 5 ) + 'class=' + cClass + CRLF()
ENDIF
@@ -963,25 +980,25 @@ METHOD PutTextUrl( cText, cUrl, cOnClick, cOnMsOver, cOnMsout, cTarget, font, cl
ENDIF
IF FONT != NIL .OR. clr != NIL .OR. size != NIL .OR. style != NIL
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 += ;
'</font>'
ENDIF
IF bld
::cStr += ;
::cStr += ;
'</b>'
ENDIF
::cStr += ;
'</a>' + iif( lBreak, '<br />' + CRLF(), CRLF() )
::cStr += ;
'</a>' + iif( lBreak, "<br />" + CRLF(), CRLF() )
RETURN Self
@@ -1052,9 +1069,9 @@ METHOD PutImageUrl( cImage, nBorder, nHeight, cUrl, ;
cStr += " hSpace= " + hb_ntos( hSpace ) + " "
ENDIF
::cStr += ;
::cStr += ;
'<a href=' + cUrl + iif( cClass != NIL, ' class="' + cClass + '"', "" ) + '><img src="' + cImage + '"' + ;
cStr + '></a>' + iif( lBreak, '<br />' + CRLF(), "" )
cStr + '></a>' + iif( lBreak, "<br />" + CRLF(), "" )
RETURN Self
@@ -1104,9 +1121,9 @@ METHOD PutTextImageUrl( cImage, nBorder, nHeight, cUrl, ;
cStr += ' target=' + cTarget
ENDIF
::cStr += ;
'<a href=' + cUrl + iif( cClass != NIL, ' class="' + cClass + '"', "" ) + '>' + cText + '<img src="' + cImage + '"' + ;
cStr + '></a>' + iif( lBreak, '<br />' + CRLF(), "" )
::cStr += ;
'<a href=' + cUrl + iif( cClass != NIL, ' class="' + cClass + '"', "" ) + ">" + cText + '<img src="' + cImage + '"' + ;
cStr + '></a>' + iif( lBreak, "<br />" + CRLF(), "" )
RETURN Self
@@ -1183,9 +1200,9 @@ METHOD PutImage( cImage, nBorder, nHeight, ;
cStr += " hSpace= " + hb_ntos( hSpace ) + " "
ENDIF
::cStr += ;
::cStr += ;
'<img src="' + cImage + '"' + ;
cStr + '>' + iif( lBreak, "<br />" + CRLF(), "" )
cStr + ">" + iif( lBreak, "<br />" + 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, '</font>', "" ) + "</th>" + 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 ) + "</tr>" + CRLF()
::cStr += Space( 5 ) + "</tr>" + 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 += "</font></td>" + CRLF()
::cStr += "</font></td>" + CRLF()
ELSE
::cStr += "</td>" + CRLF()
::cStr += "</td>" + CRLF()
ENDIF
::lFont := .F.
@@ -1570,8 +1587,8 @@ METHOD EndTableCell() CLASS THtml
METHOD EndTable() CLASS THtml
::cStr += "</table>" + CRLF()
::cStr += CRLF() + CRLF() + CRLF()
::cStr += "</table>" + 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() + "<form"
::cStr += CRLF() + "<form"
IF cMethod != NIL
::cStr += ' method="' + cMethod + '"'
::cStr += ' method="' + cMethod + '"'
ENDIF
IF cName != NIL
::cStr += ' name="' + cName + '"'
::cStr += ' name="' + cName + '"'
ENDIF
IF cAction != NIL
::cStr += ' action="' + cAction + '"'
::cStr += ' action="' + cAction + '"'
ENDIF
::cStr += '>' + CRLF()
::cStr += ">" + CRLF()
t_cForm := cName
@@ -1621,21 +1638,21 @@ METHOD FormEdit( cType, cName, xValue, nSize ) CLASS THtml
__defaultNIL( @cType, "edit" )
::cStr += '<input type="' + cType + '"'
::cStr += '<input type="' + cType + '"'
IF cName != NIL
::cStr += ' Name="' + cName + '"'
::cStr += ' Name="' + cName + '"'
ENDIF
IF xValue != NIL
::cStr += ' Value="' + HtmlAny2Str( xValue ) + '"'
::cStr += ' Value="' + HtmlAny2Str( xValue ) + '"'
ENDIF
IF nSize != NIL
::cStr += ' Size="' + HtmlAny2Str( nSize ) + '"'
::cStr += ' Size="' + HtmlAny2Str( nSize ) + '"'
ENDIF
::cStr += ">"
::cStr += ">"
RETURN Self
@@ -1649,7 +1666,7 @@ METHOD FormEdit( cType, cName, xValue, nSize ) CLASS THtml
METHOD FormSubmit( cText ) CLASS THtml
::cStr += '<input type="submit" Value="' + cText + '">' + CRLF()
::cStr += '<input type="submit" Value="' + cText + '">' + CRLF()
RETURN Self
@@ -1665,7 +1682,7 @@ METHOD FormImage( cText, name, file ) CLASS THtml
HB_SYMBOL_UNUSED( cText )
::cStr += '<input type="IMAGE" name="' + name + '" src="' + file + '">' + CRLF()
::cStr += '<input type="IMAGE" name="' + name + '" src="' + file + '">' + CRLF()
RETURN Self
@@ -1679,7 +1696,7 @@ METHOD FormImage( cText, name, file ) CLASS THtml
METHOD FormReset( cText ) CLASS THtml
::cStr += '<input type="Reset" Value="' + cText + '">' + CRLF()
::cStr += '<input type="Reset" Value="' + cText + '">' + 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() + "</button>" + CRLF()
::cStr += CRLF() + CRLF() + "</button>" + CRLF()
RETURN Self
@@ -1845,24 +1862,24 @@ METHOD Marquee( cText, cFont, cFntColor, nFntSize, ;
::StartFont( cFont, , , , nFntSize, cFntColor )
::cStr += '<marquee align="' + cAlign + '" '
::cStr += 'behavior="' + cBehavior + '" '
::cStr += 'width="' + hb_ntos( nWidth ) + '%" '
::cStr += iif( nHeight != NIL, 'height=' + hb_ntos( nHeight ) + " ", "" )
::cStr += 'bgColor="' + cBgColor + '" '
::cStr += 'scrollamount="' + hb_ntos( nScrollAmt ) + '" '
::cStr += 'scrolldelay="' + hb_ntos( nScrollDelay ) + '" '
::cStr += 'loop=' + iif( HB_ISNUMERIC( loop ), hb_ntos( loop ), loop ) + ' '
::cStr += 'direction="' + cDirection + '" '
::cStr += iif( onMsOver != NIL, 'onMouseOver="' + onMsOver + '" ', "" )
::cStr += iif( onMsOut != NIL, 'onMouseOut="' + onMsOut + '" ', "" )
::cStr += iif( onClick != NIL, 'onClick="' + onClick + '" ', "" )
::cStr += iif( onStart != NIL, 'onStart="' + onStart + '" ', "" )
::cStr += iif( onFinish != NIL, 'onFinish="' + onFinish + '" ', "" )
::cStr += '>'
::cStr += cText
::cStr += '<marquee align="' + cAlign + '" '
::cStr += 'behavior="' + cBehavior + '" '
::cStr += 'width="' + hb_ntos( nWidth ) + '%" '
::cStr += iif( nHeight != NIL, 'height=' + hb_ntos( nHeight ) + " ", "" )
::cStr += 'bgColor="' + cBgColor + '" '
::cStr += 'scrollamount="' + hb_ntos( nScrollAmt ) + '" '
::cStr += 'scrolldelay="' + hb_ntos( nScrollDelay ) + '" '
::cStr += 'loop=' + iif( HB_ISNUMERIC( loop ), hb_ntos( loop ), loop ) + " "
::cStr += 'direction="' + cDirection + '" '
::cStr += iif( onMsOver != NIL, 'onMouseOver="' + onMsOver + '" ', "" )
::cStr += iif( onMsOut != NIL, 'onMouseOut="' + onMsOut + '" ', "" )
::cStr += iif( onClick != NIL, 'onClick="' + onClick + '" ', "" )
::cStr += iif( onStart != NIL, 'onStart="' + onStart + '" ', "" )
::cStr += iif( onFinish != NIL, 'onFinish="' + onFinish + '" ', "" )
::cStr += ">"
::cStr += cText
::cStr += "</marquee>" + CRLF()
::cStr += "</marquee>" + CRLF()
::EndFont()
RETURN Self
@@ -1903,14 +1920,14 @@ METHOD StartMarquee( cFont, cFntColor, nFntSize, ;
'bgColor="' + cBgColor + '" ' + ;
'scrollamount="' + hb_ntos( nScrollAmt ) + '" ' + ;
'scrolldelay="' + hb_ntos( nScrollDelay ) + '" ' + ;
'loop=' + iif( HB_ISNUMERIC( loop ), hb_ntos( loop ), loop ) + ' ' + ;
'loop=' + iif( HB_ISNUMERIC( loop ), hb_ntos( loop ), loop ) + " " + ;
'direction="' + cDirection + '" ' + ;
iif( onMsOver != NIL, 'onMouseOver="' + onMsOver + '" ', "" ) + ;
iif( onMsOut != NIL, 'onMouseOut="' + onMsOut + '" ', "" ) + ;
iif( onClick != NIL, 'onClick="' + onClick + '" ', "" ) + ;
iif( onStart != NIL, 'onStart="' + onStart + '" ', "" ) + ;
iif( onFinish != NIL, 'onFinish="' + onFinish + '" ', "" ) + ;
'>' + ;
">" + ;
CRLF()
::cStr += cStr
@@ -1926,7 +1943,7 @@ METHOD StartMarquee( cFont, cFntColor, nFntSize, ;
METHOD EndMarquee() CLASS THtml
::cStr += "</marquee>" + CRLF()
::cStr += "</marquee>" + CRLF()
RETURN Self
@@ -1989,7 +2006,7 @@ METHOD iFrame( name, src, border, marginwidth, marginheight, ;
cStr += ">" + CRLF()
cStr += "</iframe>" + CRLF()
::cStr += cStr
::cStr += cStr
RETURN Self
@@ -2003,7 +2020,7 @@ METHOD Span( c, Style ) CLASS THtml
cStr += ' style ="' + Style + '"'
ENDIF
cStr += ">" + c + '</span>'
::cStr += cStr
::cStr += cStr
RETURN Self
@@ -2012,7 +2029,7 @@ METHOD Comment( cText ) CLASS THtml
LOCAL cStr := CRLF() + "<!-- "
cStr += cText + " -->"
::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 += "</object>" + CRLF()
::cStr += "</object>" + CRLF()
RETURN Self
METHOD ADDPARAM( cType, cValue ) CLASS THtml
::cStr += '<param name="' + cType + '" value="' + cValue + '">' + CRLF()
::cStr += '<param name="' + cType + '" value="' + cValue + '">' + CRLF()
RETURN Self
METHOD PutLinkName( cName ) CLASS THtml
LOCAL cStr := '<a name="' + cName + '"></a>'
::cStr += cStr
::cStr += '<a name="' + cName + '"></a>'
RETURN Self

6
harbour/doc/gmake.txt
View File

@@ -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.

10
harbour/doc/tracing.txt
View File

@@ -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( [<new_state>] )
current_level := hb_traceLevel( [<new_level>] )

4
harbour/doc/xhb-diff.txt
View File

@@ -2060,8 +2060,8 @@ using known from xBase++ zero space. In xBase++ each thread can
move his work area to zero space using:
DbRelease( [<nWorkArea>|<cAlias>], [<bAreaBlock>] ) --> lSuccess
Then this work area can be attached by other thread using:
DbRequest( [<cAlias>], [<lFreeArea>], ;
[<@bAreaBlock>], [<lWait>] ) --> lSuccess
DbRequest( [<cAlias>], [<lFreeArea>], ;
[<@bAreaBlock>], [<lWait>] ) --> lSuccess
In Harbour above functions are available in XPP emulation library.
There are also core Harbour functions giving this functionality:
hb_dbDetach( [<nWorkArea>|<cAlias>], [<xCargo>] ) -> <lSuccess>

2
harbour/extras/gtwvw/docs/gtwvw.txt
View File

@@ -77,7 +77,7 @@ www - http://www.harbour-project.org
Copyright 1999 David G. Holm <dholm@jsd-llc.com>
hb_gt_Tone()
See doc/license.txt for licensing terms.
See COPYING.txt for licensing terms.
www - http://www.harbour-project.org

2
harbour/extras/gtwvw/gtwvwd.c
View File

@@ -30,7 +30,7 @@
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
* hb_gt_wvw_Tone()
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
* www - http://harbour-project.org
*

2
harbour/extras/gtwvw/wvwcheck.c
View File

@@ -30,7 +30,7 @@
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
* hb_gt_wvw_Tone()
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
* www - http://harbour-project.org
*

2
harbour/extras/gtwvw/wvwdraw.c
View File

@@ -30,7 +30,7 @@
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
* hb_gt_wvw_Tone()
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
* www - http://harbour-project.org
*

2
harbour/extras/gtwvw/wvwedit.c
View File

@@ -30,7 +30,7 @@
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
* hb_gt_wvw_Tone()
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
* www - http://harbour-project.org
*

2
harbour/extras/gtwvw/wvwfuncs.c
View File

@@ -30,7 +30,7 @@
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
* hb_gt_wvw_Tone()
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
* www - http://harbour-project.org
*

2
harbour/extras/gtwvw/wvwmenu.c
View File

@@ -30,7 +30,7 @@
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
* hb_gt_wvw_Tone()
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
* www - http://harbour-project.org
*

2
harbour/extras/gtwvw/wvwpush.c
View File

@@ -30,7 +30,7 @@
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
* hb_gt_wvw_Tone()
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
* www - http://harbour-project.org
*

2
harbour/extras/gtwvw/wvwstbar.c
View File

@@ -30,7 +30,7 @@
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
* hb_gt_wvw_Tone()
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
* www - http://harbour-project.org
*

2
harbour/extras/gtwvw/wvwtbar.c
View File

@@ -30,7 +30,7 @@
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
* hb_gt_wvw_Tone()
*
* See doc/license.txt for licensing terms.
* See COPYING.txt for licensing terms.
*
* www - http://harbour-project.org
*

4
harbour/src/common/hbfsapi.c
View File

@@ -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;

2
harbour/src/rtl/gtcrs/hb-charmap.def
View File

@@ -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

4
harbour/src/rtl/strcase.c
View File

@@ -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 );
}

12
harbour/tests/inherit.prg
View File

@@ -15,8 +15,6 @@
* Placed in the public domain
*/
#xtranslate Default( <Var>, <xVal> ) => iif( <Var> == NIL, <xVal>, <Var> )
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 ) )

16
harbour/tests/stripem.prg
View File

@@ -5,8 +5,6 @@
#include "fileio.ch"
#include "hbclass.ch"
#xtranslate Default( <Var>, <xVal> ) => iif( <Var> == NIL, <xVal>, <Var> )
//
// 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 ) )

2
harbour/utils/hbmk2/Makefile
View File

@@ -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

4
harbour/utils/hbmk2/hbmk2.es_PE.po
View File

@@ -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 "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_<d>"
msgid "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of environment variable HBMK_WITH_<d>"
msgstr "<d> es el nombre de la dependencia. <v> 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_<d>"
#: hbmk2.prg:11512 hbmk2.prg:12970

8
harbour/utils/hbmk2/hbmk2.hu_HU.po
View File

@@ -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 <path>. if <path> 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. <g> 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 <path>. if <path> 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. <g> 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 "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_<d>"
msgid "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of environment variable HBMK_WITH_<d>"
msgstr ""
#: hbmk2.prg:11512 hbmk2.prg:12970
@@ -1404,7 +1404,7 @@ msgstr ""
#: hbmk2.prg:11633 hbmk2.prg:13102
#, c-format
msgid "<d> is the name of the dependency. <n> name of the package depedency. Can be specified multiple times."
msgid "<d> is the name of the dependency. <n> name of the package dependency. Can be specified multiple times."
msgstr ""
#: hbmk2.prg:11633

329
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -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] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d|.ch]>" ), _SELF_NAME_ ), ;
"", ;
I_( "Options:" ) }
hb_StrFormat( I_( " %1$s [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d|.ch]>" ), _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<outname>" , I_( "output file name" ) }, ;
@@ -15400,7 +15402,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
{ "-sign=<key>" , I_( "sign executable with <key> (Windows and Darwin only)" ) }, ;
{ "-signpw=<pw>" , I_( "use <pw> as password when signing executable (Windows and Darwin only)" ) }, ;
{ "-instfile=<g:file>" , I_( "add <file> in to the list of files to be copied to path specified by -instpath option. <g> is an optional copy group (case sensitive), it must be at least two characters long. In case you do not specify <file>, the list of files in that group will be emptied." ) }, ;
{ "-instpath=<g:path>" , I_( "copy target to <path>. if <path> 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. <g> 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 <g> groups: 'depimplib' for import libraries and 'depimplibsrc' for import library source (.dll) files, both belonging to dependencies." ) }, ;
{ "-instpath=<g:path>" , I_( "copy target to <path>. if <path> 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. <g> 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 <g> 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[=<text>]" , I_( "stop without doing anything and display <text> if specified" ) }, ;
@@ -15437,7 +15439,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
{ "-hbimplib" , I_( "create import library (Windows only)" ) }, ;
NIL, ;
{ "-hbl[=<output>]" , hb_StrFormat( I_( "output .hbl filename. %1$s macro is accepted in filename" ), _LNG_MARKER ) }, ;
{ "-lng=<languages>" , 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=<languages>" , 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=<output>" , 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=<d:n>" , I_( "<d> is the name of the dependency. <n> name of the package depedency. Can be specified multiple times." ) }, ;
{ "-deppkgname=<d:n>" , I_( "<d> is the name of the dependency. <n> name of the package dependency. Can be specified multiple times." ) }, ;
{ "-depkeyhead=<d:h>" , I_( "<d> is the name of the dependency. <h> is the key header (.h) of the package dependency. Multiple alternative headers can be specified." ) }, ;
{ "-depoptional=<d:f>" , I_( "<d> is the name of the dependency. <f> can be 'yes' or 'no', specifies whether the dependency is optional. Default: no" ) }, ;
{ "-depcontrol=<d:v>" , I_( "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_<d>" ) }, ;
{ "-depcontrol=<d:v>" , I_( "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of environment variable HBMK_WITH_<d>" ) }, ;
{ "-depincroot=<d:r>" , I_( "<d> is the name of the dependency. Set <r> as root directory for paths specified in -depincpath options." ) }, ;
{ "-depincpath=<d:i>" , I_( "<d> is the name of the dependency. Add <i> to the header detection path list." ) }, ;
{ "-depincpathlocal=<d:i>" , I_( "<d> is the name of the dependency. Add <i> to the header detection path list, where <i> 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: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. 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 [<parameters>]" ), _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 [<parameters>]" ), _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<path_to_mylib>" ), _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

8
harbour/utils/hbmk2/hbmk2.pt_BR.po
View File

@@ -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 <path>. if <path> 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. <g> 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 <path>. if <path> 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. <g> 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 "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_<d>"
msgid "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of environment variable HBMK_WITH_<d>"
msgstr ""
#: hbmk2.prg:11512 hbmk2.prg:12970
@@ -1408,7 +1408,7 @@ msgstr ""
#: hbmk2.prg:11633 hbmk2.prg:13102
#, c-format
msgid "<d> is the name of the dependency. <n> name of the package depedency. Can be specified multiple times."
msgid "<d> is the name of the dependency. <n> name of the package dependency. Can be specified multiple times."
msgstr ""
#: hbmk2.prg:11633

2
harbour/website/about.html
View File

@@ -52,7 +52,7 @@
<li>GNU/Linux,</li>
<li>Mac OSX.</li>
</ul>
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 <a href="license.html" class="black_link">click here</a>.</td>
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 <a href="http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/COPYING.txt" class="black_link">click here</a>.</td>
<td >&nbsp;</td>
</tr>
</table></td>

2
harbour/website/contact.html
View File

@@ -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. <a href="license.html" class="sample_linkback">Read more </a>»</span></td>
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. <a href="http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/COPYING.txt" class="sample_linkback">Read more </a>»</span></td>
<td >&nbsp;</td>
</tr>
<tr>

3
harbour/website/download.htm
View File

@@ -3,8 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>This page has moved!</title>
<META HTTP-EQUIV="Refresh"
CONTENT="0; URL=http://sourceforge.net/project/showfiles.php?group_id=681">
<meta http-equiv="Refresh" content="0; url=http://sourceforge.net/project/showfiles.php?group_id=681" />
</head></head>
<body>

2
harbour/website/index.html
View File

@@ -162,7 +162,7 @@ Harbour is a cross-platform compiler and is known to compile and run on Windows
</tr>
<tr>
<td >&nbsp;</td>
<td valign="top">Harbour is a free and open-source project. It can be used to make open source applications, free or commercial products. <span class="read_more"><a href="license.html" class="black_link">Read more»</a></span></td>
<td valign="top">Harbour is a free and open-source project. It can be used to make open source applications, free or commercial products. <span class="read_more"><a href="http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/COPYING.txt" class="black_link">Read more»</a></span></td>
<td valign="top"><div align="justify"></div></td>
<td height="35%" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>

217
harbour/website/license.html
View File

@@ -1,217 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Harbour Project - License</title>
<link href="css/styles.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="menu/stmenu.js"></script></head>
<body>
<table width="740" border="0" align="center" cellpadding="0" cellspacing="1" bordercolor="#000000">
<tr>
<td valign="top" bgcolor="#000000"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td height="229" valign="top" background="images/header_03.png" bgcolor="#FFFFFF"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="6%"><img src="images/header_01.jpg" width="287" height="164" /></td>
<td width="94%"><img src="images/header_02.jpg" width="448" height="164" /></td>
</tr>
</table></td>
</tr>
<tr>
<td background="images/menu-bg.gif"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="95%" height="65" valign="top" background="images/menu-bg2.png"><script type="text/javascript" src="menu/harbour-menu.js"></script></td>
</tr>
</table></td>
</tr>
</table></td>
</tr>
<tr>
<td bgcolor="#FFFFFF"><table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
<tr valign="bottom">
<td width="2%" height="26" class="tabela_box_trans_TL">&nbsp;</td>
<td width="96%" height="26" class="title">The Harbour Project Compiler License</td>
<td width="2%" height="26" class="tabela_box_trans_TR">&nbsp;</td>
</tr>
<tr>
<td >&nbsp;</td>
<td valign="top"><span class="redbox">Note: This license applies to most of the files in the source/compiler
directory.</span><br />
<br />
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.<br />
<br />
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.<br />
<br />
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 <a href="http://www.gnu.org/" class="black_link">http://www.gnu.org/</a>).</td>
<td >&nbsp;</td>
</tr>
</table></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
<tr valign="bottom">
<td width="2%" height="26" class="tabela_box_trans_TL">&nbsp;</td>
<td width="96%" height="26" class="title">The Harbour Project Library License<br /></td>
<td width="2%" height="26" class="tabela_box_trans_TR">&nbsp;</td>
</tr>
<tr>
<td >&nbsp;</td>
<td valign="top"> <span class="redbox">Note: This license applies to most of the files in the include directory,
source directory, and subdirectories. </span><br />
<br />
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. <br />
<br />
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. <br />
<br />
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 <a href="http://www.gnu.org/" class="black_link">http://www.gnu.org/</a>). <br />
<br />
As a special exception, the Harbour Project gives permission for
additional uses of the text contained in its release of Harbour. <br />
<br />
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. <br />
<br />
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. <br />
<br />
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<br />
anyone as to the status of such modified files, you must delete
this exception notice from them. <br />
<br />
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.</td>
<td >&nbsp;</td>
</tr>
</table></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
<tr valign="bottom">
<td width="2%" height="26" class="tabela_box_trans_TL">&nbsp;</td>
<td width="96%" height="26" class="title">The Old Harbour Project Library License<br /></td>
<td width="2%" height="26" class="tabela_box_trans_TR">&nbsp;</td>
</tr>
<tr>
<td >&nbsp;</td>
<td valign="top"><span class="redbox">Note: This license only applies to the following files: <br />
<br />
&nbsp;&nbsp;&nbsp;source\rtl\philes.c<br />
&nbsp;&nbsp;&nbsp;source\rtl\binnum.c<br />
&nbsp;&nbsp;&nbsp;source\lang\msgeu.c<br />
&nbsp;&nbsp;&nbsp;source\lang\msgsl437.c<br />
&nbsp;&nbsp;&nbsp;source\lang\msgsl852.c<br />
&nbsp;&nbsp;&nbsp;source\lang\msgsliso.c<br />
&nbsp;&nbsp;&nbsp;source\lang\msgslwin.c<br />
&nbsp;&nbsp;&nbsp;source\lang\msgsr852.c<br />
&nbsp;&nbsp;&nbsp;source\lang\msgsriso.c</span><br />
<br />
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: <br />
<br />
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. <br />
<br />
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. <br />
<br />
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 <a href="http://www.gnu.org/" class="black_link">http://www.gnu.org/</a>).</td>
<td >&nbsp;</td>
</tr>
</table></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
<tr valign="bottom">
<td width="2%" height="26" class="tabela_box_trans_TL">&nbsp;</td>
<td width="96%" height="26" class="title">The Harbour Project Contrib License<br /></td>
<td width="2%" height="26" class="tabela_box_trans_TR">&nbsp;</td>
</tr>
<tr>
<td >&nbsp;</td>
<td valign="top">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.</td>
<td >&nbsp;</td>
</tr>
</table></td>
</tr>
</table></td>
</tr>
<tr>
<td bgcolor="#FFFFFF">&nbsp;</td>
</tr>
<tr>
<td height="32" background="images/footer.gif"><table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
<td width="33%" class="footer"><a href="/" class="whitelink">Copyright © 1999-<script type="text/javascript">copyright_year()</script> The Harbour Project.</a></td>
<td width="33%" class="footer"><div align="center"><a href="legalnotes.html" class="whitelink">Terms of Service</a> | <a href="contact.html" class="whitelink">Contact Us</a></div></td>
<td width="33%" class="footer"><div align="right">Design
by <a href="mailto: vailtom@gmail.com" class="whitelink">Vailton Renato</a> </div>
<div align="right"></div></td>
</tr>
</table></td>
</tr>
</table></td>
</tr>
</table>
</body>
</html>

5
harbour/website/mailing.html
View File

@@ -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. <a href="license.html" class="whitelink">Read more</a> »</span></td>
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. <a href="http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/COPYING.txt" class="whitelink">Read more</a> »</span></td>
</tr>
</table></td>
<td>&nbsp;</td>
@@ -199,9 +199,6 @@ This mailing list is a place for users of the Harbour Project to discuss and h
</tr>
</table></td>
</tr>
<tr>