Move license statement into runtime, and add copyright statement.

diff --git a/v7/src/microcode/boot.c b/v7/src/microcode/boot.c
index 398190045ce51b1056d998074f752b3a4e86f0ef..7bef9c220329b821773f4e803320be6946ba5438 100644 (file)
--- a/v7/src/microcode/boot.c
+++ b/v7/src/microcode/boot.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: boot.c,v 9.110 2002/12/27 03:17:38 cph Exp $
+$Id: boot.c,v 9.111 2002/12/31 04:40:40 cph Exp $
 
 Copyright (c) 1988-2002 Massachusetts Institute of Technology
 
@@ -383,24 +383,14 @@ DEFUN (Start_Scheme, (Start_Prim, File_Name),
   OS_initialize ();
   if (I_Am_Master)
     {
-      outf_console ("Scheme Microcode Version %d.%d\n",
-                   SCHEME_VERSION, SCHEME_SUBVERSION);
       outf_console ("MIT Scheme running under %s\n", OS_Variant);
       OS_announcement ();
-      outf_console ("\nMIT Scheme comes with ABSOLUTELY NO WARRANTY.\n");
-      outf_console
-       ("This is free software, and you are welcome to redistribute it\n");
-      outf_console
-       ("under certain conditions; for details, see the file COPYING\n");
-      outf_console ("included with this program.\n\n");
+      outf_console ("\n");
       outf_flush_console ();
+      Current_State_Point = SHARP_F;
+      Fluid_Bindings = EMPTY_LIST;
+      INIT_FIXED_OBJECTS ();
     }
-  if (I_Am_Master)
-  {
-    Current_State_Point = SHARP_F;
-    Fluid_Bindings = EMPTY_LIST;
-    INIT_FIXED_OBJECTS ();
-  }
 
   /* The initial program to execute is one of
         (SCODE-EVAL (BINARY-FASLOAD <file-name>) SYSTEM-GLOBAL-ENVIRONMENT),

diff --git a/v7/src/runtime/savres.scm b/v7/src/runtime/savres.scm
index f3669b4049243f4fda07da24fb6b8c75bee547bf..7d6df039ef1648a39c53b88a50d3dcd385543b83 100644 (file)
--- a/v7/src/runtime/savres.scm
+++ b/v7/src/runtime/savres.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: savres.scm,v 14.35 2002/11/20 19:46:22 cph Exp $
+$Id: savres.scm,v 14.36 2002/12/31 04:40:53 cph Exp $
 
-Copyright (c) 1988-2001 Massachusetts Institute of Technology
+Copyright (c) 1988-2002 Massachusetts Institute of Technology
 
 This file is part of MIT Scheme.
 
@@ -137,22 +137,32 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
     (event-distributor/invoke! event:before-exit)
     ((ucode-primitive load-band) filename)))
 
-(define world-identification "Scheme")
+(define world-identification "Image")
 (define time-world-saved #f)
+(define license-statement
+  "This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.")
 
 (define (identify-world #!optional port)
   (let ((port
         (if (default-object? port)
             (current-output-port)
             (guarantee-output-port port))))
-    (write-string world-identification port)
+    (write-string "Copyright (c) " port)
+    (write (decoded-time/year (or time-world-saved (get-decoded-time))) port)
+    (write-string " Massachusetts Institute of Technology." port)
+    (newline port)
+    (write-string license-statement port)
+    (newline port)
+    (newline port)
     (if time-world-saved
        (begin
+         (write-string world-identification port)
          (write-string " saved on " port)
          (write-string (decoded-time/date-string time-world-saved) port)
          (write-string " at " port)
-         (write-string (decoded-time/time-string time-world-saved) port)))
-    (newline port)
+         (write-string (decoded-time/time-string time-world-saved) port)
+         (newline port)))
     (for-each (lambda (name)
                (write-string "  " port)
                (write-string (get-subsystem-identification-string name) port)