From b0d93dadc06cd9a9af2d224ef6d0ddd7a88a2d49 Mon Sep 17 00:00:00 2001 From: dimitrit Date: Mon, 1 Nov 2021 08:13:01 +0000 Subject: [PATCH 1/3] Include TastyBasic version details --- Source/TastyBasic/src/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/TastyBasic/src/Makefile b/Source/TastyBasic/src/Makefile index dbe3fae8..515adaba 100644 --- a/Source/TastyBasic/src/Makefile +++ b/Source/TastyBasic/src/Makefile @@ -1,5 +1,6 @@ +# git@github.com:dimitrit/tastybasic.git; commit a86d7e7; (HEAD -> master, tag: v0.3.0) +VER := \"v0.3.0\" UNAME := $(shell uname) -# VER := $(shell git describe --tags --abbrev=0) APPDIR := $(wildcard ../../../Binary/Apps) BINDIR := ../../../Tools/$(UNAME) @@ -21,14 +22,14 @@ clobber: clean @rm -f $(CPMAPP) $(ROMIMAGE): $(ROMDEPS) - @uz80as -dROMWBW tastybasic.asm tastybasic.bin tastybasic.bin.lst + @uz80as -dROMWBW -d"VERSION $(VER)" tastybasic.asm tastybasic.bin tastybasic.bin.lst $(CPMIMAGE): $(CPMCMD) @mkfs.cpm -f wbw_fd144 tastybasic.img @cpmcp -f wbw_fd144 tastybasic.img tastybasic.com 0:tbasic.com $(CPMCMD): $(CPMDEPS) - @uz80as -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst + @uz80as -dCPM -d"VERSION $(VER)" tastybasic.asm tastybasic.com tastybasic.com.lst $(APPDIR): $(CPMCMD) @cat $(CPMCMD) > $(CPMAPP) From f65e6b2ac58ac0f597ee89045cd2bcf1703e7785 Mon Sep 17 00:00:00 2001 From: dimitrit Date: Mon, 1 Nov 2021 09:06:07 +0000 Subject: [PATCH 2/3] Clean removes rom images --- Binary/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Binary/Makefile b/Binary/Makefile index cdca45ae..8f485e8a 100644 --- a/Binary/Makefile +++ b/Binary/Makefile @@ -4,5 +4,10 @@ SUBDIRS = Apps CPM3 ZPM3 include $(TOOLS)/Makefile.inc -clobber:: - @rm -f *.bin *.com *.img *.rom *.upd *.hex *.pdf *.log *.eeprom *.dat +clean:: + @rm -f *.bin *.com *.img *.rom + +clobber:: clean + @rm -f *.upd *.hex *.pdf *.log *.eeprom *.dat + +.PHONEY: clean clobber From b54438422573b3fe26bf8656b07aeacbf0846e0f Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Mon, 1 Nov 2021 20:25:33 -0700 Subject: [PATCH 3/3] Sync Windows Build - Latest changes to Linux/MacOS build needed to be added to Windows build to restore binary identical build results. --- Binary/Makefile | 9 ++------- Doc/ChangeLog.txt | 3 +++ Source/Images/d_bp.txt | 2 +- Source/Images/d_zpm3.txt | 2 +- Source/TastyBasic/src/Build.cmd | 7 +++++-- Source/ver.inc | 2 +- Source/ver.lib | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Binary/Makefile b/Binary/Makefile index 514dd41b..ea7a0d79 100644 --- a/Binary/Makefile +++ b/Binary/Makefile @@ -4,10 +4,5 @@ SUBDIRS = Apps CPM3 ZPM3 include $(TOOLS)/Makefile.inc -clean:: - @rm -f *.bin *.com *.img *.rom *.upd - -clobber:: clean - @rm -f *.hex *.pdf *.log *.eeprom *.dat - -.PHONEY: clean clobber +clobber:: + @rm -f *.bin *.com *.img *.rom *.upd *.hex *.pdf *.log *.eeprom *.dat \ No newline at end of file diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt index c2cfc6a6..e7d42423 100644 --- a/Doc/ChangeLog.txt +++ b/Doc/ChangeLog.txt @@ -54,7 +54,10 @@ Version 3.1.1 - WBW: Add interrupt receive support to UART driver - PMS: Add XModem transfer within Debug Monitor - PMS & AJL: Add DMAMON test application +- PMS: Add ZMP adaptation - LWN: Substantial BPBIOS cleanup +- AJL: Add ZMD adaptation +- D?T: Substantial update to TastyBasic incuding a .COM executable Version 3.1 ----------- diff --git a/Source/Images/d_bp.txt b/Source/Images/d_bp.txt index dd4f248c..c613ebc7 100644 --- a/Source/Images/d_bp.txt +++ b/Source/Images/d_bp.txt @@ -21,7 +21,7 @@ ../../Binary/Apps/syscopy.com 15: ../../Binary/Apps/sysgen.com 15: ../../Binary/Apps/talk.com 15: -../../Binary/Apps/tbasic.com 0: +../../Binary/Apps/tbasic.com 15: ../../Binary/Apps/timer.com 15: ../../Binary/Apps/tune.com 15: ../../Binary/Apps/xm.com 15: diff --git a/Source/Images/d_zpm3.txt b/Source/Images/d_zpm3.txt index ebb97155..878159bf 100644 --- a/Source/Images/d_zpm3.txt +++ b/Source/Images/d_zpm3.txt @@ -32,7 +32,7 @@ ../../Binary/Apps/syscopy.com 15: ../../Binary/Apps/sysgen.com 15: ../../Binary/Apps/talk.com 15: -../../Binary/Apps/tbasic.com 0: +../../Binary/Apps/tbasic.com 15: ../../Binary/Apps/timer.com 15: ../../Binary/Apps/tune.com 15: ../../Binary/Apps/xm.com 15: diff --git a/Source/TastyBasic/src/Build.cmd b/Source/TastyBasic/src/Build.cmd index 9ee76528..aa526159 100644 --- a/Source/TastyBasic/src/Build.cmd +++ b/Source/TastyBasic/src/Build.cmd @@ -7,7 +7,10 @@ set PATH=%TOOLS%\tasm32;%PATH% set TASMTABS=%TOOLS%\tasm32 -tasm -80 -g3 -fFF -dROMWBW tastybasic.asm tastybasic.bin tastybasic.bin.lst -tasm -80 -g3 -fFF -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst +# git@github.com:dimitrit/tastybasic.git; commit a86d7e7; (HEAD -> master, tag: v0.3.0) +set VER=v0.3.0 + +tasm -80 -g3 -fFF -dROMWBW -d"VERSION \"%VER%\"" tastybasic.asm tastybasic.bin tastybasic.bin.lst +tasm -80 -g3 -fFF -dCPM -d"VERSION \"%VER%\"" tastybasic.asm tastybasic.com tastybasic.com.lst copy /b /v tastybasic.com ..\..\..\Binary\Apps\tbasic.com diff --git a/Source/ver.inc b/Source/ver.inc index efa020d8..6d15aae4 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,4 +2,4 @@ #DEFINE RMN 1 #DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.135" +#DEFINE BIOSVER "3.1.1-pre.136" diff --git a/Source/ver.lib b/Source/ver.lib index a927559d..f196db79 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 1 rup equ 1 rtp equ 0 biosver macro - db "3.1.1-pre.135" + db "3.1.1-pre.136" endm