From 4d1a8cc1a37b066ca7ee7edad0207d7bb8b7a01f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 28 Apr 2010 17:06:52 +0000 Subject: [PATCH] 2010-04-28 19:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/Makefile * src/rtl/getsys.prg + src/rtl/getsyshb.prg ! Moved HB_GETREADVAR() to separate source file. ! HB_GETREADVAR() fixed to use HB_ASCIIUPPER() like TGETLIST():GETREADVAR() instead of UPPER(). * src/rtl/tgetlist.prg % TGETLIST():GETREADVAR() now can use HB_GETREADVAR() instead of duplicating the code locally. * INSTALL + Added sort of "disclaimer" note to HB_BUILD_IMPLIB option. * include/hbextern.ch + Added missing TBREADER(). --- harbour/ChangeLog | 26 ++++++++++++--- harbour/INSTALL | 5 ++- harbour/include/hbextern.ch | 1 + harbour/src/rtl/Makefile | 1 + harbour/src/rtl/getsys.prg | 12 ------- harbour/src/rtl/getsyshb.prg | 63 ++++++++++++++++++++++++++++++++++++ harbour/src/rtl/tgetlist.prg | 13 +------- 7 files changed, 92 insertions(+), 29 deletions(-) create mode 100644 harbour/src/rtl/getsyshb.prg diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 024fe5a383..a836d5ec31 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,12 +17,30 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-28 19:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/Makefile + * src/rtl/getsys.prg + + src/rtl/getsyshb.prg + ! Moved HB_GETREADVAR() to separate source file. + ! HB_GETREADVAR() fixed to use HB_ASCIIUPPER() like + TGETLIST():GETREADVAR() instead of UPPER(). + + * src/rtl/tgetlist.prg + % TGETLIST():GETREADVAR() now can use HB_GETREADVAR() + instead of duplicating the code locally. + + * INSTALL + + Added sort of "disclaimer" note to HB_BUILD_IMPLIB option. + + * include/hbextern.ch + + Added missing TBREADER(). + 2010-04-27 19:06 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbxbp/xbplistbox.prg + setItemColorFG( nIndex, aRGB ) * contrib/hbide/ideeditor.prg - + Implemented: current function the cursor is navigating + + Implemented: current function the cursor is navigating highlighted in the Functions List. 2010-04-28 01:39 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) @@ -35,7 +53,7 @@ * contrib/hbide/hbide.prg * contrib/hbide/idedocks.prg * contrib/hbide/ideharbourhelp.prg - + All docks are made to be opened in the same state these + + All docks are made to be opened in the same state these were left at the last run. TESTED: on multi-monitor every artifact is behaving as expected. @@ -86,8 +104,8 @@ * contrib/hbide/idethemes.prg + contrib/hbide/resources/environ.ui + contrib/hbide/resources/environ.uic - + started: dialog to capture build environment settings for different - language compilers on line with xMate. Dialog can be seen via + + started: dialog to capture build environment settings for different + language compilers on line with xMate. Dialog can be seen via Menubar->Projects->Environments. Please note that this menu option is subject to change in future. It is just for bird's eyeview. diff --git a/harbour/INSTALL b/harbour/INSTALL index 30016a5dfc..5aa6815b5f 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -615,7 +615,10 @@ HARBOUR to a *nix system location, otherwise no. - HB_BUILD_IMPLIB=yes Create import libraries for external .dll dependencies (including contribs). Default: no - (for Windows targets only.) + (for Windows targets only. Please note that + this feature doesn't work with all possible + binary distributions of 3rd party packages. + We test only the official/mainstream ones.) - HB_BUILD_DEBUG=yes Create a debug build. Default: no - HB_BUILD_STRIP= [all|bin|lib|no] Strip symbols and debug information from binaries. diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index f00b9c1659..8d17fc4611 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -742,6 +742,7 @@ EXTERNAL TOPBAR EXTERNAL TBMOUSE EXTERNAL TAPPLYKEY EXTERNAL TBADDCOL +EXTERNAL TBREADER EXTERNAL TBAPPLYKEY EXTERNAL TBBBLOCK EXTERNAL TBCLOSE diff --git a/harbour/src/rtl/Makefile b/harbour/src/rtl/Makefile index 8b37b49fd3..3610626f36 100644 --- a/harbour/src/rtl/Makefile +++ b/harbour/src/rtl/Makefile @@ -214,6 +214,7 @@ PRG_SOURCES := \ getlist.prg \ getsys.prg \ getsys53.prg \ + getsyshb.prg \ gui.prg \ hbi18n2.prg \ hbini.prg \ diff --git a/harbour/src/rtl/getsys.prg b/harbour/src/rtl/getsys.prg index 4cdfa47347..cecb1f0e4f 100644 --- a/harbour/src/rtl/getsys.prg +++ b/harbour/src/rtl/getsys.prg @@ -328,15 +328,3 @@ FUNCTION RangeCheck( oGet, xDummy, xLow, xHigh ) ENDIF RETURN .F. - -FUNCTION hb_GetReadVar( oGet ) - LOCAL cName := Upper( oGet:name ) - LOCAL n - - IF oGet:subScript != NIL - FOR n := 1 TO Len( oGet:subScript ) - cName += "[" + hb_NToS( oGet:subScript[ n ] ) + "]" - NEXT - ENDIF - - RETURN cName diff --git a/harbour/src/rtl/getsyshb.prg b/harbour/src/rtl/getsyshb.prg new file mode 100644 index 0000000000..7ca2f61f0f --- /dev/null +++ b/harbour/src/rtl/getsyshb.prg @@ -0,0 +1,63 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * GET system module (Harbour extensions) + * + * Copyright 2008-2010 Viktor Szakats (harbour.01 syenar.hu) + * www - http://www.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, 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. + * + */ + +FUNCTION hb_GetReadVar( oGet ) + LOCAL cName := hb_asciiUpper( oGet:name ) + LOCAL n + + IF oGet:subScript != NIL + FOR n := 1 TO Len( oGet:subScript ) + cName += "[" + hb_NToS( oGet:subScript[ n ] ) + "]" + NEXT + ENDIF + + RETURN cName diff --git a/harbour/src/rtl/tgetlist.prg b/harbour/src/rtl/tgetlist.prg index 1d94317f59..0cc94eb25b 100644 --- a/harbour/src/rtl/tgetlist.prg +++ b/harbour/src/rtl/tgetlist.prg @@ -746,18 +746,7 @@ METHOD PostActiveGet() CLASS HBGetList RETURN Self METHOD GetReadVar() CLASS HBGetList - - LOCAL oGet := ::oGet - LOCAL cName := hb_asciiUpper( oGet:Name ) - LOCAL n - - IF oGet:Subscript != NIL - FOR n := 1 TO Len( oGet:Subscript ) - cName += "[" + hb_NToS( oGet:Subscript[ n ] ) + "]" - NEXT - ENDIF - - RETURN cName + RETURN hb_GetReadVar( ::oGet ) METHOD SetFormat( bFormat ) CLASS HBGetList