CVS: sbcl/src/cold warm.lisp,1.27,1.28

Update of /cvsroot/sbcl/sbcl/src/cold
In directory sc8-pr-cvs1:/tmp/cvs-serv24124/src/cold

Modified Files:
        warm.lisp 
Log Message:
0.7.10.16:
        Fix one "outstanding embarrassment" (as per CSR sbcl-devel
                2002-12-10): no more building of compiler files in 
                warm load.
        ... play symlink games instead, to build the troublesome
                assembly files twice under different names (will need
                adjustments to work on non-Unix filesystems (e.g.
                NTFS) but no more than the rest of the build).


Index: warm.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/cold/warm.lisp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- warm.lisp   27 Oct 2002 14:52:48 -0000      1.27
+++ warm.lisp   11 Dec 2002 11:10:27 -0000      1.28
@@ -21,48 +21,6 @@
                     (space 1)
                     (speed 2)))
 
-;;;; KLUDGE: Compile and load files which really belong in cold load but are
-;;;; here for various unsound reasons. We handle them here, before the package
-;;;; hacking below, because they use the SB!FOO cold package name convention
-;;;; instead of the SB-FOO final package name convention (since they really
-;;;; do belong in cold load and will hopefully make it back there reasonably
-;;;; soon). -- WHN 19991207
-
-(dolist (stem '(;; FIXME: The assembly files here probably belong in
-               ;; cold load instead of warm load. They ended up here
-               ;; as a quick hack to work around the consequences of
-               ;; my misunderstanding how ASSEMBLE-FILE works when I
-               ;; wrote the cold build code. The cold build code
-               ;; expects only one FASL filename per source file,
-               ;; when it turns out we really need one FASL file for
-               ;; ASSEMBLE-FILE output and another for COMPILE-FILE
-               ;; output. It would probably be good to redo the cold
-               ;; build code so that the COMPILE-FILE stuff generated
-               ;; here can be loaded at the same time as the
-               ;; ASSEMBLE-FILE stuff generated there.
-               "src/assembly/target/assem-rtns"
-               "src/assembly/target/array"
-               "src/assembly/target/arith"
-               "src/assembly/target/alloc"))
-  ;; KLUDGE: Cut-and-paste programming, the sign of a true professional.:-|
-  ;; (Hopefully this will go away as we move the files above into cold load.)
-  ;; -- WHN 19991214
-  (let ((fullname (concatenate 'string stem ".lisp")))
-    ;; (Now that we use byte compiler for interpretation, /SHOW
-    ;; doesn't get compiled properly until the src/assembly files have
-    ;; been loaded, so we use PRINT instead.)
-    #+sb-show (print "/about to compile src/assembly file")
-    #+sb-show (print fullname)
-    (multiple-value-bind
-       (compiled-truename compilation-warnings-p compilation-failure-p)
-       (compile-file fullname)
-      (declare (ignore compilation-warnings-p))
-      #+sb-show (print "/done compiling src/assembly file")
-      (if compilation-failure-p
-         (error "COMPILE-FILE of ~S failed." fullname)
-         (unless (load compiled-truename)
-           (error "LOAD of ~S failed." compiled-truename))))))
-
 ;;;; package hacking
 
 ;;; Our cross-compilation host is out of the picture now, so we no



-------------------------------------------------------
This sf.net email is sponsored by:
With Great Power, Comes Great Responsibility 
Learn to use your power at OSDN's High Performance Computing Channel
http://hpc.devchannel.org/