From aed0c0a6d4d380e256d17922b2f959f110ddfde7 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Thu, 12 Mar 2020 20:38:51 -0700
Subject: [PATCH] Revamp package script, build to out/ dir

---
 .gitignore |  2 ++
 Makefile   | 21 ++++++++++++++-------
 package.sh | 20 +++++++++++++-------
 3 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0556696
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Output directory
+out
diff --git a/Makefile b/Makefile
index 7431c25..da530a2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,27 @@
 CAFLAGS = --target apple2enh --list-bytes 0
 LDFLAGS = --config apple2-asm.cfg
 
-TARGETS = basis.system.SYS
-
-.PHONY: clean all
-all: $(TARGETS)
+OUTDIR = out
 
 HEADERS = $(wildcard *.inc)
 
+TARGETS = \
+	$(OUTDIR)/basis.system.SYS
+
+.PHONY: clean all
+all: $(OUTDIR) $(TARGETS)
+
+$(OUTDIR):
+	mkdir -p $(OUTDIR)
+
 clean:
-	rm -f *.o
+	rm -f $(OUTDIR)/*.o
+	rm -f $(OUTDIR)/*.list
 	rm -f $(TARGETS)
 
-%.o: %.s $(HEADERS)
+$(OUTDIR)/%.o: %.s $(HEADERS)
 	ca65 $(CAFLAGS) --listing $(basename $@).list -o $@ $<
 
-%.SYS: %.o
+$(OUTDIR)/%.SYS: $(OUTDIR)/%.o
 	ld65 $(LDFLAGS) -o $@ $<
 	xattr -wx prodos.AuxType '00 20' $@
diff --git a/package.sh b/package.sh
index 801e525..d05b569 100755
--- a/package.sh
+++ b/package.sh
@@ -5,14 +5,20 @@
 
 set -e
 
-IMGFILE="basys33.po"
+PACKDIR=$(mktemp -d)
+IMGFILE="out/basys33.po"
 VOLNAME="basys33"
 
-# Create a new disk image.
-
 rm -f "$IMGFILE"
-cadius CREATEVOLUME "$IMGFILE" "$VOLNAME" 140KB --quiet --no-case-bits
+cadius CREATEVOLUME "$IMGFILE" "$VOLNAME" 140KB --no-case-bits --quiet
 
-cp "basis.system.SYS" "basis.system#FF0000"
-cadius ADDFILE "$IMGFILE" "/$VOLNAME" "basis.system#FF0000" --quiet --no-case-bits
-rm -f "basis.system#FF0000"
+add_file () {
+    cp "$1" "$PACKDIR/$2"
+    cadius ADDFILE "$IMGFILE" "/$VOLNAME" "$PACKDIR/$2" --no-case-bits --quiet
+}
+
+add_file "out/basis.system.SYS" "basis.system#FF0000"
+
+rm -r "$PACKDIR"
+
+cadius CATALOG "$IMGFILE"