From b863a5b11fa21ad07055ff550561bdfb011dc7b7 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Fri, 1 Dec 2023 23:42:20 +0100
Subject: [PATCH 01/12] add names of IOStatus and BkgPenCol in x16rom as
 comments

---
 6502/C64/src/vf-sys-x16.fth | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/6502/C64/src/vf-sys-x16.fth b/6502/C64/src/vf-sys-x16.fth
index 1ec73e1..802617b 100644
--- a/6502/C64/src/vf-sys-x16.fth
+++ b/6502/C64/src/vf-sys-x16.fth
@@ -7,10 +7,10 @@ include vf-lbls-cbm.fth
 
 0ffd2 >label ConOut
 0febd >label KbdbufPeek
- 0287 >label IOStatus
+ 0287 >label IOStatus  \ aka status
  028d >label MsgFlg
 09f2c >label BrdCol
- 0376 >label BkgPenCol
+ 0376 >label BkgPenCol  \ aka color
  0381 >label CurFlg  \ aka qtsw
  0385 >label InsCnt  \ aka insrt
 

From d51c2cfc0599544c2c1e0f0b39f7927bbea2713c Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sat, 2 Dec 2023 09:55:17 +0100
Subject: [PATCH 02/12] Add v4th-x16e target with x16edit invocation

---
 6502/C64/Makefile           | 16 +++++++++++++++-
 6502/C64/src/v4th-x16e.fth  | 30 ++++++++++++++++++++++++++++++
 6502/C64/src/vf-x16edit.fth | 16 ++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 6502/C64/src/v4th-x16e.fth
 create mode 100644 6502/C64/src/vf-x16edit.fth

diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index a795e13..c7ef736 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -9,7 +9,7 @@ vf_fth_files = $(wildcard src/vf-*.fth src/v4th*.fth)
 vf_fth_files_petscii = $(patsubst src/%, cbmfiles/%, $(vf_fth_files))
 vf_flavours = \
     v4thblk-c64 v4thblk-c16+ v4thblk-c16- \
-    v4th-c64 v4th-c16+ v4th-c16- v4th-x16
+    v4th-c64 v4th-c16+ v4th-c16- v4th-x16 v4th-x16e
 vf_binaries = $(patsubst %, cbmfiles/%, $(vf_flavours))
 
 test_files = $(wildcard tests/*.f*)
@@ -88,6 +88,9 @@ cbmfiles/v4th-c16-:
 cbmfiles/v4th-x16:
 	emulator/build-vf.sh v4th-x16
 
+cbmfiles/v4th-x16e:
+	emulator/build-vf.sh v4th-x16e
+
 
 # Core test targets
 
@@ -138,6 +141,13 @@ test-v4th-x16.log: cbmfiles/v4th-x16 emulator/sdcard.img
 	mcopy -i emulator/sdcard.img ::TEST.LOG cbmfiles/test.log
 	petscii2ascii cbmfiles/test.log $@
 
+test-v4th-x16e.log: cbmfiles/v4th-x16e emulator/sdcard.img
+	rm -f cbmfiles/test.log
+	emulator/run-in-x16emu.sh v4th-x16e \
+	  "include run-std-tests.fth\n1234567890"
+	mcopy -i emulator/sdcard.img ::TEST.LOG cbmfiles/test.log
+	petscii2ascii cbmfiles/test.log $@
+
 test-v4th-x16-39.log: $(test_files_petscii) emulator/run-in-vice.sh
 
 test-v4th-x16-39.log: cbmfiles/v4th-x16 emulator/sdcard.img
@@ -201,6 +211,10 @@ test-v4th-x16.golden: $(patsubst %, tests/golden/%.golden, \
     prelim core coreext double report-noblk)
 	cat $^ > $@
 
+test-v4th-x16e.golden: $(patsubst %, tests/golden/%.golden, \
+    prelim core coreext double report-noblk)
+	cat $^ > $@
+
 # Rules for building Forth binaries on top of the plain vanilla
 # c64-volksforth83.
 
diff --git a/6502/C64/src/v4th-x16e.fth b/6502/C64/src/v4th-x16e.fth
new file mode 100644
index 0000000..8843694
--- /dev/null
+++ b/6502/C64/src/v4th-x16e.fth
@@ -0,0 +1,30 @@
+
+\ with build log:
+' noop alias \log
+\ without build log:
+\ ' \ alias \log
+
+\log include logtofile.fth
+
+include vf-tc-prep.fth
+
+\log logopen" v4th-x16e.log"
+
+include vf-trg-x16.fth
+
+\ The actual volksForth sources
+
+include vf-head-x16.fth
+include vf-cbm-core.fth
+include vf-sys-x16.fth
+include vf-cbm-file.fth
+include vf-x16edit.fth
+include vf-finalize.fth
+  9f00 ' limit >body !  9b00 s0 !  9f00 r0 !
+include vf-memsetup.fth
+
+include vf-pr-target.fth
+.( target compile complete) cr
+\log logclose
+
+quit
diff --git a/6502/C64/src/vf-x16edit.fth b/6502/C64/src/vf-x16edit.fth
new file mode 100644
index 0000000..fe198cc
--- /dev/null
+++ b/6502/C64/src/vf-x16edit.fth
@@ -0,0 +1,16 @@
+
+$0001 | constant RomBank
+
+| Code (xed?  ( -- n )
+  $c000 lda  pha  $c003 lda  Push jmp  end-code
+
+| Code (xed  ( -- )
+  2 # ldx  $ff # ldy
+  $4 lda  0= ?[ $c000 jsr ][ $c003 jsr ]?
+  xyNext jmp  end-code
+
+  : xed  ( -- )
+   bl word count $4 c!  $2 !
+   RomBank c@  $d RomBank c!
+   (xed? $4c4c = IF (xed RomBank c!
+   ELSE RomBank c! ." no x16edit" THEN ;

From 5d275dea351bcef6d23d277044e0d4ddda600231 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sat, 2 Dec 2023 09:58:55 +0100
Subject: [PATCH 03/12] Add v4th-x16e binary

---
 6502/C64/cbmfiles/v4th-x16e | Bin 0 -> 13940 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 6502/C64/cbmfiles/v4th-x16e

diff --git a/6502/C64/cbmfiles/v4th-x16e b/6502/C64/cbmfiles/v4th-x16e
new file mode 100644
index 0000000000000000000000000000000000000000..992ab2ad47ac593a61bf60725254543b809cbbd7
GIT binary patch
literal 13940
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

literal 0
HcmV?d00001


From 508fbfd9397a3b80d7075a2bde19394e4e02cf0b Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sat, 2 Dec 2023 20:56:48 +0100
Subject: [PATCH 04/12] Add dos commands to v4th-x16e

---
 6502/C64/src/v4th-x16e.fth | 1 +
 1 file changed, 1 insertion(+)

diff --git a/6502/C64/src/v4th-x16e.fth b/6502/C64/src/v4th-x16e.fth
index 8843694..907f686 100644
--- a/6502/C64/src/v4th-x16e.fth
+++ b/6502/C64/src/v4th-x16e.fth
@@ -18,6 +18,7 @@ include vf-head-x16.fth
 include vf-cbm-core.fth
 include vf-sys-x16.fth
 include vf-cbm-file.fth
+include vf-cbm-dos.fth
 include vf-x16edit.fth
 include vf-finalize.fth
   9f00 ' limit >body !  9b00 s0 !  9f00 r0 !

From 9eb5c5958a310b13313b73125b806d4a0b73bc41 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sat, 2 Dec 2023 21:15:20 +0100
Subject: [PATCH 05/12] Adapt xed to newest version of x16edit

---
 6502/C64/src/vf-x16edit.fth | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/6502/C64/src/vf-x16edit.fth b/6502/C64/src/vf-x16edit.fth
index fe198cc..987d90a 100644
--- a/6502/C64/src/vf-x16edit.fth
+++ b/6502/C64/src/vf-x16edit.fth
@@ -1,16 +1,15 @@
 
 $0001 | constant RomBank
+create xed-banks  1 c, $ff c,  \ first and last RAM bank xed uses.
 
-| Code (xed?  ( -- n )
-  $c000 lda  pha  $c003 lda  Push jmp  end-code
+| Code (xed?  ( -- f )
+  $4c # lda  $c000 cmp 0= ?[ $c003 cmp 0= ?[ $c006 cmp 0= ?[
+    Push0A jmp ]? ]? ]?  txa Push0A jmp  end-code
 
 | Code (xed  ( -- )
-  2 # ldx  $ff # ldy
-  $4 lda  0= ?[ $c000 jsr ][ $c003 jsr ]?
+  xed-banks ldx  xed-banks 1+ ldy  $c003 jsr
   xyNext jmp  end-code
 
   : xed  ( -- )
-   bl word count $4 c!  $2 !
-   RomBank c@  $d RomBank c!
-   (xed? $4c4c = IF (xed RomBank c!
-   ELSE RomBank c! ." no x16edit" THEN ;
+   bl word count $4 ! $2 !  RomBank c@  $d RomBank c!
+   (xed? IF (xed  RomBank c! ELSE RomBank c! ." no x16edit" THEN ;

From aec38a5b2986257f4af77dbc7b160b43cdab0e49 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sat, 2 Dec 2023 21:17:54 +0100
Subject: [PATCH 06/12] Update v4th-x16e binary

---
 6502/C64/cbmfiles/v4th-x16e | Bin 13940 -> 14177 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/6502/C64/cbmfiles/v4th-x16e b/6502/C64/cbmfiles/v4th-x16e
index 992ab2ad47ac593a61bf60725254543b809cbbd7..98dcaeb0dddfbeb7259edce8fade04202c8eb0e7 100644
GIT binary patch
delta 678
zcmXw#O=uHA6vtn(X=sy;32Z4IHd@M9Qj&;`%_rGeG=@be+G?#HS`dVSA|CWmp{qep
z(u)QcPbE-PL|S_=;=xmrCZ)xEEZJ?l3Kl$w;z2wV5fSSfgABv`e{bIVzc;gc_2ab%
zhrAbM02lm-y@-AdE>banY$reFDIT;9`0e*;F>~N<UoH<TX|7t^Qpn>}h@WxiVGVhs
zt&n=U=v_{TJ|ZSJ;tYC{<G8+fW+R=mFTUg}2qG}Lm2w>(Pk!bLLN}D6s<6AK3f5ky
zu9{%BTWH%d6mln&6&LrjOabcYoapmDN<^^3Y(y0tFwfW1(<zo8mblfjsgT)7J#FD2
zojR7;7cU4dVDahHn;^Sola-<@{_|f?%gcId#0Ghol6tIKHC!n--x|LLY<sVz=c5fM
z>7E8x(z|mFXG!NqW4-gZb!p|Lv|N<>xzgyuNFJU@9G3ncS@b!wyy&xM`GRD+MW3f2
zeRIE(3IY#JiD?yI#7@!gI(54L!f-5m;^f4Pdk%J_OkmYg2-AZ!6Nrr{<Q{%Pg<pC&
z84ctj^ip6rmY{QRnI2yq>LlKv-D|D3xgJg&WdRj#)1I<n)Ebp~tvxgdFe#rMQ~{t%
z-!#_C8VU8P@RT|k9YKsC7O8`wMv@2>YH#Zr83Pqs)V_)G49fS^e$zmG4)rH$-#|G9
zsJ~NNQzO?={bnX6I!+)sW!tt!uAma+E~92Ln-BX`@XL;7%`!D|9<PG3(|Xszg%K4J
WvQuyA=5|XXfAAfO%pq#znd>hASN_ug

delta 427
zcmaEu_a$e7Du1yZ0|OVsH?y^-ue7(?%1m^;H!*;Bvpl1cEYo7!&CYU7V)av07#U94
ztYtXhv6lIOkEO^pn?+0u{x4;@z^1@(z~{M*0#J00$wY>AHq1AU9&uM`)Nz$rC?O-j
z@{U_ZfXS8Th|LusgZGHdJMI%UjsiYD&4TlUc^IzPfJAD9g&9D!j4YR*ze0qenX8Lu
zNE&xF!y6lCjl(zGRnl0294p(&re>z~Znnu9hGsst)eN<^PKPytl0dn3TaIJrFI_pI
zYher$s9~67%X#qf<)dd0ojH0*Q;mTk(=J%8hJk^B^}^N5Ck{?g(GjU(*lEiK;u!$B
zW<c(7TNV&^ii#zWbIq3N(uFB10Sq+^k8PQ*0+~TT<~v)a^2<PWD3JZrmgyvr83Sap
z*fE})qEZB8@!J8-xB@gV1jv!JW4t~^B@4(>vtzw{^a{w7yL>ea26imxj^4O3MI{_4
oWoO5B<0gbV$E1eA+m7wR`3qOBpP!=g59p03J7yqvipp{>048Ig^#A|>


From 150508feb87a3568fd52d575802312599081fa90 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sat, 2 Dec 2023 23:23:23 +0100
Subject: [PATCH 07/12] Keep timestamp of sources when converting them to CBM
 formats so that make doesn't always rebuild everything.

---
 6502/C64/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index c7ef736..724e2ee 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -62,10 +62,8 @@ cbmfiles/tcbase: emulator/v4th-c64-4tc.T64 emulator/build-tcbase.sh \
     disks/tc38q.d64 disks/file-words.d64 cbmfiles/tc-base.fth
 	emulator/build-tcbase.sh
 
-$(vf_binaries):  emulator/tcbase.T64 emulator/build-vf.sh \
-    disks/tc38q.d64 $(vf_fth_files_petscii)
-
-$(vf_binaries):  cbmfiles/logtofile.fth
+$(vf_binaries): $(vf_fth_files_petscii) emulator/build-vf.sh \
+    emulator/tcbase.T64 disks/tc38q.d64 cbmfiles/logtofile.fth
 
 cbmfiles/v4thblk-c64:
 	emulator/build-vf.sh v4thblk-c64
@@ -228,18 +226,22 @@ cbmfiles/devenv: emulator/run-in-vice.sh emulator/build-devenv.sh \
 
 emulator/%.T64: cbmfiles/%
 	bin2t64 $< $@
+	touch -m -r $< $@
 
 
 # Generic rule for populating cbmfiles/ with PETSCII text files
 
 cbmfiles/%.fth: src/%.fth
 	ascii2petscii $< $@
+	touch -m -r $< $@
 
 cbmfiles/%.fth: tests/%.fth
 	ascii2petscii $< $@
+	touch -m -r $< $@
 
 cbmfiles/%.fr: tests/%.fr
 	ascii2petscii $< $@
+	touch -m -r $< $@
 
 
 # Generic rule for converting .d64 blk sources into .fth files.

From 220f5c9253befc9315982fefab59bbf7dc1cf196 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sat, 2 Dec 2023 23:33:57 +0100
Subject: [PATCH 08/12] Remove obsolete x16 r39 and r41 targets

---
 6502/C64/Makefile                  | 24 ------------------------
 6502/C64/emulator/run-in-x16-39.sh |  9 ---------
 6502/C64/emulator/run-in-x16-41.sh |  9 ---------
 3 files changed, 42 deletions(-)
 delete mode 100755 6502/C64/emulator/run-in-x16-39.sh
 delete mode 100755 6502/C64/emulator/run-in-x16-41.sh

diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index 724e2ee..0c454fe 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -146,30 +146,6 @@ test-v4th-x16e.log: cbmfiles/v4th-x16e emulator/sdcard.img
 	mcopy -i emulator/sdcard.img ::TEST.LOG cbmfiles/test.log
 	petscii2ascii cbmfiles/test.log $@
 
-test-v4th-x16-39.log: $(test_files_petscii) emulator/run-in-vice.sh
-
-test-v4th-x16-39.log: cbmfiles/v4th-x16 emulator/sdcard.img
-	rm -f cbmfiles/test.log
-	emulator/run-in-x16-39.sh v4th-x16 \
-	  "include run-std-tests.fth\n1234567890"
-	mcopy -i emulator/sdcard.img ::TEST.LOG cbmfiles/test.log
-	petscii2ascii cbmfiles/test.log $@
-
-test-v4th-x16-39.golden: test-v4th-x16.golden
-	cp $< $@
-
-test-v4th-x16-41.log: $(test_files_petscii) emulator/run-in-vice.sh
-
-test-v4th-x16-41.log: cbmfiles/v4th-x16 emulator/sdcard.img
-	rm -f cbmfiles/test.log
-	emulator/run-in-x16-41.sh v4th-x16 \
-	  "include run-std-tests.fth\n1234567890"
-	mcopy -i emulator/sdcard.img ::TEST.LOG cbmfiles/test.log
-	petscii2ascii cbmfiles/test.log $@
-
-test-v4th-x16-41.golden: test-v4th-x16.golden
-	cp $< $@
-
 test-%.result: test-%.log test-%.golden tests/evaluate-test.sh
 	rm -f $@
 	tests/evaluate-test.sh $(basename $@)
diff --git a/6502/C64/emulator/run-in-x16-39.sh b/6502/C64/emulator/run-in-x16-39.sh
deleted file mode 100755
index 6713240..0000000
--- a/6502/C64/emulator/run-in-x16-39.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-emulatordir="$(realpath --relative-to="$PWD" "$(dirname "${BASH_SOURCE[0]}")")"
-
-export PATH="${HOME}/x16-r39:${PATH}"
-echo "PATH = ${PATH}"
-"${emulatordir}/run-in-x16emu.sh" "$@"
diff --git a/6502/C64/emulator/run-in-x16-41.sh b/6502/C64/emulator/run-in-x16-41.sh
deleted file mode 100755
index 89487d4..0000000
--- a/6502/C64/emulator/run-in-x16-41.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-emulatordir="$(realpath --relative-to="$PWD" "$(dirname "${BASH_SOURCE[0]}")")"
-
-export PATH="${HOME}/x16-r41:${PATH}"
-echo "PATH = ${PATH}"
-"${emulatordir}/run-in-x16emu.sh" "$@"

From 98dec1d22489beeb234406e4d2c55a95d8a72424 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sun, 3 Dec 2023 13:35:58 +0100
Subject: [PATCH 09/12] Add 6502/C64/RELEASE_NOTES.md

---
 6502/C64/RELEASE_NOTES.md | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 6502/C64/RELEASE_NOTES.md

diff --git a/6502/C64/RELEASE_NOTES.md b/6502/C64/RELEASE_NOTES.md
new file mode 100644
index 0000000..43aa995
--- /dev/null
+++ b/6502/C64/RELEASE_NOTES.md
@@ -0,0 +1,45 @@
+# VolksForth 6502 C64 Releases
+
+Release notes of VolksForth for 6502 on CBM-like machines (C64/C16/X16)
+
+## Release content
+
+The latest release zip file volksforth-6502-c64-release.zip contains
+
+* `binaries/` - the compiled VolksForth binaries, namely:
+    * `v4th-c64` - minimal C64 kernel
+    * `v4thblk-c64` - C64 kernel with added block words
+    * `v4th-c16-` - minmal C16 kernel using 32k RAM
+    * `v4thblk-c16-` - C16 kernel using 32k RAM with added block words
+    * `v4th-c16+` - minmal C16 kernel using 63k RAM
+      (with bank switching)
+    * `v4thblk-c16+` - C16 kernel using 63k RAM with added block words
+    * `v4th-x16` - minmal Commander X16 kernel
+    * `v4th-x16e` - Commander X16 kernel with added X16Edit and
+      DOS commands
+
+* `src/` - sources
+    * `v4th*.fth` - the binaries' main files
+    * `vf-*.fth` - sources from which VolksForth
+      kernels are compiled
+    * further Forth sources
+
+* `src_petscii/` - the files from `src/` converted to PETSCII
+
+* `tests/` - the test files used to validate VolksForth builds
+
+* `tests_petscii/` - the files from `tests/` converted to PETSCII
+
+## Versions
+The following version descriptions areonly valid for VolksForth 6502
+C64 Releases. As of now (Dec 2023), the different VolksForth platforms
+(6502, 68k, 8080, 8086) don't have shared code or shared versioning.
+
+### VF 6502-C64 3.9.5
+
+This release adapts the X16 VolksForth to the R46 ROM.
+It also adds an X16 binary with added words to invoke the
+ROM-based X16Edit (XED), to list directories and files (DIR and CAT)
+and to issue DOS commands and read the error channel (DOS).
+
+For C64 and C16 this release should be a no-op.

From 2378e4cc174872b35cdaabb1ecbf3c041c3ff4b9 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sun, 3 Dec 2023 13:38:43 +0100
Subject: [PATCH 10/12] Add release rule to Makefile

---
 6502/C64/Makefile | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index 0c454fe..42b230b 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -12,11 +12,17 @@ vf_flavours = \
     v4th-c64 v4th-c16+ v4th-c16- v4th-x16 v4th-x16e
 vf_binaries = $(patsubst %, cbmfiles/%, $(vf_flavours))
 
+all_src_files = $(wildcard src/*.fth)
+all_src_files_petscii = $(patsubst src/%, cbmfiles/%, $(all_src_files))
+
 test_files = $(wildcard tests/*.f*)
 test_files_petscii = $(patsubst tests/%, cbmfiles/%, $(test_files))
 test_logs = $(patsubst %, test-%.log, $(vf_flavours))
 test_resuls = $(patsubst %, test-%.result, $(vf_flavours))
 
+release_zipfile = volksforth-6502-c64-release.zip
+
+
 # Target to convert all .d64 images into .fth files for easier reading,
 # and to update all PETSCII files in cbmfiles to the latest state of
 # the corresponding ASCII files in src.
@@ -24,7 +30,8 @@ update: $(vf_blk_fth_files) $(vf_fth_files_petscii)
 
 
 clean:
-	rm -f cbmfiles/*.fr cbmfiles/*.fth cbmfiles/*.log tmp/*
+	rm -f cbmfiles/*.fr cbmfiles/*.fth cbmfiles/*.log
+	rm -rf tmp/* release
 	rm -f *.log *.result *.golden
 	rm -f cbmfiles/c??-testbase
 	rm -f disks/scratch.d64 emulator/sdcard.img
@@ -56,6 +63,29 @@ run-testbase16: emulator/testbase16.T64
 	VICE=xplus4 emulator/run-in-vice.sh testbase16
 
 
+release: release/$(release_zipfile)
+
+release/$(release_zipfile): $(vf_binaries) \
+    $(all_src_files) $(all_src_files_petscii) \
+    $(test_files) $(test_files_petscii) COPYING RELEASE_NOTES.md
+	rm -rf release
+	mkdir release
+	rm -rf tmp
+	mkdir tmp
+	mkdir tmp/binaries
+	mkdir tmp/src
+	mkdir tmp/src_petscii
+	mkdir tmp/tests
+	mkdir tmp/tests_petscii
+	cp -p COPYING RELEASE_NOTES.md tmp/
+	cp -p $(vf_binaries) tmp/binaries/
+	cp -p $(all_src_files) tmp/src/
+	cp -p $(all_src_files_petscii) tmp/src_petscii/
+	cp -p $(test_files) tmp/tests/
+	cp -p $(test_files_petscii) tmp/tests_petscii/
+	(cd tmp &&	zip -r ../release/$(release_zipfile) *)
+
+
 # Targetcompiler targets
 
 cbmfiles/tcbase: emulator/v4th-c64-4tc.T64 emulator/build-tcbase.sh \

From 480192093a1502f1183d65595c7a283861eda8bc Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sun, 3 Dec 2023 13:39:48 +0100
Subject: [PATCH 11/12] Update copyright years in 6502/C64/COPYING to 1985-2023

---
 6502/C64/COPYING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/6502/C64/COPYING b/6502/C64/COPYING
index 7949c26..9b2d58b 100644
--- a/6502/C64/COPYING
+++ b/6502/C64/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 1985-2006, Forthgesellschaft e.V. (www.forth-ev.de) All rights
+Copyright (c) 1985-2023, Forthgesellschaft e.V. (www.forth-ev.de) All rights
 reserved.
 
 Redistribution and use in source and binary forms, with or without

From 1a336935eb3ebfa306f895ea080a6f747e8713f2 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sun, 3 Dec 2023 13:48:39 +0100
Subject: [PATCH 12/12] RELEASE_NOTES.md formatting tweak

---
 6502/C64/RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/6502/C64/RELEASE_NOTES.md b/6502/C64/RELEASE_NOTES.md
index 43aa995..1361cb0 100644
--- a/6502/C64/RELEASE_NOTES.md
+++ b/6502/C64/RELEASE_NOTES.md
@@ -4,7 +4,7 @@ Release notes of VolksForth for 6502 on CBM-like machines (C64/C16/X16)
 
 ## Release content
 
-The latest release zip file volksforth-6502-c64-release.zip contains
+The latest release zip file `volksforth-6502-c64-release.zip` contains
 
 * `binaries/` - the compiled VolksForth binaries, namely:
     * `v4th-c64` - minimal C64 kernel