From e4c3a16ce497f45dbfcbd62056d7ac970298b1c7 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Mon, 31 Jul 2023 00:42:23 -0700 Subject: [PATCH] Remake loadup scripts to not use MEDLEYDIR/tmp as a working dir AND cleanly separate loadup-all from loadup-db; adjust buildLoadup.yml accordingly --- .github/workflows/buildLoadup.yml | 1 + scripts/copy-all.sh | 28 ++++++------- scripts/loadup-all.sh | 12 ++++-- scripts/loadup-apps-from-full.sh | 61 ++++------------------------ scripts/loadup-aux.sh | 22 ++-------- scripts/loadup-db.sh | 28 ++++++------- scripts/loadup-full-from-lisp.sh | 18 ++------- scripts/loadup-init.sh | 20 ++-------- scripts/loadup-lisp-from-mid.sh | 19 ++------- scripts/loadup-mid-from-init.sh | 20 ++-------- sources/LOADUP-APPS.CM | 2 +- sources/LOADUP-FULL.CM | 2 +- sources/LOADUP-INIT.LISP | 2 +- sources/LOADUP-LISP.CM | 2 +- sources/MAKEINIT | 64 ++++++++++++++---------------- sources/MAKEINIT.LCOM | Bin 23370 -> 23621 bytes 16 files changed, 92 insertions(+), 209 deletions(-) diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml index 6a4c89dd..e3d5b618 100644 --- a/.github/workflows/buildLoadup.yml +++ b/.github/workflows/buildLoadup.yml @@ -226,6 +226,7 @@ jobs: export DISPLAY=":0" PATH="$PWD/maiko:$PATH" scripts/loadup-all.sh -apps + scripts/loadup-db.sh - name: Build loadups release tar run: | diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh index 6dfd8eb9..3831f10f 100755 --- a/scripts/copy-all.sh +++ b/scripts/copy-all.sh @@ -1,30 +1,28 @@ #!/bin/sh -export MEDLEYDIR=`pwd` - if [ ! -x run-medley ] ; then echo run from MEDLEYDIR exit 1 fi +. scripts/loadup-setup.sh + # was # cp -p tmp/full.sysout tmp/lisp.sysout tmp/*.dribble tmp/whereis.hash loadups/ # cp -p tmp/exports.all tmp/RDSYS tmp/RDSYS.LCOM library/ # just copy the files that are released -./scripts/cpv tmp/init.dribble loadups -./scripts/cpv tmp/lisp.dribble loadups -./scripts/cpv tmp/full.dribble loadups -./scripts/cpv tmp/fuller.dribble loadups -./scripts/cpv tmp/whereis.dribble loadups - -./scripts/cpv tmp/fuller.database loadups - -./scripts/cpv tmp/full.sysout loadups -./scripts/cpv tmp/lisp.sysout loadups -./scripts/cpv tmp/whereis.hash loadups -./scripts/cpv tmp/exports.all loadups +./scripts/cpv ${LOADUP_WORKDIR}/full.sysout loadups +./scripts/cpv ${LOADUP_WORKDIR}/lisp.sysout loadups if [ "${1}" = "-apps" ]; then - ./scripts/cpv tmp/apps.sysout loadups + ./scripts/cpv ${LOADUP_WORKDIR}/apps.sysout loadups fi +./scripts/cpv ${LOADUP_WORKDIR}/whereis.hash loadups +./scripts/cpv ${LOADUP_WORKDIR}/exports.all loadups + +./scripts/cpv ${LOADUP_WORKDIR}/init.dribble loadups +./scripts/cpv ${LOADUP_WORKDIR}/lisp.dribble loadups +./scripts/cpv ${LOADUP_WORKDIR}/full.dribble loadups +./scripts/cpv ${LOADUP_WORKDIR}/whereis.dribble loadups + diff --git a/scripts/loadup-all.sh b/scripts/loadup-all.sh index c74f3280..5cc8f005 100755 --- a/scripts/loadup-all.sh +++ b/scripts/loadup-all.sh @@ -1,12 +1,12 @@ #!/bin/sh -export MEDLEYDIR=`pwd` - if [ ! -x run-medley ] ; then echo run from MEDLEYDIR exit 1 fi +. scripts/loadup-setup.sh + if [ "$1" = "-apps" ]; then apps="./scripts/loadup-apps-from-full.sh" else @@ -21,7 +21,13 @@ fi ./scripts/loadup-aux.sh && \ ./scripts/copy-all.sh $1 -echo "**** DONE ****" +if [ $? -eq 0 ]; +then + echo "+++++ loadup-all.sh: SUCCESS +++++" +else + echo "----- loadup-all.sh: FAILURE -----" +fi + diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh index e3a48101..a00d54f0 100755 --- a/scripts/loadup-apps-from-full.sh +++ b/scripts/loadup-apps-from-full.sh @@ -1,32 +1,12 @@ -#!/bin/bash +#!/bin/sh -#set -x +if [ ! -x run-medley ] ; then + echo must run from MEDLEYDIR ; + exit 1 ; +fi -# function to discover what directory this script is being executed from -where_am_i() { +. scripts/loadup-setup.sh - # call this with ${BASH_SOURCE[0]:-$0} as its (only) parameter - - local SCRIPT_PATH="$1"; - - pushd . > '/dev/null'; - - while [ -h "$SCRIPT_PATH" ]; - do - cd "$( dirname -- "$SCRIPT_PATH"; )"; - SCRIPT_PATH="$( readlink -f -- "$SCRIPT_PATH"; )"; - done - - cd "$( dirname -- "$SCRIPT_PATH"; )" > '/dev/null'; - SCRIPT_PATH="$( pwd; )"; - - popd > '/dev/null'; - - echo "${SCRIPT_PATH}" -} - -SCRIPTDIR=$(where_am_i "${BASH_SOURCE[0]:-$0}") -export MEDLEYDIR=$(cd ${SCRIPTDIR} && cd .. && pwd) export ROOMSDIR=${MEDLEYDIR}/rooms export CLOSDIR=${MEDLEYDIR}/clos @@ -41,33 +21,8 @@ if [ ! -e ${NOTECARDSDIR} ]; then fi fi -if [ -z "${SYSOUTDIR}" ]; then - export SYSOUTDIR=${MEDLEYDIR}/tmp -fi +./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_TMP}/full.sysout" -if [ -z "${FULLSYSOUTPATH}" ]; then - FULLSYSOUTPATH=${SYSOUTDIR}/full.sysout - if [ ! -e ${FULLSYSOUTPATH} ]; then - FULLSYSOUTPATH=${MEDLEYDIR}/loadups/full.sysout - fi -fi +loadup_finish "loadup-apps-from-full" "apps.sysout" "apps.*" -cd ${MEDLEYDIR} - -scr="-sc 1024x768 -g 1042x790" - -mkdir -p ${SYSOUTDIR} -touch ${SYSOUTDIR}/loadup.timestamp - -./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${FULLSYSOUTPATH}" - -if [ ${SYSOUTDIR}/apps.sysout -nt ${SYSOUTDIR}/loadup.timestamp ]; then - echo ---- made ---- - ls -l ${SYSOUTDIR}/apps.* - echo -------------- -else - echo XXXXX FAILURE XXXXX - ls -l ${SYSOUTDIR}/apps.* - exit 1 -fi diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh index 211accbe..5dffc2e1 100755 --- a/scripts/loadup-aux.sh +++ b/scripts/loadup-aux.sh @@ -1,28 +1,14 @@ #!/bin/sh -export MEDLEYDIR=`pwd` - if [ ! -f run-medley ] ; then echo run from MEDLEYDIR exit 1 fi -mkdir -p tmp -touch tmp/loadup.timestamp +. scripts/loadup-setup.sh -scr="-sc 1024x768 -g 1042x790" +echo '" (IL:MEDLEY-INIT-VARS)(IL:LOAD(QUOTE MEDLEY-UTILS))(IL:MAKE-EXPORTS-ALL)(IL:MAKE-WHEREIS-HASH)(IL:LOGOUT T)"' > ${LOADUP_WORKDIR}/loadup-aux.cm -echo '" (IL:MEDLEY-INIT-VARS)(IL:LOAD(QUOTE MEDLEY-UTILS))(IL:MAKE-EXPORTS-ALL)(IL:MAKE-WHEREIS-HASH)(IL:LOGOUT T)"' > tmp/loadup-aux.cm -./run-medley $scr -loadup "$MEDLEYDIR"/tmp/loadup-aux.cm tmp/full.sysout +./run-medley $scr -loadup "${LOADUP_WORKDIR}/loadup-aux.cm ${LOADUP_WORKDIR}/full.sysout -if [ tmp/whereis.hash -nt tmp/loadup.timestamp ]; then - - echo ---- made ---- - ls -l tmp/whereis.hash tmp/exports.all - echo -------------- - -else - echo XXXXX FAILURE XXXXX - ls -l tmp/whereis.hash tmp/exports.all - exit 1 -fi +loadup_finish "loadup-aux" "whereis.hash" "whereis.hash" "exports.all" diff --git a/scripts/loadup-db.sh b/scripts/loadup-db.sh index 4b47839d..d0f89f7a 100755 --- a/scripts/loadup-db.sh +++ b/scripts/loadup-db.sh @@ -1,26 +1,22 @@ #!/bin/sh -export MEDLEYDIR=`pwd` - -if [ ! -f run-medley ] ; then +if [ ! -x run-medley ] ; then echo run from MEDLEYDIR exit 1 fi -touch tmp/db.timestamp +. scripts/loadup-setup.sh -scr="-sc 1024x768 -g 1042x790" - -echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > tmp/db.cm -./run-medley $scr -loadup "$MEDLEYDIR"/tmp/db.cm -n -if [ tmp/fuller.database -nt tmp/db.timestamp ]; then - - echo ---- made ---- - ls -l tmp/fuller* - echo -------------- +./scripts/loadup-db-from-full.sh && ./scripts/copy-db.sh +if [ $? -eq 0 ]; +then + echo "+++++ loadup-db.sh: SUCCESS +++++" else - echo XXXXX FAILURE XXXXX - ls -l tmp/fuller* - exit 1 + echo "----- loadup-db.sh: FAILURE -----" fi + + + + + diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh index 14277016..509d5111 100755 --- a/scripts/loadup-full-from-lisp.sh +++ b/scripts/loadup-full-from-lisp.sh @@ -1,25 +1,13 @@ #!/bin/sh -export MEDLEYDIR=`pwd` - if [ ! -x run-medley ] ; then echo must run from MEDLEYDIR ; exit 1 ; fi -scr="-sc 1024x768 -g 1042x790" -touch tmp/loadup.timestamp +. scripts/loadup-setup.sh -./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "$MEDLEYDIR/tmp/lisp.sysout" +./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "${LOADUP_WORKDIR}/lisp.sysout" -if [ tmp/full.sysout -nt tmp/loadup.timestamp ]; then - - echo ---- made ---- - ls -l tmp/full.* - echo -------------- +loadup_finish "loadup-full-from-lisp" "full.sysout" "full.*" -else - echo XXXXX FAILURE XXXXX - ls -l tmp/full.* - exit 1 -fi diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh index 9d97dc13..947f42af 100755 --- a/scripts/loadup-init.sh +++ b/scripts/loadup-init.sh @@ -1,26 +1,12 @@ #!/bin/sh -export MEDLEYDIR=`pwd` - if [ ! -f run-medley ] ; then echo run from MEDLEYDIR exit 1 fi -scr="-sc 1024x768 -g 1042x790" +. scripts/loadup-setup.sh -mkdir -p tmp -touch tmp/loadup.timestamp +./run-medley $scr -loadup "${MEDLEYDIR}"/sources/LOADUP-INIT.LISP loadups/starter.sysout -./run-medley $scr -loadup "$MEDLEYDIR"/sources/LOADUP-INIT.LISP loadups/starter.sysout - -if [ tmp/init.dlinit -nt tmp/loadup.timestamp ]; then - - echo ---- made ---- - ls -l tmp/init.* tmp/RDSYS* tmp/I-NEW* - echo -------------- - -else - echo XXXXX FAILURE XXXXX - exit 1 -fi +loadup_finish "loadup-init" "init.dlinit" "init.*" "RDSYS*" "I-NEW*" diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh index 1c84b3e4..222466f8 100755 --- a/scripts/loadup-lisp-from-mid.sh +++ b/scripts/loadup-lisp-from-mid.sh @@ -1,25 +1,12 @@ #!/bin/sh -export MEDLEYDIR=`pwd` - if [ ! -f run-medley ] ; then echo run from MEDLEYDIR exit 1 fi -touch tmp/loadup.timestamp +. scripts/loadup-setup.sh -scr="-sc 1024x768 -g 1042x790" +./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" ${LOADUP_WORKDIR}/init-mid.sysout - -./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" tmp/init-mid.sysout - -if [ tmp/lisp.sysout -nt tmp/loadup.timestamp ]; then - - echo ---- made ---- - ls -l tmp/lisp.* - echo -------------- -else - echo XXXXX FAILURE XXXXX - exit 1 -fi +loadup_finish "loadup-lisp-from-mid" "lisp.sysout" "lisp.*" diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh index 8208bcda..afb12fa3 100755 --- a/scripts/loadup-mid-from-init.sh +++ b/scripts/loadup-mid-from-init.sh @@ -1,26 +1,12 @@ #!/bin/sh -export MEDLEYDIR=`pwd` - if [ ! -x run-medley ] ; then echo run from MEDLEYDIR exit 1 fi -mkdir -p "$MEDLEYDIR/tmp" -touch tmp/loadup.timestamp +. scripts/loadup-setup.sh -scr="-sc 1024x768 -g 1042x790" +./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit -./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout tmp/init.dlinit - - -echo -if [ tmp/loadup.timestamp -nt tmp/init-mid.sysout ]; then - echo XXXXX FAILURE XXXXX - exit 1 -else - echo ---- made ---- - ls -l tmp/init-mid.sysout - echo -------------- -fi +loadup_finish "loadup-mid-from-init" "init-mid.sysout" "init-mid.sysout" diff --git a/sources/LOADUP-APPS.CM b/sources/LOADUP-APPS.CM index d41a71c3..f8d37768 100644 --- a/sources/LOADUP-APPS.CM +++ b/sources/LOADUP-APPS.CM @@ -1 +1 @@ -" (PROGN (IL:MEDLEY-INIT-VARS 'IL:GREET) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|)) 'IL:SYSLOAD ) (IL:HARDRESET) ) SHH (PROGN (IL:ENDLOADUP) (CLOS::LOAD-CLOS) (IL:|Apps.LOADUP|) (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE SYSOUTDIR))(IL:L-CASE (QUOTE /apps.sysout))) :APPS) ) (IL:LOGOUT T) " \ No newline at end of file +" (PROGN (IL:MEDLEY-INIT-VARS 'IL:GREET) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD) (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|)) 'IL:SYSLOAD ) (IL:HARDRESET) ) SHH (PROGN (IL:ENDLOADUP) (CLOS::LOAD-CLOS) (IL:|Apps.LOADUP|) (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.sysout))) :APPS) ) (IL:LOGOUT T) " \ No newline at end of file diff --git a/sources/LOADUP-FULL.CM b/sources/LOADUP-FULL.CM index 5f13dad3..3ba363d4 100644 --- a/sources/LOADUP-FULL.CM +++ b/sources/LOADUP-FULL.CM @@ -1 +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 +" (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 LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL)) (IL:LOGOUT T) " \ No newline at end of file diff --git a/sources/LOADUP-INIT.LISP b/sources/LOADUP-INIT.LISP index 31cb03b3..016338d7 100644 --- a/sources/LOADUP-INIT.LISP +++ b/sources/LOADUP-INIT.LISP @@ -1,7 +1,7 @@ (* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh") (LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM")) -(CNDIR (MEDLEYDIR "tmp")) +(CNDIR (UNIX-GETENV "LOADUP_WORKDIR")) (DRIBBLE "init.dribble") (UNADVISE) diff --git a/sources/LOADUP-LISP.CM b/sources/LOADUP-LISP.CM index 641c5f83..150fb0ee 100644 --- a/sources/LOADUP-LISP.CM +++ b/sources/LOADUP-LISP.CM @@ -1 +1 @@ -" (PROGN(LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))(LOADUP-LISP)(HARDRESET)) SHH(PROGN(IL:ENDLOADUP)':MEDLEY)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(IL:L-CASE (QUOTE /tmp/lisp.sysout))))) (IL:LOGOUT T) " \ No newline at end of file +" (PROGN(LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))(LOADUP-LISP)(HARDRESET)) SHH(PROGN(IL:ENDLOADUP)':MEDLEY)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout))))) (IL:LOGOUT T) " \ No newline at end of file diff --git a/sources/MAKEINIT b/sources/MAKEINIT index 3f939a04..b1cd3577 100644 --- a/sources/MAKEINIT +++ b/sources/MAKEINIT @@ -1,18 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "11-Jul-2022 20:00:23"  -{DSK}kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;3 54607 +(FILECREATED "30-Jul-2023 23:39:21" {DSK}frank>il>medley>gmedley>sources>MAKEINIT.;4 54459 - :CHANGES-TO (FNS I.FIXUPNUM I.FIXUPSYM) + :CHANGES-TO (FNS MAKEINITGREET) - :PREVIOUS-DATE "19-Jul-2021 23:50:29" -{DSK}kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;2) + :PREVIOUS-DATE "11-Jul-2022 20:00:23" {DSK}frank>il>medley>gmedley>sources>MAKEINIT.;1) -(* ; " -Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation. -") - (PRETTYCOMPRINT MAKEINITCOMS) (RPAQQ MAKEINITCOMS @@ -83,7 +77,7 @@ Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation. (DEFINEQ (MAKEINITGREET - [LAMBDA NIL (* ; "Edited 11-Mar-2021 22:14 by larry") + [LAMBDA NIL (* ; "Edited 11-Mar-2021 22:14 by larry") (* ; "Edited 5-Dec-2017 15:26 by rmk:") (* ;; "") @@ -96,9 +90,11 @@ Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation. (DORENAME 'I) (DORENAME 'R) (DLFIXINIT (MAKEINIT '(39424 5682 11008) - (MEDLEYDIR "tmp" "init.sysout" T) - NIL DIRECTORIES DISPLAYFONTDIRECTORIES) - (MEDLEYDIR "tmp" "init.dlinit" T]) + (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") + "/init.sysout") + NIL DIRECTORIES DISPLAYFONTDIRECTORIES) + (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") + "/init.dlinit"]) ) (FILESLOAD (SOURCE) @@ -1053,28 +1049,26 @@ DONTCOPY (GLOBALVARS DLPRIMARYMAP DLSECONDARYMAP DLLOCKBITS DLLASTDOMINOPAGE DLIFPAGE DLNEXTPM DLPAGEMAPFP FPTOVP NEWFPFROMOLD VMEMFILE VMEMFILEX) ) -(PUTPROPS MAKEINIT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991 - 1992 1998 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3971 4718 (MAKEINITGREET 3981 . 4716)) (4901 11286 (LOADMAKEINIT 4911 . 6114) ( -LOADMKIFILES 6116 . 6431) (RELOAD 6433 . 6916) (MAKEINIT 6918 . 10578) (MKI.START 10580 . 11284)) ( -11364 17082 (MKI.PASSFILE 11374 . 14984) (SCRATCHARRAY 14986 . 15635) (DOFORM 15637 . 16314) ( -CONSTFORMP 16316 . 16550) (NOTICECOMS 16552 . 16860) (EVALFORMAKEINIT 16862 . 17080)) (17083 19203 ( -I.ADDTOVAR 17093 . 17187) (I.DECLARE%: 17189 . 17465) (I.DEFINE-FILE-INFO 17467 . 17657) ( -I.FILECREATED 17659 . 18033) (I.PUTPROPS 18035 . 18148) (I.RPAQ 18150 . 18371) (I.RPAQQ 18373 . 18569) - (I.RPAQ? 18571 . 18786) (I.SETTOPVAL 18788 . 19020) (I.NOUNDO 19022 . 19201)) (19839 26055 ( -I.ATOMNUMBER 19849 . 20340) (I.\ATOMCELL 20342 . 22095) (I.FIXUPNUM 22097 . 23022) (I.FIXUPPTR 23024 - . 23505) (I.FIXUPSYM 23507 . 24563) (I.WORDSPERNAMEENTRY 24565 . 25320) (I.SETSTKNTOFFSET 25322 . -26053)) (26087 27595 (MKI.ATOM 26097 . 26293) (MKI.IEEE 26295 . 27593)) (27692 28457 (MKI.DSET 27702 - . 27985) (MKI.ADDTO 27987 . 28172) (MKI.PUTPROP 28174 . 28455)) (28631 29183 (DUMPVP 28641 . 28738) ( -BOUTZEROS 28740 . 28819) (BIN16 28821 . 29002) (BOUT16 29004 . 29181)) (30074 52808 (DLFIXINIT 30084 - . 31059) (DLSORTSYSOUTPAGES 31061 . 36187) (DLNEXTFP 36189 . 36526) (DLLOCKEDPAGEP 36528 . 36742) ( -DLSETLOCKBIT 36744 . 37006) (DLCOPYPAGEMAP 37008 . 40059) (DLCOPYVMPAGE 40061 . 40451) ( -DLADDPAGEMAPENTRIES 40453 . 41268) (ASSIGNFILEPAGE 41270 . 42503) (ASSIGNFILEPAGERANGE 42505 . 42912) -(DLDUMPSYSOUT 42914 . 44666) (DLDUMPFPTOVP 44668 . 45707) (DLDUMPPAGEMAPS 45709 . 46409) ( -DLDUMPVMEMPAGES 46411 . 47067) (DLSETBOOTPTR 47069 . 47299) (DLDUMPARRAY 47301 . 47688) ( -DLMARKASDUMPED 47690 . 48143) (DLDUMPVMEMPAGE 48145 . 48833) (INSTALLDOMINO 48835 . 49482) ( -INSTALLDOMINO.DIRECT 49484 . 50636) (INSTALLNEWDOMINO 50638 . 52806)) (52830 54187 (DLPRINTFPTOVP -52840 . 53129) (PRINTPRIMARYMAP 53131 . 53845) (DLREADPAGEOFWORDS 53847 . 54014) (SETDIF 54016 . 54185 + (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 ))))) STOP diff --git a/sources/MAKEINIT.LCOM b/sources/MAKEINIT.LCOM index 9342cf53044d7cee8dea0863ec487e3fbf2ca714..3af36c6cc762407e7110b8077c0296917c5dad86 100644 GIT binary patch delta 4778 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 AMF0Q*