From f111e1995d54a8493edf4cfadb856dec5b4ee3d5 Mon Sep 17 00:00:00 2001 From: Philip Zembrod Date: Thu, 12 Nov 2020 23:41:00 +0100 Subject: [PATCH] Rename vf-lite-* to v4th-* --- 6502/C64/Makefile | 66 +++++++++--------- 6502/C64/cbmfiles/{vf-lite-c16+ => v4th-c16+} | Bin 6502/C64/cbmfiles/{vf-lite-c16- => v4th-c16-} | Bin 6502/C64/cbmfiles/{vf-lite-c64 => v4th-c64} | Bin 6502/C64/cbmfiles/{vf-lite-x16 => v4th-x16} | Bin .../src/{vf-lite-c16+.fth => v4th-c16+.fth} | 2 +- .../src/{vf-lite-c16-.fth => v4th-c16-.fth} | 2 +- .../C64/src/{vf-lite-c64.fth => v4th-c64.fth} | 2 +- .../C64/src/{vf-lite-x16.fth => v4th-x16.fth} | 2 +- 9 files changed, 37 insertions(+), 37 deletions(-) rename 6502/C64/cbmfiles/{vf-lite-c16+ => v4th-c16+} (100%) rename 6502/C64/cbmfiles/{vf-lite-c16- => v4th-c16-} (100%) rename 6502/C64/cbmfiles/{vf-lite-c64 => v4th-c64} (100%) rename 6502/C64/cbmfiles/{vf-lite-x16 => v4th-x16} (100%) rename 6502/C64/src/{vf-lite-c16+.fth => v4th-c16+.fth} (93%) rename 6502/C64/src/{vf-lite-c16-.fth => v4th-c16-.fth} (93%) rename 6502/C64/src/{vf-lite-c64.fth => v4th-c64.fth} (93%) rename 6502/C64/src/{vf-lite-x16.fth => v4th-x16.fth} (93%) diff --git a/6502/C64/Makefile b/6502/C64/Makefile index 505703b..c72ef17 100644 --- a/6502/C64/Makefile +++ b/6502/C64/Makefile @@ -5,12 +5,12 @@ vf_blk_d64_files = $(wildcard disks/*.d64) vf_blk_fth_files = $(patsubst %.d64, %.fth, $(vf_blk_d64_files)) -vf_fth_files = $(wildcard src/vf-*.fth) +vf_fth_files = $(wildcard src/vf-*.fth src/v4th-*.fth) vf_fth_files_petscii = $(patsubst src/%, cbmfiles/%, $(vf_fth_files)) vf_flavours = \ - full-c64 full-c16+ full-c16- \ - lite-c64 lite-c16+ lite-c16- lite-x16 -vf_binaries = $(patsubst %, cbmfiles/vf-%, $(vf_flavours)) + vf-full-c64 vf-full-c16+ vf-full-c16- \ + v4th-c64 v4th-c16+ v4th-c16- v4th-x16 +vf_binaries = $(patsubst %, cbmfiles/%, $(vf_flavours)) test_files = $(wildcard tests/*.f*) test_files_petscii = $(patsubst tests/%, cbmfiles/%, $(test_files)) @@ -38,13 +38,13 @@ test: $(test_resuls) test64: full64 lite64 -full64: test-full-c64.result +full64: test-vf-full-c64.result -lite64: test-lite-c64.result +lite64: test-v4th-c64.result debug-64: emulator/tcbase.T64 emulator/build-vf.sh \ disks/vforth4_2.d64 disks/tc38q.d64 $(vf_fth_files_petscii) - emulator/build-vf.sh vf-c64-main nosave + emulator/build-vf.sh v4th-c64 nosave run-devenv: emulator/devenv.T64 emulator/run-in-vice.sh devenv @@ -76,62 +76,62 @@ cbmfiles/vf-full-c16+: cbmfiles/vf-full-c16-: emulator/build-vf.sh vf-full-c16- -cbmfiles/vf-lite-c64: - emulator/build-vf.sh vf-lite-c64 +cbmfiles/v4th-c64: + emulator/build-vf.sh v4th-c64 -cbmfiles/vf-lite-c16+: - emulator/build-vf.sh vf-lite-c16+ +cbmfiles/v4th-c16+: + emulator/build-vf.sh v4th-c16+ -cbmfiles/vf-lite-c16-: - emulator/build-vf.sh vf-lite-c16- +cbmfiles/v4th-c16-: + emulator/build-vf.sh v4th-c16- -cbmfiles/vf-lite-x16: - emulator/build-vf.sh vf-lite-x16 +cbmfiles/v4th-x16: + emulator/build-vf.sh v4th-x16 # Core test targets $(test_logs): $(test_files_petscii) emulator/run-in-vice.sh -test-full-c64.log: emulator/vf-full-c64.T64 disks/scratch.d64 +test-vf-full-c64.log: emulator/vf-full-c64.T64 disks/scratch.d64 rm -f cbmfiles/test.log DISK9=scratch emulator/run-in-vice.sh vf-full-c64 \ "include run-full-tests.fth\n1234567890\n" petscii2ascii cbmfiles/test.log $@ -test-lite-c64.log: emulator/vf-lite-c64.T64 +test-v4th-c64.log: emulator/v4th-c64.T64 rm -f cbmfiles/test.log - emulator/run-in-vice.sh vf-lite-c64 \ + emulator/run-in-vice.sh v4th-c64 \ "include run-lite-tests.fth\n1234567890\n" petscii2ascii cbmfiles/test.log $@ -test-full-c16+.log: emulator/vf-full-c16+.T64 disks/scratch.d64 +test-vf-full-c16+.log: emulator/vf-full-c16+.T64 disks/scratch.d64 rm -f cbmfiles/test.log VICE=xplus4 emulator/run-in-vice.sh vf-full-c16+ \ "include run-full-tests.fth\n1234567890\n" petscii2ascii cbmfiles/test.log $@ -test-lite-c16+.log: emulator/vf-lite-c16+.T64 +test-v4th-c16+.log: emulator/v4th-c16+.T64 rm -f cbmfiles/test.log - VICE=xplus4 emulator/run-in-vice.sh vf-lite-c16+ \ + VICE=xplus4 emulator/run-in-vice.sh v4th-c16+ \ "include run-lite-tests.fth\n1234567890\n" petscii2ascii cbmfiles/test.log $@ -test-full-c16-.log: emulator/vf-full-c16-.T64 +test-vf-full-c16-.log: emulator/vf-full-c16-.T64 rm -f cbmfiles/test.log VICE=xplus4 emulator/run-in-vice.sh vf-full-c16- \ "include run-min-tests.fth\n1234567890\n" petscii2ascii cbmfiles/test.log $@ -test-lite-c16-.log: emulator/vf-lite-c16-.T64 +test-v4th-c16-.log: emulator/v4th-c16-.T64 rm -f cbmfiles/test.log - VICE=xplus4 emulator/run-in-vice.sh vf-lite-c16- \ + VICE=xplus4 emulator/run-in-vice.sh v4th-c16- \ "include run-lite-tests.fth\n1234567890\n" petscii2ascii cbmfiles/test.log $@ -test-lite-x16.log: cbmfiles/vf-lite-x16 emulator/sdcard.img +test-v4th-x16.log: cbmfiles/v4th-x16 emulator/sdcard.img rm -f cbmfiles/test.log - emulator/run-in-x16emu.sh vf-lite-x16 \ + emulator/run-in-x16emu.sh v4th-x16 \ "INCLUDE RUN-LITE-TESTS.FTH\\X0D1234567890\\X0D" mcopy -i emulator/sdcard.img ::TEST.LOG cbmfiles/test.log petscii2ascii cbmfiles/test.log $@ @@ -150,31 +150,31 @@ emulator/sdcard.img: emulator/sdcard.sfdisk mformat -i $@.tmp -F mv $@.tmp $@ -test-full-c64.golden: $(patsubst %, tests/golden/%.golden, \ +test-vf-full-c64.golden: $(patsubst %, tests/golden/%.golden, \ prelim core coreext double block report-blk) cat $? > $@ -test-lite-c64.golden: $(patsubst %, tests/golden/%.golden, \ +test-v4th-c64.golden: $(patsubst %, tests/golden/%.golden, \ prelim core coreext double report-noblk) cat $? > $@ -test-full-c16+.golden: $(patsubst %, tests/golden/%.golden, \ +test-vf-full-c16+.golden: $(patsubst %, tests/golden/%.golden, \ prelim core coreext double block report-blk) cat $? > $@ -test-lite-c16+.golden: $(patsubst %, tests/golden/%.golden, \ +test-v4th-c16+.golden: $(patsubst %, tests/golden/%.golden, \ prelim core coreext double report-noblk) cat $? > $@ -test-full-c16-.golden: $(patsubst %, tests/golden/%.golden, \ +test-vf-full-c16-.golden: $(patsubst %, tests/golden/%.golden, \ prelim core) cat $? > $@ -test-lite-c16-.golden: $(patsubst %, tests/golden/%.golden, \ +test-v4th-c16-.golden: $(patsubst %, tests/golden/%.golden, \ prelim core coreext double report-noblk) cat $? > $@ -test-lite-x16.golden: $(patsubst %, tests/golden/%.golden, \ +test-v4th-x16.golden: $(patsubst %, tests/golden/%.golden, \ prelim core coreext double report-noblk) cat $? > $@ diff --git a/6502/C64/cbmfiles/vf-lite-c16+ b/6502/C64/cbmfiles/v4th-c16+ similarity index 100% rename from 6502/C64/cbmfiles/vf-lite-c16+ rename to 6502/C64/cbmfiles/v4th-c16+ diff --git a/6502/C64/cbmfiles/vf-lite-c16- b/6502/C64/cbmfiles/v4th-c16- similarity index 100% rename from 6502/C64/cbmfiles/vf-lite-c16- rename to 6502/C64/cbmfiles/v4th-c16- diff --git a/6502/C64/cbmfiles/vf-lite-c64 b/6502/C64/cbmfiles/v4th-c64 similarity index 100% rename from 6502/C64/cbmfiles/vf-lite-c64 rename to 6502/C64/cbmfiles/v4th-c64 diff --git a/6502/C64/cbmfiles/vf-lite-x16 b/6502/C64/cbmfiles/v4th-x16 similarity index 100% rename from 6502/C64/cbmfiles/vf-lite-x16 rename to 6502/C64/cbmfiles/v4th-x16 diff --git a/6502/C64/src/vf-lite-c16+.fth b/6502/C64/src/v4th-c16+.fth similarity index 93% rename from 6502/C64/src/vf-lite-c16+.fth rename to 6502/C64/src/v4th-c16+.fth index f0fce4f..a73da67 100644 --- a/6502/C64/src/vf-lite-c16+.fth +++ b/6502/C64/src/v4th-c16+.fth @@ -8,7 +8,7 @@ include vf-tc-prep.fth -\log logopen" vf-lite-c16+.log" +\log logopen" v4th-c16+.log" include vf-trg-c16+.fth diff --git a/6502/C64/src/vf-lite-c16-.fth b/6502/C64/src/v4th-c16-.fth similarity index 93% rename from 6502/C64/src/vf-lite-c16-.fth rename to 6502/C64/src/v4th-c16-.fth index 1f851f2..aa179e2 100644 --- a/6502/C64/src/vf-lite-c16-.fth +++ b/6502/C64/src/v4th-c16-.fth @@ -8,7 +8,7 @@ include vf-tc-prep.fth -\log logopen" vf-lite-c16-.log" +\log logopen" v4th-c16-.log" include vf-trg-c16-.fth diff --git a/6502/C64/src/vf-lite-c64.fth b/6502/C64/src/v4th-c64.fth similarity index 93% rename from 6502/C64/src/vf-lite-c64.fth rename to 6502/C64/src/v4th-c64.fth index 1686f73..2d26f81 100644 --- a/6502/C64/src/vf-lite-c64.fth +++ b/6502/C64/src/v4th-c64.fth @@ -8,7 +8,7 @@ include vf-tc-prep.fth -\log logopen" vf-lite-c64.log" +\log logopen" v4th-c64.log" include vf-trg-c64.fth diff --git a/6502/C64/src/vf-lite-x16.fth b/6502/C64/src/v4th-x16.fth similarity index 93% rename from 6502/C64/src/vf-lite-x16.fth rename to 6502/C64/src/v4th-x16.fth index bcedc01..4b656c9 100644 --- a/6502/C64/src/vf-lite-x16.fth +++ b/6502/C64/src/v4th-x16.fth @@ -8,7 +8,7 @@ include vf-tc-prep.fth -\log logopen" vf-lite-x16.log" +\log logopen" v4th-x16.log" include vf-trg-x16.fth