Skip to content

Commit fe04869

Browse files
MattHeffronMattHeffron
authored
Add git commit ID to beginning of loadups .dribble files. (#1778)
* Add git commit ID to beginning of loadups .dribble files. The commit ID is put into the .dribble file in the .sh scripts. (using echo ... > name.dribble) The changes to MEDLEY-UTILS, LOADUP-FULL, and LOADUP-LISP are to enable the passing of APPENDFLG to (DRIBBLE ... APPENDFLG). * I hadn't saved file before previous commit. * Add to IL:SYSOUTCOMMITS instead of to the .dribble files. * Initialize SYSOUTCOMMITS so PUTASSOC has somewhere to put value(s)
1 parent 178807a commit fe04869

9 files changed

+60
-19
lines changed

‎scripts/loadup-apps-from-full.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,25 @@ main() {
3232
exit 1
3333
fi
3434

35+
git_commit_ID "${NOTECARDSDIR}"
36+
NOTECARDS_COMMIT_ID="${COMMIT_ID}"
37+
export NOTECARDS_COMMIT_ID
38+
3539
cat >"${cmfile}" <<-"EOF"
3640
"
3741
3842
(PROGN
3943
(IL:MEDLEY-INIT-VARS 'IL:GREET)
40-
(IL:DRIBBLE (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.dribble))))
44+
(IL:DRIBBLE (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.dribble))))
4145
(IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
4246
(IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
4347
(IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
4448
(IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
45-
(IL:LOAD
46-
(IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /LOADUP-APPS.LCOM))
47-
'IL:SYSLOAD
48-
)
49+
(IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /LOADUP-APPS.LCOM)) 'IL:SYSLOAD)
50+
(IL:PRINT (IL:UNIX-GETENV (QUOTE NOTECARDS_COMMIT_ID)))
51+
(IL:PUTASSOC (QUOTE IL:MEDLEY) (LIST (IL:UNIX-GETENV (QUOTE LOADUP_COMMIT_ID))) IL:SYSOUTCOMMITS)
52+
(IL:PUTASSOC (QUOTE IL:NOTECARDS) (LIST (IL:UNIX-GETENV (QUOTE NOTECARDS_COMMIT_ID))) IL:SYSOUTCOMMITS)
53+
(IL:PRINT IL:SYSOUTCOMMITS)
4954
(IL:HARDRESET)
5055
)
5156
SHH

‎scripts/loadup-aux.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ main() {
1717
(DRIBBLE (QUOTE {DSK}<TMP>FOOBAR))
1818
(IL:MAKE-EXPORTS-ALL (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE exports.all))))
1919
(DRIBBLE)
20+
(IL:PUTASSOC (QUOTE IL:MEDLEY) (LIST (IL:UNIX-GETENV (QUOTE LOADUP_COMMIT_ID))) IL:SYSOUTCOMMITS)
2021
(IL:MAKE-WHEREIS-HASH
2122
(IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.dribble)))
2223
(IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash-tmp)))
2324
(IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash)))
25+
NIL NIL
2426
)
2527
(IL:LOGOUT T)
2628
)

‎scripts/loadup-db-from-full.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ main() {
1818
1919
(PROG
2020
((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /))))
21+
(SETQ IL:SYSOUTCOMMITS (LIST (LIST (QUOTE IL:MEDLEY) (IL:UNIX-GETENV (QUOTE LOADUP_COMMIT_ID)))))
2122
(IL:MEDLEY-INIT-VARS)
2223
(IL:FILESLOAD MEDLEY-UTILS)
2324
(SETQ IL:DIRECTORIES (CONS (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) IL:DIRECTORIES))

‎scripts/loadup-full-from-lisp.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ main() {
1212
(PROGN
1313
(IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR))(QUOTE /LOADUP-FULL.LCOM)))
1414
(IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))))
15+
(IL:PUTASSOC (QUOTE IL:MEDLEY) (LIST (IL:UNIX-GETENV (QUOTE LOADUP_COMMIT_ID))) IL:SYSOUTCOMMITS)
1516
(IL:HARDRESET)
1617
)
1718
SHH

‎scripts/loadup-init.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ main() {
1212
(SETQ MEDLEYDIR NIL)
1313
(LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
1414
(MEDLEY-INIT-VARS)
15+
(PUTASSOC (QUOTE MEDLEY) (LIST (UNIX-GETENV (QUOTE LOADUP_COMMIT_ID))) SYSOUTCOMMITS)
1516
(CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
1617
(DRIBBLE "init.dribble")
1718
@@ -28,15 +29,18 @@ main() {
2829
(LOADUP-SOURCE-DIR (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_SOURCEDIR") "/"))
2930
)
3031
(SETQ DIRECTORIES (CONS LOADUP-SOURCE-DIR DIRECTORIES))
32+
(PRINT (DATE))
33+
(PRINT (SETQ SYSOUTCOMMITS (LIST (LIST (QUOTE MEDLEY) (UNIX-GETENV (QUOTE LOADUP_COMMIT_ID))))))
3134
(RESETLST (RESETSAVE OK.TO.MODIFY.FNS T)
3235
(MAKEINITGREET (CONCAT WORKDIR "init.sysout") (CONCAT WORKDIR "init.dlinit"))
3336
)
3437
)
38+
3539
(DRIBBLE)
3640
(LOGOUT T)
3741
STOP
3842
EOF
39-
43+
4044
run_medley "${LOADUP_SOURCEDIR}/starter.sysout"
4145

4246
loadup_finish "init.dlinit" "init.*" "RDSYS*" "I-NEW*"

‎scripts/loadup-lisp-from-mid.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ main() {
55
. "${LOADUP_SCRIPTDIR}/loadup-setup.sh"
66

77
loadup_start
8-
8+
99
cat >"${cmfile}" <<-"EOF"
1010
"
1111
@@ -14,6 +14,7 @@ main() {
1414
(MEDLEY-INIT-VARS)
1515
(LOAD (CONCAT (QUOTE {DSK}) (UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /LOADUP-LISP.LCOM)))
1616
(LOADUP-LISP (CONCAT (QUOTE {DSK}) (UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /lisp.dribble)))
17+
(PUTASSOC (QUOTE MEDLEY) (LIST (UNIX-GETENV (QUOTE LOADUP_COMMIT_ID))) SYSOUTCOMMITS)
1718
(HARDRESET)
1819
)
1920
SHH

‎scripts/loadup-setup.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,20 @@ then
5050
fi
5151
fi
5252

53+
HAS_GIT= [ -f $(which git) ] && [ -x $(which git) ]
54+
export HAS_GIT
5355

56+
git_commit_ID () {
57+
if ${HAS_GIT};
58+
then
59+
# This does NOT indicate if there are any modified files!
60+
COMMIT_ID=$(git -C "$1" rev-parse --short HEAD)
61+
fi
62+
}
5463

64+
git_commit_ID "${LOADUP_SOURCEDIR}"
65+
LOADUP_COMMIT_ID="${COMMIT_ID}"
66+
export LOADUP_COMMIT_ID
5567

5668
scr="-sc 1024x768 -g 1042x790"
5769
geometry=1024x768

‎sources/MEDLEYDIR

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED "19-Jul-2023 08:57:43" {WMEDLEY}<sources>MEDLEYDIR.;22 10362
3+
(FILECREATED "26-Aug-2024 22:11:48" {DSK}<home>matt>Interlisp>medley>sources>MEDLEYDIR.;4 11113
44

5-
:EDIT-BY rmk
5+
:EDIT-BY "mth"
66

7-
:CHANGES-TO (FNS MEDLEYDIR)
7+
:CHANGES-TO (VARS MEDLEYDIRCOMS MEDLEY-INIT-VARS)
8+
(FNS SET-SYSOUT-COMMIT)
89

9-
:PREVIOUS-DATE "17-Jul-2023 16:13:10" {WMEDLEY}<sources>MEDLEYDIR.;21)
10+
:PREVIOUS-DATE " 8-Jul-2024 22:49:43" {DSK}<home>matt>Interlisp>medley>sources>MEDLEYDIR.;3)
1011

1112

1213
(PRETTYCOMPRINT MEDLEYDIRCOMS)
@@ -15,16 +16,19 @@
1516
[
1617
(* ;; "set up initialization for file paths relative to where Medley is installed. This assumes that the environment variable MEDLEYDIR is set (usually by the ./run-medley script) to the (unix path) and all of the other directories variables are set relative to that (by MEDLEY-INIT-VARS)")
1718

18-
(FNS MEDLEY-INIT-VARS MEDLEYDIR MEDLEYSUBSTDIR)
19-
(INITVARS (MEDLEYDIR)
20-
(\SAVE.MEDLEYDIR))
19+
(FNS MEDLEY-INIT-VARS MEDLEYDIR MEDLEYSUBSTDIR SET-SYSOUT-COMMIT)
20+
[INITVARS (MEDLEYDIR)
21+
(\SAVE.MEDLEYDIR)
22+
(SYSOUTCOMMITS (OR (AND (BOUNDP 'SYSOUTCOMMITS)
23+
SYSOUTCOMMITS)
24+
(LIST (LIST 'MEDLEY NIL]
2125
(ADDVARS (AROUNDEXITFNS MEDLEY-INIT-VARS))
2226

2327
(* ;; "**WARNING** The EVALed expressions get run early in the lodup.")
2428

2529
(VARS MEDLEY-INIT-VARS)
2630
(DECLARE%: EVAL@COMPILE DOCOPY (ADDVARS (GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS
27-
\SAVE.MEDLEYDIR DIRECTORIES])
31+
\SAVE.MEDLEYDIR DIRECTORIES SYSOUTCOMMITS])
2832

2933

3034

@@ -158,12 +162,21 @@
158162
(EQ 1 (STRPOS OLD (U-CASE (MKSTRING BODY]
159163
THEN [PACK* NEW (SUBSTRING BODY (ADD1 (NCHARS OLD]
160164
ELSE BODY])
165+
166+
(SET-SYSOUT-COMMIT
167+
[LAMBDA (REPO COMMIT-ID-ENV-VAR) (* ; "Edited 8-Jul-2024 23:31 by mth")
168+
(PUTASSOC REPO (LIST (UNIX-GETENV COMMIT-ID-ENV-VAR))
169+
SYSOUTCOMMITS])
161170
)
162171

163172
(RPAQ? MEDLEYDIR )
164173

165174
(RPAQ? \SAVE.MEDLEYDIR )
166175

176+
(RPAQ? SYSOUTCOMMITS (OR (AND (BOUNDP 'SYSOUTCOMMITS)
177+
SYSOUTCOMMITS)
178+
(LIST (LIST 'MEDLEY NIL))))
179+
167180
(ADDTOVAR AROUNDEXITFNS MEDLEY-INIT-VARS)
168181

169182

@@ -172,7 +185,9 @@
172185

173186

174187
(RPAQQ MEDLEY-INIT-VARS
175-
([LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" "internal" "greetfiles" "doctools"]
188+
((ShellBrowser)
189+
(ShellOpener)
190+
[LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" "internal" "greetfiles" "doctools"]
176191
[LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources"]
177192
(LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES))
178193
(IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo"))
@@ -203,9 +218,9 @@
203218
NIL NIL T))))
204219
(DECLARE%: EVAL@COMPILE DOCOPY
205220

206-
(ADDTOVAR GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES)
221+
(ADDTOVAR GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES SYSOUTCOMMITS)
207222
)
208223
(DECLARE%: DONTCOPY
209-
(FILEMAP (NIL (1432 8288 (MEDLEY-INIT-VARS 1442 . 4920) (MEDLEYDIR 4922 . 7306) (MEDLEYSUBSTDIR 7308
210-
. 8286)))))
224+
(FILEMAP (NIL (1749 8823 (MEDLEY-INIT-VARS 1759 . 5237) (MEDLEYDIR 5239 . 7623) (MEDLEYSUBSTDIR 7625
225+
. 8603) (SET-SYSOUT-COMMIT 8605 . 8821)))))
211226
STOP

‎sources/MEDLEYDIR.LCOM

552 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)