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

2012-06-10 14:11 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* src/rtl/cdpdet.prg
    ! *nix specific CP autodetection code missed to call
      a local conversion subfunction.

  * src/rtl/gtfunc.c
    * HB_SETDISPCP(), HB_SETTERMCP(), HB_SETKEYCP() will
      now not RTE when passed NIL as 1st paramater. This
      makes it smoother to fall-back on purposedly invalid
      values, f.e. return values of new HB_CDPOS() and 
      HB_CDPTERM() in case of failure.

  * contrib/hblzf/tests/test2.prg
    + replaced in-source hbmk2 cmdline instructions with
      #require directive

  * contrib/gtwvg/tests/wvgactivex.prg
    ! fixed reference to non-existing batch file

  * doc/en/file.txt
  * doc/gmake.txt
  * doc/windll.txt
  * examples/gtwvw/docs/gtwvw.txt
  * examples/gtwvw/docs/whatsnew.txt
  * examples/gtwvw/tests/drawimg.prg
  * examples/guestbk/guestbk.txt
  * examples/hscript/readme.txt
    - deleted references to non-existing/obsolete batch files
This commit is contained in:
Viktor Szakats
2012-06-10 12:13:08 +00:00
parent 969e4ab0d9
commit 7e446e2d02
13 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
harbour/ChangeLog
View File

@@ -16,6 +16,35 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-06-10 14:11 UTC+0200 Viktor Szakats (harbour syenar.net)
* src/rtl/cdpdet.prg
! *nix specific CP autodetection code missed to call
a local conversion subfunction.
* src/rtl/gtfunc.c
* HB_SETDISPCP(), HB_SETTERMCP(), HB_SETKEYCP() will
now not RTE when passed NIL as 1st paramater. This
makes it smoother to fall-back on purposedly invalid
values, f.e. return values of new HB_CDPOS() and
HB_CDPTERM() in case of failure.
* contrib/hblzf/tests/test2.prg
+ replaced in-source hbmk2 cmdline instructions with
#require directive
* contrib/gtwvg/tests/wvgactivex.prg
! fixed reference to non-existing batch file
* doc/en/file.txt
* doc/gmake.txt
* doc/windll.txt
* examples/gtwvw/docs/gtwvw.txt
* examples/gtwvw/docs/whatsnew.txt
* examples/gtwvw/tests/drawimg.prg
* examples/guestbk/guestbk.txt
* examples/hscript/readme.txt
- deleted references to non-existing/obsolete batch files
2012-06-10 01:26 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbmlzo/hbmlzo.hbc
! fixed commented lib reference rendering the .hbc file unusable

2
harbour/contrib/gtwvg/tests/wvgactivex.prg
View File

@@ -134,7 +134,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam )
oXbp:killInputFocus := { |x,y,oSLE| x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarB =" + cVarB }
// Read file into LOCAL variable
cText := MemoRead( 'hbmk_b32.bat' )
cText := MemoRead( "hbmk.hbm" )
// Create MLE, specify position using :create() and
// assign data code block accessing LOCAL variable
oMLE := WvgMLE():new( oStatic2 )

5
harbour/contrib/hblzf/tests/test2.prg
View File

@@ -2,7 +2,8 @@
* $Id$
*/
/* hbmk2 testz.prg -lhbbz2 -lbz2 -lhblzf -llzf -es2 -w3 */
#require "hbbz2"
#require "hblzf"
#include "simpleio.ch"
@@ -39,7 +40,7 @@ STATIC PROCEDURE MakeTest( ... )
nBegin := hb_secondsCPU()
cRes := Eval( e:__enumValue(), iif( lCmp, hb_pValue( 3 ), e2 ), NIL, @nResult )
nEnd := hb_secondsCPU()
IF lCmp
IF lCmp
e2 := cRes
ENDIF
cFmt := hb_strFormat( ;

6
harbour/doc/en/file.txt
View File

@@ -714,8 +714,7 @@
* The file must be considered closed by the operating system before it
* may be deleted.
* $EXAMPLES$
* ERASE C:\autoexec.bat
* ERASE C:/temp/read.txt
* ERASE C:\temp\read.txt
* $STATUS$
* R
* $COMPLIANCE$
@@ -749,8 +748,7 @@
* The file must be considered closed by the operating system before it
* may be deleted.
* $EXAMPLES$
* ERASE C:\autoexec.bat
* ERASE C:/temp/read.txt
* ERASE C:\temp\read.txt
* $STATUS$
* R
* $COMPLIANCE$

28
harbour/doc/gmake.txt
View File

@@ -142,13 +142,11 @@ For gcc on Win95/WinNT with the Cygwin library:
wildcard command line arguments (this is checked at run-time!)
HB_PLATFORM win
HB_COMPILER gcc
HB_GT_LIB gtwin
CYGWIN noglob
For gcc on Win95/WinNT with the MinGW library:
HB_PLATFORM win
HB_COMPILER mingw
HB_GT_LIB gtwin
For MSVC on Win95/WinNT:
Notes: gnu make is case sensitive! If your editor converts
@@ -157,40 +155,23 @@ For MSVC on Win95/WinNT:
If you have MAKE_MODE in your dos environment, make sure it is
not set to unix
For best results, in your copy of make_gnu.bat, also set:
For best results, also set:
HB_PLATFORM win
HB_COMPILER msvc
HB_GT_LIB gtwin
For GCC on BSD:
HB_PLATFORM bsd
HB_COMPILER gcc
HB_GT_LIB gtstd
Notes:
1) You have to have bison and gmake installed in order to build
Harbour for BSD. The file doc/howtobsd.txt gives an overview
of what is required.
2) If you have an ncurses library or a slang library, you may
want to try one of the following two values for HB_GT_LIB:
gtcrs
gtsln
In which case you'll also need to export HB_SCREEN_LIB with
the name of the appropriate screen library, if it doesn't
match the default value in config/bsd/gcc.mk
For GCC on Linux:
HB_PLATFORM linux
HB_COMPILER gcc
HB_GT_LIB gtstd
Notes:
1) If you have an ncurses library or a slang library, you may
want to try one of the following two values for HB_GT_LIB:
gtcrs
gtsln
In which case you'll also need to export HB_SCREEN_LIB with
the name of the appropriate screen library, if it doesn't
match the default value in config/linux/gcc.mk.
2) If you want to take advantage of compiler cache programs
1) If you want to take advantage of compiler cache programs
(such as http://ccaache.samba.org), you may set environment
variable HB_CCACHE with the value containing the name of program.
@@ -199,26 +180,21 @@ For GCC on OS/2 for VIO mode:
you must also point LIBRARY_PATH to the EMX library directory.
HB_PLATFORM os2
HB_COMPILER gcc
HB_GT_LIB gtos2
For Borland C++ 5.5
HB_PLATFORM win
HB_COMPILER bcc
HB_GT_LIB gtwin
For Borland C++ 3.x
HB_PLATFORM dos
HB_GT_LIB gtdos
For DJGPP (GCC port for DOS)
HB_PLATFORM dos
HB_COMPILER djgpp
HB_GT_LIB gtdos
For Watcom C/C++ 10.x (default Makefile creates DOS4G extender executables)
HB_PLATFORM dos
HB_COMPILER watcom
HB_GT_LIB gtdos
Note: It is possible that you will have to increase the space reserved for
DOS environment variables in order to successfuly run make utility
(Add for example:

5
harbour/doc/windll.txt
View File

@@ -29,10 +29,6 @@ Harbour supports Windows DLLs in 3 ways.
For the Borland C platform, use that library and import32.lib
and cw32.lib from Borland, and you are ready to go.
See contrib\delphi\hbdll for an example of a Delphi program that can
use all of Harbour's functionality by accessing a self-contained DLL.
bld_sdll.bat is used there to create the DLL.
2) PCode EXEs using a Harbour.dll
@@ -90,4 +86,3 @@ Please notice that there are three different Windows DLL entry points:
If you are looking to build a Harbour.dll, then you must use
maindllh.c

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

@@ -196,7 +196,7 @@ All those commands/functions behave the same way as in other GTs.
Unlike other GTs, however, GTWVW supports multi-windows.
GTWVW has been tested using BCC32 only. To use GTWVW, build GTWVW.LIB using
make_b32.bat, then link it to your application as your GT. (Currently
hbmk2, then link it to your application as your GT. (Currently
GTWVW cannot coexist with GTWVT in a MULTIGT environment.)
Some special characteristics of GTWVW:

1
harbour/examples/gtwvw/docs/whatsnew.txt
View File

@@ -113,7 +113,6 @@
+ contrib/gtwvw/samples/drawimg.prg
+ contrib/gtwvw/samples/wutil.prg
+ contrib/gtwvw/samples/wutil.ch
+ contrib/gtwvw/samples/drawimg.bat
* A sample about this new feature.
Notes on WVW_DRAWIMAGE()

1
harbour/examples/gtwvw/tests/drawimg.prg
View File

@@ -4,7 +4,6 @@
/*
compile and link this file together with wutil.prg
(use drawimg.bat to build)
This is a sample of how to display an image file (.bmp,.gif,.jpg)
in four ways:

10
harbour/examples/guestbk/guestbk.txt
View File

@@ -4,12 +4,12 @@ Felipe Coury <fcoury@flexsys-ci.com>
How to create and test the Harbour Guestbook
You'll find bldguest.bat, guestbk.prg, guestbk.htm and
guestbk.htm files. To build the executable, review
guestbk.prg and check the directories for locating
guestbk.ini and guestbk.htm correctly.
You'll find guestbk.prg and guestbk.htm files.
To build the executable, review guestbk.prg and
check the directories for locating guestbk.ini
and guestbk.htm correctly.
With that done, build it using bldguest.bat. Put the
With that done, build it using hbmk2. Put the
resulting .exe, the .exe and .htm files on a script-
enabled directory and call guestbk.exe via WebBrowser.

2
harbour/examples/hscript/readme.txt
View File

@@ -17,7 +17,7 @@ Inside this .zip file you will find HarbourScript package. This
should be unzipped to /tests/working/hscript directory in order
to work w/o any changes.
To make the HarbourScript Translator, hscript.exe, use makehs.bat.
To make the HarbourScript Translator, hscript.exe, use hbmk2.
If you are going to test offline, there's no need to make it,
it will be done automatically for you (Batch Power<g>). To test it,
you'll have the following options:

2
harbour/src/rtl/cdpdet.prg
View File

@@ -63,6 +63,7 @@ FUNCTION hb_cdpTerm()
ELSE
__UnixParseLangCP( GetEnv( "LC_CTYPE" ), @cCP, @cLang )
ENDIF
cCP := __CPUnixToCPStd( cCP )
#elif defined( __PLATFORM__DOS )
/* TODO */
#elif defined( __PLATFORM__OS2 )
@@ -88,6 +89,7 @@ FUNCTION hb_cdpOS()
ELSE
__UnixParseLangCP( GetEnv( "LC_CTYPE" ), @cCP, @cLang )
ENDIF
cCP := __CPUnixToCPStd( cCP )
#elif defined( __PLATFORM__DOS )
/* TODO */
#elif defined( __PLATFORM__OS2 )

6
harbour/src/rtl/gtfunc.c
View File

@@ -63,7 +63,7 @@ HB_FUNC( HB_SETDISPCP )
else
hb_gtSetDispCP( hb_parc( 1 ), hb_parc( 2 ), hb_parl( 3 ) );
}
else
else if( !( hb_pcount() >= 1 && HB_ISNIL( 1 ) ) )
hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -71,7 +71,7 @@ HB_FUNC( HB_SETKEYCP )
{
if( HB_ISCHAR( 1 ) )
hb_gtSetKeyCP( hb_parc( 1 ), hb_parc( 2 ) );
else
else if( !( hb_pcount() >= 1 && HB_ISNIL( 1 ) ) )
hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -90,7 +90,7 @@ HB_FUNC( HB_SETTERMCP )
hb_gtSetKeyCP( hb_parc( 1 ), hb_parc( 2 ) );
}
}
else
else if( !( hb_pcount() >= 1 && HB_ISNIL( 1 ) ) )
hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}