Merge pull request #66 from FoenixRetro/fix/release-makefiles

fix: bring build/release Makefiles up-to-date with repo changes etc.

Author: agurtovoy

README.md

@@ -16,7 +16,8 @@ SuperBASIC is fully intended to work with the _latest_ Kernel/DOS.
 ```
 git clone git@github.com:FoenixRetro/f256-superbasic.git
 git clone git@github.com:WartyMN/Foenix-F256JR-bootscreens.git
-git clone git@github.com:ghackwrench/F256_Jr_Kernel_DOS.git
+git clone git@github.com:FoenixRetro/f256-microkernel
+git clone git@github.com:FoenixRetro/FoenixMgr
 cd f256-superbasic/source
 
 # this will build everything against/including latest kernel
@@ -92,7 +93,6 @@ Attempting to program sector 0x01 with sb01.bin
 - [F256 Documentation Wiki](https://wiki.f256foenix.com)
 - [More information on flashing SuperBASIC to your machine](https://wiki.f256foenix.com/index.php?title=Kernel_%26_SuperBASIC_Updates)
 - [More information on MAME for F256](https://wiki.f256foenix.com/index.php?title=Emulation#MAME)
-- [F256 emulator](https://github.com/FoenixRetro/junior-emulator)
-- [F256 Kernel and DOS](https://github.com/ghackwrench/F256_Jr_Kernel_DOS)
+- [F256 MicroKernel](https://github.com/FoenixRetro/f256-microkernel)
+- [F256 Boot Screens](https://github.com/WartyMN/Foenix-F256JR-bootscreens)
 - [F256 Command Line USB upload tool](https://github.com/pweingar/FoenixMgr)
-- [Foenix BootScreens](https://github.com/WartyMN/Foenix-F256JR-bootscreens)

documents/common.make

@@ -1,6 +1,6 @@
 # ***********************************************************************************
 #
-#										Common Build 
+#										Common Build
 #
 # ***********************************************************************************
 #
@@ -15,33 +15,49 @@ APPSTEM = .exe
 S = \\
 SDLDIR = C:\\sdl2
 CXXFLAGS = -I$(SDLDIR)$(S)include$(S)SDL2 -I . -fno-stack-protector -w -Wl,-subsystem,windows -DSDL_MAIN_HANDLED
-LDFLAGS = -lmingw32 
+LDFLAGS = -lmingw32
 SDL_LDFLAGS = -L$(SDLDIR)$(S)lib -lSDL2 -lSDL2main -static-libstdc++ -static-libgcc
 OSNAME = windows
 EXTRAFILES = libwinpthread-1.dll  SDL2.dll
 PYTHON = python
 else
 CCOPY = cp
 CDEL = rm -f
-CDELQ = 
+CDELQ =
 CMAKE = make
 APPSTEM =
 S = /
 SDL_CFLAGS = $(shell sdl2-config --cflags)
 SDL_LDFLAGS = $(shell sdl2-config --libs)
-CXXFLAGS = $(SDL_CFLAGS) -O2 -DLINUX  -fmax-errors=5 -I.  
-LDFLAGS = 
+CXXFLAGS = $(SDL_CFLAGS) -O2 -DLINUX  -fmax-errors=5 -I.
+LDFLAGS =
 OSNAME = linux
-EXTRAFILES = 
+EXTRAFILES =
 PYTHON = python3
 endif
 #
-#		Root directory
+#		Root and parent dirs
 #
-ROOTDIR = ..$(S)
+SELFDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+ROOTDIR := $(abspath $(SELFDIR)..$(S))$(S)
+PARENTDIR := $(abspath $(ROOTDIR)..$(S))$(S)
+#
+#		External repositories
+#
+KRN_REPO = $(PARENTDIR)f256-microkernel
+EMU_REPO = $(PARENTDIR)junior-emulator
+LDR_REPO = $(PARENTDIR)FoenixMgr
+#
+#		Binaries dir
+#
+BINDIR = $(ROOTDIR)bin$(S)
+#
+#		Emulator executable
+#
+EMULATOR = $(BINDIR)jr256$(APPSTEM)
 #
 #		Current assembler
-# 
+#
 ASM = 64tass
 #
 #		Load Addresses

games/demo/Makefile

@@ -15,8 +15,6 @@ else
 include ../../documents/common.make
 endif
 
-BINDIR = ..$(S)..$(S)bin$(S)
-EMULATOR = $(BINDIR)jr256$(APPSTEM)
 LANGUAGE = en
 SOURCE = main.bas
 
@@ -47,12 +45,12 @@ program:
 #		Run program (if built autorunning BASIC)
 #
 run: sprites program
-	$(START)	
+	$(START)
 #
 #		Run on kernel hardware
 #
-fgo: sprites program 
-	$(CCOPY) $(BINDIR)foenixmgr.ini .	
+fgo: sprites program
+	$(CCOPY) $(BINDIR)foenixmgr.ini .
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --binary graphics.bin --address $(LSPRITES)
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --binary storage$(S)load.dat --address $(LSOURCE)
 #
@@ -63,4 +61,3 @@ sdcard:
 	$(CCOPY) foenixmgr.ini upload
 	make -n -s fgo >upload$(S)files.lst
 	make -C upload
-	

games/demo2/Makefile

@@ -15,8 +15,6 @@ else
 include ../../documents/common.make
 endif
 
-BINDIR = ..$(S)..$(S)bin$(S)
-EMULATOR = $(BINDIR)jr256$(APPSTEM)
 LANGUAGE = en
 SOURCE = main.bas
 
@@ -47,12 +45,12 @@ program:
 #		Run program (if built autorunning BASIC)
 #
 run: sprites program
-	$(START)	
+	$(START)
 #
 #		Run on kernel hardware
 #
-fgo: sprites program 
-	$(CCOPY) $(BINDIR)foenixmgr.ini .	
+fgo: sprites program
+	$(CCOPY) $(BINDIR)foenixmgr.ini .
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --binary graphics.bin --address $(LSPRITES)
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --binary storage$(S)load.dat --address $(LSOURCE)
 #

games/invaders/Makefile

@@ -15,8 +15,6 @@ else
 include ../../documents/common.make
 endif
 
-BINDIR = ..$(S)..$(S)bin$(S)
-EMULATOR = $(BINDIR)jr256$(APPSTEM)
 LANGUAGE = en
 SOURCE = main.bas  ..$(S)common$(S)title.bas
 
@@ -47,12 +45,12 @@ program:
 #		Run program (if built autorunning BASIC)
 #
 run: sprites program
-	$(START)	
+	$(START)
 #
 #		Run on kernel hardware
 #
-fgo: sprites program 
-	$(CCOPY) $(BINDIR)foenixmgr.ini .	
+fgo: sprites program
+	$(CCOPY) $(BINDIR)foenixmgr.ini .
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --binary graphics.bin --address $(LSPRITES)
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --binary storage$(S)load.dat --address $(LSOURCE)
 #

games/solarfox/Makefile

@@ -15,8 +15,6 @@ else
 include ../../documents/common.make
 endif
 
-BINDIR = ..$(S)..$(S)bin$(S)
-EMULATOR = $(BINDIR)jr256$(APPSTEM)
 LANGUAGE = en
 SOURCE = main.bas levels.bas ..$(S)common$(S)title.bas
 
@@ -47,12 +45,12 @@ program:
 #		Run program (if built autorunning BASIC)
 #
 run: sprites program
-	$(START)	
+	$(START)
 #
 #		Run on kernel hardware
 #
-fgo: sprites program 
-	$(CCOPY) $(BINDIR)foenixmgr.ini .	
+fgo: sprites program
+	$(CCOPY) $(BINDIR)foenixmgr.ini .
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --binary graphics.bin --address $(LSPRITES)
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --binary storage$(S)load.dat --address $(LSOURCE)
 #
@@ -64,4 +62,3 @@ sdcard:
 	make -n -s fgo >upload$(S)files.lst
 	make -C upload
 
-	

games/squash/Makefile

@@ -15,9 +15,6 @@ else
 include ../../documents/common.make
 endif
 
-BINDIR = ..$(S)..$(S)bin$(S)
-EMULATOR = $(BINDIR)jr256$(APPSTEM)
-TTYPORT = /dev/ttyUSB0
 LANGUAGE = en
 
 START = $(EMULATOR) $(BINDIR)basic.rom@b storage$(S)load.dat@x graphics.bin@s
@@ -42,4 +39,4 @@ program:
 #		Run program (if built autorunning BASIC)
 #
 run: sprites program
-	$(START)	
+	$(START)

javascript/Makefile

@@ -15,42 +15,40 @@ else
 include ../documents/common.make
 endif
 
-BINDIR = $(ROOTDIR)bin$(S)
-ASMOPTS = -q -b -Wall -c -L output$(S)basic.lst -l output$(S)basic.lbl -Wall 
+ASMOPTS = -q -b -Wall -c -L output$(S)basic.lst -l output$(S)basic.lbl -Wall
 APPNAME = basic.rom
 SCRIPTDIR = scripts$(S)
-EMULATOR = $(BINDIR)jr256$(APPSTEM)
-TTYPORT = /dev/ttyUSB0
 LANGUAGE = en
 
-EMU_REPO= ..$(S)..$(S)junior-emulator
-UTL_REPO= ..$(S)..$(S)junior-utilities
-KRN_REPO= ..$(S)..$(S)junior-tinykernel
-
 EMSRC = $(EMU_REPO)$(S)emulator
 EMUCODE = $(EMSRC)$(S)src $(EMSRC)$(S)include $(EMSRC)$(S)framework $(EMSRC)$(S)6502 $(EMSRC)$(S)roms
 
 SOURCES = emulator/framework/main.cpp emulator/framework/gfx.cpp emulator/framework/debugger.cpp \
 		  emulator/src/sys_processor.cpp emulator/src/sys_debug_uk101.cpp emulator/src/hardware.cpp emulator/src/hw_fifo.cpp
-DEFINES = -D EMSCRIPTEN -D LINUX -D NO_DEBUGGER -DINCLUDE_OS_SUPPORT 
+DEFINES = -D EMSCRIPTEN -D LINUX -D NO_DEBUGGER -DINCLUDE_OS_SUPPORT
 EMFLAGS = -I. -I emulator/framework -I emulator//cpu -I emulator/include -I emulator -O2 -s USE_SDL=2 -s WASM=1 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]'
 COMPILE = emcc $(SOURCES) $(DEFINES) $(CADDRESSES) $(EMFLAGS) -o f256.html
 LOADERS = python makeloader.py $(CADDRESSES)
 
-all: build 
+all: build
 
-build: build1
-	make -C ../source basic  
+build: pull build1
+	make -C ../source basic
 	$(CCOPY) utility$(S)dummy* loading
 	make -C ../source basic
 	$(CCOPY) ../source/build/basic.rom loading/basic.basic
 	$(LOADERS)
 	$(COMPILE)
 
+pull:
+	cd $(EMU_REPO) && git diff --quiet || (echo "Error: Emulator repository has uncommitted changes" && exit 1)
+	cd $(EMU_REPO) && git diff --cached --quiet || (echo "Error: Emulator repository has staged changes" && exit 1)
+	cd $(EMU_REPO) && git switch main
+	cd $(EMU_REPO) && git pull
+
 build1:
-	$(CCOPY) -R $(EMUCODE) emulator 
+	$(CCOPY) -R $(EMUCODE) emulator
 	$(CDEL) loading$(S)*.*
 
 server:
 	python -m http.server 8000
-	

source/Makefile

@@ -21,17 +21,11 @@ VERSION = 1
 
 HARDWARE = 0        # 0 = F256
 HARDWARE_GEN ?= 1   # 1 = J/K, 2 = J2/K2
-BINDIR = $(ROOTDIR)bin$(S)
 ASMOPTS = -q -b -Wall -c -C -D HARDWARE="$(HARDWARE)" -D HARDWARE_GEN=$(HARDWARE_GEN) -L output$(S)basic.lst -l output$(S)basic.lbl -Wall
 APPNAME = build$(S)basic.rom
 SCRIPTDIR = scripts$(S)
-EMULATOR = $(BINDIR)jr256$(APPSTEM)
 LANGUAGE = en
 
-EMU_REPO= ..$(S)..$(S)junior-emulator
-LDR_FILE= ..$(S)..$(S)FoenixMgr
-KRN_REPO= ..$(S)..$(S)F256_Jr_Kernel_DOS
-
 MODULES= +hardware +graphics +tokeniser +sound +kernel
 
 START = $(EMULATOR) $(APPNAME)@b storage$(S)load.dat@x $(BINDIR)graphics.bin@s $(BINDIR)tile_map.bin@24000 $(BINDIR)tile_images.bin@26000
@@ -53,15 +47,16 @@ trun: testbasic
 	$(START)
 
 #
-#		Build & update Kernel & api.asm
+#		Pull & update Kernel & api.asm
 #
 pullkernel:
-	cd $(KRN_REPO) && git reset --hard
+	cd $(KRN_REPO) && git diff --quiet || (echo "Error: MicroKernel repository has uncommitted changes" && exit 1)
+	cd $(KRN_REPO) && git diff --cached --quiet || (echo "Error: MicroKernel repository has staged changes" && exit 1)
+	cd $(KRN_REPO) && git switch master
 	cd $(KRN_REPO) && git pull
 
 updatekernel:
-	make -B -C $(KRN_REPO)
-	$(CCOPY) $(KRN_REPO)$(S)kernel$(S)*.bin build
+	$(CCOPY) $(KRN_REPO)$(S)bin$(S)*.bin build
 	$(CCOPY) $(KRN_REPO)$(S)kernel$(S)api.asm  common$(S)api
 
 #
@@ -127,7 +122,7 @@ shim:
 
 fnxmgr:
 	$(CDEL) temp$(S)*.*
-	$(CCOPY) $(LDR_FILE)$(S)FoenixMgr$(S)*.* temp
+	$(CCOPY) $(LDR_REPO)$(S)FoenixMgr$(S)*.* temp
 	$(CCOPY) temp$(S)fnxmgr.py temp$(S)__main__.py
 	zip temp$(S)fnxmgr.zip -j temp$(S)__main__.py temp$(S)constants.py temp$(S)foenix_config.py temp$(S)intelhex.py \
 			temp$(S)pgx.py temp$(S)srec.py temp$(S)foenix.py temp$(S)pgz.py temp$(S)wdc.py

test/iec_gadget/Makefile

@@ -7,15 +7,14 @@ endif
 
 all : ramkernel
 
-BINDIR = ..$(S)..$(S)bin$(S)
-ASMOPTS = -q -b -Wall -c -L output$(S)testcode.lst -l output$(S)testcode.lbl -Wall 
-KRN_REPO= ..$(S)..$(S)..$(S)F256_Jr_Kernel_DOS
+ASMOPTS = -q -b -Wall -c -L output$(S)testcode.lst -l output$(S)testcode.lbl -Wall
+
 #
 #		Switch to Flash-Boot or RAM-Boot
-#	
+#
 flashboot:
-	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --boot flash 
-ramboot:	
+	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --boot flash
+ramboot:
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --boot ram
 #
 #		Build & update Kernel & api.asm
@@ -29,7 +28,7 @@ updatekernel:
 #		Build RAM based kernel / test ROM combo and boot.
 #
 ramkernel: testcode.bin ramboot
-	cat 3f.bin 3e.bin 01.bin testcode.bin  >kernel.ram 
+	cat 3f.bin 3e.bin 01.bin testcode.bin  >kernel.ram
 	cat kernel.ram $(BINDIR)$(S)basic.rom >ramkernel.bin
 	python $(BINDIR)fnxmgr.zip --port $(TTYPORT) --binary ramkernel.bin --address E000
 #