Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add git commit ID to beginning of loadups .dribble files. #1778

Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 31 additions & 20 deletions internal/MEDLEY-UTILS
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

(FILECREATED "29-Apr-2024 16:25:20" {DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;9 28903
(FILECREATED " 2-Jul-2024 12:41:00" {DSK}<home>matt>Interlisp>medley>internal>MEDLEY-UTILS.;4 29112

:EDIT-BY "lmm"
:EDIT-BY "mth"

:PREVIOUS-DATE "26-Apr-2024 16:34:08" {DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;8)
:CHANGES-TO (FNS MAKE-WHEREIS-HASH MAKE-EXPORTS-ALL MAKE-FULLER-DB)

:PREVIOUS-DATE "29-Apr-2024 16:25:20" {DSK}<home>matt>Interlisp>medley>internal>MEDLEY-UTILS.;1
)


(PRETTYCOMPRINT MEDLEY-UTILSCOMS)
Expand Down Expand Up @@ -108,12 +111,14 @@
(HELP])

(MAKE-FULLER-DB
[LAMBDA (DRIBBLEFILE DBFILE SYSOUTFILE) (* ; "Edited 3-Aug-2023 18:12 by frank")
[LAMBDA (DRIBBLEFILE DBFILE SYSOUTFILE APPENDFLG) (* ; "Edited 1-Jul-2024 21:59 by mth")
(* ; "Edited 3-Aug-2023 18:12 by frank")
(* ; "Edited 16-Jul-2022 22:07 by larry")
(* ; "Edited 20-Jun-2022 17:23 by larry")
(FILESLOAD (SOURCE)
FILESETS)
(DRIBBLE (OR DRIBBLEFILE "fuller.dribble"))
(DRIBBLE (OR DRIBBLEFILE "fuller.dribble")
APPENDFLG)
(DOFILESLOAD (SUBSET (APPEND OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL)
'FINDFILE))
(GATHER-INFO 'ALL)
Expand Down Expand Up @@ -216,27 +221,33 @@
(DEFINEQ

(MAKE-EXPORTS-ALL
[LAMBDA (OUTFILE) (* ; "Edited 3-Aug-2023 18:34 by frank")
[LAMBDA (OUTFILE) (* ; "Edited 1-Jul-2024 22:03 by mth")
(* ; "Edited 3-Aug-2023 18:34 by frank")
(* ; "Edited 9-Mar-2021 16:11 by larry")
(* "Edited May 3, 2018 by Ron Kaplan--relative to MEDLEYDIR/lispcore/. Don't know why it does the CORE/RENAME")
(*
 "Edited Aug 17 94 by Sybalsky -- point it to /king/export/lispcore as the truth directory.")
(*
 "Edited July 5, 1990 by Sybalsky -- point it to Pele as the truth directory.")
(*
 "Edited September 29, 1986 by van Melle")

(* ;; "Edited May 3, 2018 by Ron Kaplan--relative to MEDLEYDIR/lispcore/. Don't know why it does the CORE/RENAME")

(* ;; "Edited Aug 17 94 by Sybalsky -- point it to /king/export/lispcore as the truth directory.")

(* ;; "Edited July 5, 1990 by Sybalsky -- point it to Pele as the truth directory.")

(* ;; "Edited September 29, 1986 by van Melle")

(CNDIR (MEDLEYDIR "sources"))
(LOAD 'FILESETS)
(GATHEREXPORTS EXPORTFILES (OR OUTFILE "exports.all"])

(MAKE-WHEREIS-HASH
[LAMBDA (DRIBBLEFILE TMPFILE WHEREISFILE DEPTH SUBDIRS) (* ; "Edited 4-Feb-2024 21:57 by lmm")
[LAMBDA (DRIBBLEFILE TMPFILE WHEREISFILE DEPTH SUBDIRS APPENDFLG)
(* ; "Edited 2-Jul-2024 12:40 by mth")
(* ; "Edited 4-Feb-2024 21:57 by lmm")
(* ; "Edited 3-Aug-2023 18:37 by frank")
(* ; "Edited 12-Mar-2022 12:46 by rmk")
(* ; "Edited 24-Mar-2021 13:26 by larry")
(LET ((FILING.ENUMERATION.DEPTH (OR DEPTH 2))
HASHFILE)
(DRIBBLE (OR DRIBBLEFILE "whereis.dribble"))
(DRIBBLE (OR DRIBBLEFILE "whereis.dribble")
APPENDFLG)
(SETQ HASHFILE (XCL::WHERE-IS-NOTICE (OR TMPFILE "whereis.hash-tmp")
:FILES
(for X in (OR SUBDIRS MEDLEY-FIX-DIRS)
Expand Down Expand Up @@ -502,9 +513,9 @@
(ADDTOVAR LAMA )
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1064 11630 (GATHER-INFO 1074 . 6456) (MAKE-FULLER-DB 6458 . 7235) (MAKE-INDEX-HTMLS
7237 . 10999) (MEDLEY-FIX-LINKS 11001 . 11394) (MEDLEY-FIX-DATES 11396 . 11628)) (12809 15597 (
MAKE-EXPORTS-ALL 12819 . 13878) (MAKE-WHEREIS-HASH 13880 . 15069) (MAKE-WHEREIS-LOOPS 15071 . 15595))
(15598 23855 (HCFILES 15608 . 20089) (MAKE-INDEX-HTMLS 20091 . 23853)) (24105 28717 (RECOMPILE-ONE
24115 . 26012) (RECMPL 26014 . 26617) (COMPILE-SETUP 26619 . 27243) (REMAKEFILES 27245 . 28715)))))
(FILEMAP (NIL (1152 11848 (GATHER-INFO 1162 . 6544) (MAKE-FULLER-DB 6546 . 7453) (MAKE-INDEX-HTMLS
7455 . 11217) (MEDLEY-FIX-LINKS 11219 . 11612) (MEDLEY-FIX-DATES 11614 . 11846)) (13027 15806 (
MAKE-EXPORTS-ALL 13037 . 13884) (MAKE-WHEREIS-HASH 13886 . 15278) (MAKE-WHEREIS-LOOPS 15280 . 15804))
(15807 24064 (HCFILES 15817 . 20298) (MAKE-INDEX-HTMLS 20300 . 24062)) (24314 28926 (RECOMPILE-ONE
24324 . 26221) (RECMPL 26223 . 26826) (COMPILE-SETUP 26828 . 27452) (REMAKEFILES 27454 . 28924)))))
STOP
Binary file modified internal/MEDLEY-UTILS.DFASL
Binary file not shown.
15 changes: 9 additions & 6 deletions internal/loadups/LOADUP-FULL
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

(FILECREATED "31-Jul-2023 18:28:53" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;4 4521
(FILECREATED " 1-Jul-2024 21:39:04" {DSK}<home>matt>Interlisp>medley>internal>loadups>LOADUP-FULL.;2 4676

:EDIT-BY "mth"

:CHANGES-TO (FNS LOADUP-FULL)

:PREVIOUS-DATE "18-Jan-2023 16:23:36" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;3
)
:PREVIOUS-DATE "31-Jul-2023 18:28:53"
{DSK}<home>matt>Interlisp>medley>internal>loadups>LOADUP-FULL.;1)


(PRETTYCOMPRINT LOADUP-FULLCOMS)
Expand Down Expand Up @@ -39,7 +41,8 @@
(PRINTOUT T "FULL fonts loaded" T])

(LOADUP-FULL
[LAMBDA (DRIBBLEFILE) (* ; "Edited 18-Jan-2023 16:22 by FGH")
[LAMBDA (DRIBBLEFILE APPENDFLG) (* ; "Edited 1-Jul-2024 21:38 by mth")
(* ; "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")
Expand All @@ -55,7 +58,7 @@
(PROGN (SETQ MEDLEYDIR)
(CNDIR (MEDLEYDIR)))
(MEDLEY-INIT-VARS)
(DRIBBLE DRIBBLEFILE)
(DRIBBLE DRIBBLEFILE APPENDFLG)

(* ;; "BKSYSBUF stops page holding ")

Expand Down Expand Up @@ -86,5 +89,5 @@

(FIXMETA)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (467 4483 (LOADFULLFONTS 477 . 1918) (LOADUP-FULL 1920 . 4233) (FIXMETA 4235 . 4481)))))
(FILEMAP (NIL (503 4638 (LOADFULLFONTS 513 . 1954) (LOADUP-FULL 1956 . 4388) (FIXMETA 4390 . 4636)))))
STOP
Binary file modified internal/loadups/LOADUP-FULL.LCOM
Binary file not shown.
15 changes: 8 additions & 7 deletions internal/loadups/LOADUP-LISP
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)

(FILECREATED "21-Mar-2024 10:56:13" |{DSK}<home>larry>il>medley>internal>loadups>LOADUP-LISP.;4| 5586
(FILECREATED " 1-Jul-2024 21:37:42" |{DSK}<home>matt>Interlisp>medley>internal>loadups>LOADUP-LISP.;2| 5717

:EDIT-BY "lmm"
:EDIT-BY "mth"

:CHANGES-TO (FNS LOADUP-LISP)

:PREVIOUS-DATE "14-Mar-2024 12:16:33"
|{DSK}<home>larry>il>medley>internal>loadups>LOADUP-LISP.;3|)
:PREVIOUS-DATE "21-Mar-2024 10:56:13"
|{DSK}<home>matt>Interlisp>medley>internal>loadups>LOADUP-LISP.;1|)


(PRETTYCOMPRINT LOADUP-LISPCOMS)
Expand All @@ -20,15 +20,16 @@
(DEFINEQ

(LOADUP-LISP
(LAMBDA (DRIBBLEFILE) (* \; "Edited 21-Mar-2024 10:55 by lmm")
(LAMBDA (DRIBBLEFILE APPENDLFG) (* \; "Edited 1-Jul-2024 21:37 by mth")
(* \; "Edited 21-Mar-2024 10:55 by lmm")
(* \; "Edited 14-Mar-2024 12:16 by lmm")
(* \; "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 DRIBBLEFILE)
(DRIBBLE DRIBBLEFILE APPENDLFG)
(FOR X IN BOOTLOADEDFILES DO (CL:UNLESS (MEMB X SYSFILES)
(PRINTOUT T X " bootloaded" T)
(SETQ SYSFILES (CONS X SYSFILES))))
Expand Down Expand Up @@ -131,5 +132,5 @@
(GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST)
)
(DECLARE\: DONTCOPY
(FILEMAP (NIL (673 5380 (LOADUP-LISP 683 . 5378)))))
(FILEMAP (NIL (685 5511 (LOADUP-LISP 695 . 5509)))))
STOP
Binary file modified internal/loadups/LOADUP-LISP.LCOM
Binary file not shown.
16 changes: 15 additions & 1 deletion scripts/loadup-apps-from-full.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ main() {

(PROGN
(IL:MEDLEY-INIT-VARS 'IL:GREET)
(IL:DRIBBLE (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.dribble))))
(IL:DRIBBLE (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.dribble))) T)
(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 NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
(IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
Expand All @@ -63,6 +63,20 @@ main() {
"
EOF

if [ -f $(which git) ];
then
if [ -x $(which git) ];
then
# These do NOT indicate if there are any modified files!
LOADUP_NOTECARDS_COMMIT_ID=$(git -C "${NOTECARDSDIR}" rev-parse --short HEAD)
fi
fi

echo "This loadup SYSOUT was made $(date)" > "${LOADUP_WORKDIR}/apps.dribble"
echo "The MEDLEY git commit ID is: ${LOADUP_COMMIT_ID}" >> "${LOADUP_WORKDIR}/apps.dribble"
echo "The NOTECARDS git commit ID is: ${LOADUP_NOTECARDS_COMMIT_ID}" >> "${LOADUP_WORKDIR}/apps.dribble"
echo " - - - - - - - - - - - - - - -" >> "${LOADUP_WORKDIR}/apps.dribble"

run_medley "${LOADUP_WORKDIR}/full.sysout"

loadup_finish "apps.sysout" "apps.*"
Expand Down
5 changes: 5 additions & 0 deletions scripts/loadup-aux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,17 @@ main() {
(IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.dribble)))
(IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash-tmp)))
(IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash)))
NIL NIL T
)
(IL:LOGOUT T)
)
"
EOF

echo "This whereis.hash was made $(date)" > "${LOADUP_WORKDIR}/whereis.dribble"
echo "The git commit ID of the loadup SYSOUT is: ${LOADUP_COMMIT_ID}" >> "${LOADUP_WORKDIR}/whereis.dribble"
echo " - - - - - - - - - - - - - - -" >> "${LOADUP_WORKDIR}/whereis.dribble"

run_medley "${LOADUP_WORKDIR}/full.sysout"

loadup_finish "whereis.hash" "whereis.hash" "exports.all"
Expand Down
5 changes: 5 additions & 0 deletions scripts/loadup-db-from-full.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,18 @@ main() {
(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)))
T
)
(IL:LOGOUT T)
)

"
EOF

echo "This loadup SYSOUT was made $(date)" > "${LOADUP_WORKDIR}/fuller.dribble"
echo "The git commit ID is: ${LOADUP_COMMIT_ID}" >> "${LOADUP_WORKDIR}/fuller.dribble"
echo " - - - - - - - - - - - - - - -" >> "${LOADUP_WORKDIR}/fuller.dribble"

run_medley "${SYSOUT}"

loadup_finish "fuller.database" "fuller*"
Expand Down
6 changes: 5 additions & 1 deletion scripts/loadup-full-from-lisp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ main() {

(PROGN
(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:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))) T)
(IL:HARDRESET)
)
SHH
Expand All @@ -24,6 +24,10 @@ main() {
"
EOF

echo "This loadup SYSOUT was made $(date)" > "${LOADUP_WORKDIR}/full.dribble"
echo "The git commit ID is: ${LOADUP_COMMIT_ID}" >> "${LOADUP_WORKDIR}/full.dribble"
echo " - - - - - - - - - - - - - - -" >> "${LOADUP_WORKDIR}/full.dribble"

run_medley "${LOADUP_WORKDIR}/lisp.sysout"

loadup_finish "full.sysout" "full.*"
Expand Down
6 changes: 5 additions & 1 deletion scripts/loadup-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ main() {
(LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
(MEDLEY-INIT-VARS)
(CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
(DRIBBLE "init.dribble")
(DRIBBLE "init.dribble" T)

(UNADVISE)
(ADVISE 'PAGEFULLFN '(RETURN))
Expand All @@ -36,6 +36,10 @@ main() {
(LOGOUT T)
STOP
EOF

echo "This loadup SYSOUT was made $(date)" > "${LOADUP_WORKDIR}/init.dribble"
echo "The git commit ID is: ${LOADUP_COMMIT_ID}" >> "${LOADUP_WORKDIR}/init.dribble"
echo " - - - - - - - - - - - - - - -" >> "${LOADUP_WORKDIR}/init.dribble"

run_medley "${LOADUP_SOURCEDIR}/starter.sysout"

Expand Down
6 changes: 5 additions & 1 deletion scripts/loadup-lisp-from-mid.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ main() {
(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)))
(LOADUP-LISP (CONCAT (QUOTE {DSK}) (UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /lisp.dribble)) T)
(HARDRESET)
)
SHH
Expand All @@ -26,6 +26,10 @@ main() {
"
EOF

echo "This loadup SYSOUT was made $(date)" > "${LOADUP_WORKDIR}/lisp.dribble"
echo "The git commit ID is: ${LOADUP_COMMIT_ID}" >> "${LOADUP_WORKDIR}/lisp.dribble"
echo " - - - - - - - - - - - - - - -" >> "${LOADUP_WORKDIR}/lisp.dribble"

run_medley "${LOADUP_WORKDIR}/init-mid.sysout"

loadup_finish "lisp.sysout" "lisp.*"
Expand Down
9 changes: 9 additions & 0 deletions scripts/loadup-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@ then
fi


if [ -f $(which git) ];
then
if [ -x $(which git) ];
then
# This does NOT indicate if there are any modified files!
LOADUP_COMMIT_ID=$(git -C "${LOADUP_SOURCEDIR}" rev-parse --short HEAD)
export LOADUP_COMMIT_ID
fi
fi


scr="-sc 1024x768 -g 1042x790"
Expand Down