From 3e42ca8b2a947365991e86260bc4f7064a903ec7 Mon Sep 17 00:00:00 2001 From: Philip Zembrod Date: Wed, 23 Mar 2022 08:50:04 +0100 Subject: [PATCH] Update readme.org and remove the obsolete test-min.log make target. --- 8086/msdos/Makefile | 10 +--------- 8086/msdos/readme.org | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/8086/msdos/Makefile b/8086/msdos/Makefile index f25c151..2aab4da 100644 --- a/8086/msdos/Makefile +++ b/8086/msdos/Makefile @@ -6,7 +6,7 @@ fbfiles_uppercase = $(wildcard src/*.FB tests/*.FB) fthfiles_caseconverted = $(patsubst %.fb, %.fth, \ $(shell ../../tools/echo-tolower.py $(fbfiles_uppercase))) -test: incltest.result logtest.result test-min.result test-std.result \ +test: incltest.result logtest.result test-std.result test-blk.result \ incltest-volks4th.result test-volks4th-min.result fth: $(fthfiles) $(fthfiles_caseconverted) @@ -84,14 +84,6 @@ incltest.log: \ v4th.com "include include.fb include incltest.fth") dos2unix -n dosfiles/OUTPUT.LOG $@ -test-min.log: \ - $(patsubst %, dosfiles/%, v4th.com $(prepfths)) \ - $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) - rm -f dosfiles/OUTPUT.LOG - (cd dosfiles && ../emulator/run-in-dosbox.sh v4th.com \ - "include logprep.fth include test-min.fth") - dos2unix -n dosfiles/OUTPUT.LOG $@ - test-std.log: \ $(patsubst %, dosfiles/%, v4th.com $(prepfths)) \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) diff --git a/8086/msdos/readme.org b/8086/msdos/readme.org index 7653759..80cfcdb 100644 --- a/8086/msdos/readme.org +++ b/8086/msdos/readme.org @@ -25,8 +25,16 @@ kernels with build-in .fth interface. ** Binary make targets =make v4th.com= -builds the new minimal VolksForth kernel v4th.com from -.fth sources using metafile.com. +builds the new minimal VolksForth kernel v4th.com +from .fth sources using metafile.com. v4th.com does not have the block +words and the buffer mechanism anymore. The only way to load code from +files is via =include filename.fth=. + +=make v4thblk.com= +builds the new minimal VolksForth kernel v4thblk.com +from .fth sources using metafile.com. v4thblk.com contains the block +words and the buffer mechanism and can load and include both .fth +stream sources and .fb block sources. =make metafile.com= builds the metacompiler with included .fth file interface. @@ -47,8 +55,13 @@ adds the .fth file interface to the old volks4th binary. =make test= runs all current tests. -=make test-min.result= -runs v4th.com through the initial minimal set of unit tests. +=make test-std.result= +runs v4th.com through the standard set of unit tests, without the block +tests, of course + +=make test-blk.result= +runs v4thblk.com through full set of unit tests, including the block +tests. =make test-volks4th-min.result= runs the same initial minimal set of unit tests on v4thfile.com