From 0a5ff043937f9d0ecc5ac8cd5bd6786b67f582b9 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Sat, 1 May 2021 20:43:14 -0700 Subject: [PATCH] Use .CM to loadup full, to avoid GREET call (#322) --- scripts/loadup-full.sh | 4 +-- scripts/loadup-lisp-from-mid.sh | 2 +- sources/LOADUP-FULL | 36 +++++++------------------- sources/LOADUP-FULL.CM | 1 + sources/LOADUP-FULL.LCOM | Bin 4603 -> 4194 bytes sources/LOADUP-LISP | 44 +++++++++++++++----------------- sources/LOADUP-LISP.LCOM | Bin 6140 -> 6160 bytes 7 files changed, 34 insertions(+), 53 deletions(-) create mode 100644 sources/LOADUP-FULL.CM 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 c003ce2a9551d3051e28c5ba8ff2e49a07c8ad97..ba7cef6f0f460de4fc235e536460373ab41b54d4 100644 GIT binary patch delta 1410 zcmb7E&2HmV6mF`aOz#LfRi&AM*&NIi;!2KuubnvYpnzjvtET>weceu$X_J{2rIRR0 zC8`nR4G_o@4*ww zd~PS)65IiawG?YSQJBgoFlK7hWV!@Z>1=d4z8DVrFnSIWyl~Q^Z$8VWgUPf#>`f-u z?aM)bIJj=7QI^;|ZTpesWU=CAzF&LHWFR*jt1VM+nz|~%>E2|pay|HZJelsB@Wb!> z^R+Z;wVDL|-VB4k&P`pH690Q7BSNRaIIn3{0meAT;osi7e^e?Y|NHhQj~wn=nJkTC;>#S|Oq>iPUIf5FSLw9B6}q;7Oc#FsJqU(x!S7 z5DO_#oq^*e+!j&N4Xpq_(dx@RrY$XMfP;4gD5VRi)ml1hY0x=JyJ;tLp{cFv!z==h zQg_ik)D4*1QHUo8bqrXz(u}ozyl}6`iWho9DI1M8zz&O#G3Lq>b~|h7P_R79Pf<4w z4o(gu#rHyffZDMeuUK*iyEI0DztnXQUce*NkD{y{FSL>_pg@6j#4-P}dX!`FTC_(A z)o(<{BVj+M?^WgmM?@2VGPP|y80_R8|1EU&L4@CeqROpF7Kt&z`{u+W5+*|>) zg_MH5h7^?l0Rj|Tq?#Ts7$3?AAZ6K3%V3nX^1t4HU{h>0$-Np5VL0mbuf{N)^(Ms_ z>CJG4p(_c01|uLnMN+Llxi~!?4kSQjq}kPDAk*SG9euv=@nZtep$dwci1S<;K89j!>=cofa| z@1AuAr_p7m1mvq$xnNH=Nrzhhw({+IN(X4*klO%-O^fQ*Nk zQv6LSZK+iBoT1zXgtmK#b&*bXE^i}%)c?xUfDgUnpe@TE5ksf(qRrPNvX zPTX6AbT=J;vG#dtB_``)yLGyR-}Ae2Ow8_T9IfXkdp}r1iS^dy_~Vn=zqcl*i63rE7G5kww4sNphM*V!>F`SaUl;?->X_7sJsZFXao%hO$PY)7^qC0S==-yU^kpf z#TCF!4Voeh{ov4YffqScUB4-gfEx^s9MATT0^kJ()9VLZ)4+9_VbBVJt2}{aS!=!* zHi2{Fn#c@}hlsj=D1hmOYe7si(VQgWn8s(4m|6f#yr_nLqn#9lar4^8jJd_Y#+QX} zNuNP@k7kh;jYTdDV;&!>SkzT#vlP7v8XhROQned?R*b*9yFF2%>d9+RT)6Nx@L~}h z&j}sN#X#|hM@RequIqT>5hkc`Yl=Zus(wAdjH*}*r!IWV7sE7G9M5XB0TVL2f-+j% z9aLQdN)*Q}OAthV@1Q^~nrMbUg7)Ja%d3^^(!zX9hAfY=P45F@V zQsW_lrWtQ-+<(B)q);djpwBQfxsy@v__!Y-#DI>^FDPg%4mRF>i0@#^mRJsUd#R0= zUEq7!lSzg7OjaBl0s>V(XoC`fa-(TuJ>^H@pEn=iX@6}hINsYTy(1fKA_lL)Z9efF Gm;4J-VVI!+ 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 da79f25d9c03142fd9acb856bebe2f2cf347877b..f6acb562d897a672a645fa643e5581cce30aeadd 100644 GIT binary patch delta 693 zcmeyPKfz#vMLm~>o2QSfbC9cJh^vc&l98pZV?mLwk%5t+f{~Gxv7wcbiIRebQgVK7 zL1s>Bib8&#f|5c_wM(#ftxafgYEiLWPGV6}rCn}nN=|B}U9f*>kh5#BosYkxOK5!EK09{C0;28n~4>>TbTr9XY|7ASE zEX}21Vq&b|>*(zo92xBA=%+m!V`*^~oxqMw+d|V@SJ^egGbi*8j zf*lPE3=9=OZkWXTjFn3xK*3~k9-r)H4nB5fpuqxyOPPRLw+V*Bib8&#f|3GnO|?s~cdboEer~E=PGV6}rCnxDW^sXCZfZ(SYNcIqerZv1YO$S< zzoScNfUb{caDbk*NsT6|`39C&ruF7l21ZH>HAx@~a@1356lyZ_Y7}^t{PL4B^HLO$ z-J_?c2UMAoSdt19?NkD^)l{E2t$H2_W)C6b-!u2*JIA6iS!om#b_vDPky!6!K z8imQdjJk2ANC9SMWo%+)Vn}8H8P{m?B88ZOm5T-MW?`li%(A>1CML!TzK-6m!I8m! zj=ru6CdL*DR=%z-KCY3Izp*AW@=lIon+_yDv1I_sX!bfFd5irQBk$&`9J-7^4l`F1 zkZj{>1CqSl6M^J>?s6b0&eH`X7x9Dx$vA#77LcWrMR=b9b^hknU