Changeset 12896

Timestamp:

Sep 29, 2009, 7:11:08 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

In UPDATE-CCL, return a third value that indicates whether binaries
were updated. When REBUILD-CCL is called with :UPDATE T, pay
attention to that value, and advise the user to restart the lisp and
run REBUILD-CCL again if there are new binaries. (see ticket:317)

File:

• trunk/source/lib/compile-ccl.lisp (modified) (4 diffs)

trunk/source/lib/compile-ccl.lisp

@@ -526 +526 @@
     (when full
       (setq clean t kernel t reload t))
-    (when update (update-ccl :verbose (not (eq update :quiet))))
+    (when update
+      (multiple-value-bind (changed conflicts new-binaries)
+          (update-ccl :verbose (not (eq update :quiet)))
+        (declare (ignore changed conflicts))
+        (when new-binaries
+          (format t "~&There are new bootstrapping binaries.  Please restart
+the lisp and run REBUILD-CCL again.")
+          (return-from rebuild-ccl nil))))
     (when (or clean force)
       ;; for better bug reports...
@@ -643 +650 @@
 (defun update-ccl (&key (verbose t))
   (let* ((changed ())
+         (new-binaries ())
          (conflicts ()))
     (with-output-to-string (out)
@@ -686 +694 @@
                 ;; repository versions.
                 (setq changed (if (or added deleted updated merged conflicts) t))
-              
                 (dolist (f binaries)
-                  (when (member f conflicts :test #'string=)
-                    (svn-revert f)))
+                  (cond ((member f conflicts :test #'string=)
+                         (svn-revert f)
+                         (setq new-binaries t))
+                        ((or (member f updated :test #'string=)
+                             (member f merged :test #'string=))
+                         (setq new-binaries t))))
+
                 ;; If there are any remaining conflicts, offer
                 ;; to revert them.
                 (when conflicts
                   (with-preserved-working-directory ()
-                    (cerror "Discard local changes to these files (using 'svn revert'."
-                            "'svn update' was unable to merge local changes to the following file~p with the updated versions:~{~&~s~~}" (length conflicts) conflicts)
+                    (cerror "Discard local changes to these files (using 'svn revert')."
+                            "'svn update' was unable to merge local changes to the following file~p with the updated versions:~{~&~s~}" (length conflicts) conflicts)
                     (dolist (c (copy-list conflicts))
                       (svn-revert c))))
@@ -711 +723 @@
                     (show-changes "Updated files" updated)
                     (show-changes "Files with local changes, successfully merged" merged)))))))))
-    (values changed conflicts)))
+    (values changed conflicts new-binaries)))
 
 (defmacro with-preserved-working-directory ((&optional dir) &body body)