[Axiom-developer] [build-improvements] make-depsys

[Gabriel Dos Reis]

Hi,

  Currently build-depsys calls make-depsys to load some type
information (.fn files), proclaim into ./proclaims.lisp, and
load that file.  Anyone who has looked at ./proclaims.lisp knows
that file contains only

    (in-package "BOOT")

which is of no help.  Plans are to improve on declarations and
proclamation, but for the time being I'm ditching make-depsys -- it
brings nothing to the build.

Applied to build-improvements.
Built on an i686-pc-linux-gnu.

-- Gaby

2007-03-25  Gabriel Dos Reis  <address@hidden>

        * Makefile.pamphlet (${DEPSYS}): Adjust call to build-depsys.
        * Makefile.in: Regenerate.
        * util.lisp.pamphlet (make-depsys): Remove.
        (build-depsys): Adjust.

*** src/interp/Makefile.pamphlet        (revision 19358)
--- src/interp/Makefile.pamphlet        (local)
*************** ${DEPSYS}:      ${DEP} sys-pkg.lisp nocompil.
*** 1022,1028 ****
        @ echo '(load "bookvol5.lisp")' >> makedep.lisp
        @ echo '(load "util.lisp")' >> makedep.lisp
        @ echo '(in-package "BOOT")' >> makedep.lisp
!       @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))) "${AXIOM}" 
"$(builddir)")' >> makedep.lisp
        @ echo '(unless (probe-file "postpar.$(OBJEXT)") (compile-file 
"postpar.clisp" :output-file "postpar.$(OBJEXT)"))' >> makedep.lisp
        @ echo '(load "postpar")' >> makedep.lisp
        @ echo '(unless (probe-file "parse.$(OBJEXT)") (compile-file 
"parse.clisp" :output-file "parse.$(OBJEXT)"))' >> makedep.lisp
--- 1022,1028 ----
        @ echo '(load "bookvol5.lisp")' >> makedep.lisp
        @ echo '(load "util.lisp")' >> makedep.lisp
        @ echo '(in-package "BOOT")' >> makedep.lisp
!       @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))) "${AXIOM}")' 
>> makedep.lisp
        @ echo '(unless (probe-file "postpar.$(OBJEXT)") (compile-file 
"postpar.clisp" :output-file "postpar.$(OBJEXT)"))' >> makedep.lisp
        @ echo '(load "postpar")' >> makedep.lisp
        @ echo '(unless (probe-file "parse.$(OBJEXT)") (compile-file 
"parse.clisp" :output-file "parse.$(OBJEXT)"))' >> makedep.lisp
*** src/interp/util.lisp.pamphlet       (revision 19358)
--- src/interp/util.lisp.pamphlet       (local)
*************** the necessary functions and macros to co
*** 47,60 ****
  image but it does not have any autoload triggers or databases
  loaded.
  <<build-depsys>>=
! (defun build-depsys (load-files spad build-interp-dir)
  #+:CCL
    (setq *package* (find-package "BOOT"))
  #+:AKCL
    (in-package "BOOT")
    (push :oldboot *features*)
    (mapcar #'load load-files)
-   (make-depsys build-interp-dir)
    (initroot spad)
    #+:AKCL
    (init-memory-config :cons 1000 :fixnum 400 :symbol 1000 :package 16
--- 47,59 ----
  image but it does not have any autoload triggers or databases
  loaded.
  <<build-depsys>>=
! (defun build-depsys (load-files spad)
  #+:CCL
    (setq *package* (find-package "BOOT"))
  #+:AKCL
    (in-package "BOOT")
    (push :oldboot *features*)
    (mapcar #'load load-files)
    (initroot spad)
    #+:AKCL
    (init-memory-config :cons 1000 :fixnum 400 :symbol 1000 :package 16
*************** loaded.
*** 66,107 ****
  
  @
  
- \subsubsection{make-depsys}
- 
- When we are building a {\bf depsys} image for AKCL (now GCL) we need
- need to initialize some optimization routines. Each time a file is
- compiled in GCL we collect some function information and write it
- out to a {\bf .fn} file. If this {\bf .fn} file exists at compile
- time then GCL will perform function call optimizations. These can
- be significant in terms of performance.
- 
- We comment out the load of collectfn because it is already preloaded
- into the image. It used to read:
- \begin{verbatim}
-    ((collectfn (concatenate 'string (string lsp) "/cmpnew/collectfn")))
-    (unless (probe-file (concatenate 'string collectfn ".o"))
-      (compile-file collectfn))
-    (load collectfn)
-    (compiler::emit-fn t)
- \end{verbatim}
- <<make-depsys>>=
- (defun make-depsys (build-interp-dir)
-   ;; perform system initializations for building a starter system
-   (init-memory-config)
-   #+:AKCL
-   (let ()
-    (mapcar
-      #'load
-      (directory (concatenate 'string build-interp-dir "/*.fn")))
-    (with-open-file
-     (out (concatenate 'string build-interp-dir "/proclaims.lisp" )
-       :direction :output)
-      (compiler::make-proclaims out))
-    (load (concatenate 'string build-interp-dir "/proclaims.lisp")))
-   )
- 
- @
- 
  \subsection{Building Interpsys (build-interpsys)}
  \begin{verbatim}
  ;############################################################################
--- 65,70 ----
*************** function assumes that \\ can only appear
*** 1620,1626 ****
  <<relative-library-directory-list>>
  <<directory-list>>
  <<library-directory-list>>
- <<make-depsys>>
  <<boottocl>>
  
  (in-package "BOOT")
--- 1583,1588 ----