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

2010-06-03 10:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* harbour-win-spec
  * src/pp/hbpp.c
  * src/compiler/hbusage.c
  * doc/class_tp.txt
  * doc/howtobld.txt
  * doc/howtosvn.txt
  * doc/hdr_tpl.txt
  * doc/readme.txt
  * doc/whatsnew.txt
  * harbour-wce-spec
  * INSTALL
  * harbour.spec
  * utils/hbformat/hbformat.prg
  * utils/hbmk2/examples/plug_tpl.prg
  * utils/hbi18n/hbi18n.prg
  * utils/hbtest/hbtest.prg
  * utils/hbrun/hbrun.prg
  * config/global.mk
    * Deleted 'www.' from harbour-project.org website name.
      (www.harbour-project.org -> harbour-project.org)

  * contrib/xhb/xhbarr.c
    + Added TOFIX for AREMOVE() which should better be moved
      to hbxpp lib (possibly after deleting the xhb extension from
      that implementation).

  * package/winuni/RELNOTES
    + Added 'harbour-project.org'
This commit is contained in:
Viktor Szakats
2010-06-03 08:43:47 +00:00
parent 2976201710
commit 78742ae944
21 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
harbour/ChangeLog
View File

@@ -17,6 +17,36 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-06-03 10:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* harbour-win-spec
* src/pp/hbpp.c
* src/compiler/hbusage.c
* doc/class_tp.txt
* doc/howtobld.txt
* doc/howtosvn.txt
* doc/hdr_tpl.txt
* doc/readme.txt
* doc/whatsnew.txt
* harbour-wce-spec
* INSTALL
* harbour.spec
* utils/hbformat/hbformat.prg
* utils/hbmk2/examples/plug_tpl.prg
* utils/hbi18n/hbi18n.prg
* utils/hbtest/hbtest.prg
* utils/hbrun/hbrun.prg
* config/global.mk
* Deleted 'www.' from harbour-project.org website name.
(www.harbour-project.org -> harbour-project.org)
* contrib/xhb/xhbarr.c
+ Added TOFIX for AREMOVE() which should better be moved
to hbxpp lib (possibly after deleting the xhb extension from
that implementation).
* package/winuni/RELNOTES
+ Added 'harbour-project.org'
2010-06-03 09:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/xhb/trpc.prg
* harbour/contrib/xhb/trpccli.prg

4
harbour/INSTALL
View File

@@ -10,7 +10,7 @@ HARBOUR
xBase language compiler and the runtime libraries with different
terminal plugins and different databases (not just DBF)"
http://www.harbour-project.org/
http://harbour-project.org/
1. HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE
@@ -1508,7 +1508,7 @@ HARBOUR
========================
Homepage:
http://www.harbour-project.org/
http://harbour-project.org/
User Forums:
http://sourceforge.net/apps/phpbb/harbour-project/

2
harbour/config/global.mk
View File

@@ -259,7 +259,7 @@ ifeq ($(HB_INIT_DONE),)
# Macros:
# -DHB_GT_LIB=
$(info ! Building Harbour $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(HB_VER_STATUS) from source - http://www.harbour-project.org)
$(info ! Building Harbour $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(HB_VER_STATUS) from source - http://harbour-project.org)
$(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(SHELL) $(HB_MAKECMDGOALS) $(MAKEFLAGS) $(if $(MAKESHELL),MAKESHELL: $(MAKESHELL),))
ifneq ($(HB_USER_PRGFLAGS),)
$(info ! HB_USER_PRGFLAGS: $(HB_USER_PRGFLAGS))

34
harbour/contrib/xhb/xhbarr.c
View File

@@ -74,22 +74,14 @@ HB_FUNC( ASPLICE )
}
if( HB_ISNUM( 2 ) )
{
ulStart = ( HB_SIZE ) hb_parnl( 2 );
}
else
{
ulStart = ulLen + ( hb_pcount() > 3 && !HB_ISNUM( 3 ) ? 1 : 0 );
}
if( HB_ISNUM( 3 ) )
{
ulRemove = ( HB_SIZE ) hb_parnl( 3 );
}
else
{
ulRemove = ( hb_pcount() > 3 && ulStart == ulLen + 1 ) ? 0 : 1;
}
if( ulStart == 0 || ulStart > ulLen )
{
@@ -101,9 +93,7 @@ HB_FUNC( ASPLICE )
}
if( ulStart + ulRemove - 1 > ulLen )
{
ulRemove = ulLen - ulStart + 1;
}
hb_arrayNew( pReturn, ulRemove );
@@ -111,10 +101,8 @@ HB_FUNC( ASPLICE )
ulStart--;
for( ulIndex = ulStart + 1; ( ulIndex - ulStart ) <= ulRemove; ulIndex++ )
{
hb_itemMove( hb_arrayGetItemPtr( pReturn, ulIndex - ulStart ),
hb_arrayGetItemPtr( pArray, ulIndex ) );
}
if( hb_pcount() > 3 )
{
@@ -130,25 +118,19 @@ HB_FUNC( ASPLICE )
/* Shift right BEFORE adding, so that new items will not override existing values. */
for( ulIndex = ulLen; ulIndex && --ulShift; --ulIndex )
{
hb_itemMove( hb_arrayGetItemPtr( pArray, ulIndex + ulMore ),
hb_arrayGetItemPtr( pArray, ulIndex ) );
}
/* Now insert new values into emptied space. */
for( ulIndex = ulStart; ++ulNew <= ulAdd; ulIndex++ )
{
hb_itemMove( hb_arrayGetItemPtr( pArray, ulIndex + 1 ),
hb_param( 3 + ulNew, HB_IT_ANY ) );
}
}
else
{
/* Insert over the space emptied by removed items */
for( ulIndex = ulStart; ++ulNew <= ulAdd; ulIndex++ )
{
hb_itemMove( hb_arrayGetItemPtr( pArray, ulIndex + 1 ), hb_param( 3 + ulNew, HB_IT_ANY ) );
}
if( ulRemove > ulAdd )
{
@@ -156,27 +138,24 @@ HB_FUNC( ASPLICE )
/* Shift left to compact the emptied hole. */
for( ulIndex = ulStart + ulAdd + 1; ulIndex + ulRemove <= ulLen; ulIndex++ )
{
hb_itemMove( hb_arrayGetItemPtr( pArray, ulIndex ),
hb_arrayGetItemPtr( pArray, ulIndex + ulRemove ) );
}
}
}
}
else
{
for( ulIndex = ulStart + 1; ulIndex + ulRemove <= ulLen; ulIndex++ )
{
hb_itemMove( hb_arrayGetItemPtr( pArray, ulIndex ),
hb_arrayGetItemPtr( pArray, ulIndex + ulRemove ) );
}
hb_arraySize( pArray, ulLen - ulRemove );
}
}
}
/* Synonym of aSplice() Xbase++ compatability (extended with optional replacemenet values) */
/* TOFIX: Move this to hbxpp library */
/* Synonym of aSplice() Xbase++ compatibility (extended with optional replacemenet values) */
HB_FUNC( AREMOVE )
{
HB_FUNC_EXEC( ASPLICE )
@@ -207,28 +186,20 @@ HB_FUNC( AMERGE )
/* Shift right BEFORE merging, so that merged items will not override existing values. */
for( ulIndex = ulLen; ulIndex > ulStart; --ulIndex )
{
hb_itemMove( hb_arrayGetItemPtr( pArray1, ulIndex + ulAdd ),
hb_arrayGetItemPtr( pArray1, ulIndex ) );
}
}
else
{
ulStart = ulLen;
}
for( ulIndex = 1; ulIndex <= ulAdd; ulIndex++ )
{
hb_itemCopy( hb_arrayGetItemPtr( pArray1, ulStart + ulIndex ),
hb_arrayGetItemPtr( pArray2, ulIndex ) );
}
hb_itemCopy( hb_stackReturnItem(), pArray1 );
}
else
{
hb_errRT_BASE( EG_ARG, 1003, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
}
HB_FUNC( XHB_ADEL )
@@ -285,7 +256,6 @@ HB_FUNC( XHB_AINS )
hb_itemReturn( pArray ); /* AIns() returns the array itself */
}
}
HB_FUNC_EXTERN( HB_RASCAN ) ; HB_FUNC( RASCAN ) { HB_FUNC_EXEC( HB_RASCAN ); }

5
harbour/doc/class_tp.txt
View File

@@ -14,7 +14,7 @@ FILE HEADER TEMPLATE
* {one-liner description about the purpose of this source file}
*
* Copyright 2000 {list of individual authors and e-mail addresses}
* www - http://www.harbour-project.org
* 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
@@ -62,7 +62,7 @@ FILE HEADER TEMPLATE (OPTIONAL ADDITION FOR PARTIAL COPYRIGHTS)
/*
* The following parts are Copyright of the individual authors.
* www - http://www.harbour-project.org
* www - http://harbour-project.org
*
* Copyright 2000 {name} <{e-mail address}>
* {function or subsystem name}
@@ -145,4 +145,3 @@ CLASS HEADER TEMPLATE
*
* $END$
*/

4
harbour/doc/hdr_tpl.txt
View File

@@ -14,7 +14,7 @@ FILE HEADER TEMPLATE
* {one-liner description about the purpose of this source file}
*
* Copyright 2010 {list of individual authors and e-mail addresses}
* www - http://www.harbour-project.org
* 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
@@ -62,7 +62,7 @@ FILE HEADER TEMPLATE (OPTIONAL ADDITION FOR PARTIAL COPYRIGHTS)
/*
* The following parts are Copyright of the individual authors.
* www - http://www.harbour-project.org
* www - http://harbour-project.org
*
* Copyright 2010 {name} <{e-mail address}>
* {function or subsystem name}

4
harbour/doc/howtobld.txt
View File

@@ -58,7 +58,7 @@ return nil
druzus@uran:~/tmp$ hbcmp foo
Harbour Compiler Alpha build 46.2 (Flex)
Copyright 1999-2006, http://www.harbour-project.org/
Copyright 1999-2006, http://harbour-project.org/
Compiling 'foo.prg'...
Lines 5, Functions/Procedures 2
Generating C source output to 'foo.c'... Done.
@@ -80,7 +80,7 @@ return nil
druzus@uran:~/tmp$ hbmk foo
Harbour Compiler Alpha build 46.2 (Flex)
Copyright 1999-2006, http://www.harbour-project.org/
Copyright 1999-2006, http://harbour-project.org/
Compiling 'foo.prg'...
Lines 5, Functions/Procedures 2
Generating C source output to 'foo.c'... Done.

6
harbour/doc/howtosvn.txt
View File

@@ -28,8 +28,8 @@ Content
=========================================================
by Viktor Szakats
1) Read the Harbour FAQ (http://www.harbour-project.org/faq), monitor the
mailing-list (http://www.harbour-project.org/faq/harbour34.html),
1) Read the Harbour FAQ (http://harbour-project.org/faq), monitor the
mailing-list (http://harbour-project.org/faq/harbour34.html),
consult with the developers, make contributions. This way your chances
are high to get a RW access to the repository.
2) Before uploading anything you'll need Developer (RW) status for the
@@ -133,7 +133,7 @@ by Viktor Szakats
================================================================
Please read the following FAQ entry:
http://www.harbour-project.org/faq/harbour25.html
http://harbour-project.org/faq/harbour25.html
1.5 Things to do to avoid damaging the SourceForge SVN tree
===========================================================

6
harbour/doc/readme.txt
View File

@@ -10,14 +10,14 @@ referred to as Clipper (the language that is implemented by the compiler
CA-Cl*pper). The goal of the Harbour project is to produce a cross platform
CA-Cl*pper compatible compiler.
The Harbour web site is at <URL:http://www.harbour-project.org/>. If you
The Harbour web site is at <URL:http://harbour-project.org/>. If you
have any problems with this copy of Harbour please visit our web site and
ensure that you are using the latest release.
If you have any questions about Harbour please be sure to read the FAQ
<URL:http://www.harbour-project.org/faq/>. Also, please be sure to read the
<URL:http://harbour-project.org/faq/>. Also, please be sure to read the
documentation that comes with Harbour, you should find it in the same
directory in which you found this file.
directory in which you found this file.
If you are reading this file as part of a source distribution of harbour you
probably want to start by reading dirstruc.txt because this is your map to

2
harbour/doc/whatsnew.txt
View File

@@ -93,7 +93,7 @@ General
compatibility, you can turn it off manually by #defining
HB_LEGACY_OFF. (HB_USER_CFLAGS=-DHB_LEGACY_OFF)
- New Harbour Project homepage, thanks for Vailton Renato.
http://www.harbour-project.org/
http://harbour-project.org/
- GNU Make system now supports parallel builds.
(needs GNU Make newer than 3.79.1)
- GNU Make system allows to install in Harbour source tree on all platforms.

6
harbour/harbour-wce-spec
View File

@@ -17,7 +17,7 @@
%define version 2.1.0
%define releasen beta1
%define hb_pref hbce
%define hb_host www.harbour-project.org
%define hb_host harbour-project.org
%define readme README.RPM
# Workaround for the problem of /usr/bin/strip not handling PE binaries.
@@ -184,7 +184,7 @@ return nil
druzus@uran:~/tmp$ %{hb_pref}cmp foo
Harbour 1.0.0 Intl. (Rev. 9099)
Copyright (c) 1999-2008, http://www.harbour-project.org/
Copyright (c) 1999-2008, http://harbour-project.org/
Compiling 'foo.prg'...
Lines 5, Functions/Procedures 2
Generating C source output to 'foo.c'... Done.
@@ -204,7 +204,7 @@ return nil
druzus@uran:~/tmp$ %{hb_pref}mk foo
Harbour 1.0.0 Intl. (Rev. 9099)
Copyright (c) 1999-2008, http://www.harbour-project.org/
Copyright (c) 1999-2008, http://harbour-project.org/
Compiling 'foo.prg'...
Lines 5, Functions/Procedures 2
Generating C source output to 'foo.c'... Done.

6
harbour/harbour-win-spec
View File

@@ -17,7 +17,7 @@
%define version 2.1.0
%define releasen beta1
%define hb_pref hbw
%define hb_host www.harbour-project.org
%define hb_host harbour-project.org
%define readme README.RPM
# Workaround for the problem of /usr/bin/strip not handling PE binaries.
@@ -184,7 +184,7 @@ return nil
druzus@uran:~/tmp$ %{hb_pref}cmp foo
Harbour 1.0.0 Intl. (Rev. 9099)
Copyright (c) 1999-2008, http://www.harbour-project.org/
Copyright (c) 1999-2008, http://harbour-project.org/
Compiling 'foo.prg'...
Lines 5, Functions/Procedures 2
Generating C source output to 'foo.c'... Done.
@@ -204,7 +204,7 @@ return nil
druzus@uran:~/tmp$ %{hb_pref}mk foo
Harbour 1.0.0 Intl. (Rev. 9099)
Copyright (c) 1999-2008, http://www.harbour-project.org/
Copyright (c) 1999-2008, http://harbour-project.org/
Compiling 'foo.prg'...
Lines 5, Functions/Procedures 2
Generating C source output to 'foo.c'... Done.

6
harbour/harbour.spec
View File

@@ -71,7 +71,7 @@
%define hb_cmrc export HB_BUILD_NOGPLLIB=%{?_without_gpllib:yes}
%define hb_ctrb export HB_CONTRIBLIBS="hbblink hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbziparc hbfoxpro hbsms hbfship hbxpp xhb rddbmcdx rddsql sddsqlt3 hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_cups:hbcups} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird sddfb} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql sddmy} %{?_with_odbc:hbodbc sddodbc} %{?_with_pgsql:hbpgsql sddpg} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}"
%define hb_env %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_ctrb} ; %{hb_cmrc}
%define hb_host www.harbour-project.org
%define hb_host harbour-project.org
%define readme README.RPM
######################################################################
## Preamble.
@@ -487,7 +487,7 @@ return nil
druzus@uran:~/tmp$ %{hb_pref}cmp foo
Harbour 1.0.0 Intl. (Rev. 9099)
Copyright (c) 1999-2008, http://www.harbour-project.org/
Copyright (c) 1999-2008, http://harbour-project.org/
Compiling 'foo.prg'...
Lines 5, Functions/Procedures 2
Generating C source output to 'foo.c'... Done.
@@ -509,7 +509,7 @@ return nil
druzus@uran:~/tmp$ %{hb_pref}mk foo
Harbour 1.0.0 Intl. (Rev. 9099)
Copyright (c) 1999-2008, http://www.harbour-project.org/
Copyright (c) 1999-2008, http://harbour-project.org/
Compiling 'foo.prg'...
Lines 5, Functions/Procedures 2
Generating C source output to 'foo.c'... Done.

1
harbour/package/winuni/RELNOTES
View File

@@ -249,3 +249,4 @@ Changes since previous (1.1.0dev 20090408) release:
--
Brgds,
Viktor Szakats
harbour-project.org

4
harbour/src/compiler/hbusage.c
View File

@@ -181,7 +181,7 @@ void hb_compPrintCredits( HB_COMP_DECL )
{
hb_compOutStd( HB_COMP_PARAM,
"\n"
"Credits: The Harbour Team at www.harbour-project.org\n"
"Credits: The Harbour Team at harbour-project.org\n"
" (replace space with @ in e-mail addresses)\n"
"\n"
"Alejandro de Garate <alex_degarate hotmail.com>\n"
@@ -273,6 +273,6 @@ void hb_compPrintLogo( HB_COMP_DECL )
hb_compOutStd( HB_COMP_PARAM, szVer );
hb_compOutStd( HB_COMP_PARAM,
"\nCopyright (c) 1999-2010, http://www.harbour-project.org/\n" );
"\nCopyright (c) 1999-2010, http://harbour-project.org/\n" );
hb_xfree( szVer );
}

6
harbour/src/pp/hbpp.c
View File

@@ -200,7 +200,7 @@ static void hb_pp_generateRules( FILE * fout, PHB_PP_STATE pState )
" * Build in preprocessor rules.\n"
" *\n"
" * Copyright 2006 Przemyslaw Czerpak <druzus / at / priv.onet.pl>\n"
" * www - http://www.harbour-project.org\n"
" * www - http://harbour-project.org\n"
" *\n"
" * This file is generated automatically by Harbour preprocessor\n"
" * and is covered by the same license as Harbour PP\n"
@@ -344,7 +344,7 @@ static int hb_pp_generateVerInfo( char * szVerFile, int iSVNID, char * szChangeL
" * Version information and build time switches.\n"
" *\n"
" * Copyright 2008-2010 Przemyslaw Czerpak <druzus / at / priv.onet.pl>\n"
" * www - http://www.harbour-project.org\n"
" * www - http://harbour-project.org\n"
" *\n"
" * This file is generated automatically by Harbour preprocessor\n"
" * and is covered by the same license as Harbour PP\n"
@@ -756,7 +756,7 @@ int main( int argc, char * argv[] )
{
printf( "Harbour Preprocessor %d.%d.%d%s\n",
HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE, HB_VER_STATUS );
printf( "Copyright (c) 1999-2010, http://www.harbour-project.org/\n" );
printf( "Copyright (c) 1999-2010, http://harbour-project.org/\n" );
}
if( szFile )

2
harbour/utils/hbformat/hbformat.prg
View File

@@ -202,7 +202,7 @@ STATIC FUNCTION About()
?? "Harbour Source Formatter " + HBRawVersion()
? "Copyright (c) 2009-2010, Alexander S.Kresin"
? "http://www.harbour-project.org/"
? "http://harbour-project.org/"
?
? "Syntax: hbformat [options] [@config] file[s]"
?

2
harbour/utils/hbi18n/hbi18n.prg
View File

@@ -159,7 +159,7 @@ STATIC PROCEDURE Logo()
OutStd( "Harbour i18n .pot/.hbl file manager " + HBRawVersion() + HB_OSNewLine() +;
"Copyright (c) 2009-2010, Przemyslaw Czerpak" + HB_OSNewLine() + ;
"http://www.harbour-project.org/" + HB_OSNewLine() +;
"http://harbour-project.org/" + HB_OSNewLine() +;
HB_OSNewLine() )
RETURN

2
harbour/utils/hbmk2/examples/plug_tpl.prg
View File

@@ -4,7 +4,7 @@
/*
* Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
* www - http://www.harbour-project.org
* www - http://harbour-project.org
*
* See COPYING for licensing terms.
*/

2
harbour/utils/hbrun/hbrun.prg
View File

@@ -220,7 +220,7 @@ STATIC PROCEDURE HB_DotUsage()
OutStd( 'Harbour "DOt Prompt" Console / runner ' + HBRawVersion() + HB_OSNewLine() +;
"Copyright (c) 1999-2010, Przemyslaw Czerpak" + HB_OSNewLine() + ;
"http://www.harbour-project.org/" + HB_OSNewLine() +;
"http://harbour-project.org/" + HB_OSNewLine() +;
HB_OSNewLine() +;
"Syntax: hbrun [<hrbfile[.prg|.hrb]> [<parameters,...>]]" + HB_OSNewLine() )

2
harbour/utils/hbtest/hbtest.prg
View File

@@ -98,7 +98,7 @@ STATIC s_nEndTime
PROCEDURE Main( cPar1, cPar2 )
OutStd( "Harbour Regression Test Suite" + HB_OSNewLine() +;
"Copyright (c) 1999-2010, http://www.harbour-project.org/" + HB_OSNewLine() )
"Copyright (c) 1999-2010, http://harbour-project.org/" + HB_OSNewLine() )
IF cPar1 == NIL
cPar1 := ""