github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-02-26 17:13:17 +00:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Frank Halasz
2023-08-04 15:07:43 -07:00
parent 51ef95d30f
commit 126a8cfb37
8 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
internal/MEDLEY-UTILS
View File

@@ -1,11 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
(FILECREATED " 1-Aug-2023 22:43:13" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5| 10714
(FILECREATED " 3-Aug-2023 18:40:12" |{DSK}<home>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}<home>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}<home>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

BIN
internal/MEDLEY-UTILS.LCOM
View File

Binary file not shown.

11
scripts/loadup-aux.sh
View File

@@ -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

15
scripts/loadup-db-from-full.sh
View File

@@ -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

5
scripts/loadup-init.sh
View File

@@ -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

4
scripts/release-make-tars.sh
View File

@@ -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"

56
sources/MAKEINIT
View File

@@ -1,10 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "30-Jul-2023 23:39:21" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;4 54459
(FILECREATED " 3-Aug-2023 17:37:51" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;7 54420
:EDIT-BY "frank"
:CHANGES-TO (FNS MAKEINITGREET)
:PREVIOUS-DATE "11-Jul-2022 20:00:23" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;1)
:PREVIOUS-DATE "30-Jul-2023 23:39:21" {DSK}<home>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

BIN
sources/MAKEINIT.LCOM
View File

Binary file not shown.