diff --git a/scripts/loadup-full.sh b/scripts/loadup-full.sh index 493aef53..6e54b97b 100755 --- a/scripts/loadup-full.sh +++ b/scripts/loadup-full.sh @@ -10,7 +10,7 @@ scr="-sc 1024x768 -g 1042x790" touch tmp/loadup.timestamp -./run-medley $scr -greet $MEDLEYDIR/sources/LOADUP-FULL.LCOM $MEDLEYDIR/tmp/lisp.sysout +./run-medley $scr -greet "$MEDLEYDIR/sources/LOADUP-FULL.CM" "$MEDLEYDIR/tmp/lisp.sysout" if [ tmp/full.sysout -nt tmp/loadup.timestamp ]; then @@ -21,5 +21,5 @@ if [ tmp/full.sysout -nt tmp/loadup.timestamp ]; then else echo XXXXX FAILURE XXXXX ls -l tmp/full.* - exit -1 + exit 1 fi diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh index 744f3c88..c4aa2d97 100755 --- a/scripts/loadup-lisp-from-mid.sh +++ b/scripts/loadup-lisp-from-mid.sh @@ -12,7 +12,7 @@ touch tmp/loadup.timestamp scr="-sc 1024x768 -g 1042x790" -./run-medley $scr -greet $MEDLEYDIR/sources/LOADUP-LISP.CM tmp/init-mid.sysout +./run-medley $scr -greet "$MEDLEYDIR/sources/LOADUP-LISP.CM" tmp/init-mid.sysout if [ tmp/lisp.sysout -nt tmp/loadup.timestamp ]; then diff --git a/sources/LOADUP-FULL b/sources/LOADUP-FULL index e5db510f..e512cf85 100644 --- a/sources/LOADUP-FULL +++ b/sources/LOADUP-FULL @@ -1,19 +1,17 @@ (DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP") -(FILECREATED "26-Mar-2021 10:47:11" {DSK}larry>ilisp>medley>sources>LOADUP-FULL.;3 5393 +(FILECREATED "29-Apr-2021 22:31:24" {DSK}larry>medley>SOURCES>LOADUP-FULL.;2 4691 - changes to%: (FNS LOADUP-FULL) + changes to%: (VARS LOADUP-FULLCOMS) + (FNS LOADUP-FULL) - previous date%: "25-Mar-2021 22:09:37" {DSK}larry>ilisp>medley>sources>LOADUP-FULL.;2) + previous date%: "26-Mar-2021 10:47:11" {DSK}larry>medley>SOURCES>LOADUP-FULL.;1) (PRETTYCOMPRINT LOADUP-FULLCOMS) -(RPAQQ LOADUP-FULLCOMS [(COMMANDS "cd" "pwd" "ls") +(RPAQQ LOADUP-FULLCOMS ((COMMANDS "cd" "pwd" "ls") (FNS LOADFULLFONTS LOADUP-FULL FIXMETA) - (P (FIXMETA)) - (GLOBALVARS MISSINGDISPLAYFONTCOERCIONS - MISSINGCHARSETDISPLAYFONTCOERCIONS) - (DECLARE%: DONTEVAL@LOAD DONTEVAL@COMPILE DOCOPY (P (LOADUP-FULL T]) + (P (FIXMETA)))) (DEFCOMMAND "cd" (DIR) (/CNDIR DIR)) @@ -49,7 +47,7 @@ (PRINTOUT T "FULL fonts loaded" T]) (LOADUP-FULL - [LAMBDA (DOIT) (* ; "Edited 26-Mar-2021 10:44 by larry") + [LAMBDA (DOIT) (* ; "Edited 29-Apr-2021 22:27 by rmk:") (* ; "Edited 14-May-2018 15:01 by kaplan") (* ; "Edited 28-Sep-2020 12:35 by rmk:") (* ; "Edited 21-Apr-2018 07:27 by rmk:") @@ -91,15 +89,7 @@ ((WINDOWP *WHO-LINE*) (CLOSEW *WHO-LINE*))) (SETTOPVAL 'INITIALS NIL) - (DRIBBLE) - - (* ;; "Set up for making the sysout, if we made it this far.") - - (CL:WHEN DOIT - (PRINTOUT T "Creating FULL sysout on " MAKESYSFILENAME T) - (BKSYSBUF (CONCAT "(IL:ENDLOADUP)" "(IL:MAKESYS %"" MAKESYSFILENAME "%" %"Medley " - " Full Sysout%")" " -(IL:LOGOUT T)")))]) + (DRIBBLE]) (FIXMETA [LAMBDA NIL (* ; "Edited 25-Jun-2017 17:12 by rmk:") @@ -109,15 +99,7 @@ ) (FIXMETA) -(DECLARE%: DOEVAL@COMPILE DONTCOPY - -(GLOBALVARS MISSINGDISPLAYFONTCOERCIONS MISSINGCHARSETDISPLAYFONTCOERCIONS) -) -(DECLARE%: DONTEVAL@LOAD DONTEVAL@COMPILE DOCOPY - -(LOADUP-FULL T) -) (DECLARE%: DONTCOPY - (FILEMAP (NIL (887 5168 (LOADFULLFONTS 897 . 2485) (LOADUP-FULL 2487 . 4922) (FIXMETA 4924 . 5166)))) + (FILEMAP (NIL (685 4653 (LOADFULLFONTS 695 . 2283) (LOADUP-FULL 2285 . 4407) (FIXMETA 4409 . 4651)))) ) STOP diff --git a/sources/LOADUP-FULL.CM b/sources/LOADUP-FULL.CM new file mode 100644 index 00000000..5f13dad3 --- /dev/null +++ b/sources/LOADUP-FULL.CM @@ -0,0 +1 @@ +" (PROGN(IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))(IL:LOADUP-FULL)(IL:HARDRESET)) SHH(PROGN(IL:ENDLOADUP)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(IL:L-CASE (QUOTE /tmp/full.sysout))) :FULL)) (IL:LOGOUT T) " \ No newline at end of file diff --git a/sources/LOADUP-FULL.LCOM b/sources/LOADUP-FULL.LCOM index c003ce2a..ba7cef6f 100644 Binary files a/sources/LOADUP-FULL.LCOM and b/sources/LOADUP-FULL.LCOM differ diff --git a/sources/LOADUP-LISP b/sources/LOADUP-LISP index 47289b2f..68567ee2 100644 --- a/sources/LOADUP-LISP +++ b/sources/LOADUP-LISP @@ -1,10 +1,9 @@ (DEFINE-FILE-INFO READTABLE "XCL" PACKAGE "INTERLISP") -(FILECREATED "28-Mar-2021 10:06:54" |{DSK}larry>ilisp>medley>sources>LOADUP-LISP.;4| 8886 +(FILECREATED "29-Apr-2021 22:31:24" |{DSK}larry>medley>SOURCES>LOADUP-LISP.;2| 8463 |changes| |to:| (FNS LOADUP-LISP) - |previous| |date:| "25-Mar-2021 16:34:41" |{DSK}larry>ilisp>medley>sources>LOADUP-LISP.;3| -) + |previous| |date:| "28-Mar-2021 10:06:54" |{DSK}larry>medley>SOURCES>LOADUP-LISP.;1|) (PRETTYCOMPRINT LOADUP-LISPCOMS) @@ -18,7 +17,7 @@ (DEFINEQ (LOADUP-LISP - (LAMBDA NIL (* \; "Edited 28-Mar-2021 10:06 by larry") + (LAMBDA NIL (* \; "Edited 29-Apr-2021 22:30 by rmk:") (SETQQ COMPILE.EXT LCOM) (* \; "should be set earlier") (DRIBBLE (MEDLEYDIR "tmp" "lisp.dribble" T)) (FOR X IN BOOTLOADEDFILES DO (CL:UNLESS (MEMB X SYSFILES) @@ -103,7 +102,7 @@ (LOADUP '(PUP 10MBDRIVER LEAF LLETHER DPUPFTP LOCALFILE DSKDISPLAY COURIER LLNS TRSERVER SPP NSPRINT AUTHENTICATION BSP CLEARINGHOUSE NSFILING MAIKOETHER)) (DRIBBLE) - (SETQ MAKESYSNAME ':MEDLEY))) + (SETQ MAKESYSNAME ':LISP))) ) (DEFINEQ @@ -159,28 +158,27 @@ (RPAQ? FILING.ENUMERATION.DEPTH T) -(RPAQQ MEDLEY-INIT-VARS ((LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" - "internal/library"))) - (LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources"))) - (LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES)) - (IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo")) - (IRM.DINFOGRAPH) - (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES)) - (LOGINHOST/DIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR") - (UNIX-GETENV "HOME")))) - (USERGREETFILES `((,LOGINHOST/DIR "INIT" COM) - (,LOGINHOST/DIR "INIT"))) - (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/displayfonts" - "fonts/altofonts"))) - (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts"))) - (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts"))) - (XCL::*WHERE-IS-CASH-FILES*))) +(RPAQQ MEDLEY-INIT-VARS + ((LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" "internal/library"))) + (LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources"))) + (LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES)) + (IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo")) + (IRM.DINFOGRAPH) + (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES)) + (LOGINHOST/DIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR") + (UNIX-GETENV "HOME")))) + (USERGREETFILES `((,LOGINHOST/DIR "INIT" COM) + (,LOGINHOST/DIR "INIT"))) + (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/displayfonts" "fonts/altofonts"))) + (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts"))) + (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts"))) + (XCL::*WHERE-IS-CASH-FILES*))) (DECLARE\: DOEVAL@COMPILE DONTCOPY (GLOBALVARS XCL::*WHERE-IS-CASH-FILES* LISPMAKESYSDATE MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST) ) (DECLARE\: DONTCOPY - (FILEMAP (NIL (764 4856 (LOADUP-LISP 774 . 4854)) (4857 7356 (MEDLEY-INIT-VARS 4867 . 6012) (MEDLEYDIR - 6014 . 7354))))) + (FILEMAP (NIL (753 4843 (LOADUP-LISP 763 . 4841)) (4844 7343 (MEDLEY-INIT-VARS 4854 . 5999) (MEDLEYDIR + 6001 . 7341))))) STOP diff --git a/sources/LOADUP-LISP.LCOM b/sources/LOADUP-LISP.LCOM index da79f25d..f6acb562 100644 Binary files a/sources/LOADUP-LISP.LCOM and b/sources/LOADUP-LISP.LCOM differ