Put artifacts into r2r/<platform>

FozzTexx · FozzTexx · commit ebf5d3a2c2b7 · 2025-09-01T11:41:43.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,11 +9,29 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - adam
+          - apple2
+          - atari
+          - c64
+          - coco
+          - msdos
+
+    container:
+      image: fozztexx/defoogi:1.4.1
+
     steps:
       - uses: actions/checkout@v4
 
-      - id: compile
-        uses: ./.github/actions/build-matrix
+      - name: Build
+        run: make -f Makefile.${{ matrix.platform }} r2r
+
+      - name: Upload artifact for ${{ matrix.platform }}
+        uses: actions/upload-artifact@v4
         with:
-          platforms: "atari,apple2,adam,coco,c64,msdos"
-          target: "disk"
+          name: ${{ matrix.platform }}
+          path: r2r/${{ matrix.platform }}/**
diff --git a/Makefile.adam b/Makefile.adam
@@ -2,6 +2,8 @@ TARGET_EXEC ?= autorun.ddp
 
 BUILD_DIR ?= ./build
 SRC_DIRS ?= ./src
+R2R_DIR ?= ./r2r/adam
+R2R_BIN := $(R2R_DIR)/$(TARGET_EXEC)
 
 ADDL_DIR1 := ../eoslib/src
 ADDL_DIR2 := ../smartkeyslib/src
@@ -17,22 +19,22 @@ OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
 DEPS := $(OBJS:.o=.d)
 
 CFLAGS=+coleco -subtype=adam -DBUILD_ADAM -I$(ADDL_DIR1) -I$(ADDL_DIR2) 
-LDFLAGS=+coleco -subtype=adam -create-app -o$(TARGET_EXEC) -lndos -l$(ADDL_LIB1) -l$(ADDL_LIB2)
+LDFLAGS=+coleco -subtype=adam -create-app -lndos -l$(ADDL_LIB1) -l$(ADDL_LIB2)
 ASFLAGS=+coleco -subtype=adam
 
 INC_DIRS := $(shell find $(SRC_DIRS) -type d)
 INC_FLAGS := $(addprefix -I,$(INC_DIRS))
 
-$(BUILD_DIR)/$(TARGET_EXEC): $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS)
+$(R2R_BIN): $(OBJS) | $(R2R_DIR)
+	$(CC) -o$@ $(LDFLAGS) $(OBJS)
 
-.PHONY: dist autorun clean
+.PHONY: dist autorun clean r2r
 
-dist: $(TARGET_EXEC)
+dist: $(R2R_BIN)
 	cp $< ../fujinet-platformio/data/webui/device_specific/BUILD_ADAM/
 
-# Just here so all platforms can have a `make autorun`
-autorun: $(TARGET_EXEC)
+# Create the "Ready 2 Run" executable/disk
+r2r: $(R2R_BIN)
 
 # c source
 $(BUILD_DIR)/%.c.o: %.c
@@ -44,8 +46,11 @@ $(BUILD_DIR)/%.asm.o: %.asm
 	$(MKDIR_P) $(dir $@)
 	$(AS) $(ASFLAGS) -c $< -o $@
 
+$(R2R_DIR):
+	$(MKDIR_P) $@
+
 clean:
-	$(RM) -r autorun* $(BUILD_DIR)
+	$(RM) -r autorun* $(BUILD_DIR) $(R2R_DIR)
 
 -include $(DEPS)
 
diff --git a/Makefile.apple2 b/Makefile.apple2
@@ -17,7 +17,8 @@ FUJINET_LIB_VERSION_DIR = $(FUJINET_LIB)/$(FUJINET_LIB_VERSION)-$(TARGETS)
 # Name of the final, single-file executable.
 # Default: name of the current dir with target name appended
 PROGRAM := config
-DISK := dist.apple2/autorun.po
+R2R_DIR := r2r/$(TARGETS)
+DISK := $(R2R_DIR)/autorun.po
 
 # Path(s) to additional libraries required for linking the program
 # Use only if you don't want to place copies of the libraries in SRCDIR
@@ -257,7 +258,7 @@ ASFLAGS += --asm-include-dir src/$(TARGETLIST)/asminc --asm-include-dir $(FUJINE
 CFLAGS += --include-dir $(FUJINET_LIB_VERSION_DIR) -DUSING_FUJINET_LIB
 
 .SUFFIXES:
-.PHONY: all test clean get_fujinet_lib zap love dist autorun
+.PHONY: all test clean get_fujinet_lib zap love dist r2r
 
 all: get_fujinet_lib $(PROGRAM)
 
@@ -317,6 +318,9 @@ get_fujinet_lib:
 $(TARGETOBJDIR):
 	$(call MKDIR,$@)
 
+$(R2R_DIR):
+	$(call MKDIR,$@)
+
 vpath %.c $(SRCDIR)/$(TARGETLIST) $(SRCDIR)
 
 $(TARGETOBJDIR)/%.o: %.c | $(TARGETOBJDIR)
@@ -345,7 +349,7 @@ test: $(PROGRAM)
 	$(EMUCMD) $<
 	$(POSTEMUCMD)
 
-$(DISK): $(PROGRAM)
+$(DISK): $(PROGRAM) | $(R2R_DIR)
 	cp dist.apple2/bootable.po $@
 	./dist.apple2/add-file.sh $@ config config.system
 
@@ -365,8 +369,8 @@ dist: $(DISK)
     fi ; \
 	)
 
-# Just here so all platforms can have a `make autorun`
-autorun: $(DISK)
+# Create the "Ready 2 Run" executable/disk
+r2r: $(DISK)
 
 gendebug: $(PROGRAM)
 	@echo "Generating debug.scr script for AppleWin"
diff --git a/Makefile.atari b/Makefile.atari
@@ -18,6 +18,8 @@ FUJINET_LIB_VERSION_DIR = $(FUJINET_LIB)/$(FUJINET_LIB_VERSION)-$(TARGETS)
 # Name of the final, single-file executable.
 # Default: name of the current dir with target name appended
 PROGRAM := config
+R2R_DIR := r2r/$(TARGETS)
+R2R_BIN := $(R2R_DIR)/autorun.atr
 
 # Path(s) to additional libraries required for linking the program
 # Use only if you don't want to place copies of the libraries in SRCDIR
@@ -284,7 +286,7 @@ ASFLAGS += --asm-include-dir src/$(TARGETLIST)/asminc --asm-include-dir $(FUJINE
 CFLAGS += --include-dir $(FUJINET_LIB_VERSION_DIR) -DUSING_FUJINET_LIB
 
 .SUFFIXES:
-.PHONY: all test clean get_fujinet_lib zap
+.PHONY: all test clean get_fujinet_lib zap r2r
 
 all: get_fujinet_lib $(PROGRAM)
 
@@ -344,6 +346,9 @@ get_fujinet_lib:
 $(TARGETOBJDIR):
 	$(call MKDIR,$@)
 
+$(R2R_DIR):
+	$(call MKDIR,$@)
+
 vpath %.c $(SRCDIR)/$(TARGETLIST) $(SRCDIR)
 
 $(TARGETOBJDIR)/%.o: %.c | $(TARGETOBJDIR)
@@ -357,33 +362,38 @@ $(TARGETOBJDIR)/%.o: %.s | $(TARGETOBJDIR)
 $(PROGRAM): $(CONFIG) $(OBJECTS) $(LIBS)
 	$(CC) -t $(CC65TARGET) $(LDFLAGS) -o $@ $(patsubst %.cfg,-C %.cfg,$^)
 
+# Create the "Ready 2 Run" executable/disk
+r2r: $(R2R_BIN)
+
 test: $(PROGRAM)
 	$(PREEMUCMD)
 	$(EMUCMD) $<
 	$(POSTEMUCMD)
 
 test-atr: $(PROGRAM) dist
 	$(PREEMUCMD) \
-  $(EMUCMD) //disk autorun.atr \
+  $(EMUCMD) //disk $(R2R_BIN) \
 	$(POSTEMUCMD)
 
-dist: $(PROGRAM)
+$(R2R_BIN): $(PROGRAM)
 	mkdir -p dist
 	cp ../fujinet-tools/atari/dist/*.COM dist/ || true
 	cp ../fujinet-tools/atari/dist/*.com dist/ || true
 	cp $(PROGRAM) dist/
-	dir2atr -m -S -B picoboot.bin autorun.atr dist/
+	dir2atr -m -S -B picoboot.bin $@ dist/
+
+dist: $(R2R_BIN)
 
 dist-z: $(PROGRAM)
 	@if [ -d "../fujinet-config-loader" ] ; then \
-    echo "Found fujinet-config-loader, creating compressed autorun.atr"; \
+    echo "Found fujinet-config-loader, creating compressed $(R2R_BIN)"; \
     $(MAKE) -C ../fujinet-config-loader clean dist > /dev/null 2>&1 ; \
     if [ $$? -ne 0 ] ; then \
       echo "ERROR running compressor"; \
       exit 1; \
     fi; \
-    cp ../fujinet-config-loader/autorun-zx0.atr ./autorun.atr; \
-    echo "Compressed file saved as autorun.atr"; \
+    cp ../fujinet-config-loader/autorun-zx0.atr ./$(R2R_BIN); \
+    echo "Compressed file saved as $(R2R_BIN)"; \
   else \
     echo "ERROR: Could not find fujinet-config-loader in sibling directory to current."; \
     exit 1; \
diff --git a/Makefile.c64 b/Makefile.c64
@@ -18,6 +18,8 @@ FUJINET_LIB_VERSION_DIR = $(FUJINET_LIB)/$(FUJINET_LIB_VERSION)-$(TARGETS)
 # Name of the final, single-file executable.
 # Default: name of the current dir with target name appended
 PROGRAM := config
+R2R_DIR := r2r/$(TARGETS)
+R2R_BIN := $(R2R_DIR)/$(PROGRAM).prg
 
 # Path(s) to additional libraries required for linking the program
 # Use only if you don't want to place copies of the libraries in SRCDIR
@@ -260,7 +262,7 @@ ASFLAGS += --asm-include-dir src/$(TARGETLIST)/asminc --asm-include-dir $(FUJINE
 CFLAGS += --include-dir $(FUJINET_LIB_VERSION_DIR) -DUSING_FUJINET_LIB
 
 .SUFFIXES:
-.PHONY: all test clean get_fujinet_lib zap
+.PHONY: all test clean get_fujinet_lib zap r2r
 
 all: get_fujinet_lib $(PROGRAM)
 
@@ -320,6 +322,9 @@ get_fujinet_lib:
 $(TARGETOBJDIR):
 	$(call MKDIR,$@)
 
+$(R2R_DIR):
+	$(call MKDIR,$@)
+
 vpath %.c $(SRCDIR)/$(TARGETLIST) $(SRCDIR)
 
 $(TARGETOBJDIR)/%.o: %.c | $(TARGETOBJDIR)
@@ -330,9 +335,12 @@ vpath %.s $(SRCDIR)/$(TARGETLIST) $(SRCDIR)
 $(TARGETOBJDIR)/%.o: %.s | $(TARGETOBJDIR)
 	$(CC) -t $(CC65TARGET) -c --create-dep $(@:.o=.d) $(ASFLAGS) -o $@ $<
 
-$(PROGRAM): $(CONFIG) $(OBJECTS) $(LIBS)
+$(R2R_BIN): $(CONFIG) $(OBJECTS) $(LIBS) | $(R2R_DIR)
 	$(CC) -t $(CC65TARGET) $(LDFLAGS) -o $@ $(patsubst %.cfg,-C %.cfg,$^)
 
+# Create the "Ready 2 Run" executable/disk
+r2r: $(R2R_BIN)
+
 test: $(PROGRAM)
 	$(PREEMUCMD)
 	$(EMUCMD) $<
diff --git a/Makefile.coco b/Makefile.coco
@@ -7,23 +7,29 @@ ECHO=echo
 FIRMWARE_DIR="../fujinet-firmware"
 TARGET_EXEC=config.bin
 DISK=autorun.dsk
+R2R_DIR=r2r/coco
+R2R_BIN=$(R2R_DIR)/$(DISK)
 
 $(TARGET_EXEC): check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o pause.o
 	$(CC) -o $@ check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o pause.o
 
-$(DISK): $(TARGET_EXEC)
-	$(RM) $(DISK)
-	decb dskini $(DISK)
-	decb copy -t -0 dist.coco/autoexec.bas $(DISK),AUTOEXEC.BAS
-	writecocofile $(DISK) $<
+$(R2R_BIN): $(TARGET_EXEC) | $(R2R_DIR)
+	$(RM) $@
+	decb dskini $@
+	decb copy -t -0 dist.coco/autoexec.bas $@,AUTOEXEC.BAS
+	writecocofile $@ $<
 
-dist: $(DISK)
+dist: $(R2R_BIN)
 	$(CP) $< $(FIRMWARE_DIR)/data/webui/device_specific/BUILD_COCO/
 	$(ECHO) Now, Do a Upload Filesystem task.
 
-.PHONY: autorun
-# Just here so all platforms can have a `make autorun`
-autorun: $(DISK)
+.PHONY: r2r
+
+# Create the "Ready 2 Run" executable/disk
+r2r: $(R2R_BIN)
+
+$(R2R_DIR):
+	mkdir -p $@
 
 pause.o: src/coco/pause.c
 	$(CC) -c src/coco/pause.c
diff --git a/Makefile.msdos b/Makefile.msdos
@@ -1,4 +1,7 @@
 TARGET  = config.com
+R2R_DIR = r2r/msdos
+R2R_BIN = $(R2R_DIR)/$(TARGET)
+
 CC      = wcc
 CFLAGS  = -q -0 -bt=dos -ms -osh $(CPPFLAGS) -i=src -i=src/msdos 
 
@@ -10,9 +13,15 @@ SOURCE	= src/check_wifi.c src/connect_wifi.c src/destination_host_slot.c src/hos
 
 all:	$(TARGET)
 
-$(TARGET): $(OBJS)
+# Create the "Ready 2 Run" executable/disk
+r2r: $(R2R_BIN)
+
+$(R2R_BIN): $(OBJS) | $(R2R_DIR)
 	$(LD) $(LDFLAGS) NAME $@
 
+$(R2R_DIR):
+	mkdir -p $@
+
 src/check_wifi.obj: src/check_wifi.c
 	$(CC) $(CFLAGS) src/check_wifi.c 
 
