Skip to content

Commit 0a5ff04

Browse files
authored
Use .CM to loadup full, to avoid GREET call (#322)
1 parent a946a90 commit 0a5ff04

File tree

7 files changed

+34
-53
lines changed

7 files changed

+34
-53
lines changed

scripts/loadup-full.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ scr="-sc 1024x768 -g 1042x790"
1010

1111
touch tmp/loadup.timestamp
1212

13-
./run-medley $scr -greet $MEDLEYDIR/sources/LOADUP-FULL.LCOM $MEDLEYDIR/tmp/lisp.sysout
13+
./run-medley $scr -greet "$MEDLEYDIR/sources/LOADUP-FULL.CM" "$MEDLEYDIR/tmp/lisp.sysout"
1414

1515
if [ tmp/full.sysout -nt tmp/loadup.timestamp ]; then
1616

@@ -21,5 +21,5 @@ if [ tmp/full.sysout -nt tmp/loadup.timestamp ]; then
2121
else
2222
echo XXXXX FAILURE XXXXX
2323
ls -l tmp/full.*
24-
exit -1
24+
exit 1
2525
fi

scripts/loadup-lisp-from-mid.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ touch tmp/loadup.timestamp
1212
scr="-sc 1024x768 -g 1042x790"
1313

1414

15-
./run-medley $scr -greet $MEDLEYDIR/sources/LOADUP-LISP.CM tmp/init-mid.sysout
15+
./run-medley $scr -greet "$MEDLEYDIR/sources/LOADUP-LISP.CM" tmp/init-mid.sysout
1616

1717
if [ tmp/lisp.sysout -nt tmp/loadup.timestamp ]; then
1818

sources/LOADUP-FULL

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
2-
(FILECREATED "26-Mar-2021 10:47:11" {DSK}<home>larry>ilisp>medley>sources>LOADUP-FULL.;3 5393
2+
(FILECREATED "29-Apr-2021 22:31:24" {DSK}<Users>larry>medley>SOURCES>LOADUP-FULL.;2 4691
33

4-
changes to%: (FNS LOADUP-FULL)
4+
changes to%: (VARS LOADUP-FULLCOMS)
5+
(FNS LOADUP-FULL)
56

6-
previous date%: "25-Mar-2021 22:09:37" {DSK}<home>larry>ilisp>medley>sources>LOADUP-FULL.;2)
7+
previous date%: "26-Mar-2021 10:47:11" {DSK}<Users>larry>medley>SOURCES>LOADUP-FULL.;1)
78

89

910
(PRETTYCOMPRINT LOADUP-FULLCOMS)
1011

11-
(RPAQQ LOADUP-FULLCOMS [(COMMANDS "cd" "pwd" "ls")
12+
(RPAQQ LOADUP-FULLCOMS ((COMMANDS "cd" "pwd" "ls")
1213
(FNS LOADFULLFONTS LOADUP-FULL FIXMETA)
13-
(P (FIXMETA))
14-
(GLOBALVARS MISSINGDISPLAYFONTCOERCIONS
15-
MISSINGCHARSETDISPLAYFONTCOERCIONS)
16-
(DECLARE%: DONTEVAL@LOAD DONTEVAL@COMPILE DOCOPY (P (LOADUP-FULL T])
14+
(P (FIXMETA))))
1715

1816
(DEFCOMMAND "cd" (DIR) (/CNDIR DIR))
1917

@@ -49,7 +47,7 @@
4947
(PRINTOUT T "FULL fonts loaded" T])
5048

5149
(LOADUP-FULL
52-
[LAMBDA (DOIT) (* ; "Edited 26-Mar-2021 10:44 by larry")
50+
[LAMBDA (DOIT) (* ; "Edited 29-Apr-2021 22:27 by rmk:")
5351
(* ; "Edited 14-May-2018 15:01 by kaplan")
5452
(* ; "Edited 28-Sep-2020 12:35 by rmk:")
5553
(* ; "Edited 21-Apr-2018 07:27 by rmk:")
@@ -91,15 +89,7 @@
9189
((WINDOWP *WHO-LINE*)
9290
(CLOSEW *WHO-LINE*)))
9391
(SETTOPVAL 'INITIALS NIL)
94-
(DRIBBLE)
95-
96-
(* ;; "Set up for making the sysout, if we made it this far.")
97-
98-
(CL:WHEN DOIT
99-
(PRINTOUT T "Creating FULL sysout on " MAKESYSFILENAME T)
100-
(BKSYSBUF (CONCAT "(IL:ENDLOADUP)" "(IL:MAKESYS %"" MAKESYSFILENAME "%" %"Medley "
101-
" Full Sysout%")" "
102-
(IL:LOGOUT T)")))])
92+
(DRIBBLE])
10393

10494
(FIXMETA
10595
[LAMBDA NIL (* ; "Edited 25-Jun-2017 17:12 by rmk:")
@@ -109,15 +99,7 @@
10999
)
110100

111101
(FIXMETA)
112-
(DECLARE%: DOEVAL@COMPILE DONTCOPY
113-
114-
(GLOBALVARS MISSINGDISPLAYFONTCOERCIONS MISSINGCHARSETDISPLAYFONTCOERCIONS)
115-
)
116-
(DECLARE%: DONTEVAL@LOAD DONTEVAL@COMPILE DOCOPY
117-
118-
(LOADUP-FULL T)
119-
)
120102
(DECLARE%: DONTCOPY
121-
(FILEMAP (NIL (887 5168 (LOADFULLFONTS 897 . 2485) (LOADUP-FULL 2487 . 4922) (FIXMETA 4924 . 5166))))
103+
(FILEMAP (NIL (685 4653 (LOADFULLFONTS 695 . 2283) (LOADUP-FULL 2285 . 4407) (FIXMETA 4409 . 4651))))
122104
)
123105
STOP

sources/LOADUP-FULL.CM

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +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)"

sources/LOADUP-FULL.LCOM

-409 Bytes
Binary file not shown.

sources/LOADUP-LISP

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE "INTERLISP")
2-
(FILECREATED "28-Mar-2021 10:06:54" |{DSK}<home>larry>ilisp>medley>sources>LOADUP-LISP.;4| 8886
2+
(FILECREATED "29-Apr-2021 22:31:24" |{DSK}<Users>larry>medley>SOURCES>LOADUP-LISP.;2| 8463
33

44
|changes| |to:| (FNS LOADUP-LISP)
55

6-
|previous| |date:| "25-Mar-2021 16:34:41" |{DSK}<home>larry>ilisp>medley>sources>LOADUP-LISP.;3|
7-
)
6+
|previous| |date:| "28-Mar-2021 10:06:54" |{DSK}<Users>larry>medley>SOURCES>LOADUP-LISP.;1|)
87

98

109
(PRETTYCOMPRINT LOADUP-LISPCOMS)
@@ -18,7 +17,7 @@
1817
(DEFINEQ
1918

2019
(LOADUP-LISP
21-
(LAMBDA NIL (* \; "Edited 28-Mar-2021 10:06 by larry")
20+
(LAMBDA NIL (* \; "Edited 29-Apr-2021 22:30 by rmk:")
2221
(SETQQ COMPILE.EXT LCOM) (* \; "should be set earlier")
2322
(DRIBBLE (MEDLEYDIR "tmp" "lisp.dribble" T))
2423
(FOR X IN BOOTLOADEDFILES DO (CL:UNLESS (MEMB X SYSFILES)
@@ -103,7 +102,7 @@
103102
(LOADUP '(PUP 10MBDRIVER LEAF LLETHER DPUPFTP LOCALFILE DSKDISPLAY COURIER LLNS TRSERVER SPP
104103
NSPRINT AUTHENTICATION BSP CLEARINGHOUSE NSFILING MAIKOETHER))
105104
(DRIBBLE)
106-
(SETQ MAKESYSNAME ':MEDLEY)))
105+
(SETQ MAKESYSNAME ':LISP)))
107106
)
108107
(DEFINEQ
109108

@@ -159,28 +158,27 @@
159158

160159
(RPAQ? FILING.ENUMERATION.DEPTH T)
161160

162-
(RPAQQ MEDLEY-INIT-VARS ((LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers"
163-
"internal/library")))
164-
(LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources")))
165-
(LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES))
166-
(IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo"))
167-
(IRM.DINFOGRAPH)
168-
(DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES))
169-
(LOGINHOST/DIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
170-
(UNIX-GETENV "HOME"))))
171-
(USERGREETFILES `((,LOGINHOST/DIR "INIT" COM)
172-
(,LOGINHOST/DIR "INIT")))
173-
(DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/displayfonts"
174-
"fonts/altofonts")))
175-
(POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts")))
176-
(INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts")))
177-
(XCL::*WHERE-IS-CASH-FILES*)))
161+
(RPAQQ MEDLEY-INIT-VARS
162+
((LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" "internal/library")))
163+
(LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources")))
164+
(LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES))
165+
(IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo"))
166+
(IRM.DINFOGRAPH)
167+
(DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES))
168+
(LOGINHOST/DIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
169+
(UNIX-GETENV "HOME"))))
170+
(USERGREETFILES `((,LOGINHOST/DIR "INIT" COM)
171+
(,LOGINHOST/DIR "INIT")))
172+
(DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/displayfonts" "fonts/altofonts")))
173+
(POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts")))
174+
(INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts")))
175+
(XCL::*WHERE-IS-CASH-FILES*)))
178176
(DECLARE\: DOEVAL@COMPILE DONTCOPY
179177

180178
(GLOBALVARS XCL::*WHERE-IS-CASH-FILES* LISPMAKESYSDATE MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR
181179
SYSTEMINITVARS USERRECLST)
182180
)
183181
(DECLARE\: DONTCOPY
184-
(FILEMAP (NIL (764 4856 (LOADUP-LISP 774 . 4854)) (4857 7356 (MEDLEY-INIT-VARS 4867 . 6012) (MEDLEYDIR
185-
6014 . 7354)))))
182+
(FILEMAP (NIL (753 4843 (LOADUP-LISP 763 . 4841)) (4844 7343 (MEDLEY-INIT-VARS 4854 . 5999) (MEDLEYDIR
183+
6001 . 7341)))))
186184
STOP

sources/LOADUP-LISP.LCOM

20 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)