From 2bb29b565d8852d12994034a3bc4dbaaeea67be2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 23 Oct 2007 23:51:07 +0000 Subject: [PATCH] 2007-10-24 01:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/libnf/fttext.c % Optimized _writeeol() * contrib/libnf/readme.txt ! Old typos fixed. * include/hbgtinfo.ch * contrib/xhb/hbcompat.ch ! Some xhb specific MaxRow()/MaxCol() parameter extension macros (also named GTI_*) moved to xhb contrib. - bin/bld.cmd - Removed obsolete version of bld.bat (aimed for OS/2). OS/2 users should use bld.bat. - bin/bld.sh - Removed obsolete file. Linux/Unix users should use hb*.sh scripts, which are properly working (as opposed to bld.sh). * harbour-ce-spec * harbour.spec * doc/howtobld.txt - Removed gharbour and harbour-link compatibility commands (to lessen equivalent user choices and to have every harbour related stuff to start with hb) Pls use hbcmp and hblnk respectively. --- harbour/ChangeLog | 28 +++++ harbour/bin/bld.cmd | 200 ------------------------------- harbour/bin/bld.sh | 152 ----------------------- harbour/contrib/libnf/fttext.c | 11 +- harbour/contrib/libnf/readme.txt | 3 +- harbour/contrib/xhb/hbcompat.ch | 17 ++- harbour/doc/howtobld.txt | 2 - harbour/harbour-ce-spec | 1 - harbour/harbour.spec | 4 - harbour/include/hbgtinfo.ch | 23 ++-- 10 files changed, 49 insertions(+), 392 deletions(-) delete mode 100644 harbour/bin/bld.cmd delete mode 100755 harbour/bin/bld.sh diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 59f1dc6016..bbf72ae0b9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,34 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-10-24 01:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/libnf/fttext.c + % Optimized _writeeol() + + * contrib/libnf/readme.txt + ! Old typos fixed. + + * include/hbgtinfo.ch + * contrib/xhb/hbcompat.ch + ! Some xhb specific MaxRow()/MaxCol() parameter + extension macros (also named GTI_*) moved to xhb contrib. + + - bin/bld.cmd + - Removed obsolete version of bld.bat (aimed for OS/2). + OS/2 users should use bld.bat. + + - bin/bld.sh + - Removed obsolete file. Linux/Unix users should use hb*.sh + scripts, which are properly working (as opposed to bld.sh). + + * harbour-ce-spec + * harbour.spec + * doc/howtobld.txt + - Removed gharbour and harbour-link compatibility commands + (to lessen equivalent user choices and to have every harbour + related stuff to start with hb) + Pls use hbcmp and hblnk respectively. + 2007-10-23 22:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/harbour-ce-spec * set svn:keywords=Id, svn:eol-style=native diff --git a/harbour/bin/bld.cmd b/harbour/bin/bld.cmd deleted file mode 100644 index c04d9ff155..0000000000 --- a/harbour/bin/bld.cmd +++ /dev/null @@ -1,200 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem Template to build a final Harbour executable, using Harbour -rem with the C code generation feature, then calling the proper C -rem linker/compiler. -rem -rem Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) -rem See doc/license.txt for licensing terms. -rem --------------------------------------------------------------- - -rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=os2 -rem if "%HB_COMPILER%" == "" set HB_COMPILER=gcc -rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= - -if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\bin\ -if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\lib\ -if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\ - -:START - - if "%HB_ARCHITECTURE%" == "" goto NO_ARCH - if "%HB_COMPILER%" == "" goto NO_COMP - - if not "%1" == "" goto COMPILE - -:HELP - - echo. - echo Usage: bld filename - echo. - echo Notes: - echo. - echo - 'filename' is the .prg filename *without* extension. - echo - Don't forget to make a MAIN() function for you application. - echo - This batch file assumes you are in some directory off the main - echo harbour directory. - echo - Environment variables HB_ARCHITECTURE, HB_COMPILER, HB_GT_LIB - echo should be set. Setting HB_GT_LIB is optional. - echo The following values are currently supported: - echo. - echo HB_ARCHITECTURE: - echo - dos (HB_GT_LIB=gtdos by default) - echo - w32 (HB_GT_LIB=gtwin by default) - echo - linux (HB_GT_LIB=gtstd by default) - echo - os2 (HB_GT_LIB=gtos2 by default) - echo. - pause - echo HB_COMPILER: - echo - When HB_ARCHITECTURE=dos - echo - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit) - echo - djgpp (Delorie GNU C, DOS 32-bit) - echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) - echo - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit) - echo - When HB_ARCHITECTURE=w32 - echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) - echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) - echo - mingw32 (Cygnus/Mingw32 GNU C, Windows 32-bit) - echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) - echo - icc (IBM Visual Age C++, Windows 32-bit) - echo - msvc (Microsoft Visual C++, Windows 32-bit) - echo - When HB_ARCHITECTURE=linux - echo - gcc (GNU C, 32-bit) - echo - When HB_ARCHITECTURE=os2 - echo - gcc (EMX GNU C, OS/2 32-bit) - echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) - echo. - pause - echo HB_GT_LIB: - echo - gtstd (Standard streaming) (for all architectures) - echo - gtdos (DOS console) (for dos architecture) - echo - gtwin (Win32 console) (for w32 architecture) - echo - gtos2 (OS/2 console) (for os2 architecture) - echo - gtpca (PC ANSI console) (for all architectures) - echo - gtcrs (Curses console) (for linux, w32 architectures) - echo - gtsln (Slang console) (for linux, w32 architectures) - goto END - -:NO_ARCH - - echo Error: HB_ARCHITECTURE is not set. - goto HELP - -:NO_COMP - - echo Error: HB_COMPILER is not set. - goto HELP - -:BAD_ARCH - - echo Error: HB_ARCHITECTURE value is unsupported. - goto HELP - -:BAD_COMP - - echo Error: HB_COMPILER value is unsupported. - goto HELP - -:COMPILE - - %HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_INC_INSTALL% %2 %3 %HARBOURFLAGS% - -:A_DOS - - if not "%HB_GT_LIB%" == "" set _HB_GT_LIB=%HB_GT_LIB% - - if not "%HB_ARCHITECTURE%" == "dos" goto A_W32 - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtdos - - if not "%HB_COMPILER%" == "bcc16" goto A_DOS_BCC16_NOT - - echo -O2 -d -mh %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp - echo -e%1.exe >> build.tmp - echo %1.c >> build.tmp - echo debug.lib >> build.tmp - echo vm.lib >> build.tmp - echo rtl.lib >> build.tmp - echo %_HB_GT_LIB%.lib >> build.tmp - echo lang.lib >> build.tmp - echo rdd.lib >> build.tmp - echo macro.lib >> build.tmp - echo pp.lib >> build.tmp - echo dbfntx.lib >> build.tmp - echo dbfcdx.lib >> build.tmp - echo common.lib >> build.tmp - bcc @build.tmp - del build.tmp - goto END - -:A_DOS_BCC16_NOT - - if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT - - echo %1.c > build.tmp - echo -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> build.tmp - echo -ldebug >> build.tmp - echo -lvm >> build.tmp - echo -lrtl >> build.tmp - echo -l%_HB_GT_LIB% >> build.tmp - echo -llang >> build.tmp - echo -lrdd >> build.tmp - echo -lrtl >> build.tmp - echo -lvm >> build.tmp - echo -lmacro >> build.tmp - echo -lpp >> build.tmp - echo -ldbfnt >> build.tmp - echo -ldbfcd >> build.tmp - echo -lcommo >> build.tmp - gcc @build.tmp - del build.tmp - goto END - -:A_DOS_DJGPP_NOT - - if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - goto END - -:A_W32 - - if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2 - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin - - if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib - if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib user32.lib - if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning - - goto END - -:A_OS2 - - if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2 - - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -ldbffpt -lhbsix -lhsx -lcommon -lrtl -lvm - if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib - goto END - -:A_LINUX - - if not "%HB_ARCHITECTURE%" == "linux" goto BAD_ARCH - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd - - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - goto END - -:CLEANUP - - del %1.c - -:END diff --git a/harbour/bin/bld.sh b/harbour/bin/bld.sh deleted file mode 100755 index 75a1fe6f30..0000000000 --- a/harbour/bin/bld.sh +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/bash -# -# $Id$ -# - -# --------------------------------------------------------------- -# Template to build a final Harbour executable, using Harbour -# with the C code generation feature, then calling the proper C -# linker/compiler. -# -# Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) -# See doc/license.txt for licensing terms. -# --------------------------------------------------------------- - -if [ -z "$HB_ARCHITECTURE" ]; then export HB_ARCHITECTURE=linux; fi -if [ -z "$HB_COMPILER" ]; then export HB_COMPILER=gcc; fi -if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=; fi - -if [ -z "$HB_BIN_INSTALL" ]; then export HB_BIN_INSTALL=../bin/; fi -if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=../lib/; fi -if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=../include/; fi - -if [ -z "$HB_ARCHITECTURE" ]; then - echo Error: HB_ARCHITECTURE is not set. -fi -if [ -z "$HB_COMPILER" ]; then - echo Error: HB_COMPILER is not set. -fi - -if [ -z "$1" ] || [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then - - echo - echo Usage: bld.sh filename - echo - echo Notes: - echo - echo " - 'filename' is the .prg filename *without* extension." - echo " - Don't forget to make a MAIN() function for your application." - echo " - This batch file assumes you are in some directory off the main" - echo " harbour directory." - echo " - Environment variables HB_ARCHITECTURE, HB_COMPILER, HB_GT_LIB" - echo " should be set. Setting HB_GT_LIB is optional." - echo " The following values are currently supported:" - echo - echo " HB_ARCHITECTURE:" - echo " - dos (HB_GT_LIB=gtdos by default)" - echo " - w32 (HB_GT_LIB=gtwin by default)" - echo " - linux (HB_GT_LIB=gtstd by default)" - echo " - os2 (HB_GT_LIB=gtos2 by default)" - echo - read - echo " HB_COMPILER:" - echo " - When HB_ARCHITECTURE=dos" - echo " - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit)" - echo " - djgpp (Delorie GNU C, DOS 32-bit)" - echo " - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit)" - echo " - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit)" - echo " - When HB_ARCHITECTURE=w32" - echo " - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit)" - echo " - gcc (Cygnus/Cygwin GNU C, Windows 32-bit)" - echo " - mingw32 (Cygnus/Mingw32 GNU C, Windows 32-bit)" - echo " - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit)" - echo " - icc (IBM Visual Age C++, Windows 32-bit)" - echo " - msvc (Microsoft Visual C++, Windows 32-bit)" - echo " - When HB_ARCHITECTURE=linux" - echo " - gcc (GNU C, 32-bit)" - echo " - When HB_ARCHITECTURE=os2" - echo " - gcc (EMX GNU C, OS/2 32-bit)" - echo " - icc (IBM Visual Age C++ 3.0, OS/2 32-bit)" - echo - read - echo " HB_GT_LIB:" - echo " - gtstd (Standard streaming) (for all architectures)" - echo " - gtdos (DOS console) (for dos architecture)" - echo " - gtwin (Win32 console) (for w32 architecture)" - echo " - gtos2 (OS/2 console) (for os2 architecture)" - echo " - gtpca (PC ANSI console) (for all architectures)" - echo " - gtcrs (Curses console) (for linux, w32 architectures)" - echo " - gtsln (Slang console) (for linux, w32 architectures)" - exit - -else - - $HB_BIN_INSTALL/harbour $1.prg -n -i$HB_INC_INSTALL $2 $3 $HARBOURFLAGS - - if [ "$HB_ARCHITECTURE" = "dos" ]; then - - if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtdos; fi - - if [ "$HB_COMPILER" = "bcc16" ]; then - bcc -O2 -mh -d $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL $1.c debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib - elif [ "$HB_COMPILER" = "djgpp" ]; then - gcc $1.c -o$1.exe $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommo - elif [ "$HB_COMPILER" = "rsx32" ]; then - gcc $1.c -Zrsx32 $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - else - echo Error: HB_COMPILER value is unsupported. - fi - - elif [ "$HB_ARCHITECTURE" = "w32" ]; then - - if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtwin; fi - - if [ "$HB_COMPILER" = "bcc32" ]; then - bcc32 -O2 -d $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL $1.c debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib - elif [ "$HB_COMPILER" = "gcc" ]; then - gcc $1.c -o$1.exe $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - elif [ "$HB_COMPILER" = "mingw32" ]; then - gcc $1.c -o$1.exe $CFLAGS -mno-cygwin -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - elif [ "$HB_COMPILER" = "rsxnt" ]; then - gcc $1.c -Zwin32 $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - elif [ "$HB_COMPILER" = "msvc" ]; then - cl -TP -W3 $CFLAGS -I$HB_INC_INSTALL $1.c /link /subsystem:CONSOLE $HB_LIB_INSTALL\debug.lib $HB_LIB_INSTALL\vm.lib $HB_LIB_INSTALL\rtl.lib $HB_LIB_INSTALL\$HB_GT_LIB.lib $HB_LIB_INSTALL\lang.lib $HB_LIB_INSTALL\rdd.lib $HB_LIB_INSTALL\macro.lib $HB_LIB_INSTALL\pp.lib $HB_LIB_INSTALL\dbfntx.lib $HB_LIB_INSTALL\dbfcdx.lib - echo Ignore LNK4033 warning - else - echo Error: HB_COMPILER value is unsupported. - fi - - elif [ "$HB_ARCHITECTURE" = "os2" ]; then - - if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtos2; fi - - if [ "$HB_COMPILER" = "gcc" ]; then - gcc $1.c $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - elif [ "$HB_COMPILER" = "icc" ]; then - icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp $CFLAGS -I$HB_INC_INSTALL $1.c $HB_LIB_INSTALL\debug.lib $HB_LIB_INSTALL\vm.lib $HB_LIB_INSTALL\rtl.lib $HB_LIB_INSTALL\$HB_GT_LIB.lib $HB_LIB_INSTALL\lang.lib $HB_LIB_INSTALL\rdd.lib $HB_LIB_INSTALL\rtl.lib $HB_LIB_INSTALL\vm.lib $HB_LIB_INSTALL\macro.lib $HB_LIB_INSTALL\pp.lib $HB_LIB_INSTALL\dbfntx.lib $HB_LIB_INSTALL\dbfcdx.lib - else - echo Error: HB_COMPILER value is unsupported. - fi - - elif [ "$HB_ARCHITECTURE" = "linux" ]; then - if [ "$HB_GT_LIB" = "gtcrs" ]; then - export HB_SCREEN_LIB="-lncurses" - fi - - if [ "$HB_GT_LIB" = "gtsln" ]; then - export HB_SCREEN_LIB="-lslang" - fi - - if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtstd; fi - - if [ "$HB_COMPILER" = "gcc" ]; then - gcc $1.c -o$1 $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -lcodepage -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon $HB_SCREEN_LIB -lm - else - echo Error: HB_COMPILER value is unsupported. - fi - - else - echo Error: HB_ARCHITECTURE value is unsupported. - unlink $1.c - fi -fi diff --git a/harbour/contrib/libnf/fttext.c b/harbour/contrib/libnf/fttext.c index d6296977a8..f098eb0495 100644 --- a/harbour/contrib/libnf/fttext.c +++ b/harbour/contrib/libnf/fttext.c @@ -1985,17 +1985,8 @@ static BOOL _writeeol( FHANDLE fhnd ) { char * crlf = hb_conNewLine(); int len = strlen( crlf ); - int tmp; - for( tmp = 0; tmp < len; tmp++ ) - { - if( _fsWrite( fhnd, (void *) ( crlf + tmp ), 1 ) != 1 ) - { - return FALSE; - } - } - - return TRUE; + return ( _fsWrite( fhnd, crlf, len ) == len ); } /* fttext.c eof */ diff --git a/harbour/contrib/libnf/readme.txt b/harbour/contrib/libnf/readme.txt index dda597febe..52292bb803 100644 --- a/harbour/contrib/libnf/readme.txt +++ b/harbour/contrib/libnf/readme.txt @@ -17,7 +17,7 @@ asm\SAVEATT.ASM ; FT_SAVEATT() The follow functions need to be fixed. CINT86.C ; FT_INT86() -The follow functions Need that FT_INT86() been fixed or writed a "C" Wrapper +The following functions need FT_INT86() or to be rewritten in C: SETDATE.PRG FT_SETDATE() SETTIME.PRG FT_SETTIME() @@ -32,4 +32,3 @@ NWSEM.PRG FT_NWSEMLOCK() NWSEM.PRG FT_NWSEMUNLOCK() NWUID.PRG FT_NWUID() FLOPTST.PRG FT_FLOPTST() - diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index 5cf35b29ea..640a8f5b2a 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -53,14 +53,9 @@ #ifdef __HARBOUR__ #ifdef __XHARBOUR__ + #include "gtinfo.ch" #include "gfx.ch" -#else - #include "hbgtinfo.ch" - #include "hbgfx.ch" -#endif - -#ifdef __XHARBOUR__ #xtranslate hb_gtSys => gtSys #xtranslate hb_gtInfo([]) => gtInfo() @@ -101,6 +96,15 @@ #else + #include "hbgtinfo.ch" + #include "hbgfx.ch" + + /* these are used _by_ MaxRow()/MaxCol() */ + #define GTI_WINDOW 0 /* Maximum window size ('window' in CT terms) */ + #define GTI_SCREEN 1 /* Maximum screen size ('Screen' in CT terms) */ + #define GTI_CLIENT 2 /* Maximum possible client size of a window */ + #define GTI_MAX 3 /* Maximum possible window size (in Windows) */ + #xtranslate gtSys => hb_gtSys #xtranslate gtInfo([]) => hb_gtInfo() #xtranslate hb_gt_Version([]) => hb_gtVersion() @@ -246,3 +250,4 @@ #endif #endif /* __HARBOUR__ */ + diff --git a/harbour/doc/howtobld.txt b/harbour/doc/howtobld.txt index 602cc8721d..bc03348d6a 100644 --- a/harbour/doc/howtobld.txt +++ b/harbour/doc/howtobld.txt @@ -48,8 +48,6 @@ All these scripts accept command line switches: Link options work only with "hblnk" and "hbmk" and have no effect in "hbcc" and "hbcmp". Other options are passed to Harbour/C compiler/linker. -To save compatibility with older harbour distributions, "gharbour" can -be used as a synonym of "hbcmp", and "harbour-link" as synonym of "hblnk" An example compile/link session looks like: ---------------------------------------------------------------------- diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index efa6f9569e..2225a485de 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -171,7 +171,6 @@ ${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* # remove unused files rm -fR ${HB_BIN_INSTALL}/{harbour,hbdoc,hbdot,hbmake,hbpp,hbrun,hbtest,hbverfix,pretest}.exe -rm -fR ${HB_BIN_INSTALL}/{gharbour,harbour-link} rm -fR $HB_INC_INSTALL mv ${HB_BIN_INSTALL}/hb-mkslib ${HB_BIN_INSTALL}/%{hb_pref}-mkslib diff --git a/harbour/harbour.spec b/harbour/harbour.spec index b05f0a6ba7..6be025dc62 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -361,8 +361,6 @@ All these scripts accept command line switches: Link options work only with "%{hb_pref}lnk" and "%{hb_pref}mk" and have no effect in "%{hb_pref}cc" and "%{hb_pref}cmp". Other options are passed to %{dname}/C compiler/linker. -To save compatibility with older rpm distributions, "gharbour" can be used -as a synonym of "%{hb_pref}cmp", and "harbour-link" as synonym of "%{hb_pref}lnk" An example compile/link session looks like: ---------------------------------------------------------------------- @@ -473,8 +471,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/%{hb_pref}cmp %{_bindir}/%{hb_pref}lnk %{_bindir}/%{hb_pref}mk -%{_bindir}/gharbour -%{_bindir}/harbour-link #%{_bindir}/hbtest %{_bindir}/hbrun %{_bindir}/hbdot diff --git a/harbour/include/hbgtinfo.ch b/harbour/include/hbgtinfo.ch index 4e78f20bb2..122e820a5c 100644 --- a/harbour/include/hbgtinfo.ch +++ b/harbour/include/hbgtinfo.ch @@ -112,7 +112,6 @@ #define GTI_VIEWPORTHEIGHT 36 /* Current viewport height:for current mode */ #define GTI_VIEWPORTWIDTH 37 /* Current viewport width:either win or full scrn */ - #define GTI_STDOUTCON 38 /* redirect STDOUT to console */ #define GTI_STDERRCON 39 /* redirect STDERR to console */ @@ -125,21 +124,15 @@ #define GTI_ADDKEYMAP 45 /* add key escape sequences */ #define GTI_DELKEYMAP 46 /* del key escape sequences */ -/* these are used _by_ MaxRow/Col */ -#define GTI_WINDOW 0 /* Maximum window size ('window' in CT terms) */ -#define GTI_SCREEN 1 /* Maximum screen size ('Screen' in CT terms) */ -#define GTI_CLIENT 2 /* Maximum possible client size of a window */ -#define GTI_MAX 3 /* Maximum possible window size (in Windows) */ - /* Font weights */ -#define GTI_FONTW_THIN 1 -#define GTI_FONTW_NORMAL 2 -#define GTI_FONTW_BOLD 3 - -/* Font sizes */ -#define GTI_FONTQ_DRAFT 1 -#define GTI_FONTQ_NORMAL 2 -#define GTI_FONTQ_HIGH 3 +#define GTI_FONTW_THIN 1 +#define GTI_FONTW_NORMAL 2 +#define GTI_FONTW_BOLD 3 + +/* Font sizes */ +#define GTI_FONTQ_DRAFT 1 +#define GTI_FONTQ_NORMAL 2 +#define GTI_FONTQ_HIGH 3 /* Keyboard shifts states */ #define GTI_KBD_SHIFT 1