reduce changes: no separate MAKEFILE-NEW but fix so it will not copy from previous version if you do MAKEFILE(something NEW).

sources/FILEPKG

@@ -1,18 +1,15 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "18-Jul-2023 23:40:13" {WMEDLEY}<sources>FILEPKG.;50
 274539 
+
(FILECREATED "18-Apr-2024 12:53:26" {DSK}<home>larry>il>medley>sources>FILEPKG.;53
 273166 
 
-      :EDIT-BY rmk
+      :EDIT-BY "lmm"
 
-      :CHANGES-TO (FNS GATHEREXPORTS)
+      :CHANGES-TO (VARS FILEPKGCOMS)
+                  (FNS MAKEFILE)
 
-      :PREVIOUS-DATE "13-Jul-2023 14:56:21" {WMEDLEY}<sources>FILEPKG.;48)
+      :PREVIOUS-DATE "18-Apr-2024 12:33:38" {DSK}<home>larry>il>medley>sources>FILEPKG.;52)
 
 
-(* ; "
-Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
-")
-
 (PRETTYCOMPRINT FILEPKGCOMS)
 
 (RPAQQ FILEPKGCOMS

@@ -400,13 +397,13 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
        (T (COMPILEFILES0
 FILES])
 
 (COMPILEFILES0

-  [LAMBDA (FILES OPTIONS)                                    (* rmk%: "19-FEB-83 21:59")

-    (for
 X OPTS (RCFLG _ T) on
 (OR FILES NOTCOMPILEDFILES) first
 (SETQ OPTS
-                                                                  (SELECTQ (CAR (LISTP OPTIONS))
-                                                                      (C (SETQ RCFLG NIL)
-                                                                         (CDR OPTIONS))
-                                                                      (RC (CDR OPTIONS))
-                                                                      OPTIONS))
+  [LAMBDA (FILES OPTIONS)
                                    (* ; "Edited 30-Jan-2024 15:03 by lmm")

+                                                             (* rmk%: "19-FEB-83 21:59")

+    (for
 X OPTS RCFLG on
 (OR FILES NOTCOMPILEDFILES) first
 (SETQ OPTS (SELECTQ (CAR (LISTP OPTIONS))
+                                                                          (C (SETQ RCFLG NIL)
+                                                                             (CDR OPTIONS))
+                                                                          (RC (CDR OPTIONS))
+                                                                          OPTIONS))
        do
 (MAKEFILE1
 (OR (MISSPELLED? (CAR X)
                                 70 FILELST NIL X)
                          (CAR X))
@@ -437,7 +434,8 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
           (RETURN FILE])
 
 (MAKEFILE

-  [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE)
              (* ; "Edited 10-Oct-2021 20:36 by rmk:")


+  [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE)
               (* ; "Edited 30-Jan-2024 12:50 by lmm")


+                                                            (* ; "Edited 10-Oct-2021 20:36 by rmk:")


                                                             (* ; "Edited 29-Jun-2021 17:24 by rmk:")

 
     (* ;; "OPTIONS: FAST means dump with PRETTYFLG set to NIL;  LIST means list the FILE;  RC means RECOMPILE, C means COMPILEL;  --- for C AND RC assume ST unless next option is F.")

@@ -462,35 +460,14 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
           (SETQ CHANGES (fetch
 TOBEDUMPED of
 FILEPROP))
           (SETQ FILEDATES (LISTP (fetch
 FILEDATES of
 ROOTNAME)))
           (SETQ FILETYPE (GETPROP ROOTNAME 'FILETYPE))
-      LP0 (if
 (AND (NULL (fetch
 LOADTYPE of
 FILEPROP))
+          (if
 (AND (NULL (fetch
 LOADTYPE of
 FILEPROP))
                    (NULL FILEDATES))
               then
                                           (* ; 
 
                     "File has never been loaded and never dumped i.e. user just set up COMS in core")

-            elseif
 [OR (EQMEMB 'NEW OPTIONS)
+            elseif
 [OR (MEMB 'NEW OPTIONS)
                        (AND (NULL MAKEFILEREMAKEFLG)
                             (NOT (MEMB 'REMAKE OPTIONS]
-              then
 (COND
-                      ((AND (fetch
 LOADTYPE of
 FILEPROP)
-                            (NEQ T (fetch
 LOADTYPE of
 FILEPROP)))
-                       (LISPXPRIN2 FILE T T)
-                       (LISPXPRIN1 (SELECTQ (fetch
 LOADTYPE of
 FILEPROP)
-                                       (LOADCOMP "the file was loaded for compilation purposes only")
-                                       ((compiled Compiled COMPILED) 
-                                            " -- only the compiled file has been loaded
-")
-                                       ((loadfns LOADFNS) 
-                                            " -- only some of its symbolics have been loaded
-")
-                                       (SHOULDNT))
-                              T)
-                       (COND
-                          ((NEQ (ASKUSER DWIMWAIT 'Y "Go ahead and MAKEFILE anyway? ")
-                                'Y)                          (* ; 
-
              "E.g. user loads a .com file and then resets the COMS or defines the functons by hand.")

-                           (GO OUT)))
-                       (/replace
 LOADTYPE of
 FILEPROP with
 NIL)))
-                   (SETQ SOURCEFILE NIL)
-                   (SETQ REPRINTFNS NIL)
+              then
 (RETURN (MAKEFILE-NEW
 FILE OPTIONS))
             elseif
 SOURCEFILE
               then
                                           (* ; "source file given")

             elseif
 [AND FILEDATES (OR [AND (SETQ SOURCEFILE (FINDFILE ROOTNAME T))
@@ -519,11 +496,7 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
                  (LISPXPRIN2 FILE T T)
                  (LISPXPRIN1 '", so it will have to be written anew
 " T)
-                 (SETQ SOURCEFILE NIL)
-                 (SETQ REPRINTFNS NIL)
-                 (push
 OPTIONS 'NEW)
-                 (SETQ CHANGES (fetch
 FILECHANGES of
 ROOTNAME))
-                 (GO LP0))
+                 (RETURN (MAKEFILE-NEW
 FILE OPTIONS)))
           (COND
              ((AND SOURCEFILE (SETQ Z (SELECTQ (fetch
 LOADTYPE of
 FILEPROP)
                                           (LOADCOMP          (* ; 
@@ -4858,49 +4831,47 @@ compiling " T)
 
 (ADDTOVAR LAMA
 FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES)
 )
-(PUTPROPS FILEPKG COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1989 1990 
-1991 1992 1993 1995 2018 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (18975 20648 (SEARCHPRETTYTYPELST 18985 . 19954) (PRETTYDEFMACROS 19956 . 20392) (
-FILEPKGCOMPROPS 20394 . 20646)) (21461 55753 (CLEANUP 21471 . 22861) (COMPILEFILES 22863 . 23139) (
-COMPILEFILES0 23141 . 23954) (CONTINUEDIT 23956 . 25333) (MAKEFILE 25335 . 37061) (FILECHANGES 37063
- . 39827) (FILEPKG.MERGECHANGES 39829 . 40464) (FILEPKG.CHANGEDFNS 40466 . 40778) (MAKEFILE1 40780 . 
-44992) (COMPILE-FILE? 44994 . 46581) (MAKEFILES 46583 . 48111) (ADDFILE 48113 . 50656) (ADDFILE0 50658
- . 54782) (LISTFILES 54784 . 55751)) (56425 90011 (FILEPKGCHANGES 56435 . 57614) (GETFILEPKGTYPE 57616
- . 60566) (MARKASCHANGED 60568 . 62199) (FILECOMS 62201 . 62585) (WHEREIS 62587 . 64116) (
-SMASHFILECOMS 64118 . 64346) (FILEFNSLST 64348 . 64514) (FILECOMSLST 64516 . 65002) (UPDATEFILES 65004
- . 69502) (INFILECOMS? 69504 . 71347) (INFILECOMTAIL 71349 . 72467) (INFILECOMS 72469 . 72630) (
-INFILECOM 72632 . 82650) (INFILECOMSVALS 82652 . 82959) (INFILECOMSVAL 82961 . 83969) (INFILECOMSPROP 
-83971 . 84764) (IFCPROPS 84766 . 85846) (IFCEXPRTYPE 85848 . 86464) (IFCPROPSCAN 86466 . 87427) (
-IFCDECLARE 87429 . 88688) (INFILEPAIRS 88690 . 88989) (INFILECOMSMACRO 88991 . 90009)) (90046 120732 (
-FILES? 90056 . 92167) (FILES?1 92169 . 92871) (FILES?PRINTLST 92873 . 93655) (ADDTOFILES? 93657 . 
-104200) (ADDTOFILE 104202 . 105118) (WHATIS 105120 . 107096) (ADDTOCOMS 107098 . 108636) (ADDTOCOM 
-108638 . 115125) (ADDTOCOM1 115127 . 116298) (ADDNEWCOM 116300 . 117350) (MAKENEWCOM 117352 . 119199) 
-(DEFAULTMAKENEWCOM 119201 . 120730)) (120802 123619 (MERGEINSERT 120812 . 123155) (MERGEINSERT1 123157
- . 123617)) (123773 125134 (ADDTOFILEKEYLST 123783 . 125132)) (125251 136052 (DELFROMFILES 125261 . 
-126091) (DELFROMCOMS 126093 . 127772) (DELFROMCOM 127774 . 133539) (DELFROMCOM1 133541 . 134340) (
-REMOVEITEM 134342 . 135218) (MOVETOFILE 135220 . 136050)) (136266 138637 (SAVEPUT 136276 . 138635)) (
-138762 147005 (UNMARKASCHANGED 138772 . 140256) (PREEDITFN 140258 . 142739) (POSTEDITPROPS 142741 . 
-145035) (POSTEDITALISTS 145037 . 147003)) (147150 166620 (ALISTS.GETDEF 147160 . 147539) (
-ALISTS.WHENCHANGED 147541 . 148187) (CLEARCLISPARRAY 148189 . 149367) (EXPRESSIONS.WHENCHANGED 149369
- . 149747) (MAKEALISTCOMS 149749 . 150764) (MAKEFILESCOMS 150766 . 152096) (MAKELISPXMACROSCOMS 152098
- . 154116) (MAKEPROPSCOMS 154118 . 154744) (MAKEUSERMACROSCOMS 154746 . 156563) (PROPS.WHENCHANGED 
-156565 . 157186) (FILEGETDEF.LISPXMACROS 157188 . 158487) (FILEGETDEF.ALISTS 158489 . 159080) (
-FILEGETDEF.RECORDS 159082 . 160009) (FILEGETDEF.PROPS 160011 . 160806) (FILEGETDEF.MACROS 160808 . 
-161690) (FILEGETDEF.VARS 161692 . 162295) (FILEGETDEF.FNS 162297 . 163537) (FILEPKGCOMS.PUTDEF 163539
- . 165481) (FILES.PUTDEF 165483 . 166351) (VARS.PUTDEF 166353 . 166496) (FILES.WHENCHANGED 166498 . 
-166618)) (168642 175873 (RENAME 168652 . 170097) (CHANGECALLERS 170099 . 175871)) (175874 223783 (
-SHOWDEF 175884 . 177081) (COPYDEF 177083 . 179831) (GETDEF 179833 . 182376) (GETDEFCOM 182378 . 183344
-) (GETDEFCOM0 183346 . 184539) (GETDEFCURRENT 184541 . 190853) (GETDEFERR 190855 . 192125) (
-GETDEFFROMFILE 192127 . 196356) (GETDEFSAVED 196358 . 197446) (PUTDEF 197448 . 198155) (EDITDEF 198157
- . 199140) (DEFAULT.EDITDEF 199142 . 201980) (EDITDEF.FILES 201982 . 202187) (LOADDEF 202189 . 202365)
- (DWIMDEF 202367 . 203221) (DELDEF 203223 . 206117) (DELFROMLIST 206119 . 206623) (HASDEF 206625 . 
-212862) (GETFILEDEF 212864 . 213376) (SAVEDEF 213378 . 215066) (UNSAVEDEF 215068 . 215964) (
-COMPAREDEFS 215966 . 219772) (COMPARE 219774 . 220478) (TYPESOF 220480 . 223781)) (223933 232181 (
-FILEPKGCOM 223943 . 228719) (FILEPKGTYPE 228721 . 232179)) (244214 261689 (FINDCALLERS 244224 . 244854
-) (EDITCALLERS 244856 . 255573) (EDITFROMFILE 255575 . 261004) (FINDATS 261006 . 261278) (LOOKIN 
-261280 . 261687)) (261690 263361 (SEPRCASE 261700 . 263359)) (263878 268881 (IMPORTFILE 263888 . 
-264858) (IMPORTEVAL 264860 . 265746) (IMPORTFILESCAN 265748 . 266161) (CHECKIMPORTS 266163 . 267419) (
-GATHEREXPORTS 267421 . 268289) (\DUMPEXPORTS 268291 . 268879)) (269219 271289 (CLEARFILEPKG 269229 . 
-271287)))))
+  (FILEMAP (NIL (18960 20633 (SEARCHPRETTYTYPELST 18970 . 19939) (PRETTYDEFMACROS 19941 . 20377) (
+FILEPKGCOMPROPS 20379 . 20631)) (21446 54515 (CLEANUP 21456 . 22846) (COMPILEFILES 22848 . 23124) (
+COMPILEFILES0 23126 . 23992) (CONTINUEDIT 23994 . 25371) (MAKEFILE 25373 . 35823) (FILECHANGES 35825
+ . 38589) (FILEPKG.MERGECHANGES 38591 . 39226) (FILEPKG.CHANGEDFNS 39228 . 39540) (MAKEFILE1 39542 . 
+43754) (COMPILE-FILE? 43756 . 45343) (MAKEFILES 45345 . 46873) (ADDFILE 46875 . 49418) (ADDFILE0 49420
+ . 53544) (LISTFILES 53546 . 54513)) (55187 88773 (FILEPKGCHANGES 55197 . 56376) (GETFILEPKGTYPE 56378
+ . 59328) (MARKASCHANGED 59330 . 60961) (FILECOMS 60963 . 61347) (WHEREIS 61349 . 62878) (
+SMASHFILECOMS 62880 . 63108) (FILEFNSLST 63110 . 63276) (FILECOMSLST 63278 . 63764) (UPDATEFILES 63766
+ . 68264) (INFILECOMS? 68266 . 70109) (INFILECOMTAIL 70111 . 71229) (INFILECOMS 71231 . 71392) (
+INFILECOM 71394 . 81412) (INFILECOMSVALS 81414 . 81721) (INFILECOMSVAL 81723 . 82731) (INFILECOMSPROP 
+82733 . 83526) (IFCPROPS 83528 . 84608) (IFCEXPRTYPE 84610 . 85226) (IFCPROPSCAN 85228 . 86189) (
+IFCDECLARE 86191 . 87450) (INFILEPAIRS 87452 . 87751) (INFILECOMSMACRO 87753 . 88771)) (88808 119494 (
+FILES? 88818 . 90929) (FILES?1 90931 . 91633) (FILES?PRINTLST 91635 . 92417) (ADDTOFILES? 92419 . 
+102962) (ADDTOFILE 102964 . 103880) (WHATIS 103882 . 105858) (ADDTOCOMS 105860 . 107398) (ADDTOCOM 
+107400 . 113887) (ADDTOCOM1 113889 . 115060) (ADDNEWCOM 115062 . 116112) (MAKENEWCOM 116114 . 117961) 
+(DEFAULTMAKENEWCOM 117963 . 119492)) (119564 122381 (MERGEINSERT 119574 . 121917) (MERGEINSERT1 121919
+ . 122379)) (122535 123896 (ADDTOFILEKEYLST 122545 . 123894)) (124013 134814 (DELFROMFILES 124023 . 
+124853) (DELFROMCOMS 124855 . 126534) (DELFROMCOM 126536 . 132301) (DELFROMCOM1 132303 . 133102) (
+REMOVEITEM 133104 . 133980) (MOVETOFILE 133982 . 134812)) (135028 137399 (SAVEPUT 135038 . 137397)) (
+137524 145767 (UNMARKASCHANGED 137534 . 139018) (PREEDITFN 139020 . 141501) (POSTEDITPROPS 141503 . 
+143797) (POSTEDITALISTS 143799 . 145765)) (145912 165382 (ALISTS.GETDEF 145922 . 146301) (
+ALISTS.WHENCHANGED 146303 . 146949) (CLEARCLISPARRAY 146951 . 148129) (EXPRESSIONS.WHENCHANGED 148131
+ . 148509) (MAKEALISTCOMS 148511 . 149526) (MAKEFILESCOMS 149528 . 150858) (MAKELISPXMACROSCOMS 150860
+ . 152878) (MAKEPROPSCOMS 152880 . 153506) (MAKEUSERMACROSCOMS 153508 . 155325) (PROPS.WHENCHANGED 
+155327 . 155948) (FILEGETDEF.LISPXMACROS 155950 . 157249) (FILEGETDEF.ALISTS 157251 . 157842) (
+FILEGETDEF.RECORDS 157844 . 158771) (FILEGETDEF.PROPS 158773 . 159568) (FILEGETDEF.MACROS 159570 . 
+160452) (FILEGETDEF.VARS 160454 . 161057) (FILEGETDEF.FNS 161059 . 162299) (FILEPKGCOMS.PUTDEF 162301
+ . 164243) (FILES.PUTDEF 164245 . 165113) (VARS.PUTDEF 165115 . 165258) (FILES.WHENCHANGED 165260 . 
+165380)) (167404 174635 (RENAME 167414 . 168859) (CHANGECALLERS 168861 . 174633)) (174636 222545 (
+SHOWDEF 174646 . 175843) (COPYDEF 175845 . 178593) (GETDEF 178595 . 181138) (GETDEFCOM 181140 . 182106
+) (GETDEFCOM0 182108 . 183301) (GETDEFCURRENT 183303 . 189615) (GETDEFERR 189617 . 190887) (
+GETDEFFROMFILE 190889 . 195118) (GETDEFSAVED 195120 . 196208) (PUTDEF 196210 . 196917) (EDITDEF 196919
+ . 197902) (DEFAULT.EDITDEF 197904 . 200742) (EDITDEF.FILES 200744 . 200949) (LOADDEF 200951 . 201127)
+ (DWIMDEF 201129 . 201983) (DELDEF 201985 . 204879) (DELFROMLIST 204881 . 205385) (HASDEF 205387 . 
+211624) (GETFILEDEF 211626 . 212138) (SAVEDEF 212140 . 213828) (UNSAVEDEF 213830 . 214726) (
+COMPAREDEFS 214728 . 218534) (COMPARE 218536 . 219240) (TYPESOF 219242 . 222543)) (222695 230943 (
+FILEPKGCOM 222705 . 227481) (FILEPKGTYPE 227483 . 230941)) (242976 260451 (FINDCALLERS 242986 . 243616
+) (EDITCALLERS 243618 . 254335) (EDITFROMFILE 254337 . 259766) (FINDATS 259768 . 260040) (LOOKIN 
+260042 . 260449)) (260452 262123 (SEPRCASE 260462 . 262121)) (262640 267643 (IMPORTFILE 262650 . 
+263620) (IMPORTEVAL 263622 . 264508) (IMPORTFILESCAN 264510 . 264923) (CHECKIMPORTS 264925 . 266181) (
+GATHEREXPORTS 266183 . 267051) (\DUMPEXPORTS 267053 . 267641)) (267981 270051 (CLEARFILEPKG 267991 . 
+270049)))))
 STOP