diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index d3471fe..e5e4166 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -40,12 +40,13 @@ * SELECTOR.LIST created if missing. (#92) * Position desktop icons based on Slot/Drive assignment. (#94) * Don't crash after renaming volume. (#99) +* Startup menu will include Slot 2. (#106) * Correct odd behavior for file type $08 (#103) * Hardware/Emulator Specific: - * IIc Plus: don't spin slot 5 drives constantly. (Use Special > Check Drives) (#25) - * Macintosh LC IIe Option Card: prevent crash. (#93) + * IIc Plus: don't spin slot 5 drives constantly. (Use Special > Check Drive) (#25) + * Macintosh LC IIe Option Card: don't crash on startup. (#93) * IIgs: color DHR is re-enabled on exit. (#43) - * IIgs emulators no longer crash on startup. (#85) + * KEGS-based IIgs emulators no longer crash on startup. (#85) # 1.1 diff --git a/ram.system/res/go.sh b/ram.system/res/go.sh index eb08ba9..6144c0a 100755 --- a/ram.system/res/go.sh +++ b/ram.system/res/go.sh @@ -5,27 +5,5 @@ set -e source "../res/util.sh" -function verify { - diff "orig/$1" "out/$2" \ - && (cecho green "diff $2 good" ) \ - || (tput blink ; cecho red "DIFF $2 BAD" ; return 1) -} - -function stats { - echo "$(printf '%-15s' $1)""$(../res/stats.pl < $1)" -} - #do_make clean do_make all - -SOURCES="ram.system" - -# Verify original and output match -echo "Verifying diffs:" -verify "RAM.SYSTEM.SYS" "ram.system.SYS" - -# Compute stats -echo "Stats:" -for t in $SOURCES; do - stats "$t.s" -done; diff --git a/res/go.sh b/res/go.sh index c4b85be..ab267c5 100755 --- a/res/go.sh +++ b/res/go.sh @@ -3,22 +3,14 @@ # Run this from the top level directory set -e +source "res/util.sh" -cd desktop.system -res/go.sh -cd .. - -cd ram.system -res/go.sh -cd .. - -cd desktop -res/go.sh -cd .. - -cd desk.acc -res/go.sh -cd .. +for i in desktop desk.acc desktop.system ram.system; do + cecho yellow Building: $i + cd $i + res/go.sh + cd .. +done # Mountable directory for Virtual ][ if [ -d mount ]; then diff --git a/res/mount.sh b/res/mount.sh index 8185d60..a12b26c 100755 --- a/res/mount.sh +++ b/res/mount.sh @@ -40,3 +40,4 @@ done mount_f1 "desktop2" "desktop" "mount" mount_sys "desktop.system" "desktop.system" "mount" +mount_sys "ram.system" "ram.system" "mount" diff --git a/res/unpxmap.pl b/res/unpxmap.pl new file mode 100755 index 0000000..ac8e279 --- /dev/null +++ b/res/unpxmap.pl @@ -0,0 +1,13 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + + +while () { + chomp; + next unless m/px\(/i; + s/[^01]//g; + tr/01/ #/; + print $_, "\n"; +} diff --git a/res/util.sh b/res/util.sh index 1cbe090..a2de088 100644 --- a/res/util.sh +++ b/res/util.sh @@ -1,10 +1,10 @@ function cecho { case $1 in - red) tput setaf 1 ;; - green) tput setaf 2 ;; - yellow) tput setaf 3 ;; + red) tput setaf 1 ; shift ;; + green) tput setaf 2 ; shift ;; + yellow) tput setaf 3 ; shift ;; esac - echo -e "$2" + echo -e "$@" tput sgr0 }