Browse Source

TastyBasic Build Adjustments

- Minor changes to the build process in TastyBasic to ensure binary identical results across all platforms.
pull/272/head
Wayne Warthen 4 years ago
parent
commit
6d115df490
  1. 4
      Source/HBIOS/Build.cmd
  2. 4
      Source/TastyBasic/src/Build.cmd
  3. 3
      Source/TastyBasic/src/Clean.cmd
  4. 14
      Source/TastyBasic/src/Makefile
  5. 2
      Source/ver.inc
  6. 2
      Source/ver.lib

4
Source/HBIOS/Build.cmd

@ -70,7 +70,7 @@ call :asm romldr || exit /b
call :asm eastaegg || exit /b call :asm eastaegg || exit /b
call :asm nascom || exit /b call :asm nascom || exit /b
call :asm tastybasic || exit /b
:: call :asm tastybasic || exit /b
call :asm game || exit /b call :asm game || exit /b
call :asm usrrom || exit /b call :asm usrrom || exit /b
call :asm updater || exit /b call :asm updater || exit /b
@ -84,7 +84,7 @@ call :asm imgpad2 || exit /b
:: ::
copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin + ..\cpm22\cpm_wbw.bin osimg.bin || exit /b copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin + ..\cpm22\cpm_wbw.bin osimg.bin || exit /b
copy /b ..\Forth\camel80.bin + nascom.bin + tastybasic.bin + game.bin + eastaegg.bin + netboot.mod + updater.bin + usrrom.bin osimg1.bin || exit /b
copy /b ..\Forth\camel80.bin + nascom.bin + ..\tastybasic\src\tastybasic.bin + game.bin + eastaegg.bin + netboot.mod + updater.bin + usrrom.bin osimg1.bin || exit /b
copy /b imgpad2.bin osimg2.bin || exit /b copy /b imgpad2.bin osimg2.bin || exit /b
copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin osimg_small.bin || exit /b copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin osimg_small.bin || exit /b

4
Source/TastyBasic/src/Build.cmd

@ -7,7 +7,7 @@ set PATH=%TOOLS%\tasm32;%PATH%
set TASMTABS=%TOOLS%\tasm32 set TASMTABS=%TOOLS%\tasm32
tasm -80 -dROMWBW tastybasic.asm tastybasic.bin tastybasic.bin.lst
tasm -80 -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst
tasm -80 -g3 -fFF -dROMWBW tastybasic.asm tastybasic.bin tastybasic.bin.lst
tasm -80 -g3 -fFF -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst
copy /b /v tastybasic.com ..\..\..\Binary\Apps\tbasic.com copy /b /v tastybasic.com ..\..\..\Binary\Apps\tbasic.com

3
Source/TastyBasic/src/Clean.cmd

@ -7,5 +7,4 @@ if exist *.prn del *.prn
if exist *.hex del *.hex if exist *.hex del *.hex
if exist *.rel del *.rel if exist *.rel del *.rel
if exist *.sym del *.sym if exist *.sym del *.sym
if exist ..\..\..\Binary\Apps\tbasic.com del ..\..\..\Binary\Apps\tbasic.com
if exist *.com del *.com

14
Source/TastyBasic/src/Makefile

@ -1,5 +1,5 @@
UNAME := $(shell uname) UNAME := $(shell uname)
VER := $(shell git describe --tags --abbrev=0)
# VER := $(shell git describe --tags --abbrev=0)
APPDIR := $(wildcard ../../../Binary/Apps) APPDIR := $(wildcard ../../../Binary/Apps)
BINDIR := ../../../Tools/$(UNAME) BINDIR := ../../../Tools/$(UNAME)
@ -14,17 +14,21 @@ export PATH := $(BINDIR):${PATH}
all: $(ROMIMAGE) $(CPMCMD) | $(APPDIR) all: $(ROMIMAGE) $(CPMCMD) | $(APPDIR)
clean clobber:
@rm -f *.lst *.img *.com *.bin $(CPMAPP)
clean:
@rm -f *.lst *.img *.com *.bin
clobber: clean
@rm -f $(CPMAPP)
$(ROMIMAGE): $(ROMDEPS) $(ROMIMAGE): $(ROMDEPS)
@uz80as -dROMWBW -d"VERSION \"$(VER)\"" tastybasic.asm tastybasic.bin tastybasic.bin.lst
@uz80as -dROMWBW tastybasic.asm tastybasic.bin tastybasic.bin.lst
$(CPMIMAGE): $(CPMCMD) $(CPMIMAGE): $(CPMCMD)
@mkfs.cpm -f wbw_fd144 tastybasic.img @mkfs.cpm -f wbw_fd144 tastybasic.img
@cpmcp -f wbw_fd144 tastybasic.img tastybasic.com 0:tbasic.com @cpmcp -f wbw_fd144 tastybasic.img tastybasic.com 0:tbasic.com
$(CPMCMD): $(CPMDEPS) $(CPMCMD): $(CPMDEPS)
@uz80as -dCPM -d"VERSION \"$(VER)\"" tastybasic.asm tastybasic.com tastybasic.com.lst
@uz80as -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst
$(APPDIR): $(CPMCMD) $(APPDIR): $(CPMCMD)
@cat $(CPMCMD) > $(CPMAPP) @cat $(CPMCMD) > $(CPMAPP)

2
Source/ver.inc

@ -2,4 +2,4 @@
#DEFINE RMN 1 #DEFINE RMN 1
#DEFINE RUP 1 #DEFINE RUP 1
#DEFINE RTP 0 #DEFINE RTP 0
#DEFINE BIOSVER "3.1.1-pre.133"
#DEFINE BIOSVER "3.1.1-pre.134"

2
Source/ver.lib

@ -3,5 +3,5 @@ rmn equ 1
rup equ 1 rup equ 1
rtp equ 0 rtp equ 0
biosver macro biosver macro
db "3.1.1-pre.133"
db "3.1.1-pre.134"
endm endm

Loading…
Cancel
Save