diff --git a/run-medley b/run-medley index 861eee9b..87ae41de 100755 --- a/run-medley +++ b/run-medley @@ -75,6 +75,10 @@ while [ "$#" -ne 0 ]; do export DISPLAY="$2" shift ;; + "-prog" ) + prog="$2" + shift + ;; "-vmem" | "--vmem" | "-vmfile" ) export LDEDESTSYSOUT="$2" shift diff --git a/scripts/loadup-all.sh b/scripts/loadup-all.sh index 6283ff52..ee96265f 100755 --- a/scripts/loadup-all.sh +++ b/scripts/loadup-all.sh @@ -2,7 +2,7 @@ export MEDLEYDIR=`pwd` -if [ ! -f run-medley ] ; then +if [ ! -x run-medley ] ; then echo run from MEDLEYDIR exit 1 fi diff --git a/scripts/loadup-full.sh b/scripts/loadup-full.sh index 882266ed..a77f1ddd 100755 --- a/scripts/loadup-full.sh +++ b/scripts/loadup-full.sh @@ -2,11 +2,17 @@ export MEDLEYDIR=`pwd` -if [ ! -f run-medley ] ; then +if [ ! -x run-medley ] ; then echo must run from MEDLEYDIR ; exit 1 ; fi +scr="-sc 1024x768 -gr 1042x790" -./run-medley -greet $MEDLEYDIR/sources/LOADUP-FULL.LCOM $MEDLEYDIR/loadups/lisp.sysout +rm -f ~/rem.cm + +./run-medley $scr -greet $MEDLEYDIR/sources/LOADUP-FULL.LCOM $MEDLEYDIR/loadups/lisp.sysout +echo ----- made ---- +ls -l loadups/full.sysout +echo --------------- diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh index a7cae529..92e4805f 100755 --- a/scripts/loadup-init.sh +++ b/scripts/loadup-init.sh @@ -7,10 +7,13 @@ if [ ! -f run-medley ] ; then exit 1 fi -export LOADUPDIR="$MEDLEYDIR" +scr="-sc 1024x768 -gr 1042x790" + mkdir -p "$MEDLEYDIR/tmp" +rm -f ~/rem.cm -./run-medley -greet "$MEDLEYDIR"/sources/LOADUP-INIT.LISP -full +./run-medley $scr -greet "$MEDLEYDIR"/sources/LOADUP-INIT.LISP -full +echo ---- made ---- ls -l tmp loadups/init* - +echo -------------- diff --git a/scripts/loadup-lisp-from-init.sh b/scripts/loadup-lisp-from-init.sh deleted file mode 100755 index e7c62054..00000000 --- a/scripts/loadup-lisp-from-init.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -export MEDLEYDIR=`pwd` - -if [ ! -f run-medley ] ; then - echo run from MEDLEYDIR - exit 1 -fi - -export LOADUPDIR="$MEDLEYDIR" -mkdir -p "$MEDLEYDIR/tmp" - -rm -f ~/rem.cm ~/lisp.virtualmem ./tmp/* loadups/init*~ - -cp sources/XREM.CM ~/rem.cm - -prog=../maiko/linux.x86_64/ldeinit -if [ ! -x $prog ] ; then - echo $prog not found - prog=../maiko/darwin.aarch64/ldeinit -fi - -$prog -sc 1000x900 -g 1000x900 loadups/init.dlinit -echo init run - -cp ~/lisp.virtualmem tmp/init-mid.sysout -echo '"' > ~/rem.cm - -echo '(PROGN(LOAD(QUOTE {DSK}'$MEDLEYDIR'/sources/LOADUP.LISP))(HARDRESET))' >> ~/rem.cm -echo 'SHH(PROGN (IL:ENDLOADUP) (IL:SPECVARS . T) (IL:MAKESYS (QUOTE {DSK}'$MEDLEYDIR'/loadups/lisp.sysout)))' >> ~/rem.cm -echo '(IL:LOGOUT)' >> ~/rem.cm - -echo '"' >> ~/rem.cm - -echo -----rem.cm -cat ~/rem.cm -echo ----- -./run-medley -greet $MEDLEYDIR/sources/LOADUP-GREET tmp/init-mid.sysout -rm ~/rem.cm - -echo ----- created: ------- -ls -l loadups/lisp.sysout -echo ---------------------- - diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh index 3f9d65fa..370bda35 100755 --- a/scripts/loadup-lisp-from-mid.sh +++ b/scripts/loadup-lisp-from-mid.sh @@ -7,8 +7,7 @@ if [ ! -f run-medley ] ; then exit 1 fi -rm -f ~/rem.cm loadups/LISP.SYSOUT* loadups/lisp.sysout* -touch loadups/lisp.sysout +scr="-sc 1024x768 -gr 1042x790" echo '"' > ~/rem.cm echo '(PROGN(LOAD(QUOTE {DSK}'$MEDLEYDIR'/sources/LOADUP.LISP))(HARDRESET))' >> ~/rem.cm @@ -19,7 +18,9 @@ echo '"' >> ~/rem.cm echo -----rem.cm ----- cat ~/rem.cm echo ---------------- -./run-medley -greet $MEDLEYDIR/sources/LOADUP-GREET tmp/init-mid.sysout + +./run-medley $scr -greet $MEDLEYDIR/sources/LOADUP-GREET tmp/init-mid.sysout + rm ~/rem.cm echo ----- created: ------- diff --git a/scripts/loadup-lisp.sh b/scripts/loadup-lisp.sh deleted file mode 100755 index 2756a2bd..00000000 --- a/scripts/loadup-lisp.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -export MEDLEYDIR=`pwd` - -if [ ! -f run-medley ] ; then - echo run from MEDLEYDIR - exit 1 -fi - -./scripts/loadup-init.sh && ./scripts/loadup-lisp-from-init.sh && ./scripts/loadup-full.sh - -echo tada! diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh index 0d1b2fa1..1e0f5712 100755 --- a/scripts/loadup-mid-from-init.sh +++ b/scripts/loadup-mid-from-init.sh @@ -2,32 +2,18 @@ export MEDLEYDIR=`pwd` -if [ ! -f run-medley ] ; then +if [ ! -x run-medley ] ; then echo run from MEDLEYDIR exit 1 fi mkdir -p "$MEDLEYDIR/tmp" - -rm -f ~/rem.cm ~/lisp.virtualmem ./tmp/* loadups/init*~ +scr="-sc 1024x768 -gr 1042x790" cp sources/XREM.CM ~/rem.cm -prog=../maiko/linux.x86_64/ldeinit -if [ ! -x $prog ] ; then - prog=../maiko/darwin.aarch64/ldeinit -fi -if [ ! -x $prog ] ; then - prog=../maiko/linux.armv7l/ldeinit -fi - - -$prog -sc 1000x900 -g 1000x900 loadups/init.dlinit - -echo - -echo --- init run -- -ls -l ~ - - -cp ~/lisp.virtualmem tmp/init-mid.sysout +./run-medley -prog ldeinit $scr -vmem tmp/init-mid.sysout loadups/init.dlinit +echo ---- made ---- +ls -l tmp/ +echo --------------