1
0
mirror of synced 2026-02-27 01:19:42 +00:00

Remake loadup scripts to not use MEDLEYDIR/tmp as a working dir AND cleanly separate loadup-all from loadup-db; adjust buildLoadup.yml accordingly

This commit is contained in:
Frank Halasz
2023-07-31 00:42:23 -07:00
parent 94269303d0
commit b59e37b703
16 changed files with 92 additions and 209 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1 +1 @@
"
"

View File

@@ -1 +1 @@
"
"

View File

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

View File

@@ -1 +1 @@
"
"

View File

@@ -1,18 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "11-Jul-2022 20:00:23" 
{DSK}<users>kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;3 54607
(FILECREATED "30-Jul-2023 23:39:21" {DSK}<home>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}<users>kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;2)
:PREVIOUS-DATE "11-Jul-2022 20:00:23" {DSK}<home>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

Binary file not shown.