diff --git a/clos/defsys.DFASL b/clos/defsys.DFASL index 91e2f5e3e..145d30ae0 100644 Binary files a/clos/defsys.DFASL and b/clos/defsys.DFASL differ diff --git a/clos/defsys.lisp b/clos/defsys.lisp index 62e5850cb..70529efcd 100644 --- a/clos/defsys.lisp +++ b/clos/defsys.lisp @@ -641,7 +641,7 @@ and load your system with: ((listp m) (operate-on-system 'clos :compile-from m)) ((symbolp m) (operate-on-system 'clos :recompile-some `(,m)))))) -(defun load-clos (&optional m) +(defun il:load-clos (&optional m) (let (#+:coral(ccl::*warn-if-redefine-kernel* nil) #+Lucid (lcl:*redefinition-action* nil) #+excl (excl::*redefinition-warnings* nil) diff --git a/internal/loadups/LOADUP-APPS b/internal/loadups/LOADUP-APPS index e0c8df7ba..ec21f9827 100644 --- a/internal/loadups/LOADUP-APPS +++ b/internal/loadups/LOADUP-APPS @@ -1,43 +1,63 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "17-Jan-2023 20:34:02" {DSK}frank>il>medley>gmedley>sources>LOADUP-APPS.;3 2095 +(FILECREATED " 3-Jan-2025 08:29:59" {DSK}larry>il>medley>internal>loadups>LOADUP-APPS.;5 2611 - :CHANGES-TO (FNS Apps.RemoveBackgroundMenuItem) + :EDIT-BY "larry" - :PREVIOUS-DATE "17-Jan-2023 20:29:39" {DSK}frank>il>medley>gmedley>sources>LOADUP-APPS.;2 + :PREVIOUS-DATE " 2-Jan-2025 20:38:44" {DSK}larry>il>medley>internal>loadups>LOADUP-APPS.;7 ) (PRETTYCOMPRINT LOADUP-APPSCOMS) (RPAQQ LOADUP-APPSCOMS ((GLOBALVARS *ALL-BUTTONS* BackgroundMenuCommands BackgroundMenu) - (FNS Apps.LOADUP Apps.RemoveBackgroundMenuItem))) + (FNS LOADUP-APPS Apps.RemoveBackgroundMenuItem))) (DECLARE%: DOEVAL@COMPILE DONTCOPY (GLOBALVARS *ALL-BUTTONS* BackgroundMenuCommands BackgroundMenu) ) (DEFINEQ -(Apps.LOADUP - [LAMBDA NIL (* ; "Edited 12-Nov-2022 14:03 by FGH") - (PROGN - (* ;; " Delete button(s) that are created when lispusers/BUTTONS is loaded") +(LOADUP-APPS + [LAMBDA NIL (* ; "Edited 2-Jan-2025 20:38 by lmm") + (* ; "Edited 2-Jan-2025 06:30 by larry") + (PUTASSOC 'MEDLEY (LIST (UNIX-GETENV 'LOADUP_COMMIT_ID)) + SYSOUTCOMMITS) - (for B in *ALL-BUTTONS* do (DELETE-BUTTON B)) + (* ;; "= = = = = = = = = = = = = = = = = =") - (* ;; " Remove the BUTTONS BackgroundMenu item") + (DOFILESLOAD `((SYSLOAD) + (FROM ,(MEDLEYDIR "ROOMS")) + ROOMS)) - (Apps.RemoveBackgroundMenuItem "Button Control") + (* ;; "======================") - (* ;; " Remove the NoteCards Background Menu Item") + (DOFILESLOAD `((SYSLOAD) + (FROM ,(CONCAT (UNIX-GETENV "NOTECARDSDIR") + "/system")) + NOTECARDS)) - (Apps.RemoveBackgroundMenuItem 'NoteCards) + (* ;; " Remove the NoteCards Background Menu Item") - (* ;; " Remove the CLOS Background Menu Item") + (PUTASSOC 'NOTECARDS (LIST (UNIX-GETENV 'NOTECARDS_COMMIT_ID)) + SYSOUTCOMMITS) - (Apps.RemoveBackgroundMenuItem 'BrowseClass) - (RPLACA [CAR (LIST '(A B C] - NIL]) + (* ;; "======================") + + (DOFILESLOAD `((SYSLOAD) + (FROM ,(MEDLEYDIR "CLOS")) + DEFSYS)) + (LOAD-CLOS) + + (* ;; " Remove the CLOS Background Menu Item") + + (Apps.RemoveBackgroundMenuItem 'BrowseClass) + + (* ;; "= = = = = = = = = = = = = == = = = ") + + (DOFILESLOAD '((SYSLOAD) + BUTTONS)) + (PRINTOUT T "commits-- " SYSOUTCOMMITS T]) (Apps.RemoveBackgroundMenuItem [LAMBDA (ItemStringOrAtom) @@ -52,5 +72,5 @@ Apps.SBG]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (647 2072 (Apps.LOADUP 657 . 1400) (Apps.RemoveBackgroundMenuItem 1402 . 2070))))) + (FILEMAP (NIL (618 2588 (LOADUP-APPS 628 . 1916) (Apps.RemoveBackgroundMenuItem 1918 . 2586))))) STOP diff --git a/internal/loadups/LOADUP-APPS.LCOM b/internal/loadups/LOADUP-APPS.LCOM index 07d8eb3f7..fe303c0e1 100644 Binary files a/internal/loadups/LOADUP-APPS.LCOM and b/internal/loadups/LOADUP-APPS.LCOM differ diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh index e698aa860..1c8906ebf 100755 --- a/scripts/loadup-apps-from-full.sh +++ b/scripts/loadup-apps-from-full.sh @@ -37,36 +37,20 @@ main() { export NOTECARDS_COMMIT_ID cat >"${cmfile}" <<-"EOF" - " - - (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: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) - (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 LOADUP_SOURCEDIR)) (QUOTE /LOADUP-APPS.LCOM)) 'IL:SYSLOAD) - (IL:PRINT (IL:UNIX-GETENV (QUOTE NOTECARDS_COMMIT_ID))) - (IL:PUTASSOC (QUOTE IL:MEDLEY) (LIST (IL:UNIX-GETENV (QUOTE LOADUP_COMMIT_ID))) IL:SYSOUTCOMMITS) - (IL:PUTASSOC (QUOTE IL:NOTECARDS) (LIST (IL:UNIX-GETENV (QUOTE NOTECARDS_COMMIT_ID))) IL:SYSOUTCOMMITS) - (IL:PRINT IL:SYSOUTCOMMITS) - (IL:HARDRESET) - ) - SHH - (PROGN - (IL:ENDLOADUP) - (CLOS::LOAD-CLOS) - (IL:|Apps.LOADUP|) - (IL:DRIBBLE) - (IL:MAKESYS - (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.sysout))) - :APPS) - ) - (IL:LOGOUT T) - - " - EOF +" +(PROGN + (SETQ IL:HELPTIME 0) + (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:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR))(QUOTE /LOADUP-APPS.LCOM))) + (IL:LOADUP-APPS) + (IL:ENDLOADUP) + (IL:DRIBBLE) + (IL:MAKESYS + (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR)) + (IL:L-CASE (QUOTE /apps.sysout))) + :APPS)) " +EOF run_medley "${LOADUP_WORKDIR}/full.sysout" diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh index 34b3ae46e..04dfed982 100755 --- a/scripts/loadup-full-from-lisp.sh +++ b/scripts/loadup-full-from-lisp.sh @@ -13,10 +13,6 @@ main() { (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:PUTASSOC (QUOTE IL:MEDLEY) (LIST (IL:UNIX-GETENV (QUOTE LOADUP_COMMIT_ID))) IL:SYSOUTCOMMITS) - (IL:HARDRESET) - ) - SHH - (PROGN (IL:ENDLOADUP) (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL)) (IL:LOGOUT T) diff --git a/sources/ADIR b/sources/ADIR index 3a596d8b2..358717ca3 100644 --- a/sources/ADIR +++ b/sources/ADIR @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "25-Dec-2024 11:31:30" {MEDLEY}ADIR.;15 70102 +(FILECREATED " 3-Jan-2025 08:03:51" {DSK}larry>il>medley>sources>ADIR.;2 70265 - :EDIT-BY rmk + :EDIT-BY "lmm" - :CHANGES-TO (FNS TRUEDEVICE.STUB) + :CHANGES-TO (FNS MAKESYS) - :PREVIOUS-DATE "25-Dec-2024 07:35:38" {MEDLEY}ADIR.;13) + :PREVIOUS-DATE "25-Dec-2024 11:31:30" {DSK}larry>il>medley>sources>ADIR.;1) (PRETTYCOMPRINT ADIRCOMS) @@ -1100,14 +1100,15 @@ (MAKESYS [LAMBDA (FILE NAME) (DECLARE (GLOBALVARS \MISCSTATS) - (SPECVARS FILE NAME)) (* ; "Edited 16-Mar-2021 19:36 by larry") + (SPECVARS FILE NAME)) (* ; "Edited 3-Jan-2025 08:03 by lmm") + (* ; "Edited 16-Mar-2021 19:36 by larry") (* ; "Edited 28-Jul-88 18:16 by drc:") (\USEREVENT 'BEFOREMAKESYS) (HERALD (CONCAT (OR NAME (CL:STRING-CAPITALIZE MAKESYSNAME)) - " " - (SUBSTRING (SETQ MAKESYSDATE (DATE)) - 1 11) - " ...")) + " " + (SUBSTRING (SETQ MAKESYSDATE (DATE)) + 1 11) + " ...")) (\DEVICEEVENT 'BEFOREMAKESYS) (* ;; "RMK: make sysout on a temp file, then rename it in order to get version numbers LMM unneded -- OUTFILEP assivvns a new version number") @@ -1115,18 +1116,19 @@ (LET ((NEWFILE (\COPYSYS FILE))) (COND ((NLISTP NEWFILE) (* ; - "Coming back from doing the MAKESYS, so just set up to keep going.,") + "Coming back from doing the MAKESYS, so just set up to keep going.,") (\DEVICEEVENT 'AFTERDOMAKESYS) (\USEREVENT 'AFTERDOMAKESYS) + (LOGOUT T) FILE) (T (* ; - "Coming back in the MAKESYS'd sysout, so restart the world.") + "Coming back in the MAKESYS'd sysout, so restart the world.") (\DEVICEEVENT 'AFTERMAKESYS) (\PROCESS.AFTER.EXIT 'AFTERMAKESYS) (PRIN1 HERALDSTRING T) (\USEREVENT 'AFTERMAKESYS) - (INTERPRET.REM.CM) (* ; - "Run the commands in the file REM.CM") + (INTERPRET.REM.CM) (* ; + "Run the commands in the file REM.CM") (RESET]) (SYSOUT @@ -1289,15 +1291,15 @@ (ADDTOVAR LAMA PACKFILENAME.STRING PACKFILENAME) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3201 15904 (DELFILE 3211 . 3372) (FULLNAME 3374 . 3741) (INFILE 3743 . 4002) (INFILEP -4004 . 4139) (IOFILE 4141 . 4392) (OPENFILE 4394 . 4697) (OPENSTREAM 4699 . 9039) (OUTFILE 9041 . 9303 -) (OUTFILEP 9305 . 9441) (RENAMEFILE 9443 . 9749) (SIMPLE.FINDFILE 9751 . 10161) (VMEMSIZE 10163 . -10330) (\COPYSYS 10332 . 14623) (\FLUSHVM 14625 . 15697) (\LOGOUT0 15699 . 15902)) (16033 16269 ( -TRUEDEVICE.STUB 16043 . 16267)) (16637 41297 (UNPACKFILENAME.STRING 16647 . 38483) (\UPF.DIRECTORY -38485 . 41295)) (42825 45131 (UNPACKFILENAME 42835 . 43021) (LASTCHPOS 43023 . 43717) (FILENAMEFIELD -43719 . 44013) (FILENAMEFIELD.STRING 44015 . 44419) (PACKFILENAME 44421 . 44764) (PACKFILENAME.STRING -44766 . 45129)) (59601 60514 (FILEDIRCASEARRAY 59611 . 60512)) (60681 67861 (LOGOUT 60691 . 61608) ( -MAKESYS 61610 . 63239) (SYSOUT 63241 . 64793) (SAVEVM 64795 . 65595) (HERALD 65597 . 65757) ( -INTERPRET.REM.CM 65759 . 67484) (\USEREVENT 67486 . 67859)) (68043 69770 (USERNAME 68053 . 69009) ( -SETUSERNAME 69011 . 69768))))) + (FILEMAP (NIL (3229 15932 (DELFILE 3239 . 3400) (FULLNAME 3402 . 3769) (INFILE 3771 . 4030) (INFILEP +4032 . 4167) (IOFILE 4169 . 4420) (OPENFILE 4422 . 4725) (OPENSTREAM 4727 . 9067) (OUTFILE 9069 . 9331 +) (OUTFILEP 9333 . 9469) (RENAMEFILE 9471 . 9777) (SIMPLE.FINDFILE 9779 . 10189) (VMEMSIZE 10191 . +10358) (\COPYSYS 10360 . 14651) (\FLUSHVM 14653 . 15725) (\LOGOUT0 15727 . 15930)) (16061 16297 ( +TRUEDEVICE.STUB 16071 . 16295)) (16665 41325 (UNPACKFILENAME.STRING 16675 . 38511) (\UPF.DIRECTORY +38513 . 41323)) (42853 45159 (UNPACKFILENAME 42863 . 43049) (LASTCHPOS 43051 . 43745) (FILENAMEFIELD +43747 . 44041) (FILENAMEFIELD.STRING 44043 . 44447) (PACKFILENAME 44449 . 44792) (PACKFILENAME.STRING +44794 . 45157)) (59629 60542 (FILEDIRCASEARRAY 59639 . 60540)) (60709 68024 (LOGOUT 60719 . 61636) ( +MAKESYS 61638 . 63402) (SYSOUT 63404 . 64956) (SAVEVM 64958 . 65758) (HERALD 65760 . 65920) ( +INTERPRET.REM.CM 65922 . 67647) (\USEREVENT 67649 . 68022)) (68206 69933 (USERNAME 68216 . 69172) ( +SETUSERNAME 69174 . 69931))))) STOP diff --git a/sources/ADIR.LCOM b/sources/ADIR.LCOM index 5633fc9e1..f372fa88b 100644 Binary files a/sources/ADIR.LCOM and b/sources/ADIR.LCOM differ