From dece73c962017ef90e5913140e867c812e4c3931 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 24 Oct 2012 11:51:19 +0000 Subject: [PATCH] 2012-10-24 13:47 UTC+0200 Viktor Szakats (harbour syenar.net) - doc/en/license.txt - deleted yet another copy of the Harbour license. A very outdated one. * contrib/gtwvg/gtwvg.hbp * contrib/hbcairo/hbcairo.hbp * contrib/hbct/hbct.hbp * contrib/hbhpdf/hbhpdf.hbp * contrib/hbmysql/hbmysql.hbp * contrib/hbmzip/hbmzip.hbp * contrib/hbpgsql/hbpgsql.hbp * contrib/hbsqlit3/hbsqlit3.hbp * contrib/hbtip/hbtip.hbm * contrib/hbwin/hbwin.hbp * contrib/hbzebra/hbzebra.hbp * contrib/rddads/rddads.hbp * contrib/rddsql/rddsql.hbp * contrib/xhb/xhb.hbp * do not copy contrib .ch files to central Harbour directory. It means that if you need to use these files from now on, you need to use the .hbc files for all Harbour contribs. INCOMPATIBLE. This is the final step to complete this TODO: 2012-03-04 20:31 UTC+0100 Now all contrib .ch and .hbx files are stored locally in package folder. * ChangeLog * updated status for past TODO/TOFIX items --- harbour/ChangeLog | 47 ++++++-- harbour/contrib/gtwvg/gtwvg.hbp | 4 - harbour/contrib/hbcairo/hbcairo.hbp | 2 - harbour/contrib/hbct/hbct.hbp | 5 - harbour/contrib/hbhpdf/hbhpdf.hbp | 2 - harbour/contrib/hbmysql/hbmysql.hbp | 2 - harbour/contrib/hbmzip/hbmzip.hbp | 2 - harbour/contrib/hbpgsql/hbpgsql.hbp | 2 - harbour/contrib/hbsqlit3/hbsqlit3.hbp | 2 - harbour/contrib/hbtip/hbtip.hbm | 3 - harbour/contrib/hbwin/hbwin.hbp | 1 - harbour/contrib/hbzebra/hbzebra.hbp | 2 - harbour/contrib/rddads/rddads.hbp | 2 - harbour/contrib/rddsql/rddsql.hbp | 2 - harbour/contrib/xhb/xhb.hbp | 3 - harbour/doc/en/license.txt | 148 -------------------------- 16 files changed, 39 insertions(+), 190 deletions(-) delete mode 100644 harbour/doc/en/license.txt diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 73e89e7629..f5ee4d10f2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,37 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-24 13:47 UTC+0200 Viktor Szakats (harbour syenar.net) + - doc/en/license.txt + - deleted yet another copy of the Harbour license. + A very outdated one. + + * contrib/gtwvg/gtwvg.hbp + * contrib/hbcairo/hbcairo.hbp + * contrib/hbct/hbct.hbp + * contrib/hbhpdf/hbhpdf.hbp + * contrib/hbmysql/hbmysql.hbp + * contrib/hbmzip/hbmzip.hbp + * contrib/hbpgsql/hbpgsql.hbp + * contrib/hbsqlit3/hbsqlit3.hbp + * contrib/hbtip/hbtip.hbm + * contrib/hbwin/hbwin.hbp + * contrib/hbzebra/hbzebra.hbp + * contrib/rddads/rddads.hbp + * contrib/rddsql/rddsql.hbp + * contrib/xhb/xhb.hbp + * do not copy contrib .ch files to central Harbour + directory. It means that if you need to use + these files from now on, you need to use the + .hbc files for all Harbour contribs. INCOMPATIBLE. + This is the final step to complete this TODO: + 2012-03-04 20:31 UTC+0100 + Now all contrib .ch and .hbx files are stored + locally in package folder. + + * ChangeLog + * updated status for past TODO/TOFIX items + 2012-10-24 02:03 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbcairo/hbcairo.hbp * contrib/hbct/hbct.hbp @@ -5809,13 +5840,13 @@ making such code rearrangement. Untested. ; TOFIX: Some more stuff (code) has been added to hbxbp, - I didn't deal with those. + I didn't deal with those. [SOLVED] ; TOFIX: Someone please remove the duplicate resources from hbide/resources. Also, please make use of 'svn move' when moving around objects inside the repository tree, otherwise such thing will happen and history is also lost - along the way. + along the way. [SOLVED] 2012-09-20 22:18 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hb @@ -6412,7 +6443,7 @@ It also contains references to an arbitrary selection of non-Harbour SVN project and payware products. Even after reporting it on the list and received the answer that - it will get a meaning later. Well, it didn't. + it will get a meaning later. Well, it didn't. [SOLVED] 2012-09-04 21:57 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/rddads/rddads.h @@ -9348,7 +9379,7 @@ ; TOFIX: extras/hbxlsxml which contains high 8-bit chars with unspecified codepage, which got corrupted in recent - changes. + changes. [DONE] ; NOTE: Please use 7-bit ASCII chars only in sources and files, or, use UTF-8 while setting in SVN: svn propset svn:mime-type "text/plain; charset=UTF-8" @@ -12847,7 +12878,7 @@ fixes) ; NOTE: this is only the pure AMF3 encoder/decoder, and doesn't include websocket layers - ; TODO: adding license + ; TODO: adding license [NO LICENSE] * utils/hbmk2/hbmk2.prg * minor in comments @@ -15863,7 +15894,7 @@ facilitates usage of subclassing a Qt class. ; TODO: impliment siblings checking inside hbqt_par_isDerivedFrom(). - HBQPlainTextEdit() is a sibling of QPlainTextEdit(). + HBQPlainTextEdit() is a sibling of QPlainTextEdit(). [SOLVED] 2012-05-05 15:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtnetwork/qth/QNetworkProxy.qth @@ -16033,7 +16064,7 @@ * formatting ; TOFIX: hb_StrShrink() to work on UTF8 HVM CP [DONE] - ; TOFIX: hbnf, hbtip [DONE], xhb, hbide, hbxbp, gtwvg, tests and docs + ; TOFIX: hbnf [DONE], hbtip [DONE], xhb, gtwvg, tests and docs for unicode 2012-05-02 12:48 UTC+0200 Viktor Szakats (harbour syenar.net) @@ -17840,7 +17871,7 @@ so that contrib headers are no longer duplicated in central Harbour include dir. This WILL BE INCOMPATIBLE change requiring users to use .hbc files to add contrib packages - to their projects (as opposed to manual -l options). + to their projects (as opposed to manual -l options). [DONE] 2012-03-04 14:29 UTC+0100 Viktor Szakats (harbour syenar.net) * package/winuni/mpkg_win_uni.bat diff --git a/harbour/contrib/gtwvg/gtwvg.hbp b/harbour/contrib/gtwvg/gtwvg.hbp index 487aeec769..591be37319 100644 --- a/harbour/contrib/gtwvg/gtwvg.hbp +++ b/harbour/contrib/gtwvg/gtwvg.hbp @@ -19,10 +19,6 @@ hbwin.hbc # Optimize build time and make sure we build even with this option -cflag=-DWIN32_LEAN_AND_MEAN --instfile=inc:hbgtwvg.ch --instfile=inc:wvtwin.ch --instfile=inc:wvgparts.ch - gtwvg.c wvgcore.c wvgcuig.c diff --git a/harbour/contrib/hbcairo/hbcairo.hbp b/harbour/contrib/hbcairo/hbcairo.hbp index 25c8f8b1f8..03fe1763da 100644 --- a/harbour/contrib/hbcairo/hbcairo.hbp +++ b/harbour/contrib/hbcairo/hbcairo.hbp @@ -20,8 +20,6 @@ -iflag={bcc}-a --instfile=inc:hbcairo.ch - hbcairo.hbx context.c diff --git a/harbour/contrib/hbct/hbct.hbp b/harbour/contrib/hbct/hbct.hbp index cef0983225..1c0947b6c7 100644 --- a/harbour/contrib/hbct/hbct.hbp +++ b/harbour/contrib/hbct/hbct.hbp @@ -18,11 +18,6 @@ -instfile=contrib:ctstr.h -instfile=contrib:ctstrfil.h -instfile=contrib:ctwin.h --instfile=inc:ct.ch --instfile=inc:ctcom.ch --instfile=inc:ctdisk.ch --instfile=inc:cterror.ch --instfile=inc:ctvideo.ch hbct.hbx diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbp b/harbour/contrib/hbhpdf/hbhpdf.hbp index d28c4d08c9..baef21c4d5 100644 --- a/harbour/contrib/hbhpdf/hbhpdf.hbp +++ b/harbour/contrib/hbhpdf/hbhpdf.hbp @@ -19,8 +19,6 @@ -depimplibs=libharu:../lib_dll/libhpdf.dll -depfinish=libharu --instfile=inc:harupdf.ch - hbhpdf.hbx core.c diff --git a/harbour/contrib/hbmysql/hbmysql.hbp b/harbour/contrib/hbmysql/hbmysql.hbp index b5d90e4773..e0c5587e47 100644 --- a/harbour/contrib/hbmysql/hbmysql.hbp +++ b/harbour/contrib/hbmysql/hbmysql.hbp @@ -18,8 +18,6 @@ -depimplibs=mysql:../lib/opt/libmySQL.dll -depimplibs=mysql:../lib/libmySQL.dll --instfile=inc:mysql.ch - hbmysql.hbx mysql.c diff --git a/harbour/contrib/hbmzip/hbmzip.hbp b/harbour/contrib/hbmzip/hbmzip.hbp index 78ba24e394..5d2248af27 100644 --- a/harbour/contrib/hbmzip/hbmzip.hbp +++ b/harbour/contrib/hbmzip/hbmzip.hbp @@ -31,8 +31,6 @@ -depincpath=zlib:/boot/develop/headers/3rdparty -depincpathlocal=zlib:../../src/3rd/zlib --instfile=inc:hbmzip.ch - hbmzip.hbx mzip.c diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbp b/harbour/contrib/hbpgsql/hbpgsql.hbp index a7af4e5b3f..c090b42c76 100644 --- a/harbour/contrib/hbpgsql/hbpgsql.hbp +++ b/harbour/contrib/hbpgsql/hbpgsql.hbp @@ -24,8 +24,6 @@ -iflag={bcc}-a --instfile=inc:postgres.ch - hbpgsql.hbx postgres.c diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbp b/harbour/contrib/hbsqlit3/hbsqlit3.hbp index d97d2e1d9a..e5f01d439d 100644 --- a/harbour/contrib/hbsqlit3/hbsqlit3.hbp +++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbp @@ -17,8 +17,6 @@ -depincpathlocal=sqlite3:../3rd/sqlite3 -depfinish=sqlite3 --instfile=inc:hbsqlit3.ch - hbsqlit3.hbx core.c diff --git a/harbour/contrib/hbtip/hbtip.hbm b/harbour/contrib/hbtip/hbtip.hbm index e7a479195a..4eef28187c 100644 --- a/harbour/contrib/hbtip/hbtip.hbm +++ b/harbour/contrib/hbtip/hbtip.hbm @@ -10,9 +10,6 @@ -w3 -es2 --instfile=inc:tip.ch --instfile=inc:thtml.ch - hbtip.hbx encurlc.c diff --git a/harbour/contrib/hbwin/hbwin.hbp b/harbour/contrib/hbwin/hbwin.hbp index 34df282eca..d2515bd376 100644 --- a/harbour/contrib/hbwin/hbwin.hbp +++ b/harbour/contrib/hbwin/hbwin.hbp @@ -24,7 +24,6 @@ -instfile=contrib:hbwapi.h -instfile=contrib:hbwin.h -instfile=contrib:hbwinole.h --instfile=inc:hbwin.ch -instfile=contrib:*.def hbwin.hbx diff --git a/harbour/contrib/hbzebra/hbzebra.hbp b/harbour/contrib/hbzebra/hbzebra.hbp index 001ae42333..4805251db4 100644 --- a/harbour/contrib/hbzebra/hbzebra.hbp +++ b/harbour/contrib/hbzebra/hbzebra.hbp @@ -9,8 +9,6 @@ -w3 -es2 --instfile=inc:hbzebra.ch - hbzebra.hbx # Core diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp index 576975e36f..b07494520e 100644 --- a/harbour/contrib/rddads/rddads.hbp +++ b/harbour/contrib/rddads/rddads.hbp @@ -20,8 +20,6 @@ {x86}-depimplibs=ads:32bit/ace32.dll {x86}-depimplibs=ads:ace32.dll --instfile=inc:ads.ch - # To avoid a warning in ACE header -cflag+=-Wno-unknown-pragmas{allgcc} diff --git a/harbour/contrib/rddsql/rddsql.hbp b/harbour/contrib/rddsql/rddsql.hbp index ec01f7bf06..ff6e3182fc 100644 --- a/harbour/contrib/rddsql/rddsql.hbp +++ b/harbour/contrib/rddsql/rddsql.hbp @@ -11,7 +11,5 @@ -hbx= --instfile=inc:hbrddsql.ch - sqlbase.c sqlmix.c diff --git a/harbour/contrib/xhb/xhb.hbp b/harbour/contrib/xhb/xhb.hbp index 528f4f8d5f..0d30f6f2d7 100644 --- a/harbour/contrib/xhb/xhb.hbp +++ b/harbour/contrib/xhb/xhb.hbp @@ -14,9 +14,6 @@ -instfile=contrib:hbcompat.h -instfile=contrib:xhb.h --instfile=inc:hbcompat.ch --instfile=inc:xhb.ch --instfile=inc:xhbcls.ch # For hbserv.c, maybe more -c=gnu90 diff --git a/harbour/doc/en/license.txt b/harbour/doc/en/license.txt deleted file mode 100644 index 913d96a4e7..0000000000 --- a/harbour/doc/en/license.txt +++ /dev/null @@ -1,148 +0,0 @@ -/* - * $Id$ - */ - -/* $DOC$ - $TEMPLATE$ - Document - $NAME$ - Harbour License - $CATEGORY$ - Document - $SUBCATEGORY$ - License - $ONELINER$ - Harbour License - $DESCRIPTION$ - THE HARBOUR PROJECT COMPILER LICENSE - ==================================== - - Note: This license applies to most of the files in the src/compiler - directory. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - their web site at http://www.gnu.org/). - - - THE HARBOUR PROJECT LIBRARY LICENSE - =================================== - - Note: This license applies to most of the files in the include directory, - source directory, and subdirectories. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this software; see the file COPYING. 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. - - - THE OLD HARBOUR PROJECT LIBRARY LICENSE - ======================================= - - Note: This license only applies to the following files: - 
-          contrib\libmisc\dates2.c (Only the DateTime() function by Jon Berg)
-          samples\pe\*
-          source\rtl\philes.c
-          source\rtl\binnum.c
-          source\lang\msgsr852.c
-          source\lang\msgpl852.c
-          source\lang\msgpliso.c
-          source\lang\msgplmaz.c
-          source\lang\msgeu.c
-          source\lang\msgcsiso.c
-          source\lang\msgcswin.c
-          source\lang\msgcskam.c
-          source\lang\msgsriso.c
-          source\lang\msgde.c
-          source\lang\msghr852.c
-          source\lang\msgcs852.c
-          source\lang\msghriso.c
-          source\lang\msgis850.c
-
- This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version, with one exception: - - The exception is that if you link the Harbour Runtime Library (HRL) - and/or the Harbour Virtual Machine (HVM) with other files to produce - an executable, this does not by itself cause the resulting executable - to be covered by the GNU General Public License. Your use of that - executable is in no way restricted on account of linking the HRL - and/or HVM code into it. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - their web site at http://www.gnu.org/). - - - THE HARBOUR PROJECT CONTRIB LICENSE - =================================== - - There is no one single license that applies to the Harbour Project - contrib files. Some files use the Harbour Project Compiler license. - Some files use the Harbour Project Library license. Some files use - the old Harbour Project Library license (and in one case, just one - function in a file that otherwise uses the Harbour Project Library - license uses the old license - this is the DateTime() function in - the file contrib\libmisc\dates2.c). 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. - - $SEEALSO$ - Overview - $END$ - */