Changeset 15708 for release/1.9/source/lib/compile-ccl.lisp

Timestamp:

Feb 15, 2013, 8:00:01 AM (6 years ago)

Author:

gb

Message:

Propagate r15707 to 1.9.

File:

• release/1.9/source/lib/compile-ccl.lisp (modified) (3 diffs)

release/1.9/source/lib/compile-ccl.lisp

@@ -591 +591 @@
     (when full
       (setq clean t kernel t reload t))
-
     (when update
       (multiple-value-bind (changed conflicts new-binaries)
@@ -621 +620 @@
                             "ccl:**;")))
                  (delete-file f)))
+             (with-global-optimization-settings ()
+               (compile-ccl (not (null force)))
+               (if force (xload-level-0 :force) (xload-level-0)))
              (when kernel
                (when (or clean force)
@@ -632 +634 @@
                (format t "~&;Building lisp-kernel ...")
                (with-output-to-string (s)
-                                      (let* ((proc (run-program (make-program)
-                                                                (list "-k" "-C" 
-                                                                      (format nil "lisp-kernel/~a"
-                                                                              (kernel-build-directory))
-                                                                      "-j"
+                 (let* ((proc (run-program (make-program)
+                                           (list "-k" "-C" 
+                                                 (format nil "lisp-kernel/~a"
+                                                         (kernel-build-directory))
+                                                 "-j"
                                                             
-                                                                      (format nil "~d" (1+ (cpu-count))))
-                                                                :output s
-                                                                :error :output)))
-                                        (multiple-value-bind (status exit-code)
-                                            (external-process-status proc)
-                                          (if (and (eq :exited status) (zerop exit-code))
-                                            (progn
-                                              (format t "~&;Kernel built successfully.")
-                                              (when verbose
-                                                (format t "~&;kernel build output:~%~a"
-                                                        (get-output-stream-string s)))
-                                              (sleep 1))
-                                            (error "Error(s) during kernel compilation.~%~a"
-                                                   (or
-                                                    (describe-external-process-failure
-                                                     proc
-                                                     "Developer tools may not be installed correctly.")
-                                                    (get-output-stream-string s))))))))
-             (with-global-optimization-settings ()
-               (compile-ccl (not (null force)))
-               (if force (xload-level-0 :force) (xload-level-0)))
+                                                 (format nil "~d" (1+ (cpu-count))))
+                                           :output s
+                                           :error :output)))
+                   (multiple-value-bind (status exit-code)
+                       (external-process-status proc)
+                     (if (and (eq :exited status) (zerop exit-code))
+                       (progn
+                         (format t "~&;Kernel built successfully.")
+                         (when verbose
+                           (format t "~&;kernel build output:~%~a"
+                                   (get-output-stream-string s)))
+                         (sleep 1))
+                       (error "Error(s) during kernel compilation.~%~a"
+                              (or
+                               (describe-external-process-failure
+                                proc
+                                "Developer tools may not be installed correctly.")
+                               (get-output-stream-string s))))))))
              (when reload
                (with-input-from-string (cmd (format nil
-                                                    "(save-application ~s)"
-                                                    (standard-image-name)))
+                                              "(save-application ~s)"
+                                              (standard-image-name)))
                  (with-output-to-string (output)
-                                        (multiple-value-bind (status exit-code)
-                                            (external-process-status
-                                             (run-program
-                                              (format nil "./~a" (standard-kernel-name))
-                                              (list* "--image-name" (standard-boot-image-name)
-                                                     "--batch"
-                                                     reload-arguments)
-                                              :input cmd
-                                              :output output
-                                              :error output))
-                                          (if (and (eq status :exited)
-                                                   (eql exit-code 0))
-                                            (progn
-                                              (format t "~&;Wrote heap image: ~s"
-                                                      (truename (format nil "ccl:~a"
-                                                                        (standard-image-name))))
-                                              (when verbose
-                                                (format t "~&;Reload heap image output:~%~a"
-                                                        (get-output-stream-string output))))
-                                            (error "Errors (~s ~s) reloading boot image:~&~a"
-                                                   status exit-code
-                                                   (get-output-stream-string output)))))))
+                   (multiple-value-bind (status exit-code)
+                       (external-process-status
+                        (run-program
+                         (format nil "./~a" (standard-kernel-name))
+                         (list* "--image-name" (standard-boot-image-name)
+                                "--batch"
+                                reload-arguments)
+                         :input cmd
+                         :output output
+                         :error output))
+                     (if (and (eq status :exited)
+                              (eql exit-code 0))
+                       (progn
+                         (format t "~&;Wrote heap image: ~s"
+                                 (truename (format nil "ccl:~a"
+                                                   (standard-image-name))))
+                         (when verbose
+                           (format t "~&;Reload heap image output:~%~a"
+                                   (get-output-stream-string output))))
+                       (error "Errors (~s ~s) reloading boot image:~&~a"
+                              status exit-code
+                              (get-output-stream-string output)))))))
              (when exit
                (quit)))