Merge branch 'makeinit7'

.gitignore

@@ -1,3 +1,7 @@
+# loadup interim steps
+
+tmp/*
+loadups/init*
 
 #compiled code -- leave in for now
 

greetfiles/MAKEINITGREET.~1~

@@ -1 +0,0 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")

run-medley

@@ -82,15 +82,19 @@ while [ "$#" -ne 0 ]; do
             export DISPLAY="$2"
             shift
             ;;
+	"-prog" )
+	    prog="$2"
+	    shift
+	    ;;
         "-vmem" | "--vmem" | "-vmfile" )
             export LDEDESTSYSOUT="$2"
             shift
             ;;
         "-full")
-            export LDESRCESYSOUT="$MEDLEYDIR/loadups/xfull35.sysout"
+            export LDESRCESYSOUT="$MEDLEYDIR/loadups/full.sysout"
             ;;
         "-lisp")
-            export LDESRCESYSOUT="$MEDLEYDIR/loadups/xlisp.sysout"
+            export LDESRCESYSOUT="$MEDLEYDIR/loadups/lisp.sysout"
             ;;
         "-*")
             passthrough_args="$passthrough_args $1 $2"
@@ -162,6 +166,6 @@ echo "start $LDEINIT"
 
 export INMEDLEY=1
 
-$prog $geometry $screensize -t "Medley Interlisp" $passthrough_args "$LDESRCESYSOUT"
+$prog $geometry $screensize -m 256 -t "Medley Interlisp" $passthrough_args "$LDESRCESYSOUT"
 
 

scripts/loadup-all.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+export MEDLEYDIR=`pwd`
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+./scripts/loadup-init.sh && ./scripts/loadup-mid-from-init.sh && ./scripts/loadup-lisp-from-mid.sh && ./scripts/loadup-full.sh
+
+echo tada!

scripts/loadup-full.sh

@@ -2,13 +2,17 @@
 
 export MEDLEYDIR=`pwd`
 
-if [ ! -f run-medley ] ; then
+if [ ! -x run-medley ] ; then
     echo must run from MEDLEYDIR ;
     exit 1 ;
 fi
+scr="-sc 1024x768 -g 1042x790"
 
-export LOADUPDIR=$MEDLEYDIR
+rm -f ~/rem.cm
 
-./run-medley -greet $MEDLEYDIR/sources/LOADUP-FULL.LCOM $MEDLEYDIR/loadups/xlisp.sysout
+./run-medley $scr -greet $MEDLEYDIR/sources/LOADUP-FULL.LCOM $MEDLEYDIR/loadups/lisp.sysout
 
 
+echo ----- made ----
+ls -l loadups/full.sysout
+echo ---------------

scripts/loadup-init.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+export MEDLEYDIR=`pwd`
+
+if [ ! -f run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+scr="-sc 1024x768 -g 1042x790"
+
+mkdir -p "$MEDLEYDIR/tmp"
+
+./run-medley $scr -greet "$MEDLEYDIR"/sources/LOADUP-INIT.LISP -full
+
+echo ---- made ----
+ls -l tmp loadups/init*
+echo --------------

scripts/loadup-lisp-from-mid.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+export MEDLEYDIR=`pwd`
+
+if [ ! -f run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+scr="-sc 1024x768 -g 1042x790"
+
+
+./run-medley $scr -greet $MEDLEYDIR/sources/YREM.CM tmp/init-mid.sysout
+
+echo ----- created: -------
+ls -l loadups/lisp.sysout
+echo ----------------------
+

scripts/loadup-lisp.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-export MEDLEYDIR=`pwd`
-
-if [ ! -f run-medley ] ; then
-    echo run from MEDLEYDIR
-    exit 1
-fi
-
-export LOADUPDIR=$MEDLEYDIR
-
-./run-medley -greet $MEDLEYDIR/sources/LOADUP-LISP.LCOM $MEDLEYDIR/loadups/lisp.venuesysout

scripts/loadup-mid-from-init.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+export MEDLEYDIR=`pwd`
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+mkdir -p "$MEDLEYDIR/tmp"
+scr="-sc 1024x768 -g 1042x790"
+
+./run-medley -prog ldeinit -greet $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout loadups/init.dlinit
+
+echo ---- made ----
+ls -l tmp/
+echo --------------

sources/FILEPKG.~4~

@@ -1,2 +0,0 @@
-
-

sources/LOADUP-INIT.LISP

@@ -0,0 +1,10 @@
+(* "make init files")
+
+(CNDIR (MEDLEYDIR "tmp"))
+(MOVD 'NILL 'PAGEFULLFN)
+(LOAD (MEDLEYDIR "sources" "MAKEINITGREET.LCOM"))
+(PROGN (DRIBBLE "makeinit.dribble")
+       (BKSYSBUF " ")
+       (MAKEINITGREET)
+       (DRIBBLE)
+       (LOGOUT T))

sources/LOADUP.LISP

@@ -1 +1,53 @@
-(SETQQ COMPILE.EXT LCOM)
+(SETQQ COMPILE.EXT LCOM)
+(SETQ SYSFILES (UNION BOOTLOADEDFILES SYSFILES))
+(SETQ BOOTLOADEDFILES)
+(* ;; "following files are really loaded earlier, this call to LOADUP just cleans up")
+(LOADUP (QUOTE (ACODE MACHINEINDEPENDENT POSTLOADUP)))
+(* ;; "establish all package exports early")
+(LOADUP (QUOTE (LISP-PACKAGE FASL-PACKAGE D-ASSEM-PACKAGE COMPILER-PACKAGE)))
+(* ;; "load FASL loader here, so we can load DFASLs earlier in loadup")
+(LOADUP (QUOTE (ERROR-RUNTIME CMLARITH CONDITION-HIERARCHY CMLHASH D-ASSEM FASLOAD)))
+(* ;; "These are needed by any FASL files")
+(LOADUP (QUOTE (DEFFER-RUNTIME CMLPRINT CLSTREAMS CMLSTRING CMLSYMBOL CMLTYPES CMLSEQCOMMON CMLSEQMAPPERS CMLPATHNAME CMLFILESYS)))
+(* ;;; "* 'FASL files may be loaded after this point' * * *")
+(LOADUP (QUOTE (CMLDEFFER ERROR-RUNTIME-AFTER-FASL WRAPPERS)))
+(* ;; "early runtime support for Common Lisp and (temporarily) debugger")
+(LOADUP (QUOTE (STACKFNS CMLMVS MACROS MACROAUX UNWINDMACROS)))
+(LOADUP (QUOTE (COMMON XCLC-RUNTIME CMLTYPES CL-ERROR)))
+(LOADUP (QUOTE (AFONT EDIT WEDIT PRETTY DSPRINTDEF NEWPRINTDEF FONTPROFILE SPELLFILE PRINTFN LOADFNS 
+DMISC DIRECTORY SPELLFILE FILEPKG RESOURCE)))
+(* ;; "needed for makesys")
+(LOADUP (QUOTE (MOD44IO)))
+(* ;; 
+"The Byte Compiler (DLAP, BYTECOMPILER, COMPILER) used to be here.  Moved after    XCL Compiler so that one byte compiler init will work.  JDS 10/11/89"
+)
+(LOADUP (QUOTE (HIST UNDO SPELL DWIM WTFIX CLISP DWIMIFY CLISPIFY RECORD)))
+(LOADUP (QUOTE (GAINSPACE COROUTINE ARGLIST ASKUSER SYSPRETTY COMMON COMPARE)))
+(DWIM (QUOTE C))
+(* ;; "Kernel Common Lisp files")
+(LOADUP (QUOTE (CMLSTEP CMLDOC CMLPARSE CMLSETF CMLPRED CMLREAD WALKER CMLSEQFINDER CMLSEQMODIFY CMLSORT DEFSTRUCT CMLMISCIO CMLCOMPILE CMLDESTRUCT CL-ERROR CMLFORMAT CMLENVIRONMENT CMLLOAD CMLFLOAT CMLTIME CMLRAND CMLMODULES)))
+(LOADUP (QUOTE (PROFILE CMLEXEC EXEC-COMMANDS DEBUGGER IL-ERROR-STUFF DEBUGEDIT)))
+(LOADUP (QUOTE (ADDARITH)))
+(LOADUP (QUOTE (CMLPATHNAME HPRINT AARITH ADISPLAY HLDISPLAY MENU WINDOWOBJ WINDOWSCROLL WINDOW WINDOWICON PAINTW ATTACHEDWINDOW XXGEOM XXFILL DEXEC INSPECT DESCRIBE CMLARRAYINSPECTOR EDITINTERFACE TTYIN)))
+(LOADUP (QUOTE (BREAK-AND-TRACE)))
+(LOADUP (QUOTE (FASDUMP XCL-COMPILER ADVISE)))
+(* ;; "the bytecompiler and Interlisp compiler interface functions")
+(LOADUP (QUOTE (DLAP BYTECOMPILER COMPILE)))
+(LOADUP (QUOTE (HARDCOPY LOGOW IDLER ICONW FREEMENU SEDIT)))
+(CLOSEW (LOGOW)) (MOVD 'NILL 'LOGOW)
+(LOADUP (QUOTE (DSK UFS UFSCALLC MAIKOBITBLT)))
+(LOADUP (QUOTE (TIME)))
+(LOADUP (QUOTE (XCL-EXTRAS)))
+(* "CMLPACKAGE pushes onto INSPECTMACROS")
+(LOADUP (QUOTE (CMLPACKAGE)))
+(* ;; 
+"Puts ARGNAME properties on CL and XCL functions that IL:SMARTARGLIST can't hack. Keep this last so everything will be defined when it runs"
+)
+(LOADUP (QUOTE (CMLSMARTARGS)))
+(LOADUP (QUOTE (IMPLICIT-KEY-HASH CLOSURE-CACHE)))
+(* ;; "Already enabled, but this time fixes tables that weren't defined in the init")
+ (PACKAGE-ENABLE)
+ (* ;; "Additional stuff that should be folded into original definitions")
+  (LOADUP (QUOTE (LOADUP-LISP)))
+  STOP
+  

sources/MAIKOINIT

@@ -0,0 +1,7 @@
+
+(RPAQQ SI::*CLOSURE-CACHE-ENABLED* NIL)
+
+(QUOTE (\\TEDIT.BLTCHAR \\MAIKO.PUNTBLTCHAR SI::*CLOSURE-CACHE* XCL::*DELETED-IMPLICIT-HASH-SLOT* ))
+
+(PUTPROPS MAIKOINIT COPYRIGHT ("Venue" 1990))
+STOP

sources/MAKEINITGREET

@@ -0,0 +1 @@
+(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")

sources/XREM.CM

@@ -0,0 +1,8 @@
+"
+(SETQ SI::*CLOSURE-CACHE-ENABLED* NIL)
+(QUOTE (\\TEDIT.BLTCHAR \\MAIKO.PUNTBLTCHAR SI::*CLOSURE-CACHE* XCL::*DELETED-IMPLICIT-HASH-SLOT* ))
+(MOVD? (QUOTE NILL) (QUOTE PROMPTPRINT))
+(MOVD? (QUOTE NILL) (QUOTE CURSORP))
+(MOVD? (QUOTE NILL) (QUOTE CHANGEBACKGROUNDBORDER))
+(LOGOUT)
+"

sources/YREM.CM

@@ -0,0 +1,6 @@
+"
+(PROGN(LOAD(CONCAT (QUOTE {DSK}) (UNIX-GETENV (QUOTE MEDLEYDIR)) (QUOTE /sources/LOADUP.LISP)))(HARDRESET))
+SHH(PROGN(IL:ENDLOADUP)(SETQ IL:MAKESYSNAME ':MEDLEY)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(IL:L-CASE (QUOTE /loadups/lisp.sysout)))))
+(IL:LOGOUT T)
+
+"