arch-msx/msxbuild
2
0
Fork 0
Code Issues Pull requests 3 Actions Activity

Used MB_CACHE to store omsxctl
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 0s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-25 15:46:31 +02:00
parent 717aaaf83e
commit 5ce923b3fb
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/make/mb_base.mk
View file

@ -7,7 +7,7 @@ ifeq ($(OS),Windows_NT)
MB_COPY = copy MB_COPY = copy
MB_ERRIGNORE = 2>NUL || true MB_ERRIGNORE = 2>NUL || true
MB_SEP=\\ MB_SEP=\\
MB_CACHE=%LOCALAPPDATA% MB_CACHE ?= %LOCALAPPDATA%
else else
MB_RM = rm -f MB_RM = rm -f
MB_RMDIR = rm -rf MB_RMDIR = rm -rf
@ -15,7 +15,7 @@ else
MB_COPY = cp MB_COPY = cp
MB_ERRIGNORE = 2>/dev/null MB_ERRIGNORE = 2>/dev/null
MB_SEP=/ MB_SEP=/
MB_CACHE=~/.cache MB_CACHE ?= ~/.cache
endif endif
# Remove space after separator # Remove space after separator

1
lib/make/mb_msxhub.mk
View file

@ -1,5 +1,4 @@
MB_CACHE ?=~/.cache
MB_MSXHUB_API ?= https://msxhub.com/api MB_MSXHUB_API ?= https://msxhub.com/api
MB_MSXHUB_CACHE ?= $(MB_CACHE)/msxhub/repro-v0 MB_MSXHUB_CACHE ?= $(MB_CACHE)/msxhub/repro-v0
MB_MSXHUB_WGET ?= wget MB_MSXHUB_WGET ?= wget

14
lib/make/mb_openmsx.mk
View file

@ -13,14 +13,14 @@ MB_OPENMSX_JOYPORTB ?=
MB_OPENMSX_SCALE_FACTOR ?= 3 MB_OPENMSX_SCALE_FACTOR ?= 3
MB_OPENMSX_THROTTLE ?= off MB_OPENMSX_THROTTLE ?= off
MB_OPENMSX_RENDERER ?= MB_OPENMSX_RENDERER ?=
MB_OPENMSX_CTL_CACHE ?= ~/.openMSX/share/omsxctl MB_OPENMSX_CTLCACHE ?= $(MB_CACHE)/omsxctl
MB_OPENMSX_SAVE_ON_EXIT ?= off MB_OPENMSX_SAVE_ON_EXIT ?= off
# TODO: create openMSX issue to control extensions from the command line. # TODO: create openMSX issue to control extensions from the command line.
define _mb_openmsx_setup define _mb_openmsx_setup
$(if $(wildcard $(MB_OPENMSX_CTL_CACHE)),,$(call mb_mkdir,$(MB_OPENMSX_CTL_CACHE))) $(if $(wildcard $(MB_OPENMSX_CTLCACHE)),,$(call mb_mkdir,$(MB_OPENMSX_CTLCACHE)))
$(call mb_msxhub_file,$(MB_OPENMSX_CTL_CACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl) $(call mb_msxhub_file,$(MB_OPENMSX_CTLCACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
$(call mb_msxhub_file,$(MB_OPENMSX_CTL_CACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com) $(call mb_msxhub_file,$(MB_OPENMSX_CTLCACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com)
$(if $(wildcard ~/.openMSX/share/extensions/ide-nextor.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/ide-nextor.xml,~/.openMSX/share/extensions/)) $(if $(wildcard ~/.openMSX/share/extensions/ide-nextor.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/ide-nextor.xml,~/.openMSX/share/extensions/))
endef endef
@ -44,7 +44,7 @@ define _mb_openmsx_run
$(MB_OPENMSX_EXTRA_HDD) \ $(MB_OPENMSX_EXTRA_HDD) \
$(MB_OPENMSX_EXTRA_MEM) \ $(MB_OPENMSX_EXTRA_MEM) \
$(MB_OPENMSX_EXTS) \ $(MB_OPENMSX_EXTS) \
-script $(MB_OPENMSX_CTL_CACHE)/omsxctl.tcl \ -script $(MB_OPENMSX_CTLCACHE)/omsxctl.tcl \
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl \ -script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl \
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl \ -script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl \
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \ -script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \
@ -53,7 +53,7 @@ define _mb_openmsx_run
endef endef
define mb_openmsx_dosctl define mb_openmsx_dosctl
$(if $(wildcard $(MB_OPENMSX_CTL_CACHE)/omsxctl.tcl),,$(call _mb_openmsx_setup)) $(if $(wildcard $(MB_OPENMSX_CTLCACHE)/omsxctl.tcl),,$(call _mb_openmsx_setup))
$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTL_CACHE)/omsxctl.com,$(1))) $(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTLCACHE)/omsxctl.com,$(1)))
$(call _mb_openmsx_run,$(1)) $(call _mb_openmsx_run,$(1))
endef endef

4
lib/make/mb_packages.mk
View file

@ -1,7 +1,7 @@
# MSXHUB fetch package files functions # MSXHUB fetch package files functions
define mb_package_emuctl define mb_package_emuctl
$(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/shutdown.bat,$(1)) $(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/shutdown.bat,$(1))
$(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/z80.bat,$(1)) $(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/z80.bat,$(1))
endef endef
# #