move all loadups-related source files into internal/loadups; adjust scripts accordingly; move venuesysouts from loadups into internal/venuesysouts; fix issues in .CM files to allow starting loadups-all from any lisp/full.sysout

scripts/copy-all.sh

@@ -9,27 +9,22 @@ fi
 
 echo ">>>>> 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 "${LOADUP_OUTDIR}"  | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.sysout "${LOADUP_OUTDIR}"  | sed -e "s#${MEDLEYDIR}/##g"
 if [ "${1}" = "-apps" ]; then
-    ./scripts/cpv "${LOADUP_WORKDIR}"/apps.sysout loadups
+    ./scripts/cpv "${LOADUP_WORKDIR}"/apps.sysout "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
 fi
 
-./scripts/cpv "${LOADUP_WORKDIR}"/whereis.hash loadups
-./scripts/cpv "${LOADUP_WORKDIR}"/exports.all loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.hash "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/exports.all "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
 
-./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 "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/full.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
 
-./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS library
-./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS.LCOM library
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS library | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS.LCOM library | sed -e "s#${MEDLEYDIR}/##g"
 
 echo "<<<<< END ${script_name}"
 echo ""

scripts/copy-db.sh

@@ -9,8 +9,8 @@ fi
 
 echo ">>>>> START ${script_name}"
 
-./scripts/cpv "${LOADUP_WORKDIR}"/fuller.database loadups
-./scripts/cpv "${LOADUP_WORKDIR}"/fuller.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.database "${LOADUP_OUTDIR}"
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.dribble "${LOADUP_OUTDIR}"
 
 echo "<<<<< END ${script_name}"
 echo ""

scripts/loadup-apps-from-full.sh

@@ -32,14 +32,14 @@ cat >"${cmfile}" <<"EOF"
    (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:LOAD
+       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /LOADUP-APPS.LCOM))
        'IL:SYSLOAD
    )
    (IL:HARDRESET)
 )
 SHH
-(PROGN 
+(PROGN
    (IL:ENDLOADUP)
    (CLOS::LOAD-CLOS)
    (IL:|Apps.LOADUP|)

scripts/loadup-db.sh

@@ -7,6 +7,42 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start
+
+cat >"${cmfile}" <<"EOF"
+"
+
+(PROG
+  ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /)))
+   (LOADUP-SOURCE-DIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /)))
+  )
+  (IL:MEDLEY-INIT-VARS)
+  (IL:FILESLOAD MEDLEY-UTILS)
+  (SETQ IL:DIRECTORIES (CONS LOADUP-SOURCE-DIR IL:DIRECTORIES))
+  (IL:MAKE-FULLER-DB
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.dribble)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.database)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.sysout)))
+  )
+  (IL:LOGOUT T)
+)
+
+"
+EOF
+
+./run-medley ${scr} -loadup "${cmfile}" -full
+
+loadup_finish "fuller.database" "fuller*"
+
+#!/bin/sh
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+. scripts/loadup-setup.sh
+
 ./scripts/loadup-db-from-full.sh && ./scripts/copy-db.sh
 
 if [ $? -eq 0 ];

scripts/loadup-full-from-lisp.sh

@@ -13,7 +13,7 @@ cat >"${cmfile}" <<"EOF"
 "
 
 (PROGN
-  (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))
+  (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR))(QUOTE /LOADUP-FULL.LCOM)))
   (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))))
   (IL:HARDRESET)
 )

scripts/loadup-init.sh

@@ -12,7 +12,9 @@ loadup_start
 cat >"${cmfile}" <<"EOF"
 (* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh")
 
+(SETQ MEDLEYDIR NIL)
 (LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
+(MEDLEY-INIT-VARS)
 (CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
 (DRIBBLE "init.dribble")
 
@@ -23,16 +25,21 @@ cat >"${cmfile}" <<"EOF"
 (DEFINEQ (RRE (LAMBDA (X Y) Y)))
 (MOVD? 'RRE 'READ-READER-ENVIRONMENT)
 
-(LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM"))
+(LOAD (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_SOURCEDIR") "/" "MAKEINIT.LCOM"))
 (PROG
-  ((WORKDIR (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") "/")))
-  (MAKEINITGREET (CONCAT WORKDIR "init.sysout") (CONCAT WORKDIR "init.dlinit"))
+  ((WORKDIR (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") "/"))
+   (LOADUP-SOURCE-DIR (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_SOURCEDIR") "/"))
+  )
+  (SETQ DIRECTORIES (CONS LOADUP-SOURCE-DIR DIRECTORIES))
+  (RESETLST (RESETSAVE OK.TO.MODIFY.FNS T)
+    (MAKEINITGREET (CONCAT WORKDIR "init.sysout") (CONCAT WORKDIR "init.dlinit"))
+  )
 )
 (DRIBBLE)
 (LOGOUT T)
 STOP
 EOF
 
-./run-medley $scr -loadup "${cmfile}" loadups/starter.sysout
+./run-medley $scr -loadup "${cmfile}" "${LOADUP_SOURCEDIR}"/starter.sysout
 
 loadup_finish "init.dlinit" "init.*" "RDSYS*" "I-NEW*"

scripts/loadup-lisp-from-mid.sh

@@ -13,14 +13,16 @@ cat >"${cmfile}" <<"EOF"
 "
 
 (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)))
+  (LOAD (CONCAT (QUOTE {DSK}) (UNIX-GETENV (QUOTE MEDLEYDIR)) (QUOTE /sources/MEDLEYDIR.LCOM)))
+  (MEDLEY-INIT-VARS)
+  (LOAD (CONCAT (QUOTE {DSK}) (UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /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:MAKESYS (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR)) (IL:L-CASE (QUOTE /lisp.sysout))) :LISP)
   (IL:LOGOUT T)
 )
 

scripts/loadup-setup.sh

@@ -6,6 +6,16 @@ then
   export LOADUP_WORKDIR=/tmp/loadups-$$
 fi
 
+if [ -z "${LOADUP_SOURCEDIR}" ];
+then
+  export LOADUP_SOURCEDIR="${MEDLEYDIR}"/internal/loadups
+fi
+
+if [ -z "${LOADUP_OUTDIR}" ];
+then
+  export LOADUP_OUTDIR="${MEDLEYDIR}"/loadups
+fi
+
 mkdir -p "${LOADUP_WORKDIR}"
 
 scr="-sc 1024x768 -g 1042x790"