Change to put release version into runtime system rather than

microcode.

diff --git a/v7/src/runtime/savres.scm b/v7/src/runtime/savres.scm
index 113b187aadd0b661f704475ad1ac6ff2b853808f..1a4bf0a39169967b1d581b91c74892e0e2d265f2 100644 (file)
--- a/v7/src/runtime/savres.scm
+++ b/v7/src/runtime/savres.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: savres.scm,v 14.31 1999/04/07 04:09:06 cph Exp $
+$Id: savres.scm,v 14.32 2000/03/01 23:45:56 cph Exp $
 
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ;;; package: (runtime save/restore)
 
 (declare (usual-integrations))
-\f
+
 ;;; (DISK-SAVE  filename #!optional identify)
 ;;; (DUMP-WORLD filename #!optional identify)
 ;;; Saves a world image in FILENAME.  IDENTIFY has the following meaning:
@@ -43,8 +43,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define disk-save)
 (define dump-world)
-(define *within-restore-window?* false)
-
+(define *within-restore-window?* #f)
+\f
 (define (setup-image save-image)
   (lambda (filename #!optional identify)
     (let ((identify
@@ -55,10 +55,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
        filename
        (lambda ()
         (set! time-world-saved time)
-        (if (string? identify) unspecific false))
+        (if (string? identify) unspecific #f))
        (lambda ()
         (set! time-world-saved time)
-        (fluid-let ((*within-restore-window?* true))
+        (fluid-let ((*within-restore-window?* #t))
           (event-distributor/invoke! event:after-restore))
         (start-thread-timer)
         (cond ((string? identify)
@@ -69,10 +69,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
                   (identify-world (cmdl/port cmdl))
                   (event-distributor/invoke! event:after-restart))))
               ((not identify)
-               true)
+               #t)
               (else
                (event-distributor/invoke! event:after-restart)
-               true)))))))
+               #t)))))))
 
 (define (disk-save/kernel filename after-suspend after-restore)
   (let ((filename (->namestring (merge-pathnames filename))))
@@ -152,10 +152,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
          (write-string " at " port)
          (write-string (decoded-time/time-string time-world-saved) port)))
     (newline port)
-    (write-string "  Release " port)
-    (write-string microcode-id/release-string port)
     (for-each (lambda (name)
-               (newline port)
                (write-string "  " port)
-               (write-string (get-subsystem-identification-string name) port))
+               (write-string (get-subsystem-identification-string name) port)
+               (newline port))
              (get-subsystem-names))))
\ No newline at end of file

diff --git a/v7/src/runtime/version.scm b/v7/src/runtime/version.scm
index b908a59e84eaf1d14cc4be382d0d431aebea50e6..283074a0c3790cf2b06d079b297395698f12fe0f 100644 (file)
--- a/v7/src/runtime/version.scm
+++ b/v7/src/runtime/version.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: version.scm,v 14.180 1999/04/07 04:09:08 cph Exp $
+$Id: version.scm,v 14.181 2000/03/01 23:44:54 cph Exp $
 
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -25,11 +25,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (declare (usual-integrations))
 
 (define (initialize-package!)
+  (add-subsystem-identification! "Release" '(7 5 4))
   (snarf-microcode-version!)
   (add-event-receiver! event:after-restore snarf-microcode-version!)
-  (add-identification! "Runtime" 14 180))
+  (add-subsystem-identification! "Runtime" '(14 180)))
 
 (define (snarf-microcode-version!)
-  (add-identification! "Microcode"
-                      microcode-id/version
-                      microcode-id/modification))
\ No newline at end of file
+  (add-subsystem-identification! "Microcode"
+                                (list microcode-id/version
+                                      microcode-id/modification)))
\ No newline at end of file