See ChangeLog entry 19990610-18:05 EDT David G. Holm <dholm@jsd-llc.com>

This commit is contained in:
David G. Holm
1999-06-10 23:11:45 +00:00
parent 6e5269b867
commit 4f310a1ac4
10 changed files with 92 additions and 66 deletions

View File

@@ -1,3 +1,30 @@
19990610-18:05 EDT David G. Holm <dholm@jsd-llc.com>
* makefile.b16
- Changed all 'y_tab' to 'harboury'
- Changed all 'lexyy' to 'harbourl'
* makefile.b31
- Changed all 'y_tab' to 'harboury'
- Changed all 'lexyy' to 'harbourl'
* makefile.b32
- Changed all 'y_tab' to 'harboury'
- Changed all 'lexyy' to 'harbourl'
* makefile.icc
- Changed all 'y_tab' to 'harboury'
- Changed all 'lexyy' to 'harbourl'
* makefile.vc
- Changed all 'y_tab' to 'harboury'
- Changed all 'lexyy' to 'harbourl'
* config/c.cf
- Remove $(MV) command following $(YACC) command
* source/compiler/harbour.l
- Changed '#include "y_tab.h"' to '#include "harboury.h"'
* source/compiler/makefile.dos
- Changed all 'y_tab' to 'harboury'
- Changed all 'lexyy' to 'harbourl'
* source/compiler/makefile.wat
- Changed all 'y_tab' to 'harboury'
- Changed all 'lexyy' to 'harbourl'
19990610-11:40 EDT David G. Holm <dholm@jsd-llc.com>
+ tests/working/makerunr.dos
- New make file to build RUNNER.EXE using DJGPP

View File

@@ -28,7 +28,6 @@ $(YACC_OBJ) : $(YACC_C)
$(YACC_C) : ../../$(YACC_SOURCE)
$(YACC) $(YACC_FLAGS) -o$@ $?
$(MV) $(YACC_H_TMP) $(YACC_H)
$(LEX_OBJ) : $(LEX_C)

View File

@@ -72,23 +72,23 @@ tclass.c : tclass.prg harbour.exe
bcc -c -ml -O2 -I.\include -o$@ $<
tlib .\libs\b16\harbour.lib -+$@,,
harbour.exe : y_tab.c lexyy.c harbour.obj
harbour.exe : harboury.c harbourl.c harbour.obj
echo -ml -O2 > bld.31
echo -ebin\harbour.exe >> bld.31
echo -Iinclude;source\compiler >> bld.31
echo source\compiler\y_tab.c >> bld.31
echo source\compiler\lexyy.c >> bld.31
echo source\compiler\harboury.c >> bld.31
echo source\compiler\harbourl.c >> bld.31
echo source\compiler\harbour.obj >> bld.31
bcc @bld.31
del bld.31
del y_tab.obj
del lexyy.obj
del harboury.obj
del harbourl.obj
y_tab.c : harbour.y
bison -d -v -y -osource\compiler\y_tab.c source\compiler\harbour.y
harboury.c : harbour.y
bison -d -v -y -osource\compiler\harboury.c source\compiler\harbour.y
lexyy.c : harbour.l
flex -i -8 -osource\compiler\lexyy.c source\compiler\harbour.l
harbourl.c : harbour.l
flex -i -8 -osource\compiler\harbourl.c source\compiler\harbour.l
harbour.obj : harbour.c
bcc -c -ml -O2 -I.\include -osource\compiler\harbour.obj \

View File

@@ -130,9 +130,9 @@ strright.obj : source\tools\strright.c extend.h types.h
tasm -I.\include $< $@
tlib .\libs\b16\harbour.lib -+$@,,
harbour.exe : y_tab.obj lexyy.obj lex_t1.obj lex_t2.obj lex_t3.obj harbour.obj genobj32.obj
echo -ebin\harbour.exe obj\y_tab.obj > b31.bc
echo obj\lexyy.obj obj\lex_t1.obj >> b31.bc
harbour.exe : harboury.obj harbourl.obj lex_t1.obj lex_t2.obj lex_t3.obj harbour.obj genobj32.obj
echo -ebin\harbour.exe obj\harboury.obj > b31.bc
echo obj\harbourl.obj obj\lex_t1.obj >> b31.bc
echo obj\lex_t2.obj obj\lex_t3.obj >> b31.bc
echo obj\harbour.obj obj\genobj32.obj >> b31.bc
bcc $(c_opt) -Isource\compiler @b31.bc
@@ -140,21 +140,21 @@ harbour.exe : y_tab.obj lexyy.obj lex_t1.obj lex_t2.obj lex_t3.obj harbour.obj g
fixflex.obj : source\compiler\fixflex.c
genobj32.obj : source\compiler\genobj32.c
harbour.obj : source\compiler\harbour.c
lexyy.obj : source\compiler\lexyy.c harbour.l
harbourl.obj : source\compiler\harbourl.c harbour.l
lex_t1.obj : source\compiler\lex_t1.c harbour.l
lex_t2.obj : source\compiler\lex_t2.c harbour.l
lex_t3.obj : source\compiler\lex_t3.c harbour.l
y_tab.obj : source\compiler\y_tab.c harbour.y
harboury.obj : source\compiler\harboury.c harbour.y
source\compiler\y_tab.c : harbour.y
bison -d -v -y -osource\compiler\y_tab.c source\compiler\harbour.y
source\compiler\harboury.c : harbour.y
bison -d -v -y -osource\compiler\harboury.c source\compiler\harbour.y
fixflex.exe : fixflex.obj
bcc -mh $(c_opt) -ebin\fixflex.exe obj\fixflex.obj
source\compiler\lex_t1.c :: harbour.l fixflex.exe
source\compiler\lex_t2.c :: harbour.l fixflex.exe
source\compiler\lexyy.c :: harbour.l fixflex.exe
flex -i -8 -osource\compiler\lexyy.c source\compiler\harbour.l
if exist source\compiler\lexyy.bak del source\compiler\lexyy.bak
fixflex source\compiler\lexyy.c source\compiler\lex_t1.c source\compiler\lex_t2.c source\compiler\lex_t3.c -P-
source\compiler\harbourl.c :: harbour.l fixflex.exe
flex -i -8 -osource\compiler\harbourl.c source\compiler\harbour.l
if exist source\compiler\harbourl.bak del source\compiler\harbourl.bak
fixflex source\compiler\harbourl.c source\compiler\lex_t1.c source\compiler\lex_t2.c source\compiler\lex_t3.c -P-

View File

@@ -74,24 +74,24 @@ tclass.c : tclass.prg harbour.exe
bcc32 -c -O2 -I.\include -o$@ $<
tlib .\libs\b32\harbour.lib -+$@,,
harbour.exe : y_tab.c lexyy.c genobj32.obj harbour.obj compiler.h
harbour.exe : harboury.c harbourl.c genobj32.obj harbour.obj compiler.h
echo -O2 > bld.32
echo -ebin\harbour.exe >> bld.32
echo -Iinclude;source\compiler >> bld.32
echo source\compiler\y_tab.c >> bld.32
echo source\compiler\lexyy.c >> bld.32
echo source\compiler\harboury.c >> bld.32
echo source\compiler\harbourl.c >> bld.32
echo source\compiler\genobj32.obj >> bld.32
echo source\compiler\harbour.obj >> bld.32
bcc32 @bld.32
del bld.32
del y_tab.obj
del lexyy.obj
del harboury.obj
del harbourl.obj
y_tab.c : harbour.y
bison -d -v -y -osource\compiler\y_tab.c source\compiler\harbour.y
harboury.c : harbour.y
bison -d -v -y -osource\compiler\harboury.c source\compiler\harbour.y
lexyy.c : harbour.l
flex -i -8 -osource\compiler\lexyy.c source\compiler\harbour.l
harbourl.c : harbour.l
flex -i -8 -osource\compiler\harbourl.c source\compiler\harbour.l
genobj32.obj : genobj32.c
bcc32 -c -O2 -I.\include -osource\compiler\genobj32.obj \

View File

@@ -180,15 +180,15 @@ $(path_obj)\stringp.obj : {$(path_prg)}\stringp.prg $(path_h)\pcode.h $(path_h
icc /C+ $(c_opt) /Fo$@ /Tp$<
ilib .\libs\icc\hbtools.lib -+$@,,
$(path_exe)\harbour.exe : {$(path_c)}y_tab.c {$(path_c)}lexyy.c {$(path_c)}genobj32.c {$(path_c)}harbour.c
$(path_exe)\harbour.exe : {$(path_c)}harboury.c {$(path_c)}harbourl.c {$(path_c)}genobj32.c {$(path_c)}harbour.c
icc /C- $(c_opt) /Fe$(path_exe)\harbour.exe /Isource\compiler \
/Fo$(path_obj)\y_tab.obj /Tpsource\compiler\y_tab.c \
/Fo$(path_obj)\lexyy.obj /Tpsource\compiler\lexyy.c \
/Fo$(path_obj)\harboury.obj /Tpsource\compiler\harboury.c \
/Fo$(path_obj)\harbourl.obj /Tpsource\compiler\harbourl.c \
/Fo$(path_obj)\genobj32.obj /Tpsource\compiler\genobj32.c \
/Fo$(path_obj)\harbour.obj /Tpsource\compiler\harbour.c
y_tab.c : {$(path_y)}harbour.y
# bison -d -v -y -osource\compiler\y_tab.c source\compiler\harbour.y
harboury.c : {$(path_y)}harbour.y
# bison -d -v -y -osource\compiler\harboury.c source\compiler\harbour.y
lexyy.c : {$(path_l)}harbour.l
# flex -i -8 -osource\compiler\lexyy.c -Sd:\bin\emx\lib\flexskel.cc -Hd:\bin\emx\include\flexskel.h source\compiler\harbour.l
harbourl.c : {$(path_l)}harbour.l
# flex -i -8 -osource\compiler\harbourl.c -Sd:\bin\emx\lib\flexskel.cc -Hd:\bin\emx\include\flexskel.h source\compiler\harbour.l

View File

@@ -91,13 +91,13 @@ TERMINAL_LIB_OBJS = \
all: $(HARBOUR_EXE) $(HARBOUR_LIB) $(TOOLS_LIB) $(TERMINAL_LIB)
$(HARBOUR_EXE) : \
$(COMPILER_DIR)\y_tab.c \
$(COMPILER_DIR)\lexyy.c \
$(COMPILER_DIR)\harboury.c \
$(COMPILER_DIR)\harbourl.c \
$(COMPILER_DIR)\genobj32.c \
$(COMPILER_DIR)\harbour.c
$(CC) $(CFLAGS) $(COMPILER_DIR)\y_tab.c $(COMPILER_DIR)\lexyy.c $(COMPILER_DIR)\harbour.obj -o $(BIN_DIR)\harbour
-del y_tab.obj
-del lexyy.obj
$(CC) $(CFLAGS) $(COMPILER_DIR)\harboury.c $(COMPILER_DIR)\harbourl.c $(COMPILER_DIR)\harbour.obj -o $(BIN_DIR)\harbour
-del harboury.obj
-del harbourl.obj
#
# Library depencies and build rules
@@ -116,11 +116,11 @@ $(TERMINAL_LIB) : $(TERMINAL_LIB_OBJS)
# Compiler source depencies and build rules
#
$(COMPILER_DIR)\y_tab.c : $(COMPILER_DIR)\harbour.y
bison -d -v $(COMPILER_DIR)\harbour.y -o$(COMPILER_DIR)\y_tab.c
$(COMPILER_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y
bison -d -v $(COMPILER_DIR)\harbour.y -o$(COMPILER_DIR)\harboury.c
$(COMPILER_DIR)\lexyy.c : $(COMPILER_DIR)\harbour.l
flex -i -o$(COMPILER_DIR)\lexyy.c $(COMPILER_DIR)\harbour.l
$(COMPILER_DIR)\harbourl.c : $(COMPILER_DIR)\harbour.l
flex -i -o$(COMPILER_DIR)\harbourl.c $(COMPILER_DIR)\harbour.l
#
# RTL source depencies below. Add as needed

View File

@@ -12,7 +12,7 @@
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include "y_tab.h"
#include "harboury.h"
#include "hbsetup.h" /* main configuration file */
#include "hberrors.h"
#include "types.h"

View File

@@ -9,17 +9,17 @@ TARGET=$(HARBOURDIR)/bin/harbour.exe
all: $(TARGET)
$(TARGET): y_tab.c harbour.c lexyy.c
$(CC) $(CFLAGS) y_tab.c harbour.c lexyy.c -o $(TARGET)
$(TARGET): harboury.c harbour.c harbourl.c
$(CC) $(CFLAGS) harboury.c harbour.c harbourl.c -o $(TARGET)
y_tab.c : harbour.y
bison -d -v -y harbour.y -o y_tab.c
harboury.c : harbour.y
bison -d -v -y harbour.y -o harboury.c
lexyy.c : harbour.l
flex -i -8 -olexyy.c harbour.l
harbourl.c : harbour.l
flex -i -8 -oharbourl.c harbour.l
clean:
-del *.o
-del y_tab.*
-del lexyy.c
-del harboury.*
-del harbourl.c
-del *.out

View File

@@ -7,37 +7,37 @@ TARGET=$(HARBOURDIR)\bin\harbour.exe
all : $(TARGET)
$(TARGET) : y_tab.obj lexyy.obj harbour.obj
$(TARGET) : harboury.obj harbourl.obj harbour.obj
%create link.tmp
%append link.tmp $(WLDEBUG)
%append link.tmp FI y_tab
%append link.tmp FI lexyy
%append link.tmp FI harboury
%append link.tmp FI harbourl
%append link.tmp FI harbour
%append link.tmp NAME $(TARGET)
%append link.tmp $(WLOPTIONS)
%append link.tmp $(WLSTACK)
wlink @link.tmp
y_tab.obj : y_tab.c
harboury.obj : harboury.c
*$(WC) $(WCOPTIONS) $(WCINCLUDE) $(WCDEBUG) $(WCDEFINE) $(WCEXTRA) $<
lexyy.obj : lexyy.c
harbourl.obj : harbourl.c
*$(WC) $(WCOPTIONS) $(WCINCLUDE) $(WCDEBUG) $(WCDEFINE) $(WCEXTRA) $<
harbour.obj : harbour.c
*$(WC) $(WCOPTIONS) $(WCINCLUDE) $(WCDEBUG) $(WCDEFINE) $(WCEXTRA) $<
y_tab.c : harbour.y
bison -d -v -o y_tab.c harbour.y
harboury.c : harbour.y
bison -d -v -o harboury.c harbour.y
lexyy.c : harbour.l
flex -i -8 -olexyy.c harbour.l
harbourl.c : harbour.l
flex -i -8 -oharbourl.c harbour.l
clean : .SYMBOLIC
del *.out
del *.obj
del y_tab.*
del lexyy.*
del harboury.*
del harbourl.*
del *.h
del *.err
del *.tmp