From 977397ad00dff923d079ee13ccd6e19ad481a7d1 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Sat, 27 Jul 2019 10:17:47 -0400
Subject: [PATCH] virtual-machines: split up MacEmu configs and use a script
 for launching them

---
 applications/basilisk_ii                      | 36 ----------------
 scripts/fish/macemu                           | 24 +++++++++++
 virtual-machines/MacEmu-OS7                   |  1 +
 virtual-machines/MacEmu-OS9                   |  1 +
 .../MacEmu-common                             | 42 +++++++------------
 virtual-machines/MacEmu-common-m68k           | 14 +++++++
 virtual-machines/MacEmu-common-ppc            |  8 ++++
 7 files changed, 64 insertions(+), 62 deletions(-)
 delete mode 100644 applications/basilisk_ii
 create mode 100644 scripts/fish/macemu
 create mode 100644 virtual-machines/MacEmu-OS7
 create mode 100644 virtual-machines/MacEmu-OS9
 rename applications/sheepshaver => virtual-machines/MacEmu-common (60%)
 create mode 100644 virtual-machines/MacEmu-common-m68k
 create mode 100644 virtual-machines/MacEmu-common-ppc

diff --git a/applications/basilisk_ii b/applications/basilisk_ii
deleted file mode 100644
index ffc83d9..0000000
--- a/applications/basilisk_ii
+++ /dev/null
@@ -1,36 +0,0 @@
-displaycolordepth 0
-disk /mnt/s/vm/MacEmu/OS7
-extfs 
-screen win/800/600
-seriala /dev/ttyS0
-serialb /dev/ttyS1
-ether enp1s0
-udptunnel false
-udpport 6066
-rom /mnt/s/osmedia/Apple MacOS/ROMs OldWorld/512KB ROMs/1989-09 - 368CADFE - Mac IIci.ROM
-bootdrive 0
-bootdriver 0
-ramsize 67108864
-frameskip 1
-modelid 5
-cpu 4
-fpu true
-nocdrom false
-nosound true
-noclipconversion false
-nogui false
-jit true
-jitfpu true
-jitdebug false
-jitcachesize 8192
-jitlazyflush true
-jitinline true
-keyboardtype 5
-keycodes true
-keycodefile /usr/share/BasiliskII/keycodes
-mousewheelmode 1
-mousewheellines 3
-dsp /dev/dsp
-mixer /dev/mixer
-ignoresegv false
-idlewait false
diff --git a/scripts/fish/macemu b/scripts/fish/macemu
new file mode 100644
index 0000000..67fc399
--- /dev/null
+++ b/scripts/fish/macemu
@@ -0,0 +1,24 @@
+# vim: syntax=fish:
+
+function macemu -d "Frontend to SheepShaver and BasiliskII" -a arch cfg
+	switch "$arch"
+		case m68k
+			set config ~/.basilisk_ii_prefs
+			set executable BasiliskII
+		case ppc
+			set config ~/.sheepshaver_prefs
+			set executable SheepShaver
+	end
+
+	chmod u+w $config
+
+	cat $_agw_dir_rc/virtual-machines/MacEmu-common        > $config
+	cat $_agw_dir_rc/virtual-machines/MacEmu-common-$arch >> $config
+	cat $_agw_dir_rc/virtual-machines/MacEmu-$cfg         >> $config
+
+	chmod -w $config
+
+	$executable
+end
+
+## EOF
diff --git a/virtual-machines/MacEmu-OS7 b/virtual-machines/MacEmu-OS7
new file mode 100644
index 0000000..450a21b
--- /dev/null
+++ b/virtual-machines/MacEmu-OS7
@@ -0,0 +1 @@
+disk /mnt/s/vm/MacEmu/OS7
diff --git a/virtual-machines/MacEmu-OS9 b/virtual-machines/MacEmu-OS9
new file mode 100644
index 0000000..3a6d757
--- /dev/null
+++ b/virtual-machines/MacEmu-OS9
@@ -0,0 +1 @@
+disk /mnt/s/vm/MacEmu/OS9
diff --git a/applications/sheepshaver b/virtual-machines/MacEmu-common
similarity index 60%
rename from applications/sheepshaver
rename to virtual-machines/MacEmu-common
index 26fcfb0..321487c 100644
--- a/applications/sheepshaver
+++ b/virtual-machines/MacEmu-common
@@ -1,32 +1,22 @@
-disk /mnt/s/vm/MacEmu/OS9
-extfs /mnt/s/vm/MacEmu/Share
-screen win/800/600
-windowmodes 0
-screenmodes 0
-seriala /dev/ttyS0
-serialb /dev/ttyS1
-rom /mnt/s/osmedia/Apple MacOS/ROMs NewWorld/1999-05-14 - Mac OS ROM 1.6.rom
 bootdrive 0
 bootdriver 0
-ramsize 1073741824
+dsp /dev/dsp
+ether enp1s0
+extfs /mnt/s/vm/MacEmu/Share
 frameskip 1
-gfxaccel true
+ignoresegv false
+jit true
+keyboardtype 5
+keycodefile /usr/share/BasiliskII/keycodes
+keycodes true
+mixer /dev/mixer
+mousewheellines 3
+mousewheelmode 1
 nocdrom false
+noclipconversion false
+nogui false
 nonet false
 nosound false
-nogui false
-noclipconversion false
-ignoresegv false
-ignoreillegal false
-jit true
-jit68k false
-keyboardtype 5
-ether slirp
-keycodes true
-keycodefile /usr/share/BasiliskII/keycodes
-mousewheelmode 1
-mousewheellines 3
-dsp /dev/dsp
-mixer /dev/mixer
-ignoresegv false
-idlewait true
+screen win/800/600
+seriala /dev/ttyS0
+serialb /dev/ttyS1
diff --git a/virtual-machines/MacEmu-common-m68k b/virtual-machines/MacEmu-common-m68k
new file mode 100644
index 0000000..d335fd9
--- /dev/null
+++ b/virtual-machines/MacEmu-common-m68k
@@ -0,0 +1,14 @@
+cpu 4
+displaycolordepth 0
+fpu true
+idlewait false
+jitcachesize 16384
+jitdebug false
+jitfpu true
+jitinline true
+jitlazyflush true
+modelid 5
+ramsize 67108864
+rom /mnt/s/osmedia/Apple MacOS/ROMs OldWorld/512KB ROMs/1989-09 - 368CADFE - Mac IIci.ROM
+udpport 6066
+udptunnel false
diff --git a/virtual-machines/MacEmu-common-ppc b/virtual-machines/MacEmu-common-ppc
new file mode 100644
index 0000000..cdf1cad
--- /dev/null
+++ b/virtual-machines/MacEmu-common-ppc
@@ -0,0 +1,8 @@
+gfxaccel true
+idlewait true
+ignoreillegal false
+jit68k false
+ramsize 1073741824
+rom /mnt/s/osmedia/Apple MacOS/ROMs NewWorld/1999-05-14 - Mac OS ROM 1.6.rom
+screenmodes 0
+windowmodes 0