20000306-22:12 GMT+1 Victor Szakats <info@szelvesz.hu>

This commit is contained in:
Viktor Szakats
2000-03-06 21:18:43 +00:00
parent 04e124bd3c
commit ed49d952f7
36 changed files with 304 additions and 259 deletions

View File

@@ -1,3 +1,49 @@
20000306-22:12 GMT+1 Victor Szakats <info@szelvesz.hu>
- ee.lbl
- ee.frm
+ test.lbl
+ test.frm
* tests/testrpt.prg
tests/testlbl.prg
* EE.* renamed to TEST.*
* makefile.bc
makefile.vc
+ TODO added.
- include/unistd.h
* doc/gmake.txt
makefile.vc
- UNISTD.H addition (20000306-17:34 GMT+1) undone.
- config/dos/bcc31.cfg
+ config/dos/bcc16.cfg
config/dos/global.cfg
make_tpl.*
bin/bld_tpl.*
doc/gmake.txt
doc/funclist.txt
* Renamed.
* bin/bld_tpl.*
+ lib list made common for all platforms.
+ BCC32 added for bld_tpl.*.
* bin/bld_tpl.*
source/runner/stdalone/Makefile
tests/Makefile
tests/regress/Makefile
utils/hbdoc/Makefile
! Changed the order of libs to make it work after the VM/RTL moves.
* tests/parexpr.prg
tests/testwarn.prg
! Warnings treaten as non-fatal (with #pragma).
* tests/memvar.prg
tests/testvars.prg
! Warnings fixed.
* tests/dates.prg
! A PROC was returning a value.
- include/hbrptlbl.ch
source/rtl/tlabel.prg
source/rtl/treport.prg
* Public #defines from a public header moved to the only source
files where they are used.
20000306-17:34 GMT+1 Victor Szakats <info@szelvesz.hu>
+ include/unistd.h
* doc/gmake.txt

View File

@@ -11,11 +11,10 @@ echo pp.lib >> build.tmp
echo common.lib >> build.tmp
echo terminal.lib >> build.tmp
echo macro.lib >> build.tmp
echo tools.lib >> build.tmp
echo dbfntx.lib >> build.tmp
echo dbfcdx.lib >> build.tmp
echo debug.lib >> build.tmp
echo runner.lib >> build.tmp
echo tools.lib >> build.tmp
bcc @build.tmp
del build.tmp
del %1.c

View File

@@ -4,5 +4,5 @@ rem $Id$
rem
..\bin\harbour %1 %2 %3 /n /i..\include
bcc32 %1.c -e%1.exe -5 -O2 -I..\include -L..\lib\b32 common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib runner.lib terminal.lib tools.lib
bcc32 %1.c -e%1.exe -5 -O2 -I..\include -L..\lib\b32 common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib terminal.lib tools.lib
rem del %1.c

View File

@@ -4,6 +4,6 @@ rem $Id$
rem
..\bin\harbour %1 %2 %3 /n /i..\include /gf
tlink32 -L..\lib\b32 c0x32.obj %1.obj hvm.obj,%1.exe,, common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib runner.lib terminal.lib tools.lib import32.lib cw32mt.lib
tlink32 -L..\lib\b32 c0x32.obj %1.obj hvm.obj,%1.exe,, common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib terminal.lib import32.lib cw32mt.lib tools.lib
del %1.obj

View File

@@ -4,5 +4,5 @@ rem $Id$
rem
..\bin\harbour %1 %2 %3 /n /i..\include
bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -5 -tW common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib runner.lib terminal.lib tools.lib
bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -5 -tW common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib terminal.lib tools.lib
rem del %1.c

View File

@@ -8,7 +8,8 @@ rem Flavour: DOS/Windows batch file
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 linker/compiler. This file will only work if Harbour was built
rem using the GNU-make system.
rem
rem Copyright 1999 Victor Szakats <info@szelvesz.hu>
rem See doc/license.txt for licensing terms.
@@ -47,15 +48,15 @@ rem set HB_COMPILER=
pause
echo HB_COMPILER:
echo - When HB_ARCHITECTURE=dos
echo - bcc31 (Borland C/C++ 3.1, 16-bit DOS)
echo - bcc16 (Borland C++ 3.x, 16-bit DOS)
echo - djgpp (GCC (DJGPP), 32-bit Windows)
echo - watcom
echo - When HB_ARCHITECTURE=w32
echo - bcc32
echo - bcc32 (Borland C++ 4.x,5.x, 32-bit Windows)
echo - gcc (GCC (Cygnus), 32-bit Windows)
echo - mingw32 (GCC (Cygnus/MingW32), Windows 32 bit (console mode))
echo - icc
echo - msvc (MSVC v 12.00.8168, Windows 32 bit (console mode))
echo - msvc (Microsoft Visual C++, Windows 32 bit (console mode))
echo - When HB_ARCHITECTURE=linux
echo - gcc
echo - When HB_ARCHITECTURE=os2
@@ -79,17 +80,18 @@ rem set HB_COMPILER=
if not "%HB_ARCHITECTURE%" == "dos" goto A_W32
if "%HB_COMPILER%" == "bcc31" bcc -O2 -mh -I..\include %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "djgpp" gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfnt -ldbfcd -lcommon
if "%HB_COMPILER%" == "bcc16" bcc -O2 -mh -I..\include %1.c -L..\lib tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
if "%HB_COMPILER%" == "djgpp" gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommon
goto END
:A_W32
if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2
if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\macro.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -I..\include %1.c -L..\lib tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning
goto END
@@ -97,15 +99,16 @@ rem set HB_COMPILER=
if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\main.obj ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
goto END
:A_LINUX
if not "%HB_ARCHITECTURE%" == "linux" goto CLEANUP
if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
goto END
:CLEANUP

View File

@@ -8,7 +8,8 @@ rem Flavour: OS/2 command file
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 linker/compiler. This file will only work if Harbour was built
rem using the GNU-make system.
rem
rem Copyright 1999 Victor Szakats <info@szelvesz.hu>
rem See doc/license.txt for licensing terms.
@@ -47,15 +48,15 @@ rem set HB_COMPILER=
pause
echo HB_COMPILER:
echo - When HB_ARCHITECTURE=dos
echo - bcc31 (Borland C/C++ 3.1, 16-bit DOS)
echo - bcc16 (Borland C++ 3.x, 16-bit DOS)
echo - djgpp (GCC (DJGPP), 32-bit Windows)
echo - watcom
echo - When HB_ARCHITECTURE=w32
echo - bcc32
echo - bcc32 (Borland C++ 4.x,5.x, 32-bit Windows)
echo - gcc (GCC (Cygnus), 32-bit Windows)
echo - mingw32 (GCC (Cygnus/MingW32), Windows 32 bit (console mode))
echo - icc
echo - msvc (MSVC v 12.00.8168, Windows 32 bit (console mode))
echo - msvc (Microsoft Visual C++, Windows 32 bit (console mode))
echo - When HB_ARCHITECTURE=linux
echo - gcc
echo - When HB_ARCHITECTURE=os2
@@ -79,17 +80,18 @@ rem set HB_COMPILER=
if not "%HB_ARCHITECTURE%" == "dos" goto A_W32
if "%HB_COMPILER%" == "bcc31" bcc -O2 -mh -I..\include %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "djgpp" gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfnt -ldbfcd -lcommon
if "%HB_COMPILER%" == "bcc16" bcc -O2 -mh -I..\include %1.c -L..\lib tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
if "%HB_COMPILER%" == "djgpp" gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommon
goto END
:A_W32
if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2
if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\macro.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -I..\include %1.c -L..\lib tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning
goto END
@@ -97,15 +99,16 @@ rem set HB_COMPILER=
if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\main.obj ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
goto END
:A_LINUX
if not "%HB_ARCHITECTURE%" == "linux" goto CLEANUP
if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -ltools -ldebug -lvm -lrtl -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
goto END
:CLEANUP

View File

@@ -4,5 +4,5 @@ rem $Id$
rem
..\bin\harbour %1 %2 %3 /n /i..\include
cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\vc\harbour.lib ..\lib\vc\pp.lib ..\lib\vc\terminal.lib ..\lib\vc\tools.lib ..\lib\vc\dbfntx.lib ..\lib\vc\dbfcdx.lib ..\lib\vc\debug.lib ..\lib\vc\macro.lib ..\lib\vc\common.lib
cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\vc\tools.lib ..\lib\vc\harbour.lib ..\lib\vc\pp.lib ..\lib\vc\terminal.lib ..\lib\vc\dbfntx.lib ..\lib\vc\dbfcdx.lib ..\lib\vc\debug.lib ..\lib\vc\macro.lib ..\lib\vc\common.lib
del %1.c

View File

@@ -15,7 +15,7 @@ MK := $(subst \,/,$(subst \~,~,$(MAKE)))
ifeq ($(COMSPEC),) #location of command.com
COMSPEC := command.com
else
ifeq ($(HB_COMPILER),bcc31)
ifeq ($(HB_COMPILER),bcc16)
#Use standard dos path, which is already set up.
else
COMSPEC := $(subst \,/,$(COMSPEC))

View File

@@ -9,7 +9,7 @@
;
; Where:
; <state> - R[eady], S[tarted], N[ot Started]
; <platform> - dos[-bcc31]
; <platform> - dos[-bcc16]
; dos[-djgpp]
; dos[-watcom]
; w32[-bcc32][+T]

View File

@@ -145,7 +145,8 @@ For gcc on Win95/WinNT with the Mingw32 library:
C_USR -DHARBOUR_USE_WIN_GTAPI
For MSVC on Win95/WinNT:
Notes: gnu make is case sensitive! If your editor converts
Notes: You must create an empty unistd.h in the include directory.
gnu make is case sensitive! If your editor converts
harbour.c to HARBOUR.C when it saves the file, then gnu make
_will_not_work.
If you have MAKE_MODE in your dos environment, make sure it is
@@ -175,13 +176,14 @@ For GCC on OS/2:
-DHARBOUR_USE_SLN_GTAPI
For IBM Visual Age C++ on OS/2:
Note: You must create an empty unistd.h in the IBMCPP\INCLUDE directory.
HB_ARCHITECTURE os2
HB_COMPILER icc
C_USR -DHARBOUR_USE_OS2_GTAPI
For Borland C++ 3.1
For Borland C++ 3.x
HB_ARCHITECTURE dos
HB_COMPILER bcc31
HB_COMPILER bcc16
C_USR -DHARBOUR_USE_DOS_GTAPI
For DJGPP (GCC port for DOS)

View File

@@ -53,7 +53,6 @@ PRG_HEADERS=\
hbextern.ch \
hbmemory.ch \
hbmemvar.ch \
hbrptlbl.ch \
hbsetup.ch \
inkey.ch \
memoedit.ch \

View File

@@ -1,175 +0,0 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* Header file for TLabelForm and TReportForm Classes
*
* Copyright 1999 {list of individual authors and e-mail addresses}
* 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 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
* 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/).
*
*/
#ifndef HB_RPTLBL_CH_
#define HB_RPTLBL_CH_
#define _RFRM_PAGENO 3 // "Page No."
#define _RFRM_SUBTOTAL 4 // "** Subtotal **"
#define _RFRM_SUBSUBTOTAL 5 // "* Subsubtotal *"
#define _RFRM_TOTAL 6 // "*** Total ***"
#define RPT_HEADER 1 // Array of header strings
#define RPT_WIDTH 2 // Numeric, report page width
#define RPT_LMARGIN 3 // Numeric, report page offset
#define RPT_RMARGIN 4 // NIL, Not used
#define RPT_LINES 5 // Numeric, number of lines per page
#define RPT_SPACING 6 // Numeric, single=1, double=2
#define RPT_BEJECT 7 // Logical, eject before 1st page, .T.=Yes .F.=No
#define RPT_AEJECT 8 // Logical, eject after last page, .T.=Yes .F.=No
#define RPT_PLAIN 9 // Logical, plain report, .T.=Yes .F.=No
#define RPT_SUMMARY 10 // Logical, no detail lines, .T.=Yes .F.=No
#define RPT_COLUMNS 11 // Array of Column arrays
#define RPT_GROUPS 12 // Array of Group arrays
#define RPT_HEADING 13 // Character, heading for the report
#define RPT_COUNT 13 // Number of elements in the Report array
// Column array definitions ( one array per column definition )
#define RCT_EXP 1 // Block, contains compiled column expression
#define RCT_TEXT 2 // Character, contains text column expression
#define RCT_TYPE 3 // Character, type of expression
#define RCT_HEADER 4 // Array of column heading strings
#define RCT_WIDTH 5 // Numeric, column width including decimals and
// decimal point
#define RCT_DECIMALS 6 // Numeric, number of decimal places
#define RCT_TOTAL 7 // Logical, total this column, .T.=Yes .F.=No
#define RCT_PICT 8 // Character, picture string
#define RCT_COUNT 8 // Number of elements in the Column array
// Group array definitions ( one array per group definition )
#define RGT_EXP 1 // Block, contains compiled group expression
#define RGT_TEXT 2 // Character, contains text group expression
#define RGT_TYPE 3 // Character, type of expression
#define RGT_HEADER 4 // Character, column heading string
#define RGT_AEJECT 5 // Logical, eject after group, .T.=Yes .F.=No
#define RGT_COUNT 5 // Number of elements in the Group array
#define SIZE_FILE_BUFF 1990 // Size of report file
#define SIZE_LENGTHS_BUFF 110
#define SIZE_OFFSETS_BUFF 110
#define SIZE_EXPR_BUFF 1440
#define SIZE_FIELDS_BUFF 300
#define SIZE_PARAMS_BUFF 24
// Definitions for offsets into the FILE_BUFF string
#define LENGTHS_OFFSET 5 // Start of expression length array
#define OFFSETS_OFFSET 115 // Start of expression position array
#define EXPR_OFFSET 225 // Start of expression data area
#define FIELDS_OFFSET 1665 // Start of report columns (fields)
#define PARAMS_OFFSET 1965 // Start of report parameters block
// These are offsets into the FIELDS_BUFF string to actual values
// Values are added to a block offset FLD_OFFSET that is moved in
// increments of 12
#define FIELD_WIDTH_OFFSET 1
#define FIELD_TOTALS_OFFSET 6
#define FIELD_DECIMALS_OFFSET 7
// These are offsets into FIELDS_BUFF which are used to 'point' into
// the EXPR_BUFF string which contains the textual data
#define FIELD_CONTENT_EXPR_OFFSET 9
#define FIELD_HEADER_EXPR_OFFSET 11
// These are actual offsets into the PARAMS_BUFF string which
// are used to 'point' into the EXPR_BUFF string
#define PAGE_HDR_OFFSET 1
#define GRP_EXPR_OFFSET 3
#define SUB_EXPR_OFFSET 5
#define GRP_HDR_OFFSET 7
#define SUB_HDR_OFFSET 9
// These are actual offsets into the PARAMS_BUFF string to actual values
#define PAGE_WIDTH_OFFSET 11
#define LNS_PER_PAGE_OFFSET 13
#define LEFT_MRGN_OFFSET 15
#define RIGHT_MGRN_OFFSET 17
#define COL_COUNT_OFFSET 19
#define DBL_SPACE_OFFSET 21
#define SUMMARY_RPT_OFFSET 22
#define PE_OFFSET 23
#define OPTION_OFFSET 24
// File error definitions
#define F_OK 0 // No error
#define F_EMPTY -3 // File is empty
#define F_ERROR -1 // Some kind of error
#define F_NOEXIST 2 // File does not exist
#define _LF_SAMPLES 2 // "Do you want more samples?"
#define _LF_YN 12 // "Y/N"
#define LBL_REMARK 1 // Character, remark from label file
#define LBL_HEIGHT 2 // Numeric, label height
#define LBL_WIDTH 3 // Numeric, label width
#define LBL_LMARGIN 4 // Numeric, left margin
#define LBL_LINES 5 // Numeric, lines between labels
#define LBL_SPACES 6 // Numeric, spaces between labels
#define LBL_ACROSS 7 // Numeric, number of labels across
#define LBL_FIELDS 8 // Array of Field arrays
#define LBL_COUNT 8 // Numeric, number of label fields
// Field array definitions ( one array per field )
#define LF_EXP 1 // Block, field expression
#define LF_TEXT 2 // Character, text of field expression
#define LF_BLANK 3 // Logical, compress blank fields, .T.=Yes .F.=No
#define LF_COUNT 3 // Numeric, number of elements in field array
#define BUFFSIZE 1034 // Size of label file
#define FILEOFFSET 74 // Start of label content descriptions
#define FIELDSIZE 60
#define REMARKOFFSET 2
#define REMARKSIZE 60
#define HEIGHTOFFSET 62
#define HEIGHTSIZE 2
#define WIDTHOFFSET 64
#define WIDTHSIZE 2
#define LMARGINOFFSET 66
#define LMARGINSIZE 2
#define LINESOFFSET 68
#define LINESSIZE 2
#define SPACESOFFSET 70
#define SPACESSIZE 2
#define ACROSSOFFSET 72
#define ACROSSSIZE 2
#endif /* HB_RPTLBL_CH_ */

View File

@@ -1,18 +0,0 @@
/*
* $Id$
*/
/* NOTE: Temporary fix to make Harbour compile with Microsoft Visual C++ (MSVC)
on Win32 and IBM Visual Age C++ on OS/2.
- This file is intentionally empty.
- This file was intentionally not added to Makefile, since the it's
not needed to build a final Harbour application.
- This file should not conflict with other platforms since the
unistd.h file is first checked in the compilers include path, and
this one will only be used when it's not found there.
[vszakats] */
/* TOFIX: This file should be removed when the MSVC/IBMVC issue is solved.
[vszakats] */

View File

@@ -44,7 +44,7 @@ set HB_ARCHITECTURE=dos
rem ---------------------------------------------------------------
rem The following HB_COMPILER values are currently supported:
rem - When HB_ARCHITECTURE=dos
rem - bcc31
rem - bcc16
rem - djgpp
rem - watcom
rem - When HB_ARCHITECTURE=w32

View File

@@ -44,7 +44,7 @@ set HB_ARCHITECTURE=os2
rem ---------------------------------------------------------------
rem The following HB_COMPILER values are currently supported:
rem - When HB_ARCHITECTURE=dos
rem - bcc31
rem - bcc16
rem - djgpp
rem - watcom
rem - When HB_ARCHITECTURE=w32

View File

@@ -44,7 +44,7 @@ export HB_ARCHITECTURE=linux
# ---------------------------------------------------------------
# The following HB_COMPILER values are currently supported:
# - When HB_ARCHITECTURE=dos
# - bcc31
# - bcc16
# - djgpp
# - watcom
# - When HB_ARCHITECTURE=w32

View File

@@ -2,6 +2,10 @@
# $Id$
#
#
# TODO: Generate the same library names as the GNU-make system.
#
# makefile for Borland C/C++ compilers
# Merge duplicate strings

View File

@@ -13,6 +13,16 @@
# (see current one as an example)
#
#
# NOTE: In order to compile with MSVC you'll have to create an empty
# file with the name UNISTD.H in the \INCLUDE directory, until
# the issue is sorted out [vszakats].
#
#
# TODO: Generate the same library names as the GNU-make system.
#
#
# Directory macros. These should never have to change.
#

View File

@@ -34,10 +34,52 @@
*/
#include "hbclass.ch"
#include "hbrptlbl.ch"
#include "error.ch"
#include "fileio.ch"
#include "inkey.ch"
#define F_OK 0 // No error
#define F_EMPTY -3 // File is empty
#define _LF_SAMPLES 2 // "Do you want more samples?"
#define _LF_YN 12 // "Y/N"
#define LBL_REMARK 1 // Character, remark from label file
#define LBL_HEIGHT 2 // Numeric, label height
#define LBL_WIDTH 3 // Numeric, label width
#define LBL_LMARGIN 4 // Numeric, left margin
#define LBL_LINES 5 // Numeric, lines between labels
#define LBL_SPACES 6 // Numeric, spaces between labels
#define LBL_ACROSS 7 // Numeric, number of labels across
#define LBL_FIELDS 8 // Array of Field arrays
#define LBL_COUNT 8 // Numeric, number of label fields
// Field array definitions ( one array per field )
#define LF_EXP 1 // Block, field expression
#define LF_TEXT 2 // Character, text of field expression
#define LF_BLANK 3 // Logical, compress blank fields, .T.=Yes .F.=No
#define LF_COUNT 3 // Numeric, number of elements in field array
#define BUFFSIZE 1034 // Size of label file
#define FILEOFFSET 74 // Start of label content descriptions
#define FIELDSIZE 60
#define REMARKOFFSET 2
#define REMARKSIZE 60
#define HEIGHTOFFSET 62
#define HEIGHTSIZE 2
#define WIDTHOFFSET 64
#define WIDTHSIZE 2
#define LMARGINOFFSET 66
#define LMARGINSIZE 2
#define LINESOFFSET 68
#define LINESSIZE 2
#define SPACESOFFSET 70
#define SPACESSIZE 2
#define ACROSSOFFSET 72
#define ACROSSSIZE 2
CLASS TLabelForm
DATA aLabelData AS {}

View File

@@ -34,10 +34,103 @@
*/
#include "hbclass.ch"
#include "hbrptlbl.ch"
#include "error.ch"
#include "fileio.ch"
#include "inkey.ch"
#define F_OK 0 // No error
#define F_EMPTY -3 // File is empty
#define _RFRM_PAGENO 3 // "Page No."
#define _RFRM_SUBTOTAL 4 // "** Subtotal **"
#define _RFRM_SUBSUBTOTAL 5 // "* Subsubtotal *"
#define _RFRM_TOTAL 6 // "*** Total ***"
#define RPT_HEADER 1 // Array of header strings
#define RPT_WIDTH 2 // Numeric, report page width
#define RPT_LMARGIN 3 // Numeric, report page offset
#define RPT_RMARGIN 4 // NIL, Not used
#define RPT_LINES 5 // Numeric, number of lines per page
#define RPT_SPACING 6 // Numeric, single=1, double=2
#define RPT_BEJECT 7 // Logical, eject before 1st page, .T.=Yes .F.=No
#define RPT_AEJECT 8 // Logical, eject after last page, .T.=Yes .F.=No
#define RPT_PLAIN 9 // Logical, plain report, .T.=Yes .F.=No
#define RPT_SUMMARY 10 // Logical, no detail lines, .T.=Yes .F.=No
#define RPT_COLUMNS 11 // Array of Column arrays
#define RPT_GROUPS 12 // Array of Group arrays
#define RPT_HEADING 13 // Character, heading for the report
#define RPT_COUNT 13 // Number of elements in the Report array
// Column array definitions ( one array per column definition )
#define RCT_EXP 1 // Block, contains compiled column expression
#define RCT_TEXT 2 // Character, contains text column expression
#define RCT_TYPE 3 // Character, type of expression
#define RCT_HEADER 4 // Array of column heading strings
#define RCT_WIDTH 5 // Numeric, column width including decimals and
// decimal point
#define RCT_DECIMALS 6 // Numeric, number of decimal places
#define RCT_TOTAL 7 // Logical, total this column, .T.=Yes .F.=No
#define RCT_PICT 8 // Character, picture string
#define RCT_COUNT 8 // Number of elements in the Column array
// Group array definitions ( one array per group definition )
#define RGT_EXP 1 // Block, contains compiled group expression
#define RGT_TEXT 2 // Character, contains text group expression
#define RGT_TYPE 3 // Character, type of expression
#define RGT_HEADER 4 // Character, column heading string
#define RGT_AEJECT 5 // Logical, eject after group, .T.=Yes .F.=No
#define RGT_COUNT 5 // Number of elements in the Group array
#define SIZE_FILE_BUFF 1990 // Size of report file
#define SIZE_LENGTHS_BUFF 110
#define SIZE_OFFSETS_BUFF 110
#define SIZE_EXPR_BUFF 1440
#define SIZE_FIELDS_BUFF 300
#define SIZE_PARAMS_BUFF 24
// Definitions for offsets into the FILE_BUFF string
#define LENGTHS_OFFSET 5 // Start of expression length array
#define OFFSETS_OFFSET 115 // Start of expression position array
#define EXPR_OFFSET 225 // Start of expression data area
#define FIELDS_OFFSET 1665 // Start of report columns (fields)
#define PARAMS_OFFSET 1965 // Start of report parameters block
// These are offsets into the FIELDS_BUFF string to actual values
// Values are added to a block offset FLD_OFFSET that is moved in
// increments of 12
#define FIELD_WIDTH_OFFSET 1
#define FIELD_TOTALS_OFFSET 6
#define FIELD_DECIMALS_OFFSET 7
// These are offsets into FIELDS_BUFF which are used to 'point' into
// the EXPR_BUFF string which contains the textual data
#define FIELD_CONTENT_EXPR_OFFSET 9
#define FIELD_HEADER_EXPR_OFFSET 11
// These are actual offsets into the PARAMS_BUFF string which
// are used to 'point' into the EXPR_BUFF string
#define PAGE_HDR_OFFSET 1
#define GRP_EXPR_OFFSET 3
#define SUB_EXPR_OFFSET 5
#define GRP_HDR_OFFSET 7
#define SUB_HDR_OFFSET 9
// These are actual offsets into the PARAMS_BUFF string to actual values
#define PAGE_WIDTH_OFFSET 11
#define LNS_PER_PAGE_OFFSET 13
#define LEFT_MRGN_OFFSET 15
#define RIGHT_MGRN_OFFSET 17
#define COL_COUNT_OFFSET 19
#define DBL_SPACE_OFFSET 21
#define SUMMARY_RPT_OFFSET 22
#define PE_OFFSET 23
#define OPTION_OFFSET 24
CLASS TReportForm
DATA aReportData AS {}

View File

@@ -33,11 +33,11 @@
*
*/
#include 'common.ch'
#include 'error.ch'
#include 'fileio.ch'
#include "common.ch"
#include "error.ch"
#include "fileio.ch"
#define pBUFFER_LENGTH 2048
#define BUFFER_LENGTH 2048
PROCEDURE __TYPEFILE( cFile, lPrint )
LOCAL nHandle, cBuffer
@@ -109,7 +109,7 @@ PROCEDURE __TYPEFILE( cFile, lPrint )
// display the whole buffer since it said: "without any headings or formating"
? // start in a new line
DO WHILE fread( nHandle, @cbuffer, pBUFFER_LENGTH ) > 0
DO WHILE fread( nHandle, @cbuffer, BUFFER_LENGTH ) > 0
?? cBuffer
ENDDO

View File

@@ -14,15 +14,16 @@ PRG_SOURCES=\
PRG_MAIN=hbrun.prg
LIBS=\
runner \
tools \
tools \
debug \
rdd \
vm \
rdd \
rtl \
pp \
vm \
rtl \
rdd \
rtl \
vm \
macro \
common \
pp \
runner \
common \
include $(TOP)$(ROOT)config/bin.cf

View File

@@ -11,12 +11,12 @@ ROOT = ../
LIBS=\
tools \
debug \
rtl \
rdd \
vm \
rtl \
rdd \
rtl \
macro \
vm \
macro \
pp \
runner \
common \
@@ -58,7 +58,6 @@ PRG_SOURCES=\
dates2.prg \
dates3.prg \
dates4.prg \
db_brows.prg \
dbevalts.prg \
debugtst.prg \
devtest.prg \

View File

@@ -87,4 +87,4 @@ procedure TestCentury(cNewLine)
OUTSTD (__SETCENTURY ())
__SETCENTURY (5)
OUTSTD (__SETCENTURY ())
return nil
return

View File

@@ -2,6 +2,32 @@
//
// $Id$
//
MEMVAR memvar
MEMVAR memvar1
MEMVAR memvar2
MEMVAR memvar3
MEMVAR memvar4
MEMVAR mempublic
MEMVAR memprivate
MEMVAR memparam
MEMVAR memfunc
MEMVAR public1
MEMVAR public2
MEMVAR public3
MEMVAR publCB
MEMVAR private1
MEMVAR private2
MEMVAR private3
MEMVAR privVar
MEMVAR para1
MEMVAR para2
MEMVAR para3
MEMVAR parameter1again
MEMVAR param1
MEMVAR param2
MEMVAR initmem
PROCEDURE MAIN()
LOCAL main:=0

View File

@@ -8,6 +8,11 @@
// These tests were written by Dave Pearson <davep@hagbard.demon.co.uk> and
// are placed into the public domain.
// This file is OK to have warnings.
#ifdef __HARBOUR__
#pragma -es0
#endif
Function Main()
Local x
Local y

View File

@@ -22,13 +22,12 @@ PRG_SOURCES=\
PRG_MAIN=rt_main.prg
LIBS=\
tools \
debug \
rtl \
rdd \
vm \
rtl \
rdd \
rtl \
vm \
macro \
pp \
runner \

View File

@@ -6,7 +6,7 @@ FUNCTION MAIN()
USE Test New
LABEL FORM EE
LABEL FORM TEST
USE

View File

@@ -6,7 +6,7 @@ FUNCTION() MAIN
USE Test New
Report FORM EE
Report FORM TEST
USE

View File

@@ -2,6 +2,8 @@
// $Id$
//
MEMVAR I
Function Main(Param1)
local i, j, k

View File

@@ -2,6 +2,11 @@
// $Id$
//
// This file is OK to have warnings.
#ifdef __HARBOUR__
#pragma -es0
#endif
DECLARE FUNCTION nMyFunc( ) AS NUMERIC
FUNCTION Main()

View File

@@ -23,11 +23,11 @@ PRG_MAIN=hbdoc.prg
LIBS=\
tools \
debug \
rtl \
rdd \
vm \
rtl \
rdd \
rtl \
vm \
macro \
pp \
runner \