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

19991212-16:28 GMT+1 Victor Szel <info@szelvesz.hu>

Browse Source
This commit is contained in:
Viktor Szakats
1999-12-12 16:39:58 +00:00
parent b25bfa6813
commit fa8b474da8
13 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -1,3 +1,13 @@
19991212-16:28 GMT+1 Victor Szel <info@szelvesz.hu>
* source/runner/stdalone/Makefile
! Fixed lib order.
* tests/regress/rt_hvm.prg
+ Added some tests, commented out for Harbour.
* *.b32
make_b*.bat
tests/bld_b*.bat
! New versions by Jose Lalin.
19991212-13:55 GMT+1 Ryszard Glab <rglab@imid.med.pl>
*source/compiler/harbour.c

17
harbour/hbpp.b32
View File

@@ -4,25 +4,24 @@
# makefile for Borland C/C++ 32 bits
.path.c = source\pp;source\common
.path.c = source\pp
.path.h = include
.path.lib = lib\b32
.path.obj = obj
PROJECT: lib\b32\hbpp.lib hbpp.exe
PROJECT: lib\b32\hbpp.lib bin\hbpp.exe
lib\b32\hbpp.lib : hbfsapi.obj hbppint.obj hbpp.obj hbstr.obj table.obj hbpplib.obj
lib\b32\hbpp.lib : hbpp.obj hbppint.obj hbpplib.obj table.obj
hbfsapi.obj : hbfsapi.c
hbppint.obj : hbppint.c
hbpp.obj : hbpp.c
hbstr.obj : hbstr.c
table.obj : table.c
hbppint.obj : hbppint.c
hbpplib.obj : hbpplib.c
table.obj : table.c
.c.obj :
bcc32 -c -O2 -Iinclude -o$@ $<
tlib lib\b32\hbpp.lib -+$@,,
hbpp.exe : source\pp\stdalone\hbpp.c
bcc32 -O2 -ebin\hbpp.exe -Iinclude source\pp\stdalone\hbpp.c lib\b32\hbpp.lib
bin\hbpp.exe : source\pp\stdalone\hbpp.c
bcc32 -O2 -ebin\hbpp.exe -Iinclude source\pp\stdalone\hbpp.c \
lib\b32\common.lib lib\b32\hbpp.lib

3
harbour/make_b32.bat
View File

@@ -3,7 +3,8 @@ rem
rem $Id$
rem
make -fhbpp.b32 > make.err
make -fcommon.b32 > make.err
make -fhbpp.b32 >> make.err
make -fmakefile.b32 >> make.err
make -fterminal.b32 >> make.err
make -fgt.b32 >> make.err

1
harbour/make_b40.bat
View File

@@ -3,6 +3,7 @@ rem
rem $Id$
rem
make -DB40 -fcommon.b32 > make.err
make -DB40 -fhbpp.b32 > make.err
make -DB40 -fmakefile.b32 >> make.err
make -DB40 -fterminal.b32 >> make.err

45
harbour/makefile.b32
View File

@@ -12,7 +12,7 @@
!endif
.path.asm = source\vm
.path.c = source\compiler;source\common;source\macro;source\vm;source\rtl;source\tools;source\rtl\gt;source\rtl\natmsg;source\pp;source\rdd
.path.c = source\compiler;source\vm;source\macro;source\rtl;source\tools;source\rtl\gt;source\rtl\natmsg;source\pp;source\rdd
.path.h = include;source\macro
.path.l = source\compiler;source\macro
.path.y = source\compiler;source\macro
@@ -32,15 +32,16 @@ harbour.lib : achoice.obj adir.obj alert.obj arrays.obj \
dynsym.obj dummy.obj empty.obj environ.obj \
errorapi.obj errorsys.obj extend.obj \
fieldbl.obj fileread.obj filesys.obj fm.obj \
harbinit.obj hardcr.obj hbfsapi.obj hbstr.obj \
hbtrace.obj hb_f.obj hvm.obj initexit.obj \
harbinit.obj hardcr.obj \
hb_f.obj hvm.obj initexit.obj \
initsymb.obj inkey.obj input.obj isprint.obj itemapi.obj \
langapi.obj len.obj \
macro.obj macrol.obj macroy.obj maindll.obj mainstd.obj mainwin.obj math.obj \
macroy.obj macrol.obj macro.obj \
maindll.obj mainstd.obj mainwin.obj math.obj \
mathx.obj memofile.obj memoline.obj memvars.obj \
memvarbl.obj menuto.obj mlcount.obj mtran.obj msgen.obj \
natmsg.obj net.obj objfunc.obj oldbox.obj oldclear.obj \
pcount.obj proc.obj pvalue.obj readvar.obj readkey.obj reserved.obj \
pcount.obj proc.obj pvalue.obj readvar.obj readkey.obj \
samples.obj set.obj setta.obj setcolor.obj \
setkey.obj setta.obj soundex.obj strfmt.obj \
strings.obj stringp.obj stringsx.obj symbols.obj \
@@ -91,9 +92,6 @@ filesys.obj : filesys.c extend.h hbdefs.h
fm.obj : fm.c extend.h hbdefs.h
harbinit.obj : harbinit.c extend.h hbdefs.h
hardcr.obj : hardcr.c extend.h hbdefs.h
hbfsapi.obj : hbfsapi.c extend.h hbdefs.h
hbstr.obj : hbstr.c extend.h hbdefs.h
hbtrace.obj : hbtrace.c extend.h hbdefs.h
hb_f.obj : hb_f.c extend.h hbdefs.h
hvm.obj : hvm.c extend.h hbdefs.h
initexit.obj : initexit.c extend.h hbdefs.h
@@ -104,12 +102,12 @@ isprint.obj : isprint.c extend.h hbdefs.h
itemapi.obj : itemapi.c extend.h hbdefs.h
langapi.obj : langapi.c extend.h hbdefs.h
len.obj : len.c extend.h hbdefs.h
macro.obj : macro.c extend.h hbdefs.h
macrol.obj : macrol.c extend.h hbdefs.h
macroy.obj : macroy.c extend.h hbdefs.h
maindll.obj : maindll.c extend.h hbdefs.h
mainstd.obj : mainstd.c extend.h hbdefs.h
mainwin.obj : mainwin.c extend.h hbdefs.h
macroy.obj : macroy.c extend.h hbdefs.h
macrol.obj : macrol.c extend.h hbdefs.h
macro.obj : macro.c extend.h hbdefs.h
math.obj : math.c extend.h hbdefs.h
mathx.obj : mathx.c extend.h hbdefs.h
mlcount.obj : mlcount.c extend.h hbdefs.h
@@ -130,7 +128,6 @@ proc.obj : proc.c extend.h hbdefs.h
pvalue.obj : pvalue.c extend.h hbdefs.h
readkey.obj : readkey.c extend.h hbdefs.h
readvar.obj : readvar.c extend.h hbdefs.h
reserved.obj : reserved.c extend.h hbdefs.h
samples.obj : samples.c extend.h hbdefs.h
set.obj : set.c extend.h hbdefs.h
setta.obj : setta.c extend.h hbdefs.h
@@ -205,12 +202,11 @@ xsavescr.c : xsavescr.prg harbour.exe
harbour.exe : cmdcheck.c harboury.c harbourl.c hbfunchk.c hbgenerr.c hbpcode.c \
hbusage.c genc.obj genhrb.obj genjava.obj genrc.obj genpas.obj \
genobj32.obj expropt.obj harbour.obj hbfsapi.obj hbstr.obj compiler.h \
hbppint.c hbpp.c reserved.c table.c
genobj32.obj expropt.obj harbour.obj compiler.h \
hbppint.c hbpp.c table.c
echo $(BCC_OPT) > temp.bld
echo -ebin\harbour.exe >> temp.bld
echo -Iinclude;source\compiler >> temp.bld
echo source\common\reserved.c >> temp.bld
echo source\compiler\cmdcheck.c >> temp.bld
echo source\compiler\harboury.c >> temp.bld
echo source\compiler\harbourl.c >> temp.bld
@@ -226,11 +222,8 @@ harbour.exe : cmdcheck.c harboury.c harbourl.c hbfunchk.c hbgenerr.c hbpcode.c \
echo source\compiler\genpas.obj >> temp.bld
echo source\compiler\expropt.obj >> temp.bld
echo source\compiler\harbour.obj >> temp.bld
echo obj\hbfsapi.obj >> temp.bld
echo obj\hbstr.obj >> temp.bld
echo source\pp\hbppint.c >> temp.bld
echo source\pp\hbpp.c >> temp.bld
echo source\pp\table.c >> temp.bld
echo lib\b32\common.lib >> temp.bld
echo lib\b32\hbpp.lib >> temp.bld
bcc32 @temp.bld
del temp.bld
del harboury.obj
@@ -239,14 +232,14 @@ harbour.exe : cmdcheck.c harboury.c harbourl.c hbfunchk.c hbgenerr.c hbpcode.c \
harboury.c : harbour.y
bison -d -v -y -osource\compiler\harboury.c source\compiler\harbour.y
macroy.c : macro.y
bison -d -v -y -osource\macro\macroy.c source\macro\macro.y
harbourl.c : harbour.l
flex -i -8 -osource\compiler\harbourl.c source\compiler\harbour.l
macrol.c : macro.l
flex -i -8 -osource\macro\macrol.c source\macro\macro.l
macroy.c: macro.y
bison -d -v -y -osource\macro\macroy.c source\macro\macro.y
macrol.c: macro.l
flex -i -8 -osource\macro\macrol.c source\macro\macro.l
genobj32.obj : genobj32.c
bcc32 $(BCC_OPT) -c -Iinclude -osource\compiler\genobj32.obj \
@@ -278,4 +271,4 @@ expropt.obj : expropt.c
harbour.obj : harbour.c
bcc32 $(BCC_OPT) -c -Iinclude;source\compiler -osource\compiler\harbour.obj \
source\compiler\harbour.c
source\compiler\harbour.c

1
harbour/regress.b32
View File

@@ -52,5 +52,6 @@ rt_main.exe : rt_main.obj rt_array.obj rt_date.obj rt_file.obj \
echo lib\b32\terminal.lib >> temp.32
echo lib\b32\hbpp.lib >> temp.32
echo lib\b32\rdd.lib >> temp.32
echo lib\b32\common.lib >> temp.32
bcc32 @temp.32
del temp.32

1
harbour/runner.b32
View File

@@ -38,6 +38,7 @@ hbrun.exe : hbrun.c external.c runlib.c
echo lib\b32\hbgt.lib >> bld.32
echo lib\b32\hbpp.lib >> bld.32
echo lib\b32\rdd.lib >> bld.32
echo lib\b32\common.lib >> bld.32
echo lib\b32\runner.lib >> bld.32
bcc32 @bld.32
del bld.32

2
harbour/source/runner/stdalone/Makefile
View File

@@ -23,7 +23,7 @@ LIBS=\
rdd \
rtl \
pp \
common \
macro \
common \
include $(TOP)$(ROOT)config/bin.cf

2
harbour/tests/bld_b16.bat
View File

@@ -4,5 +4,5 @@ rem $Id$
rem
..\bin\harbour %1 /n /i..\include
bcc %1.c -e%1.exe -O2 -I..\include -L..\lib\b16 -P -mh -Fm harbour.lib terminal.lib hbpp.lib hbtools.lib
bcc %1.c -e%1.exe -O2 -I..\include -L..\lib\b16 -P -mh -Fm harbour.lib terminal.lib hbpp.lib common.lib hbtools.lib
del %1.c

2
harbour/tests/bld_b32.bat
View File

@@ -4,5 +4,5 @@ rem $Id$
rem
..\bin\harbour %1 /n /i..\include
bcc32 -e%1.exe -O2 -I..\include -L..\lib\b32 -v harbour.lib terminal.lib hbpp.lib hbgt.lib rdd.lib %1.c
bcc32 -e%1.exe -O2 -I..\include -L..\lib\b32 -v harbour.lib terminal.lib hbpp.lib common.lib hbgt.lib rdd.lib %1.c
rem del %1.c

2
harbour/tests/bld_b32o.bat
View File

@@ -4,6 +4,6 @@ rem $Id$
rem
..\bin\harbour %1 /n /i..\include /gf
tlink32 -L..\lib\b32;c:\bc5\lib c:\bc5\lib\c0x32.obj %1.obj hvm.obj,%1.exe,, harbour.lib terminal.lib import32.lib cw32mt.lib
tlink32 -L..\lib\b32;c:\bc5\lib c:\bc5\lib\c0x32.obj %1.obj hvm.obj,%1.exe,, harbour.lib terminal.lib common.lib import32.lib cw32mt.lib
del %1.obj

2
harbour/tests/bld_b32w.bat
View File

@@ -4,5 +4,5 @@ rem $Id$
rem
..\bin\harbour %1 /n /i..\include
bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -tW harbour.lib termwin.lib hbpp.lib hbgt.lib rdd.lib
bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -tW harbour.lib termwin.lib hbpp.lib common.lib hbgt.lib rdd.lib
del %1.c

10
harbour/tests/regress/rt_hvm.prg
View File

@@ -696,6 +696,16 @@ FUNCTION Main_HVM()
TEST_LINE( --nA , 1 )
TEST_LINE( nA , 1 )
/* These will generate warnings and errors with Harbour */
#ifndef __HARBOUR__
TEST_LINE( { 1, 2 }[ ( 2, 1 ) ]++ , 1 )
TEST_LINE( ++{ 1, 2 }[ ( 2, 1 ) ] , 2 )
TEST_LINE( { 1, 2 }[ 1 ]++ , 1 )
TEST_LINE( ++{ 1, 2 }[ 1 ] , 2 )
TEST_LINE( ({ 1, 2 }[ 1 ])++ , 1 )
TEST_LINE( ++({ 1, 2 }[ 1 ]) , 2 )
#endif
/* Operator precedence */
TEST_LINE( 1 + 2 * 3 / 4 - 2 ** 2 ^ 3 , -61.50 )