From 9b7df4a02234ec4e67b09c84278b8ab4fb77b805 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Mon, 2 Aug 2021 20:14:54 -0700 Subject: [PATCH] Add option (mainly for Ron) to add tmp to front of directories where exports.all and other newly created sources will come from (when using SIMPLE-INIT). Modified fn MEDLEY-INIT-VARS in LOADUP-LISP. (#383) --- sources/LOADUP-LISP | 58 ++++++++++++++++++++++----------------- sources/LOADUP-LISP.LCOM | Bin 6160 -> 6358 bytes 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/sources/LOADUP-LISP b/sources/LOADUP-LISP index 68567ee2..eba4bbcb 100644 --- a/sources/LOADUP-LISP +++ b/sources/LOADUP-LISP @@ -1,9 +1,10 @@ -(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE "INTERLISP") -(FILECREATED "29-Apr-2021 22:31:24" |{DSK}larry>medley>SOURCES>LOADUP-LISP.;2| 8463 +(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10 FORMAT XCCS) +(FILECREATED " 1-Aug-2021 13:16:06" |{DSK}larry>ilisp>medley>sources>LOADUP-LISP.;3| 9364 - |changes| |to:| (FNS LOADUP-LISP) + |changes| |to:| (FNS MEDLEY-INIT-VARS) - |previous| |date:| "28-Mar-2021 10:06:54" |{DSK}larry>medley>SOURCES>LOADUP-LISP.;1|) + |previous| |date:| " 1-Aug-2021 13:09:52" |{DSK}larry>ilisp>medley>sources>LOADUP-LISP.;2| +) (PRETTYCOMPRINT LOADUP-LISPCOMS) @@ -107,7 +108,7 @@ (DEFINEQ (MEDLEY-INIT-VARS - (LAMBDA (CLEAR) (* \; "Edited 17-Jan-2021 14:29 by larry") + (LAMBDA (CLEAR) (* \; "Edited 1-Aug-2021 13:15 by larry") (* |;;| "MEDLEY-INIT-VARS has variables that might need to get reset. ") @@ -125,9 +126,15 @@ (* |;;| "WHEREIS doesn't follow conventions") - (CL:WHEN (GETD 'XCL::ADD-WHERE-IS-DATABASE) - (SETQ XCL::*WHERE-IS-CASH-FILES* NIL) - (NLSETQ (XCL::ADD-WHERE-IS-DATABASE (MEDLEYDIR "loadups" "WHEREIS.HASH")))) + (LET ((NEW (STRPOS "/tmp/" (UNIX-GETENV "LDESRCESYSOUT")))) + (IF NEW + THEN (PUSH DIRECTORIES (MEDLEYDIR "tmp"))) + (CL:WHEN (GETD 'XCL::ADD-WHERE-IS-DATABASE) + (SETQ XCL::*WHERE-IS-CASH-FILES* NIL) + (NLSETQ (XCL::ADD-WHERE-IS-DATABASE (MEDLEYDIR (|if| |new| + |then| "tmp" + |else| "loadups") + "WHEREIS.HASH"))))) NIL))) (MEDLEYDIR @@ -158,27 +165,28 @@ (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 (753 4843 (LOADUP-LISP 763 . 4841)) (4844 7343 (MEDLEY-INIT-VARS 4854 . 5999) (MEDLEYDIR - 6001 . 7341))))) + (FILEMAP (NIL (792 4882 (LOADUP-LISP 802 . 4880)) (4883 7834 (MEDLEY-INIT-VARS 4893 . 6490) (MEDLEYDIR + 6492 . 7832))))) STOP diff --git a/sources/LOADUP-LISP.LCOM b/sources/LOADUP-LISP.LCOM index f6acb562d897a672a645fa643e5581cce30aeadd..75913fe5b13a84b973e941858c5bdca79fd011ad 100644 GIT binary patch delta 1226 zcmbVLO>EOx5N-lgY#=3}p+y0z!3RiSo%-2L(wbGk*e|WAaZ*30DcY_eByJNaZK9@S zh1N?E;=%=iEN+M!2P96wjRSY?a7Ka?C$5MCj9m~vk&wWL&olGpz4_*w_ihO<$&r*s zi@HhqqHa)LH;W}0D=X@(GEITgO`BSV&dS{F`0(awg;5{^j1^1PS;dC21yyC~NXp-- zT2!&A1{@Gx*;wX9K_oyVndD_cI7o5z&Pun{b{f!G#iWS)pT=hY|Et+qaSH9)+S=tp ztKI5#3oA~e?OZPOIvZ;q%xl!v9Zc%uiO1x*pEk3J-Q>24{W^K%4pUNY0z0oaYpcsn4~edKWEWCJ zlfhZ48T1^=uiN~*VzD&1-8JV@tFz(f`J83f>?18q$yxFD#5^HB3YT`xxvS2b7;`@L2&`j0`mwh8Pkdj32X7u2B zG5@(CO}9|e2?Da|Ul{`(5JljsGt{Cw%giWj1}BjRuHC6MHo84@2yp8wT^z-ant-fL zMp9+SdLN?@n($yKu_VEc{RAryFYYw>8lKZ0)ZCsP)NTQECjLnWPSIuK$gILl4*|m z8a<20!WVp_I+Sb$+0|GwzHP^BkhM41@UDqUibV4M*|R^F&%)y3)(h3Ji=6OPSs)Wx zV765*F*F6JnEC=gO>Jt>MjqY@C%O05^`)8t1&HvGGvEdmB3*iaZ{PzX_r9Vej9F z)!{kB2g4AGde4XF5f3L85w9ewJEJM9tjwJR3?0DG`@{mGwa?ieRTaxSIg<2V>{Bo_ bI?_ONN0ty@2Y6<*hW5kJ^E;xZZbUx;u8TE1 delta 1004 zcmb7@!B5j*7{=E*Oe}6`Wg80$zG*ykkS=Z4jjftVS-*v9*Nt`qjKnxug(ZV78#55A z=#d+yR}*hWZYti1|AZ&GnfPC*Ux&ttCwlnh{rbJ%^F7a-_KR@9GpveAnt`~IrXx-> zN)?zgk)qa=c^v_>Qq-AObZjq4vVKDmZ`F_rjF{(?PL~sTQ2B0fAgL@ALOKL8r-#w#@4#sbFqzW2ZvxwhBcfd32vurKWRCA z+~YgdZQR9(Ij-FJJ#>MW`K*ksVvX}nSvU#>E2Fn9O_mMaLbXM1Nzv;l34t3yA{c1R z(Lurq;Aa5RuP*u6m{<#~`vnzXMaes)uGNJ+l#!~Vd#Yw8!)!VYvQaV1ijEf`NWd&F zAQNd;YC*9U7{~+Db{fror^h72rw8#Dr`50l(*jw|k!%$t?|KA?v^N)t8X`fNK zj%kW`=oj^g)*$`T1brcNXV7zH?8DEU04vN2;QhE9j|k}utgfE^JZjaWDLoWsg^agJ zT_q%MpPIrM-ckD({YhkbZ