From 126a8cfb37e1aab43b5e061d3e324a476db25a5e Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Fri, 4 Aug 2023 15:07:43 -0700 Subject: [PATCH] Remove references to LOADUP_WORKDIR from all lisp code and instead pass the file references down from the callinf .CM files (which are now embedded in the loadup- scripts; also add /unicode subdir to the release tars. --- internal/MEDLEY-UTILS | 45 +++++++++++++------------- internal/MEDLEY-UTILS.LCOM | Bin 7317 -> 6947 bytes scripts/loadup-aux.sh | 11 +++++-- scripts/loadup-db-from-full.sh | 15 ++++++--- scripts/loadup-init.sh | 5 ++- scripts/release-make-tars.sh | 4 ++- sources/MAKEINIT | 56 ++++++++++++++++----------------- sources/MAKEINIT.LCOM | Bin 23621 -> 23471 bytes 8 files changed, 77 insertions(+), 59 deletions(-) diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS index 47d52d5e..2e0ae0e2 100644 --- a/internal/MEDLEY-UTILS +++ b/internal/MEDLEY-UTILS @@ -1,11 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10) -(FILECREATED " 1-Aug-2023 22:43:13" |{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5| 10714 +(FILECREATED " 3-Aug-2023 18:40:12" |{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;6| 10695 - :CHANGES-TO (FNS MAKE-FULLER-DB) + :EDIT-BY "frank" - :PREVIOUS-DATE " 1-Aug-2023 22:22:02" -|{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;4|) + :CHANGES-TO (FNS MAKE-FULLER-DB MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH) + + :PREVIOUS-DATE " 1-Aug-2023 22:43:13" +|{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5|) (PRETTYCOMPRINT MEDLEY-UTILSCOMS) @@ -101,21 +103,19 @@ (HELP)))) (MAKE-FULLER-DB - (LAMBDA NIL (* \; "Edited 16-Jul-2022 22:07 by larry") + (LAMBDA (DRIBBLEFILE DBFILE SYSOUTFILE) (* \; "Edited 3-Aug-2023 18:12 by frank") + (* \; "Edited 16-Jul-2022 22:07 by larry") (* \; "Edited 20-Jun-2022 17:23 by larry") (FILESLOAD (SOURCE) FILESETS) - (DRIBBLE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") - "/" "fuller.dribble")) + (DRIBBLE (OR DRIBBLEFILE "fuller.dribble")) (DOFILESLOAD (SUBSET (APPEND OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL) 'FINDFILE)) (GATHER-INFO 'ALL) (MASTERSCOPE '(WHO CALLS XYZZY)) - (DUMPDATABASE NIL (MKATOM (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") - "/" "fuller.database"))) + (DUMPDATABASE NIL (MKATOM (OR DBFILE "fuller.database"))) (DRIBBLE) - (MAKESYS (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") - "/" "fuller.sysout") + (MAKESYS (OR SYSOUTFILE "fuller.sysout") "Welcome to Fuller sysout"))) (MEDLEY-FIX-LINKS @@ -148,7 +148,8 @@ (DEFINEQ (MAKE-EXPORTS-ALL - (LAMBDA NIL (* \; "Edited 9-Mar-2021 16:11 by larry") + (LAMBDA (OUTFILE) (* \; "Edited 3-Aug-2023 18:34 by frank") + (* \; "Edited 9-Mar-2021 16:11 by larry") (* "Edited May 3, 2018 by Ron Kaplan--relative to MEDLEYDIR/lispcore/. Don't know why it does the CORE/RENAME") (*  "Edited Aug 17 94 by Sybalsky -- point it to /king/export/lispcore as the truth directory.") @@ -158,27 +159,25 @@  "Edited September 29, 1986 by van Melle") (CNDIR (MEDLEYDIR "sources")) (LOAD 'FILESETS) - (GATHEREXPORTS EXPORTFILES (CONCAT '{DSK} (UNIX-GETENV "LOADUP_WORKDIR") - "/" "exports.all")))) + (GATHEREXPORTS EXPORTFILES (OR OUTFILE "exports.all")))) (MAKE-WHEREIS-HASH - (LAMBDA (DRIBBLEFILE) (* \; "Edited 12-Mar-2022 12:46 by rmk") + (LAMBDA (DRIBBLEFILE TMPFILE WHEREISFILE) (* \; "Edited 3-Aug-2023 18:37 by frank") + (* \; "Edited 12-Mar-2022 12:46 by rmk") (* \; "Edited 24-Mar-2021 13:26 by larry") (LET ((FILING.ENUMERATION.DEPTH 2) HASHFILE) - (DRIBBLE DRIBBLEFILE) - (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") - "/" "whereis.hash-tmp") + (DRIBBLE (OR DRIBBLEFILE "whereis.dribble")) + (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (OR TMPFILE "whereis.hash-tmp") :FILES (|for| X |in| MEDLEY-FIX-DIRS |collect| (CONCAT (MEDLEYDIR X) "*.;")) :HASH-FILE-SIZE 60000 :NEW T)) - (RENAMEFILE HASHFILE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") - "/" "whereis.hash")) + (RENAMEFILE HASHFILE (OR WHEREISFILE "whereis.hash")) (DRIBBLE)))) ) (DECLARE\: DONTCOPY - (FILEMAP (NIL (620 7662 (GATHER-INFO 630 . 6158) (MAKE-FULLER-DB 6160 . 7017) (MEDLEY-FIX-LINKS 7019 - . 7416) (MEDLEY-FIX-DATES 7418 . 7660)) (8701 10691 (MAKE-EXPORTS-ALL 8711 . 9739) (MAKE-WHEREIS-HASH - 9741 . 10689))))) + (FILEMAP (NIL (679 7642 (GATHER-INFO 689 . 6217) (MAKE-FULLER-DB 6219 . 6997) (MEDLEY-FIX-LINKS 6999 + . 7396) (MEDLEY-FIX-DATES 7398 . 7640)) (8681 10672 (MAKE-EXPORTS-ALL 8691 . 9752) (MAKE-WHEREIS-HASH + 9754 . 10670))))) STOP diff --git a/internal/MEDLEY-UTILS.LCOM b/internal/MEDLEY-UTILS.LCOM index 4a353503f00571c86078e35bfd0c85c18b11ca6d..b492e029673249f348f9d10bbe5f8e361aba8011 100644 GIT binary patch delta 978 zcmZvb-D=w~6vyMXbXzV;x{!X2Z3l1ArVwMv&WAk;Q(|Q?wc}vBq$#~gSFa7tnv$e! zg|M=DYIW;c6;u_u`1=A(o8LL40(>HPisOJ9xeg&RMu<;dkp4y#xLR5Eqd z#KkXB{kky9f(&@Js3KFvrf$eE8ouqlzvylrk6_d}A3;*C?l}(JFIE(V*B!Tq5ik1B zF?lR!lUr5Wp%tH!kXpRxA0dlE3Bs%-?Q9fy3#1l|Jebt7!(6!q^1FWf{7hz_Bw&Bm zUd}<1eUqLuO|otm=8{X>Hed)^fwvcm9$*6kt2_=>uzb5*c4$0jOR1go&HO@QzL((N zBQd=G@u0_sspd7|!8Dr`(L*tm$LV-2PNx!ENJrq3UCP@6;xNZe0HG3Cdv3!bAt{r9 z@`MKNE(tvs41;e8Lh1(SebZ^_9WZpm#Zx0jZ^F zj(gcYY7ZhA3>~(bH4iHMfB^Pe2M4VzpyI5u-#I$!Mso6YJ^f31VS@@2AF4d2`wh>J zZ3(iF$R?zO#8R0J5YPqO2~VvwhHwYb?_ABZ44a7R9EJxHJ3JO%dH>Cv8Zw8+Ny*m4c);Hl@*&Bt^wY zeu9-n@m>4{eeuCxA^0x%6MPb1yu0~m8f*7q=g!Q%XYQPH=9BtfKXT?s!Z_SbP?1VN zX-bw-RDM^rx=JSw0*r2wl%l7IC_tzEr19*aerKlxoxSHBhzLfh2 zo?^|Qo~XVtJC~B=6PV`S_IAB00M&aKIE+CA2Mi#NYqLN2YgrJ1ZIo=s3ojc7?mowJ zoWDPR-QFE~WXyTf!N$NDs@PYj2jhaG3<#CQQ9}LC^N^NA2ycKU>e0(QH{eteL8!hw zXf)fcWTjpgKvu#_NI0Cng#UAX!!Iw~TKagA=lJ?WG|E31>u+p2?SELv?VNA+lShGO zC$c`Y2SKYi%rc5BG#ELt3mNkZzGy!hi*?nZp%fj8%q*}?lpm0c{-dGFC@tvc!C|4z zL`Yez3}~*@n&GY`f@2eI?hy+pN%d4h!bqU}i(0i=-D@Rll~xT+6AGWe0LdL=Em#~% i4=RRB$rS-4|0uR_8$}6BN5#k)Whg+X*zuRx{^VakX)B!o diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh index 4a48f779..598f6955 100755 --- a/scripts/loadup-aux.sh +++ b/scripts/loadup-aux.sh @@ -11,11 +11,18 @@ loadup_start cat >"${cmfile}" <<"EOF" " +(PROG + ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /)))) (IL:MEDLEY-INIT-VARS) (IL:LOAD(QUOTE MEDLEY-UTILS)) - (IL:MAKE-EXPORTS-ALL) - (IL:MAKE-WHEREIS-HASH (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /whereis.dribble)))) + (IL:MAKE-EXPORTS-ALL (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE exports.all)))) + (IL:MAKE-WHEREIS-HASH + (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.dribble))) + (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash-tmp))) + (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash))) + ) (IL:LOGOUT T) +) " EOF diff --git a/scripts/loadup-db-from-full.sh b/scripts/loadup-db-from-full.sh index c972491a..8b368d50 100755 --- a/scripts/loadup-db-from-full.sh +++ b/scripts/loadup-db-from-full.sh @@ -12,10 +12,17 @@ loadup_start cat >"${cmfile}" <<"EOF" " -(IL:MEDLEY-INIT-VARS) -(IL:FILESLOAD MEDLEY-UTILS) -(IL:MAKE-FULLER-DB) -(IL:LOGOUT T) +(PROG + ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /)))) + (IL:MEDLEY-INIT-VARS) + (IL:FILESLOAD MEDLEY-UTILS) + (IL:MAKE-FULLER-DB + (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.dribble))) + (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.database))) + (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.sysout))) + ) + (IL:LOGOUT T) +) " EOF diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh index e08f8ad5..ce1d5686 100755 --- a/scripts/loadup-init.sh +++ b/scripts/loadup-init.sh @@ -24,7 +24,10 @@ cat >"${cmfile}" <<"EOF" (MOVD? 'RRE 'READ-READER-ENVIRONMENT) (LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM")) -(MAKEINITGREET) +(PROG + ((WORKDIR (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") "/"))) + (MAKEINITGREET (CONCAT WORKDIR "init.sysout") (CONCAT WORKDIR "init.dlinit")) +) (DRIBBLE) (LOGOUT T) STOP diff --git a/scripts/release-make-tars.sh b/scripts/release-make-tars.sh index f62d9236..69fae765 100755 --- a/scripts/release-make-tars.sh +++ b/scripts/release-make-tars.sh @@ -81,6 +81,8 @@ tar -c -z -f "${release_dir}"/$tag-runtime.tgz \ "${dirname}"/library \ "${dirname}"/lispusers \ "${dirname}"/sources \ - "${dirname}"/internal ; + "${dirname}"/internal \ + "${dirname}"/unicode ; + echo "Done with release tars" diff --git a/sources/MAKEINIT b/sources/MAKEINIT index b1cd3577..f4f13448 100644 --- a/sources/MAKEINIT +++ b/sources/MAKEINIT @@ -1,10 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "30-Jul-2023 23:39:21" {DSK}frank>il>medley>gmedley>sources>MAKEINIT.;4 54459 +(FILECREATED " 3-Aug-2023 17:37:51" {DSK}frank>il>medley>gmedley>sources>MAKEINIT.;7 54420 + + :EDIT-BY "frank" :CHANGES-TO (FNS MAKEINITGREET) - :PREVIOUS-DATE "11-Jul-2022 20:00:23" {DSK}frank>il>medley>gmedley>sources>MAKEINIT.;1) + :PREVIOUS-DATE "30-Jul-2023 23:39:21" {DSK}frank>il>medley>gmedley>sources>MAKEINIT.;6) (PRETTYCOMPRINT MAKEINITCOMS) @@ -77,7 +79,8 @@ (DEFINEQ (MAKEINITGREET - [LAMBDA NIL (* ; "Edited 11-Mar-2021 22:14 by larry") + [LAMBDA (SYSOUTFILE DLINITFILE) (* ; "Edited 3-Aug-2023 17:37 by frank") + (* ; "Edited 11-Mar-2021 22:14 by larry") (* ; "Edited 5-Dec-2017 15:26 by rmk:") (* ;; "") @@ -90,11 +93,8 @@ (DORENAME 'I) (DORENAME 'R) (DLFIXINIT (MAKEINIT '(39424 5682 11008) - (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") - "/init.sysout") - NIL DIRECTORIES DISPLAYFONTDIRECTORIES) - (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") - "/init.dlinit"]) + SYSOUTFILE NIL DIRECTORIES DISPLAYFONTDIRECTORIES) + DLINITFILE]) ) (FILESLOAD (SOURCE) @@ -1050,25 +1050,25 @@ DONTCOPY FPTOVP NEWFPFROMOLD VMEMFILE VMEMFILEX) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3843 4691 (MAKEINITGREET 3853 . 4689)) (4874 11259 (LOADMAKEINIT 4884 . 6087) ( -LOADMKIFILES 6089 . 6404) (RELOAD 6406 . 6889) (MAKEINIT 6891 . 10551) (MKI.START 10553 . 11257)) ( -11337 17055 (MKI.PASSFILE 11347 . 14957) (SCRATCHARRAY 14959 . 15608) (DOFORM 15610 . 16287) ( -CONSTFORMP 16289 . 16523) (NOTICECOMS 16525 . 16833) (EVALFORMAKEINIT 16835 . 17053)) (17056 19176 ( -I.ADDTOVAR 17066 . 17160) (I.DECLARE%: 17162 . 17438) (I.DEFINE-FILE-INFO 17440 . 17630) ( -I.FILECREATED 17632 . 18006) (I.PUTPROPS 18008 . 18121) (I.RPAQ 18123 . 18344) (I.RPAQQ 18346 . 18542) - (I.RPAQ? 18544 . 18759) (I.SETTOPVAL 18761 . 18993) (I.NOUNDO 18995 . 19174)) (19812 26028 ( -I.ATOMNUMBER 19822 . 20313) (I.\ATOMCELL 20315 . 22068) (I.FIXUPNUM 22070 . 22995) (I.FIXUPPTR 22997 - . 23478) (I.FIXUPSYM 23480 . 24536) (I.WORDSPERNAMEENTRY 24538 . 25293) (I.SETSTKNTOFFSET 25295 . -26026)) (26060 27568 (MKI.ATOM 26070 . 26266) (MKI.IEEE 26268 . 27566)) (27665 28430 (MKI.DSET 27675 - . 27958) (MKI.ADDTO 27960 . 28145) (MKI.PUTPROP 28147 . 28428)) (28604 29156 (DUMPVP 28614 . 28711) ( -BOUTZEROS 28713 . 28792) (BIN16 28794 . 28975) (BOUT16 28977 . 29154)) (30047 52781 (DLFIXINIT 30057 - . 31032) (DLSORTSYSOUTPAGES 31034 . 36160) (DLNEXTFP 36162 . 36499) (DLLOCKEDPAGEP 36501 . 36715) ( -DLSETLOCKBIT 36717 . 36979) (DLCOPYPAGEMAP 36981 . 40032) (DLCOPYVMPAGE 40034 . 40424) ( -DLADDPAGEMAPENTRIES 40426 . 41241) (ASSIGNFILEPAGE 41243 . 42476) (ASSIGNFILEPAGERANGE 42478 . 42885) -(DLDUMPSYSOUT 42887 . 44639) (DLDUMPFPTOVP 44641 . 45680) (DLDUMPPAGEMAPS 45682 . 46382) ( -DLDUMPVMEMPAGES 46384 . 47040) (DLSETBOOTPTR 47042 . 47272) (DLDUMPARRAY 47274 . 47661) ( -DLMARKASDUMPED 47663 . 48116) (DLDUMPVMEMPAGE 48118 . 48806) (INSTALLDOMINO 48808 . 49455) ( -INSTALLDOMINO.DIRECT 49457 . 50609) (INSTALLNEWDOMINO 50611 . 52779)) (52803 54160 (DLPRINTFPTOVP -52813 . 53102) (PRINTPRIMARYMAP 53104 . 53818) (DLREADPAGEOFWORDS 53820 . 53987) (SETDIF 53989 . 54158 + (FILEMAP (NIL (3867 4652 (MAKEINITGREET 3877 . 4650)) (4835 11220 (LOADMAKEINIT 4845 . 6048) ( +LOADMKIFILES 6050 . 6365) (RELOAD 6367 . 6850) (MAKEINIT 6852 . 10512) (MKI.START 10514 . 11218)) ( +11298 17016 (MKI.PASSFILE 11308 . 14918) (SCRATCHARRAY 14920 . 15569) (DOFORM 15571 . 16248) ( +CONSTFORMP 16250 . 16484) (NOTICECOMS 16486 . 16794) (EVALFORMAKEINIT 16796 . 17014)) (17017 19137 ( +I.ADDTOVAR 17027 . 17121) (I.DECLARE%: 17123 . 17399) (I.DEFINE-FILE-INFO 17401 . 17591) ( +I.FILECREATED 17593 . 17967) (I.PUTPROPS 17969 . 18082) (I.RPAQ 18084 . 18305) (I.RPAQQ 18307 . 18503) + (I.RPAQ? 18505 . 18720) (I.SETTOPVAL 18722 . 18954) (I.NOUNDO 18956 . 19135)) (19773 25989 ( +I.ATOMNUMBER 19783 . 20274) (I.\ATOMCELL 20276 . 22029) (I.FIXUPNUM 22031 . 22956) (I.FIXUPPTR 22958 + . 23439) (I.FIXUPSYM 23441 . 24497) (I.WORDSPERNAMEENTRY 24499 . 25254) (I.SETSTKNTOFFSET 25256 . +25987)) (26021 27529 (MKI.ATOM 26031 . 26227) (MKI.IEEE 26229 . 27527)) (27626 28391 (MKI.DSET 27636 + . 27919) (MKI.ADDTO 27921 . 28106) (MKI.PUTPROP 28108 . 28389)) (28565 29117 (DUMPVP 28575 . 28672) ( +BOUTZEROS 28674 . 28753) (BIN16 28755 . 28936) (BOUT16 28938 . 29115)) (30008 52742 (DLFIXINIT 30018 + . 30993) (DLSORTSYSOUTPAGES 30995 . 36121) (DLNEXTFP 36123 . 36460) (DLLOCKEDPAGEP 36462 . 36676) ( +DLSETLOCKBIT 36678 . 36940) (DLCOPYPAGEMAP 36942 . 39993) (DLCOPYVMPAGE 39995 . 40385) ( +DLADDPAGEMAPENTRIES 40387 . 41202) (ASSIGNFILEPAGE 41204 . 42437) (ASSIGNFILEPAGERANGE 42439 . 42846) +(DLDUMPSYSOUT 42848 . 44600) (DLDUMPFPTOVP 44602 . 45641) (DLDUMPPAGEMAPS 45643 . 46343) ( +DLDUMPVMEMPAGES 46345 . 47001) (DLSETBOOTPTR 47003 . 47233) (DLDUMPARRAY 47235 . 47622) ( +DLMARKASDUMPED 47624 . 48077) (DLDUMPVMEMPAGE 48079 . 48767) (INSTALLDOMINO 48769 . 49416) ( +INSTALLDOMINO.DIRECT 49418 . 50570) (INSTALLNEWDOMINO 50572 . 52740)) (52764 54121 (DLPRINTFPTOVP +52774 . 53063) (PRINTPRIMARYMAP 53065 . 53779) (DLREADPAGEOFWORDS 53781 . 53948) (SETDIF 53950 . 54119 ))))) STOP diff --git a/sources/MAKEINIT.LCOM b/sources/MAKEINIT.LCOM index 3af36c6cc762407e7110b8077c0296917c5dad86..2a2c0084cb2ad6a9865cfe9dba267d11dbda2ec3 100644 GIT binary patch delta 505 zcmZutO-md>5S`gI5C?<=1Vcc0%*EZqE?wO{J3D<4$DLl&$r@#Lmgr4!jf&r*ASeWK z@T}|)@h}Jd13BiFbB_5P>DEXhqz+ZDx?c5r-QVv0+dKdI(j=UB&KN1il}tjMZXE6(?ad6abATZ14thQOOKdiqA%^Rxo5TNI5b>}c)Vijp zJGo8^omtXz2O?Gxg(L2_-o}We_Tquz! zPB$0rxK$4p(+}EwG{r)$bpe&NgPH*$>$yXx4g-e%YJX|)*ml82ug9kbb$HVAy~<0^ z#+FOt&(Wc4=eE~eS)O>|N*cKQ%B#u5Ds;_?6M+=pHw9#%Z+GuY>HTnWpJd7Sj!@MKv8+0T#i{*yNqXlRjNd+M0!=3A(ECP W9f^cR!oKd$I`OAP@aVxW;L(%cK_`J-tLPlw`@i>o|2GWt?j!m9iM(AaKaeXr=O;V& zwnYmlV*CEVxQz@spw$(uYa@l}=4AKTc)5Vl9vIY5(;=J%P1B@MY)rR`e=cxo%UJ2j zK@?<>pGRT&o-CD|*oy*eA#4wf@)coMEo*i)08