From 71a2d7aac79d1d8d55e285360aefe77d61371633 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Sun, 30 Jul 2023 13:01:17 -0700 Subject: [PATCH 01/12] Fix bug in medley.sh wherein it was ignoring sysout argument --- scripts/medley/medley_args.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/medley/medley_args.sh b/scripts/medley/medley_args.sh index 7275d0db..11a7d868 100755 --- a/scripts/medley/medley_args.sh +++ b/scripts/medley/medley_args.sh @@ -158,7 +158,7 @@ do if [[ $# -eq 1 || "$2" = "--" ]]; then sysout_flag=true - sysout_arg="$2" + sysout_arg="$1" else err_msg=( "ERROR: sysout argument must be last argument" From 41f4489e9f7a1a5d949d8693fc2175948de3ea1b Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:15:16 -0700 Subject: [PATCH 02/12] LLREAD uses \INCCODE.EOLC instead of \INCCODE to coerce LF and CRLF to EOL(=CR) (#1300) --- sources/LLREAD | 37 +++++++++++++++++++------------------ sources/LLREAD.LCOM | Bin 22502 -> 22496 bytes 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sources/LLREAD b/sources/LLREAD index 606e9bd1..7733498f 100644 --- a/sources/LLREAD +++ b/sources/LLREAD @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "17-Jun-2023 13:12:06" {WMEDLEY}LLREAD.;104 90176 +(FILECREATED "30-Jul-2023 17:42:27" {WMEDLEY}LLREAD.;105 90277 :EDIT-BY rmk - :CHANGES-TO (VARS LLREADCOMS CHARACTERNAMES) + :CHANGES-TO (FNS \SUBREAD) - :PREVIOUS-DATE "19-Jul-2022 23:36:54" {WMEDLEY}LLREAD.;102) + :PREVIOUS-DATE "17-Jun-2023 13:12:06" {WMEDLEY}LLREAD.;104) (* ; " @@ -629,6 +629,7 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation. (\SUBREAD [LAMBDA (STRM SA READTYPE PNSTR CASEBASE EOF-SUPPRESS EOF-VALUE CHAR PRESERVE-WHITESPACE) + (* ; "Edited 30-Jul-2023 17:42 by rmk") (* ; "Edited 19-Jul-2022 23:36 by rmk") (* ; "Edited 6-Aug-2021 21:40 by rmk:") @@ -674,7 +675,7 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation. then (* ;  "caller specified eof-error-p of NIL. Happens only on top-level calls") (RETURN EOF-VALUE)) (* ; "By Skipping Separator Characters,Happens CHARSET-Mode Exchanging. (Solution of AR#114 in FX, edited by tt [Jan-22-'90])") - (repeatwhile (EQ [SETQ SNX (\SYNCODE SA (SETQ CH (\INCCODE STRM] + (repeatwhile (EQ [SETQ SNX (\SYNCODE SA (SETQ CH (\INCCODE.EOLC STRM] SEPRCHAR.RC)) (COND ((EQ CH CHAR) (* ; @@ -782,7 +783,7 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation. (if (AND EOF-POSSIBILITY (SETQ AT-EOF (\EOFP STRM))) then (* ; "EOF terminates atoms at top level") (GO FINISHATOM) - elseif (EQ [SETQ SNX (\SYNCODE SA (SETQ CH (\INCCODE STRM] + elseif (EQ [SETQ SNX (\SYNCODE SA (SETQ CH (\INCCODE.EOLC STRM] OTHER.RC) then (* ;  "normal case tested first--another vanilla constituent char, so keep accumulating atom chars") @@ -1663,17 +1664,17 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation. (PUTPROPS LLREAD COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 1991 1993 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3460 11904 (LASTC 3470 . 3776) (PEEKC 3778 . 4166) (PEEKCCODE 4168 . 4579) (RATOM 4581 - . 5662) (READ 5664 . 6224) (READC 6226 . 6867) (READCCODE 6869 . 7628) (READP 7630 . 8182) ( -SETREADMACROFLG 8184 . 8483) (SKIPSEPRCODES 8485 . 9565) (SKIPSEPRS 9567 . 9953) (SKREAD 9955 . 11902) -) (11950 20559 (CL:READ 11960 . 12509) (CL:READ-PRESERVING-WHITESPACE 12511 . 13233) ( -CL:READ-DELIMITED-LIST 13235 . 14150) (CL:PARSE-INTEGER 14152 . 20557)) (20652 33129 (RSTRING 20662 . -21394) (READ-EXTENDED-TOKEN 21396 . 25268) (\RSTRING2 25270 . 33127)) (33165 63779 (\TOP-LEVEL-READ -33175 . 35158) (\SUBREAD 35160 . 60195) (\SUBREADCONCAT 60197 . 60820) (\ORIG-READ.SYMBOL 60822 . -61890) (\ORIG-INVALID.SYMBOL 61892 . 62791) (\APPLYREADMACRO 62793 . 63209) (INREADMACROP 63211 . -63777)) (63938 64113 (READQUOTE 63948 . 64111)) (64138 76042 (READVBAR 64148 . 65479) (READHASHMACRO -65481 . 71291) (DEFMACRO-LAMBDA-LIST-KEYWORD-P 71293 . 71513) (DIGITBASEP 71515 . 72249) ( -READNUMBERINBASE 72251 . 74137) (ESTIMATE-DIMENSIONALITY 74139 . 74464) (SKIP.HASH.COMMENT 74466 . -75434) (CMLREAD.FEATURE.PARSER 75436 . 76040)) (76086 82430 (CHARACTER.READ 76096 . 77350) ( -CHARCODE.DECODE 77352 . 82428)) (82431 85601 (HEXNUM? 82441 . 84784) (OCTALNUM? 84786 . 85599))))) + (FILEMAP (NIL (3442 11886 (LASTC 3452 . 3758) (PEEKC 3760 . 4148) (PEEKCCODE 4150 . 4561) (RATOM 4563 + . 5644) (READ 5646 . 6206) (READC 6208 . 6849) (READCCODE 6851 . 7610) (READP 7612 . 8164) ( +SETREADMACROFLG 8166 . 8465) (SKIPSEPRCODES 8467 . 9547) (SKIPSEPRS 9549 . 9935) (SKREAD 9937 . 11884) +) (11932 20541 (CL:READ 11942 . 12491) (CL:READ-PRESERVING-WHITESPACE 12493 . 13215) ( +CL:READ-DELIMITED-LIST 13217 . 14132) (CL:PARSE-INTEGER 14134 . 20539)) (20634 33111 (RSTRING 20644 . +21376) (READ-EXTENDED-TOKEN 21378 . 25250) (\RSTRING2 25252 . 33109)) (33147 63880 (\TOP-LEVEL-READ +33157 . 35140) (\SUBREAD 35142 . 60296) (\SUBREADCONCAT 60298 . 60921) (\ORIG-READ.SYMBOL 60923 . +61991) (\ORIG-INVALID.SYMBOL 61993 . 62892) (\APPLYREADMACRO 62894 . 63310) (INREADMACROP 63312 . +63878)) (64039 64214 (READQUOTE 64049 . 64212)) (64239 76143 (READVBAR 64249 . 65580) (READHASHMACRO +65582 . 71392) (DEFMACRO-LAMBDA-LIST-KEYWORD-P 71394 . 71614) (DIGITBASEP 71616 . 72350) ( +READNUMBERINBASE 72352 . 74238) (ESTIMATE-DIMENSIONALITY 74240 . 74565) (SKIP.HASH.COMMENT 74567 . +75535) (CMLREAD.FEATURE.PARSER 75537 . 76141)) (76187 82531 (CHARACTER.READ 76197 . 77451) ( +CHARCODE.DECODE 77453 . 82529)) (82532 85702 (HEXNUM? 82542 . 84885) (OCTALNUM? 84887 . 85700))))) STOP diff --git a/sources/LLREAD.LCOM b/sources/LLREAD.LCOM index 7783332caf0886aa1300db1043dc3fab7cc5a896..d2947fa369c44cd43efcb9af7940d5d008d39de5 100644 GIT binary patch delta 256 zcmaF1p7FtY#tGrV#s<1xr8&Ar21dpThUQi#Mpi}>v-ImtH5Is&j4TmyMut`<=2pfQ zN(xCusmb}d1(`XiDGI3-1x3ZGRthn}p-w@rjxGwBc?wEyp*}te$a?kk^pq4*5=(#@ zuo-G%rliTG;pXY%>I^g^#MMPXNd$|t%qOpBlw&tlurx3-H=pd!C@t&e7p%YqvszQZ sDj>);%+o(KSl0z;%488n)6M4?RrFc)T>X8VCx0@S0byKNkcq5!maaxbGHn}Vf*p}E=QKt^fTFvp-^E(ISSpb8gff8SsQ zXAj39N9PdNAU{W6*I-QrtAHTaFi-!`U|koW89*Z}f!@jidCN$_$k@u*%*xbc@_a@) VMx)L97*+HqKR1}Mxy3L>4FE7FM^FF& From e4c3a16ce497f45dbfcbd62056d7ac970298b1c7 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Mon, 31 Jul 2023 00:42:23 -0700 Subject: [PATCH 03/12] 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* From 5b3cf9b7d58848e89da06c69081a6e7bf9e73931 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Mon, 31 Jul 2023 01:07:39 -0700 Subject: [PATCH 04/12] Add new files left out from last commit; add RDSYS to library as part of loadups-all --- scripts/copy-all.sh | 3 +++ scripts/copy-db.sh | 12 +++++++++++ scripts/loadup-db-from-full.sh | 17 +++++++++++++++ scripts/loadup-setup.sh | 38 ++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100755 scripts/copy-db.sh create mode 100755 scripts/loadup-db-from-full.sh create mode 100644 scripts/loadup-setup.sh diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh index 3831f10f..6c1f9053 100755 --- a/scripts/copy-all.sh +++ b/scripts/copy-all.sh @@ -26,3 +26,6 @@ fi ./scripts/cpv ${LOADUP_WORKDIR}/full.dribble loadups ./scripts/cpv ${LOADUP_WORKDIR}/whereis.dribble loadups +./scripts/cpv ${LOADUP_WORKDIR}/RDSYS library +./scripts/cpv ${LOADUP_WORKDIR}/RDSYS.LCOM library + diff --git a/scripts/copy-db.sh b/scripts/copy-db.sh new file mode 100755 index 00000000..25044ad1 --- /dev/null +++ b/scripts/copy-db.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ ! -x run-medley ] ; then + echo run from MEDLEYDIR + exit 1 +fi + +. scripts/loadup-setup.sh + +./scripts/cpv ${LOADUP_WORKDIR}/fuller.database loadups +./scripts/cpv ${LOADUP_WORKDIR}/fuller.dribble loadups + diff --git a/scripts/loadup-db-from-full.sh b/scripts/loadup-db-from-full.sh new file mode 100755 index 00000000..b1793a11 --- /dev/null +++ b/scripts/loadup-db-from-full.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +if [ ! -x run-medley ] ; then + echo run from MEDLEYDIR + exit 1 +fi + +. scripts/loadup-setup.sh + +DBCM="${LOADUP_WORKDIR}"/db.cm + +echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > ${DBCM} + +./run-medley $scr -loadup "${DBCM}" -full + +loadup_finish "loadup-db" "fuller.database" "fuller*" + diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh new file mode 100644 index 00000000..194bde91 --- /dev/null +++ b/scripts/loadup-setup.sh @@ -0,0 +1,38 @@ + +export MEDLEYDIR=`pwd` + +# echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%${LOADUP_WORKDIR}=============" + +if [ -z "${LOADUP_WORKDIR}" ]; +then + export LOADUP_WORKDIR=/tmp/loadups-$$ +fi + +mkdir -p "${LOADUP_WORKDIR}" + +scr="-sc 1024x768 -g 1042x790" + +touch "${LOADUP_WORKDIR}"/loadup.timestamp + +loadup_finish () { + echo "===== ${1}" + if [ "${LOADUP_WORKDIR}/${2}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ]; + then + echo "+++++ SUCCESS +++++" + exit_code=0 + else + echo "----- FAILURE -----" + exit_code=1 + fi + echo "===== files created ======" + shift; shift + for f in ${*}; + do + ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null + done + echo "=======================================" + exit ${exit_code} +} + + + From ca3280f8946dc0596fb70ec9fa46600a02850d13 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Tue, 1 Aug 2023 12:08:55 -0700 Subject: [PATCH 05/12] WIP updating loadups scripts --- internal/MEDLEY-UTILS | 28 +++++++++++++++------------- internal/MEDLEY-UTILS.LCOM | Bin 7036 -> 7148 bytes scripts/cpv | 28 +++++++++++++++++++--------- scripts/loadup-apps-from-full.sh | 4 +++- scripts/loadup-aux.sh | 14 ++++++++++++-- scripts/loadup-full-from-lisp.sh | 2 ++ scripts/loadup-init.sh | 2 ++ scripts/loadup-lisp-from-mid.sh | 2 ++ scripts/loadup-mid-from-init.sh | 4 +++- scripts/loadup-setup.sh | 14 +++++++++----- sources/LOADUP-FULL | 12 +++++------- sources/LOADUP-FULL.CM | 2 +- sources/LOADUP-FULL.LCOM | Bin 3665 -> 3505 bytes sources/LOADUP-LISP | 13 ++++++------- sources/LOADUP-LISP.CM | 2 +- sources/LOADUP-LISP.LCOM | Bin 3566 -> 3508 bytes 16 files changed, 80 insertions(+), 47 deletions(-) diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS index abf4d00e..c4c6c9ca 100644 --- a/internal/MEDLEY-UTILS +++ b/internal/MEDLEY-UTILS @@ -1,12 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10) -(FILECREATED "23-May-2023 07:10:58" |{DSK}larry>il>medley>internal>MEDLEY-UTILS.;12| 10354 +(FILECREATED "31-Jul-2023 18:34:20" |{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;3| 10550 - :EDIT-BY "lmm" + :CHANGES-TO (FNS MAKE-WHEREIS-HASH) - :CHANGES-TO (FNS GATHER-INFO) - - :PREVIOUS-DATE "22-May-2023 22:57:21" |{DSK}larry>il>medley>internal>MEDLEY-UTILS.;11|) + :PREVIOUS-DATE "31-Jul-2023 18:07:23" +|{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;2|) (PRETTYCOMPRINT MEDLEY-UTILSCOMS) @@ -156,24 +155,27 @@  "Edited September 29, 1986 by van Melle") (CNDIR (MEDLEYDIR "sources")) (LOAD 'FILESETS) - (GATHEREXPORTS EXPORTFILES (MEDLEYDIR "tmp" "exports.all" T)))) + (GATHEREXPORTS EXPORTFILES (CONCAT '{DSK} (UNIX-GETENV "LOADUP_WORKDIR") + "/" "exports.all")))) (MAKE-WHEREIS-HASH - (LAMBDA NIL (* \; "Edited 12-Mar-2022 12:46 by rmk") + (LAMBDA (DRIBBLEFILE) (* \; "Edited 12-Mar-2022 12:46 by rmk") (* \; "Edited 24-Mar-2021 13:26 by larry") (LET ((FILING.ENUMERATION.DEPTH 2) HASHFILE) - (DRIBBLE (MEDLEYDIR "tmp" "whereis.dribble" T)) - (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (MEDLEYDIR "tmp" "whereis.hash-tmp" T) + (DRIBBLE DRIBBLEFILE) + (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") + "/" "whereis.hash-tmp") :FILES (|for| X |in| MEDLEY-FIX-DIRS |collect| (CONCAT (MEDLEYDIR X) "*.;")) :HASH-FILE-SIZE 60000 :NEW T)) - (RENAMEFILE HASHFILE (MEDLEYDIR "tmp" "whereis.hash" T)) + (RENAMEFILE HASHFILE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") + "/" "whereis.hash")) (DRIBBLE)))) ) (DECLARE\: DONTCOPY - (FILEMAP (NIL (624 7499 (GATHER-INFO 634 . 6162) (MAKE-FULLER-DB 6164 . 6854) (MEDLEY-FIX-LINKS 6856 - . 7253) (MEDLEY-FIX-DATES 7255 . 7497)) (8538 10331 (MAKE-EXPORTS-ALL 8548 . 9507) (MAKE-WHEREIS-HASH - 9509 . 10329))))) + (FILEMAP (NIL (623 7498 (GATHER-INFO 633 . 6161) (MAKE-FULLER-DB 6163 . 6853) (MEDLEY-FIX-LINKS 6855 + . 7252) (MEDLEY-FIX-DATES 7254 . 7496)) (8537 10527 (MAKE-EXPORTS-ALL 8547 . 9575) (MAKE-WHEREIS-HASH + 9577 . 10525))))) STOP diff --git a/internal/MEDLEY-UTILS.LCOM b/internal/MEDLEY-UTILS.LCOM index f4ccfed11a663695d6512a233e5e72a74bb90390..acc62cc9a2efcc4c6fc909397450126bcadb30e3 100644 GIT binary patch delta 863 zcmaKqUvJV-7{*~5|I{S|h3#&>Yhr|p;yL{Tv@vL*XHbC_+wwKxIdYTY0_vDSo@rV}y=M_Oz z1hjPT#t$dm(Q#qm6^3rlbKe(^mLGQ)!aNP^+6|OfaGr(v?A3U9;@$7fVLlkmfnn7~ z!-k9EOeRBhz3$AVqDyReflV{1eZ59X7Ev9dt&8pj@pwc{PBpvw;bDI~bPN9o3JgY) zgg_}(RHIC6&M_giZ`e>*tAuM;h(&aptEhG*4NAizE!}L|oJPm4PgPJ(q0xZ(@6>Zl zgVD^LjFw;GQT{Bk@#1#$k^efed*vt+@eg9#+06)jnBWzQq_POgsuLvXG)&8}L6V?k z8YR^M5kb??J6xGK#Ax~75>ONngj)laAz)+^$ELV|?#R0DPR5hjG}HAw7DNfy2P_Em zQ!`bq**IvMR#nq2|5mcKr2_)Z(u>6!30(Y_$(=i&uSFwKZzCR$KE4@b8~;ul-SodE zZT~Q~wfLL+#(8)w$}1nhq6ii-)Ou(MSddqHU|zhq2w;?hPN}9SVF4U%z%U)XL?HX; ziX=mwXf^VTCJs0RL>3eYFReMP##0Cw(V`8~2AKyX=#&d~<81vo32-POuK*SnL}1_c z-HAJxX8PS}p9RdzAumk1t^uQmnCefp>-2A9AuIadxA*oaTOKi&Xescpp|kkT@zq~D CNZbbi delta 823 zcmZuv%Wl&^6m_DiqJag4M%}?>HY5v2o^hPV2n9LzxUq1YV7pCtp2Ked3{7=u|2pJi9}?OsuW99seSdI z9t49hylzZ_M%>FhxxpkV0wQFCB@!(wRFV)x!_dE+PZyKGA4QOhF2{q}mA|ABoTy%l zIihJB9f&5g2#|4VS+Gr0DwR0HXs}9lcL|hHF;}P=ro}XesUFigYKLV`@X)>11w{3 zn60*1;sY@GqrvHU{Wa)o7NtG@Aed;nqTTUKjX_lctz&Dd2Nh|P=&yJ{ltknrRUum_ zo)b$LsLgs%mw~oax5WclOmxjR40vZWtt9CK^F{P-?1%njSsD+PV+0uUj(8;qDoXtF a_!*>kT;AYD;bb@rd<69rc>C%2?cQ(byUT+B diff --git a/scripts/cpv b/scripts/cpv index 29fc5604..7f0e7ece 100755 --- a/scripts/cpv +++ b/scripts/cpv @@ -4,6 +4,13 @@ # could extend with -r or copying multiple files # could change from cp to ln +ln_or_cp () { + f=$(df $(dirname $1) | tail -1 | awk '{ print $1 }') + d=$(df $(dirname $2) | tail -1 | awk '{ print $1 }') + if [ "$f" != "$d" ]; then cmd="cp -p"; else cmd="ln"; fi + echo $cmd +} + file="$1" dest="$2" @@ -18,9 +25,15 @@ if [ -d "$dest" ]; then dest=$dest/`basename $file` fi +# if (the new) $dest is a directory, then just bail +if [ -d "$dest" ]; then + echo "Error: destination file ($dest) is a directory. Exiting." + exit 1 +fi + # if no such file $dest then just copy if [ ! -f "$dest" ]; then - ln $file $dest #WAS cp -p $file $dest + $(ln_or_cp $file $dest) $file $dest exit 0 fi @@ -41,7 +54,7 @@ if [ $max -eq 0 ]; then # no current versions new=2 else if cmp -q $dest $dest.~$max~ >/dev/null 2>&1 - then # they're different + then # they're different max=`expr $max + 1` # make newer version mv $dest $dest.~$max~ new=`expr $max + 1` @@ -51,11 +64,8 @@ else fi fi -# make new version +# make new version and link it -ln $file $dest.~$new~ # cp -p $file $dest.~$new~ -ln $dest.~$new~ $dest # and link it - - - - +$(ln_or_cp $file $dest.~new~) $file $dest.~$new~ +rm -f $dest +ln $dest.~$new~ $dest diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh index a00d54f0..d7b6cb7d 100755 --- a/scripts/loadup-apps-from-full.sh +++ b/scripts/loadup-apps-from-full.sh @@ -7,6 +7,8 @@ fi . scripts/loadup-setup.sh +loadup_start "loadup-apps-from-full" + export ROOMSDIR=${MEDLEYDIR}/rooms export CLOSDIR=${MEDLEYDIR}/clos @@ -21,7 +23,7 @@ if [ ! -e ${NOTECARDSDIR} ]; then fi fi -./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_TMP}/full.sysout" +./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_WORKDIR}/full.sysout" loadup_finish "loadup-apps-from-full" "apps.sysout" "apps.*" diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh index 5dffc2e1..f0abfb47 100755 --- a/scripts/loadup-aux.sh +++ b/scripts/loadup-aux.sh @@ -7,8 +7,18 @@ fi . scripts/loadup-setup.sh -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 +loadup_start "loadup-aux" -./run-medley $scr -loadup "${LOADUP_WORKDIR}/loadup-aux.cm ${LOADUP_WORKDIR}/full.sysout +cat >"${LOADUP_WORKDIR}"/loadup-aux.cm <<"EOF" +" + (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:LOGOUT T) +" +EOF + +./run-medley $scr -loadup "${LOADUP_WORKDIR}"/loadup-aux.cm "${LOADUP_WORKDIR}"/full.sysout loadup_finish "loadup-aux" "whereis.hash" "whereis.hash" "exports.all" diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh index 509d5111..351ab260 100755 --- a/scripts/loadup-full-from-lisp.sh +++ b/scripts/loadup-full-from-lisp.sh @@ -7,6 +7,8 @@ fi . scripts/loadup-setup.sh +loadup_start "loadup-full-from-lisp" + ./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "${LOADUP_WORKDIR}/lisp.sysout" loadup_finish "loadup-full-from-lisp" "full.sysout" "full.*" diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh index 947f42af..4c7be321 100755 --- a/scripts/loadup-init.sh +++ b/scripts/loadup-init.sh @@ -7,6 +7,8 @@ fi . scripts/loadup-setup.sh +loadup_start "loadup-init" + ./run-medley $scr -loadup "${MEDLEYDIR}"/sources/LOADUP-INIT.LISP loadups/starter.sysout 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 222466f8..283b8ba6 100755 --- a/scripts/loadup-lisp-from-mid.sh +++ b/scripts/loadup-lisp-from-mid.sh @@ -7,6 +7,8 @@ fi . scripts/loadup-setup.sh +loadup_start "loadup-lisp-from-mid" + ./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" ${LOADUP_WORKDIR}/init-mid.sysout 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 afb12fa3..d5f4ff26 100755 --- a/scripts/loadup-mid-from-init.sh +++ b/scripts/loadup-mid-from-init.sh @@ -7,6 +7,8 @@ fi . scripts/loadup-setup.sh -./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit +loadup_start "loadup-mid-from-init" + +./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem ${LOADUP_WORKDIR}/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit loadup_finish "loadup-mid-from-init" "init-mid.sysout" "init-mid.sysout" diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh index 194bde91..2fca51be 100644 --- a/scripts/loadup-setup.sh +++ b/scripts/loadup-setup.sh @@ -1,8 +1,6 @@ export MEDLEYDIR=`pwd` -# echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%${LOADUP_WORKDIR}=============" - if [ -z "${LOADUP_WORKDIR}" ]; then export LOADUP_WORKDIR=/tmp/loadups-$$ @@ -14,8 +12,13 @@ scr="-sc 1024x768 -g 1042x790" touch "${LOADUP_WORKDIR}"/loadup.timestamp + +loadup_start () { + echo ">>>>> START ${1}" +} + loadup_finish () { - echo "===== ${1}" + local script_name=${1} if [ "${LOADUP_WORKDIR}/${2}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ]; then echo "+++++ SUCCESS +++++" @@ -24,13 +27,14 @@ loadup_finish () { echo "----- FAILURE -----" exit_code=1 fi - echo "===== files created ======" + echo "..... files created ....." shift; shift for f in ${*}; do ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null done - echo "=======================================" + echo "<<<<< END ${script_name}" + echo "" exit ${exit_code} } diff --git a/sources/LOADUP-FULL b/sources/LOADUP-FULL index 104dbbee..55171e07 100644 --- a/sources/LOADUP-FULL +++ b/sources/LOADUP-FULL @@ -1,10 +1,10 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "18-Jan-2023 16:23:36" {DSK}frank>il>medley>gmedley>sources>LOADUP-FULL.;2 4636 +(FILECREATED "31-Jul-2023 18:28:53" {DSK}frank>il>medley>gmedley>sources>LOADUP-FULL.;4 4521 :CHANGES-TO (FNS LOADUP-FULL) - :PREVIOUS-DATE "12-Aug-2022 12:30:09" {DSK}frank>il>medley>gmedley>sources>LOADUP-FULL.;1 + :PREVIOUS-DATE "18-Jan-2023 16:23:36" {DSK}frank>il>medley>gmedley>sources>LOADUP-FULL.;3 ) @@ -39,7 +39,7 @@ (PRINTOUT T "FULL fonts loaded" T]) (LOADUP-FULL - [LAMBDA NIL (* ; "Edited 18-Jan-2023 16:22 by FGH") + [LAMBDA (DRIBBLEFILE) (* ; "Edited 18-Jan-2023 16:22 by FGH") (* ; "Edited 12-Aug-2022 11:17 by lmm") (* ; "Edited 14-Jul-2022 12:32 by rmk") (* ; "Edited 12-Jul-2022 21:57 by rmk") @@ -55,9 +55,7 @@ (PROGN (SETQ MEDLEYDIR) (CNDIR (MEDLEYDIR))) (MEDLEY-INIT-VARS) - (SETQ MAKESYSFILENAME (MEDLEYDIR "tmp" "full.sysout" T)) - (SETQ MAKESYSNAME :MEDLEY) - (DRIBBLE (MEDLEYDIR "tmp" "full.dribble" T)) + (DRIBBLE DRIBBLEFILE) (* ;; "BKSYSBUF stops page holding ") @@ -88,5 +86,5 @@ (FIXMETA) (DECLARE%: DONTCOPY - (FILEMAP (NIL (467 4598 (LOADFULLFONTS 477 . 1918) (LOADUP-FULL 1920 . 4348) (FIXMETA 4350 . 4596))))) + (FILEMAP (NIL (467 4483 (LOADFULLFONTS 477 . 1918) (LOADUP-FULL 1920 . 4233) (FIXMETA 4235 . 4481))))) STOP diff --git a/sources/LOADUP-FULL.CM b/sources/LOADUP-FULL.CM index 3ba363d4..8ebb9a67 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 LOADUP_WORKDIR))(IL:L-CASE (QUOTE /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:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble)))) (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-FULL.LCOM b/sources/LOADUP-FULL.LCOM index 2db7026c038af6c2705c6700cec9fdbf4eb20cc1..518982003d573a98392da20b61201494ded38524 100644 GIT binary patch delta 638 zcmZuvO>fgc5RH4NND3!FRJ5Rng+x**k;m)LoJis|Z0p#T?I_AIN-CfPT7h#xg8l`9 ze+LH??)(PMTsd;&2e6Kkh_5|7y?Ha5eLJ&X4?i8eAKqZpJf6>*x~4Ob)7IU#W-p$f zTpA6if8{i%O^%9ua{l6C_F#%ey;3Pl&7~U@_e~cVzq=7dsv)SC)eXArEs=a;)+goif`5WCE51o0+3DU1yRa} zAWOqggkCg^L8gWv>UaZ58ABk_EFNSaomR3x2m(I}vlK+uwotQ>@gz2}Mg2IC?rmhE&m;K~6MZgcI+C8`&OnB_e6x33*(X9hj?ygcB_ht! sOfItDfX#}JSNB!Jh3d~|GtAD%)AJY*pQ-hi!&#kEE&@|@F6y$h zeA_wWH6YhDN_8gbTp^Gq^W&50vk^>YP$5PTL~uQ@(P$7D4b$=He+fiNYL%+(xK=x~ zjMy@72Ay{xDnx+gXLW;vq=-tE3T&I#jm2T!CI`lKk?K@ie%uq->bLM~qiO>M&*)gu zAj)%h4bK7_7&xYDHG!Si_uzv7r|<}fK8=D&ye@voLC z8kkOK9kpXW928SCG-xd{ zdV#0}CYlYJx@J`6BAH5|)j``@JsX-=LntzM7MeG}^dL5`F4@;geaNW>yZsk_-F3Rw zE{>+&xT*|VZQl!AoRmWBc$SZo;wlarry>il>medley>sources>LOADUP-LISP.;2| 5263 - - :EDIT-BY "lmm" +(FILECREATED "31-Jul-2023 18:22:53" |{DSK}frank>il>medley>gmedley>sources>LOADUP-LISP.;2| 5235 :CHANGES-TO (FNS LOADUP-LISP) - :PREVIOUS-DATE "12-Aug-2022 12:29:57" |{DSK}larry>il>medley>sources>LOADUP-LISP.;1|) + :PREVIOUS-DATE "27-Feb-2023 17:15:53" +|{DSK}frank>il>medley>gmedley>sources>LOADUP-LISP.;1|) (PRETTYCOMPRINT LOADUP-LISPCOMS) @@ -19,13 +18,13 @@ (DEFINEQ (LOADUP-LISP - (LAMBDA NIL (* \; "Edited 26-Feb-2023 12:17 by lmm") + (LAMBDA (DRIBBLEFILE) (* \; "Edited 26-Feb-2023 12:17 by lmm") (* \; "Edited 13-Jul-2022 14:09 by rmk") (* \; "Edited 4-Mar-2022 19:13 by larry") (* \; "Edited 29-Apr-2021 22:30 by rmk:") (SETQQ COMPILE.EXT LCOM) (MEDLEY-INIT-VARS) (* \; "should be set earlier") - (DRIBBLE (MEDLEYDIR "tmp" "lisp.dribble" T)) + (DRIBBLE DRIBBLEFILE) (FOR X IN BOOTLOADEDFILES DO (CL:UNLESS (MEMB X SYSFILES) (PRINTOUT T X " bootloaded" T) (SETQ SYSFILES (CONS X SYSFILES)))) @@ -124,5 +123,5 @@ (GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST) ) (DECLARE\: DONTCOPY - (FILEMAP (NIL (654 5057 (LOADUP-LISP 664 . 5055))))) + (FILEMAP (NIL (649 5029 (LOADUP-LISP 659 . 5027))))) STOP diff --git a/sources/LOADUP-LISP.CM b/sources/LOADUP-LISP.CM index 150fb0ee..d08bdff7 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 LOADUP_WORKDIR))(IL:L-CASE (QUOTE /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(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble))) (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/LOADUP-LISP.LCOM b/sources/LOADUP-LISP.LCOM index 8e01adf6921b2a5f9bc93bd2c7f74f25e296318e..46a716e563eadef79e7c50efe17e315594777aa3 100644 GIT binary patch delta 1107 zcmaiy&rcIU6vydeC@f6~5itRRkD{?PX|wZY+in}vFzt?YZMT%&Mc`!6RwNc`NHtMw zdh$eKBoi+l{3r12-J1uaSN{UNnRs(Ht&BfN+{5g5-+tfs^CmN2=iko1T$`aJb>m?> zg$7a}Rsm^&7)PxO({~TH_wN^X+r_)z??J!oHU z_Mo@B-vd3)8Vw(QH>cBS>1%FxTheq&4AOW~Ph4|qyzFrnaQhzWyn+8uRgna zud~-Go;K&w8JYoIh)DWqZFW)rpM610X!BDJ7+`x&sZ`_P3}RVJoqHY8Mj|^S@;M(a z>veVWhxvIET{)K;0j-T-PLG+4RHDm=yOOojo?I_^yJ%%(z3kR}mw5s6D&Ze(e#`gFj4ZV_C{U0u28wSJE2Bi_pk54f4)o_?&JX=cm~&~8ggKk? sWuiEoe5A?#(O4zyufKR76owmDG;LCWP%DAj3Z6`dq^hIb+0Mllit5Bpuxh8lc4#Z6q>0){NmI22 z2?)x>!~(KdSeO}6k(e3T*eW4LCI(hko=M5IQt@#9@7=xsdw2IfF8*44b$^~RsoZW# zG)rY5OedKDz{wEcqZ~&$ zj&dC3ILdJpaptD&0zHEvi*gp;C^*Bv9RP&G2!|04BOFFJjBps?XCp*`;zqq{)&RW% z%d2@dFct7uC4lcd5~>2OHFS$0tK%1tvlufSYumIvK%3D-va8q^4-C)8R#WgWuCZ?U z+kVw>@zDqaeY6h`%AkZ@LICrvQn2CKmJcMWU6^YsU~(Bd)`zQkjZYLU{CP#3RI)U@ zHuYvM&mdK_D@8kSjhdeZnX&NG)N($D@sjKKuHglSSBX~CQRu8=FrZ*ytK>-5R^S;} zHpnsy=i-?KtT0vd*3Hc-?!wYjf$dr-vn+fV7X^)l!}u*B&%$?c5D@q|J}=~0cpCq5 zJ%SjfX?S*UFAY>-;fHBcK;PffrvhQ&*O|3Riav9RLgeEoUPM0M5-X9R+BMETO}nm}3DpIutXX&^$g-#_m58?AOrL=1@C&e1`pb=YY(yKNDB1;pdt K!O7d%h1ehet16=a From 1c077d1b3d724cd68aefea51630bc20ac22ccb93 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Tue, 1 Aug 2023 22:59:01 -0700 Subject: [PATCH 06/12] First full pass at loadups revamp. --- internal/MEDLEY-UTILS | 23 +++++++++++---------- internal/MEDLEY-UTILS.LCOM | Bin 7148 -> 7317 bytes scripts/copy-all.sh | 27 ++++++++++++++----------- scripts/copy-db.sh | 9 +++++++-- scripts/cpv | 7 ++++--- scripts/loadup-apps-from-full.sh | 33 ++++++++++++++++++++++++++++--- scripts/loadup-aux.sh | 8 ++++---- scripts/loadup-db-from-full.sh | 17 ++++++++++++---- scripts/loadup-full-from-lisp.sh | 24 +++++++++++++++++++--- scripts/loadup-full.sh | 11 +++++------ scripts/loadup-init.sh | 27 ++++++++++++++++++++++--- scripts/loadup-lisp-from-mid.sh | 24 +++++++++++++++++++--- scripts/loadup-mid-from-init.sh | 18 ++++++++++++++--- scripts/loadup-setup.sh | 15 ++++++++++---- 14 files changed, 184 insertions(+), 59 deletions(-) diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS index c4c6c9ca..47d52d5e 100644 --- a/internal/MEDLEY-UTILS +++ b/internal/MEDLEY-UTILS @@ -1,11 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10) -(FILECREATED "31-Jul-2023 18:34:20" |{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;3| 10550 +(FILECREATED " 1-Aug-2023 22:43:13" |{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5| 10714 - :CHANGES-TO (FNS MAKE-WHEREIS-HASH) + :CHANGES-TO (FNS MAKE-FULLER-DB) - :PREVIOUS-DATE "31-Jul-2023 18:07:23" -|{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;2|) + :PREVIOUS-DATE " 1-Aug-2023 22:22:02" +|{DSK}frank>il>medley>gmedley>internal>MEDLEY-UTILS.;4|) (PRETTYCOMPRINT MEDLEY-UTILSCOMS) @@ -105,14 +105,17 @@ (* \; "Edited 20-Jun-2022 17:23 by larry") (FILESLOAD (SOURCE) FILESETS) - (DRIBBLE (MEDLEYDIR "tmp" "fuller.dribble" T T)) + (DRIBBLE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") + "/" "fuller.dribble")) (DOFILESLOAD (SUBSET (APPEND OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL) 'FINDFILE)) (GATHER-INFO 'ALL) (MASTERSCOPE '(WHO CALLS XYZZY)) - (DUMPDATABASE NIL (MKATOM (MEDLEYDIR "tmp" "fuller.database" T T))) + (DUMPDATABASE NIL (MKATOM (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") + "/" "fuller.database"))) (DRIBBLE) - (MAKESYS (MEDLEYDIR "tmp" "fuller.sysout" T T) + (MAKESYS (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") + "/" "fuller.sysout") "Welcome to Fuller sysout"))) (MEDLEY-FIX-LINKS @@ -175,7 +178,7 @@ (DRIBBLE)))) ) (DECLARE\: DONTCOPY - (FILEMAP (NIL (623 7498 (GATHER-INFO 633 . 6161) (MAKE-FULLER-DB 6163 . 6853) (MEDLEY-FIX-LINKS 6855 - . 7252) (MEDLEY-FIX-DATES 7254 . 7496)) (8537 10527 (MAKE-EXPORTS-ALL 8547 . 9575) (MAKE-WHEREIS-HASH - 9577 . 10525))))) + (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))))) STOP diff --git a/internal/MEDLEY-UTILS.LCOM b/internal/MEDLEY-UTILS.LCOM index acc62cc9a2efcc4c6fc909397450126bcadb30e3..4a353503f00571c86078e35bfd0c85c18b11ca6d 100644 GIT binary patch delta 773 zcmZva&2G~`5XWl{m6`*JPzB^R@+lFr@vgsOBMzJFrm^DK#&(*fDndzP5K^*MM5#wm@G79Tvb|JnJ?f9?Ha|8jo5I|ib#-k$4;R^Z_1_Ltu9d1S&lk;DuvG8|n>I6vp4X+fN9GDj zM6-#J|BznLR?qiEtnfw++$a{OUf4?%j)+GDG_Fw@O1Ue&k&K(eC+(-wZ620i=C7U~ z=U>b3H}SSyDdKv1fKRD-l@F>^v!Tm6A{pSR92=Tp&}1o)I)z@~ohc_G6~QSG%LX2M zjfO8Ur@(vN2(7RNOHeS8(P3%W#guLly1kE}1SciwTEs~+jIfOmIALiU&*%lM5Qs*A zhsBpl{E%_5O=x)mF9fhGxVT_ZBmz#sB0CFnw_+Gum%4Lrgc^H3)(&F-&A>lHGz*yT zV+ME$K<;Og%juU47E@>~CzEUj^KbL%a)Fn@!SctArf#*m4f1QO*%%Agz34+fj62+m z3lST>^Q3cyxq%xt&Fh(pw`DjQ&NI1$I_@a|I>tu;icR+bVnMav4xx!|6F3{3pATxF g8(T}`+2_${lF2}wJ0gY$z+xO6-Vtx6&#sRC0@H88UH||9 delta 659 zcmZuu(Q4Z;6s^0L#f%ZQ!Pddx;wSsTL9%RD_Sl0GDYaK8_N-)GN?#I^K_I20Ngf7a z`Gpm;uh?UMqo2}`sFXG(tkc8g>KvVOuB1QF?cwh)ZwPijFK4cYJOY@;#E%KOnsg7y z$^q*i644mbtD6J4i#Hk#3s&RdVlrO+PvH^EG3|DmiB>6CPw*#)RHlb2YJ94Z6_^+W z0jho(Z-bLWlp>XG!ert=T$JK#n)jv4mCF+obQr57Fss=3Xn5Dp_LG;!-zuxW+n#2LXX}6sNrNDFjR5HsM zhtPv|+T|L6fWX-qD+p#HSv~lw?}!MnEK?2OkW}c^hjoC# z`o5gaCYO!*&-ul2VW~TYU@gvns18SutorHUXgHr})Zg-mfPIqW&{D1vz70-K2aXB5 cs>|tUG}EH3#s}M$dB1E4M~!xEzdo>>>> START ${script_name}" + # 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 ${LOADUP_WORKDIR}/full.sysout loadups -./scripts/cpv ${LOADUP_WORKDIR}/lisp.sysout loadups +./scripts/cpv "${LOADUP_WORKDIR}"/full.sysout loadups +./scripts/cpv "${LOADUP_WORKDIR}"/lisp.sysout loadups if [ "${1}" = "-apps" ]; then - ./scripts/cpv ${LOADUP_WORKDIR}/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}"/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 +./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 -./scripts/cpv ${LOADUP_WORKDIR}/RDSYS library -./scripts/cpv ${LOADUP_WORKDIR}/RDSYS.LCOM library +./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS library +./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS.LCOM library +echo "<<<<< END ${script_name}" +echo "" +exit 0 diff --git a/scripts/copy-db.sh b/scripts/copy-db.sh index 25044ad1..4c22b420 100755 --- a/scripts/copy-db.sh +++ b/scripts/copy-db.sh @@ -7,6 +7,11 @@ fi . scripts/loadup-setup.sh -./scripts/cpv ${LOADUP_WORKDIR}/fuller.database loadups -./scripts/cpv ${LOADUP_WORKDIR}/fuller.dribble loadups +echo ">>>>> START ${script_name}" +./scripts/cpv "${LOADUP_WORKDIR}"/fuller.database loadups +./scripts/cpv "${LOADUP_WORKDIR}"/fuller.dribble loadups + +echo "<<<<< END ${script_name}" +echo "" +exit 0 diff --git a/scripts/cpv b/scripts/cpv index 7f0e7ece..4d84e663 100755 --- a/scripts/cpv +++ b/scripts/cpv @@ -2,7 +2,6 @@ # cpv file dest # could extend with -r or copying multiple files -# could change from cp to ln ln_or_cp () { f=$(df $(dirname $1) | tail -1 | awk '{ print $1 }') @@ -14,9 +13,8 @@ ln_or_cp () { file="$1" dest="$2" - if [ ! -f "$file" ]; then - echo no such file "$file" + echo "Error: no such file "$file". Exiting." exit 1 fi @@ -34,6 +32,7 @@ fi # if no such file $dest then just copy if [ ! -f "$dest" ]; then $(ln_or_cp $file $dest) $file $dest + echo "Added $(basename $dest) to $(dirname $dest)" exit 0 fi @@ -67,5 +66,7 @@ fi # make new version and link it $(ln_or_cp $file $dest.~new~) $file $dest.~$new~ +echo "Added $(basename $dest.~$new~) to $(dirname $dest.~$new~)" rm -f $dest ln $dest.~$new~ $dest +echo "Linked $(basename $dest) to $(basename $dest.~$new~) in $(dirname $dest)" diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh index d7b6cb7d..c4ba2e47 100755 --- a/scripts/loadup-apps-from-full.sh +++ b/scripts/loadup-apps-from-full.sh @@ -7,7 +7,7 @@ fi . scripts/loadup-setup.sh -loadup_start "loadup-apps-from-full" +loadup_start export ROOMSDIR=${MEDLEYDIR}/rooms export CLOSDIR=${MEDLEYDIR}/clos @@ -23,8 +23,35 @@ if [ ! -e ${NOTECARDSDIR} ]; then fi fi -./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_WORKDIR}/full.sysout" +cat >"${cmfile}" <<"EOF" +" -loadup_finish "loadup-apps-from-full" "apps.sysout" "apps.*" +(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) +" +EOF +./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/full.sysout" + +loadup_finish "apps.sysout" "apps.*" diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh index f0abfb47..4a48f779 100755 --- a/scripts/loadup-aux.sh +++ b/scripts/loadup-aux.sh @@ -7,9 +7,9 @@ fi . scripts/loadup-setup.sh -loadup_start "loadup-aux" +loadup_start -cat >"${LOADUP_WORKDIR}"/loadup-aux.cm <<"EOF" +cat >"${cmfile}" <<"EOF" " (IL:MEDLEY-INIT-VARS) (IL:LOAD(QUOTE MEDLEY-UTILS)) @@ -19,6 +19,6 @@ cat >"${LOADUP_WORKDIR}"/loadup-aux.cm <<"EOF" " EOF -./run-medley $scr -loadup "${LOADUP_WORKDIR}"/loadup-aux.cm "${LOADUP_WORKDIR}"/full.sysout +./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}"/full.sysout -loadup_finish "loadup-aux" "whereis.hash" "whereis.hash" "exports.all" +loadup_finish "whereis.hash" "whereis.hash" "exports.all" diff --git a/scripts/loadup-db-from-full.sh b/scripts/loadup-db-from-full.sh index b1793a11..c972491a 100755 --- a/scripts/loadup-db-from-full.sh +++ b/scripts/loadup-db-from-full.sh @@ -7,11 +7,20 @@ fi . scripts/loadup-setup.sh -DBCM="${LOADUP_WORKDIR}"/db.cm +loadup_start -echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > ${DBCM} +cat >"${cmfile}" <<"EOF" +" -./run-medley $scr -loadup "${DBCM}" -full +(IL:MEDLEY-INIT-VARS) +(IL:FILESLOAD MEDLEY-UTILS) +(IL:MAKE-FULLER-DB) +(IL:LOGOUT T) -loadup_finish "loadup-db" "fuller.database" "fuller*" +" +EOF + +./run-medley ${scr} -loadup "${cmfile}" -full + +loadup_finish "fuller.database" "fuller*" diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh index 351ab260..6c027ec4 100755 --- a/scripts/loadup-full-from-lisp.sh +++ b/scripts/loadup-full-from-lisp.sh @@ -7,9 +7,27 @@ fi . scripts/loadup-setup.sh -loadup_start "loadup-full-from-lisp" +loadup_start -./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "${LOADUP_WORKDIR}/lisp.sysout" +cat >"${cmfile}" <<"EOF" +" -loadup_finish "loadup-full-from-lisp" "full.sysout" "full.*" +(PROGN + (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM))) + (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble)))) + (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) +) + +" +EOF + +./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/lisp.sysout" + +loadup_finish "full.sysout" "full.*" diff --git a/scripts/loadup-full.sh b/scripts/loadup-full.sh index a3a06fe1..a49fdd5a 100755 --- a/scripts/loadup-full.sh +++ b/scripts/loadup-full.sh @@ -1,15 +1,14 @@ #!/bin/sh -export MEDLEYDIR=`pwd` - if [ ! -x run-medley ] ; then echo must run from MEDLEYDIR ; exit 1 ; fi +. ./scripts/loadup-setup.sh - ./scripts/loadup-init.sh && \ - ./scripts/loadup-mid-from-init.sh && \ - ./scripts/loadup-lisp-from-mid.sh && \ - ./scripts/loadup-full-from-lisp.sh +./scripts/loadup-init.sh && \ +./scripts/loadup-mid-from-init.sh && \ +./scripts/loadup-lisp-from-mid.sh && \ +./scripts/loadup-full-from-lisp.sh diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh index 4c7be321..e08f8ad5 100755 --- a/scripts/loadup-init.sh +++ b/scripts/loadup-init.sh @@ -7,8 +7,29 @@ fi . scripts/loadup-setup.sh -loadup_start "loadup-init" +loadup_start -./run-medley $scr -loadup "${MEDLEYDIR}"/sources/LOADUP-INIT.LISP loadups/starter.sysout +cat >"${cmfile}" <<"EOF" +(* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh") -loadup_finish "loadup-init" "init.dlinit" "init.*" "RDSYS*" "I-NEW*" +(LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM")) +(CNDIR (UNIX-GETENV "LOADUP_WORKDIR")) +(DRIBBLE "init.dribble") + +(UNADVISE) +(ADVISE 'PAGEFULLFN '(RETURN)) +(ADVISE '(ERROR IN \DO-DEFINE-FILE-INFO) '(RETURN)) +(MOVD? 'NILL 'SETTEMPLATE) +(DEFINEQ (RRE (LAMBDA (X Y) Y))) +(MOVD? 'RRE 'READ-READER-ENVIRONMENT) + +(LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM")) +(MAKEINITGREET) +(DRIBBLE) +(LOGOUT T) +STOP +EOF + +./run-medley $scr -loadup "${cmfile}" loadups/starter.sysout + +loadup_finish "init.dlinit" "init.*" "RDSYS*" "I-NEW*" diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh index 283b8ba6..7233f85b 100755 --- a/scripts/loadup-lisp-from-mid.sh +++ b/scripts/loadup-lisp-from-mid.sh @@ -7,8 +7,26 @@ fi . scripts/loadup-setup.sh -loadup_start "loadup-lisp-from-mid" +loadup_start -./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" ${LOADUP_WORKDIR}/init-mid.sysout +cat >"${cmfile}" <<"EOF" +" -loadup_finish "loadup-lisp-from-mid" "lisp.sysout" "lisp.*" +(PROGN + (LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM))) + (LOADUP-LISP(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble))) + (HARDRESET) +) +SHH +(PROGN + (IL:ENDLOADUP) + (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout))) :LISP) + (IL:LOGOUT T) +) + +" +EOF + +./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/init-mid.sysout" + +loadup_finish "lisp.sysout" "lisp.*" diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh index d5f4ff26..7efc13e4 100755 --- a/scripts/loadup-mid-from-init.sh +++ b/scripts/loadup-mid-from-init.sh @@ -7,8 +7,20 @@ fi . scripts/loadup-setup.sh -loadup_start "loadup-mid-from-init" +loadup_start -./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem ${LOADUP_WORKDIR}/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit +cat >"${cmfile}" <<"EOF" +" +(MOVD? (QUOTE NILL) (QUOTE PROMPTPRINT)) +(MOVD? (QUOTE NILL) (QUOTE CURSORP)) +(MOVD? (QUOTE NILL) (QUOTE CHANGEBACKGROUNDBORDER)) +(LOGOUT) +" +EOF -loadup_finish "loadup-mid-from-init" "init-mid.sysout" "init-mid.sysout" +./run-medley -prog "ldeinit" \ + -NF \ + -loadup "${cmfile}" ${scr} -vmem "${LOADUP_WORKDIR}/init-mid.sysout" \ + "${LOADUP_WORKDIR}/init.dlinit" + +loadup_finish "init-mid.sysout" "init-mid.sysout" diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh index 2fca51be..98e15150 100644 --- a/scripts/loadup-setup.sh +++ b/scripts/loadup-setup.sh @@ -12,14 +12,20 @@ scr="-sc 1024x768 -g 1042x790" touch "${LOADUP_WORKDIR}"/loadup.timestamp +script_name=$(basename "$0" ".sh") +cmfile="${LOADUP_WORKDIR}/${script_name}.cm" + + +###################################################################### loadup_start () { - echo ">>>>> START ${1}" + echo ">>>>> START ${script_name}" } loadup_finish () { - local script_name=${1} - if [ "${LOADUP_WORKDIR}/${2}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ]; + local exit_code + rm -f "${cmfile}" + if [ "${LOADUP_WORKDIR}/${1}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ]; then echo "+++++ SUCCESS +++++" exit_code=0 @@ -28,7 +34,7 @@ loadup_finish () { exit_code=1 fi echo "..... files created ....." - shift; shift + shift; for f in ${*}; do ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null @@ -38,5 +44,6 @@ loadup_finish () { exit ${exit_code} } +###################################################################### From b0ec2476d569ff230f2b20ca6107c487dda5775b Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Tue, 1 Aug 2023 23:41:39 -0700 Subject: [PATCH 07/12] Handle case where files already exist in LOADUP_WORKDIR - show only the newly created files - not the old ones --- scripts/loadup-setup.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh index 98e15150..d838dca4 100644 --- a/scripts/loadup-setup.sh +++ b/scripts/loadup-setup.sh @@ -37,7 +37,13 @@ loadup_finish () { shift; for f in ${*}; do - ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null + for ff in $(ls -1 "${LOADUP_WORKDIR}"/$f); + do + if [ "${ff}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ]; + then + ls -l ${ff} 2>/dev/null | grep -v "^.*~[0-9]\+~$" + fi + done done echo "<<<<< END ${script_name}" echo "" From ae2633591e62a67229f74c6e6d59bf49e76d449a Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 2 Aug 2023 01:02:12 -0700 Subject: [PATCH 08/12] Remove now obsolete sources/*.CM files; update README a bit --- scripts/README.md | 22 +++++++++++++++++----- sources/LOADUP-APPS.CM | 1 - sources/LOADUP-FULL.CM | 1 - sources/LOADUP-INIT.LISP | 19 ------------------- sources/LOADUP-LISP.CM | 1 - sources/XREM.CM | 6 ------ 6 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 sources/LOADUP-APPS.CM delete mode 100644 sources/LOADUP-FULL.CM delete mode 100644 sources/LOADUP-INIT.LISP delete mode 100644 sources/LOADUP-LISP.CM delete mode 100644 sources/XREM.CM diff --git a/scripts/README.md b/scripts/README.md index d4dd7da1..413d08e1 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -7,18 +7,30 @@ Loading from an old 'starter' sysout * loadup-mid-from-init.sh -- phase 2 (creates init.sysout) * loadup-lisp-from-mid.sh -- phase 3 (creates lisp.sysout) * loadup-full-from-lisp.sh -- phase 4 (creates full.sysout) -* loadup-aux.sh -- phase 5,(creates exports.all whereis.hash +* loadup-apps-from-full.sh -- phase 5 (creates app.sysout, with notecards, rooms and clos; optional) +* loadup-aux.sh -- phase 6 (creates exports.all whereis.hash) +* loadup-db-from-full.sh -- phase 7 (makes unreleased 'fuller.sysout' and fuller.database) -* loadup-full.sh -- Phase 1-4 only +All of these scripts read from and write to a directory specified by the env variable LOADUP_WORKDIR. +LOADUP_WORKDIR defaults to /tmp/loadups-$$ (where $$ is the PID of the script). Note that all /tmp files +are cleared after 10 days or upon system reboot. You can replicate the old work directory scheme +where files were never deleted automatically by simply setting LOADUP_WORKDIR to "./tmp" -* loadup-db.sh -- phase 6 (makes unreleased 'fuller.sysout' and fuller.database -* copy-all.sh -- copy loadups from tmp/ to loadups/ and library/ +* loadup-all.sh [-apps] -- Phases 1-4 & 6 (plus Phase 5 with -apps flag) +* loadup-db.sh -- phase 7 only based on full.syout in loadup directory + +These two scripts call the 7 scripts above as specified and then (if successful) copy (ln) the results +to the loadups directory using a versioned copy. The files are hardlinked into loadups from the workdir +if workdir and loadups are on the same filesystem, otherwise they are copied. + +* loadup-full.sh -- Phases 1-4 only, no copy into loadups at the end. ## possibly handy scripts * lsee -- show lisp file with font-control-characters rendered as linux color changes -* cpv file1 file2 -- copies file1 to file2 (or directory name) adding versions +* cpv file1 file2 -- hardlinks (or copies) file1 to file2 (or directory name) adding versions + choice of hardlink or copy depends on whether the files are on the same filesystem. * restore-versions.sh -- pulls out old versions from git history and links in with medley versioning conventions ## Not useful anymore diff --git a/sources/LOADUP-APPS.CM b/sources/LOADUP-APPS.CM deleted file mode 100644 index f8d37768..00000000 --- a/sources/LOADUP-APPS.CM +++ /dev/null @@ -1 +0,0 @@ -" (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 deleted file mode 100644 index 8ebb9a67..00000000 --- a/sources/LOADUP-FULL.CM +++ /dev/null @@ -1 +0,0 @@ -" (PROGN (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM))) (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble)))) (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 deleted file mode 100644 index 016338d7..00000000 --- a/sources/LOADUP-INIT.LISP +++ /dev/null @@ -1,19 +0,0 @@ -(* "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 (UNIX-GETENV "LOADUP_WORKDIR")) -(DRIBBLE "init.dribble") - -(UNADVISE) -(ADVISE 'PAGEFULLFN '(RETURN)) -(ADVISE '(ERROR IN \DO-DEFINE-FILE-INFO) '(RETURN)) -(MOVD? 'NILL 'SETTEMPLATE) -(DEFINEQ (RRE (LAMBDA (X Y) Y))) -(MOVD? 'RRE 'READ-READER-ENVIRONMENT) - -(LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM")) -(MAKEINITGREET) -(DRIBBLE) -(LOGOUT T) -STOP - diff --git a/sources/LOADUP-LISP.CM b/sources/LOADUP-LISP.CM deleted file mode 100644 index d08bdff7..00000000 --- a/sources/LOADUP-LISP.CM +++ /dev/null @@ -1 +0,0 @@ -" (PROGN (LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM))) (LOADUP-LISP(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble))) (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/XREM.CM b/sources/XREM.CM deleted file mode 100644 index 1cd92bd7..00000000 --- a/sources/XREM.CM +++ /dev/null @@ -1,6 +0,0 @@ -" -(MOVD? (QUOTE NILL) (QUOTE PROMPTPRINT)) -(MOVD? (QUOTE NILL) (QUOTE CURSORP)) -(MOVD? (QUOTE NILL) (QUOTE CHANGEBACKGROUNDBORDER)) -(LOGOUT) -" From 346c11b0ad446184c07ace1534067d6a97e24b78 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 2 Aug 2023 13:41:36 -0700 Subject: [PATCH 09/12] WIP fixing up scripts/release_medley.sh and syncing with buildLoadup.yml --- .gitignore | 4 ++ scripts/release-make-tars.sh | 86 ++++++++++++++++++++++++++++++++++++ scripts/release-medley.sh | 49 +++++--------------- 3 files changed, 101 insertions(+), 38 deletions(-) create mode 100755 scripts/release-make-tars.sh diff --git a/.gitignore b/.gitignore index aeae2bea..223b84a6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,10 @@ tmp/* +# releases directory +releases/* + + # all loadup files loadups/exports.all diff --git a/scripts/release-make-tars.sh b/scripts/release-make-tars.sh new file mode 100755 index 00000000..f62d9236 --- /dev/null +++ b/scripts/release-make-tars.sh @@ -0,0 +1,86 @@ +#!/bin/sh + +######### Functions ######## +check_exists () { + f="$1" + if [ -e "${f}" ] + then + echo "${f}" + else + echo "Warning: $f does not exist. $(basename ${f}) will not be included in release tars" 1>&2 + echo " " + fi +} +######## End Functions ####### + + +if [ ! -x run-medley ] ; then + echo run from MEDLEYDIR + exit 1 +fi +export MEDLEYDIR=`pwd` + +if [ -z "$1" ] ; then + tag=medley-$(date +%y%m%d)-$(date +%s) +else + tag="$1" +fi +short_tag="${tag#medley-}" + +dirname=$(basename "${MEDLEYDIR}") +if [ "${dirname}" = "medley" ] +then + name_xform=" " +else + uname | grep -q -i Linux + if [ $? -eq 0 ] + then + name_xform="--xform s/^${dirname}/medley/" + else + name_xform="-s /^${dirname}/medley/" + fi +fi + +cd .. +release_dir="${dirname}"/releases/"${short_tag}" +mkdir -p "${release_dir}" + +echo making releases/${short_tag}/$tag-loadups.tgz + + +tar -c -z -f "${release_dir}"/$tag-loadups.tgz \ + ${name_xform} \ + "${dirname}"/loadups/lisp.sysout \ + "${dirname}"/loadups/full.sysout \ + $(check_exists "${dirname}/loadups/apps.sysout") \ + "${dirname}"/loadups/*.dribble \ + "${dirname}"/loadups/whereis.hash \ + "${dirname}"/loadups/exports.all \ + $(check_exists "${dirname}/loadups/fuller.database") ; + +echo making releases/${short_tag}/$tag-runtime.tgz + +tar -c -z -f "${release_dir}"/$tag-runtime.tgz \ + --exclude "*~" --exclude "*#*" \ + --exclude exports.all \ + ${name_xform} \ + "${dirname}"/clos \ + "${dirname}"/docs/dinfo \ + "${dirname}"/docs/man-page/medley.1.gz \ + "${dirname}"/doctools \ + "${dirname}"/greetfiles \ + "${dirname}"/rooms \ + "${dirname}"/medley \ + "${dirname}"/run-medley \ + "${dirname}"/scripts \ + "${dirname}"/fonts/displayfonts \ + "${dirname}"/fonts/altofonts \ + "${dirname}"/fonts/adobe \ + "${dirname}"/fonts/postscriptfonts \ + "${dirname}"/fonts/ipfonts \ + "${dirname}"/library \ + "${dirname}"/lispusers \ + "${dirname}"/sources \ + "${dirname}"/internal ; + +echo "Done with release tars" diff --git a/scripts/release-medley.sh b/scripts/release-medley.sh index a4fcf0df..3834d7e9 100755 --- a/scripts/release-medley.sh +++ b/scripts/release-medley.sh @@ -6,48 +6,21 @@ if [ ! -x run-medley ] ; then exit 1 fi -tag=$1 - -if [ -z "$tag" ] ; then - tag=medley-`date +%y%m%d` +if [ -z "$1" ] ; then + tag=medley-$(date +%y%m%d)-$(date +%s) +else + tag="$1" fi +short_tag="${tag#medley-}" -cd .. - -echo making $tag-loadups.tgz - -tar cfz medley/tmp/$tag-loadups.tgz \ - medley/loadups/lisp.sysout \ - medley/loadups/full.sysout \ - medley/loadups/fuller.database \ - medley/loadups/*.dribble \ - medley/loadups/whereis.hash \ - medley/loadups//exports.all - -echo making $tag-runtime.tgz - -tar cfz medley/tmp/$tag-runtime.tgz \ - --exclude "*~" --exclude "*#*" \ - medley/docs/dinfo \ - medley/doctools \ - medley/greetfiles \ - medley/rooms \ - medley/run-medley \ - medley/scripts \ - medley/fonts/displayfonts medley/fonts/altofonts \ - medley/fonts/adobe \ - medley/fonts/postscriptfonts \ - medley/library \ - medley/lispusers \ - medley/sources \ - medley/internal - -cd medley +scripts/release-make-tars.sh "${tag}" echo making release -sed s/'$tag'/$tag/g < release-notes.md > tmp/release-notes.md -gh release create $tag -F tmp/release-notes.md -p -t $tag +sed s/'$tag'/$tag/g < release-notes.md > releases/${short_tag}/release-notes.md +gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag echo uploading -gh release upload $tag tmp/$tag-loadups.tgz tmp/$tag-runtime.tgz --clobber +gh release upload $tag releases/${short_tag}/$tag-loadups.tgz releases/${short_tag}/$tag-runtime.tgz --clobber + +echo done From 84391b367b4482ce45540e0c2921a00340874faf Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 2 Aug 2023 16:43:35 -0700 Subject: [PATCH 10/12] First pass a complete new make-release.sh --- scripts/README.md | 7 +++++++ scripts/release-medley.sh | 22 ++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/scripts/README.md b/scripts/README.md index 413d08e1..6430dfb0 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -25,6 +25,13 @@ if workdir and loadups are on the same filesystem, otherwise they are copied. * loadup-full.sh -- Phases 1-4 only, no copy into loadups at the end. +## releases + +* release-medley.sh -- will create Medley release tars and upload as a release on github. + Arguments: -d to make a draft release. to uses as a tag for this + release on github (defaults to meldey-\-\). + +* release-make-tars.sh -- will create the Medley release tars and store them in the releases directory. ## possibly handy scripts diff --git a/scripts/release-medley.sh b/scripts/release-medley.sh index 3834d7e9..68f5f77f 100755 --- a/scripts/release-medley.sh +++ b/scripts/release-medley.sh @@ -6,6 +6,24 @@ if [ ! -x run-medley ] ; then exit 1 fi +if [ -z "$(which gh)" ]; then + echo "Error: this script requires gh (github cli) to be installed. Exiting." + exit 1 +fi + +gh auth status 2>&1 | grep -i -q "Logged in to github.com" +if [ $? -ne 0 ]; then + echo 'Error: this script requires you to be logged into github. Use "gh auth login" to do so. Exiting.' + exit 1 +fi + +if [ "$1" = "-d" ]; then + draft="-d" + shift +else + draft="" +fi + if [ -z "$1" ] ; then tag=medley-$(date +%y%m%d)-$(date +%s) else @@ -17,10 +35,10 @@ scripts/release-make-tars.sh "${tag}" echo making release sed s/'$tag'/$tag/g < release-notes.md > releases/${short_tag}/release-notes.md -gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag +gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag ${draft} echo uploading gh release upload $tag releases/${short_tag}/$tag-loadups.tgz releases/${short_tag}/$tag-runtime.tgz --clobber -echo done +echo "Done with release ${tag}" From dfce541a18676745291243360f37987a3c39b77b Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 2 Aug 2023 16:47:04 -0700 Subject: [PATCH 11/12] Fix scripts/README.md --- scripts/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/README.md b/scripts/README.md index 6430dfb0..f62e02bb 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -28,8 +28,9 @@ if workdir and loadups are on the same filesystem, otherwise they are copied. ## releases * release-medley.sh -- will create Medley release tars and upload as a release on github. - Arguments: -d to make a draft release. to uses as a tag for this + Arguments: -d to make a draft release. \ to use as a tag for this release on github (defaults to meldey-\-\). + Both are optional. * release-make-tars.sh -- will create the Medley release tars and store them in the releases directory. From 1ff71ea15d4317dccaa9e9c1231e36f22a6a56d4 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Wed, 2 Aug 2023 22:03:38 -0700 Subject: [PATCH 12/12] update buildLOadup.yml to use new scripts/release-make-tars.sh instead of its almost but not quite equivalent make tars code --- .github/workflows/buildLoadup.yml | 41 +++---------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml index e3d5b618..54da1136 100644 --- a/.github/workflows/buildLoadup.yml +++ b/.github/workflows/buildLoadup.yml @@ -228,45 +228,10 @@ jobs: scripts/loadup-all.sh -apps scripts/loadup-db.sh - - name: Build loadups release tar + - name: Build release tars run: | - cd .. - mkdir -p medley/${TARBALL_DIR} - tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-loadups.tgz \ - medley/loadups/lisp.sysout \ - medley/loadups/full.sysout \ - medley/loadups/apps.sysout \ - medley/loadups/whereis.hash \ - medley/loadups/*.dribble \ - medley/loadups/fuller.database \ - medley/loadups/exports.all - - - name: Build runtime release tar - run: | - cd .. - mkdir -p medley/${TARBALL_DIR} - tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-runtime.tgz \ - --exclude "*~" --exclude "*#*" \ - --exclude exports.all \ - medley/clos \ - medley/docs/dinfo \ - medley/docs/man-page/medley.1.gz \ - medley/doctools \ - medley/greetfiles \ - medley/rooms \ - medley/medley \ - medley/run-medley \ - medley/scripts \ - medley/fonts/displayfonts \ - medley/fonts/altofonts \ - medley/fonts/adobe \ - medley/fonts/postscriptfonts \ - medley/fonts/ipfonts \ - medley/library \ - medley/lispusers \ - medley/sources \ - medley/internal - + scripts/release-make-tars.sh "${MEDLEY_RELEASE_TAG}" + mv releases/"${MEDLEY_SHORT_RELEASE_TAG}"/*.tgz "${TARBALL_DIR}" # Build the deb files as well as the tgz files - name: Build .deb files for 3 architectures