[Axiom-developer] [build-improvements] tidy build-depsys and build-interpsys

[Gabriel Dos Reis]

build-depsys is supposed to be an interface between the lisp world and
the "makefile" world.  However, it lacks abstraction.  Basically, it
takes (among other things) six parameters for directories, just to use
only one to build a path for some files to lookup>  It does so bt
concatening that directory path with "/interp/".  It could just take
that directory aas argument.  Fixed thusly.
build-interpsys has similr behaviour.

built and tested on an i868-pc-linux-gnu.

-- Gaby
*** ChangeLog.build-improvements        (revision 15870)
--- ChangeLog.build-improvements        (local)
***************
*** 1,3 ****
--- 1,8 ----
+ 2006-09-28  Gabriel Dos Reis  <address@hidden>
+ 
+       * config/setup-dep.mk (Makefile): Don't depend directly on
+       $(top_srcdir)/configure.
+ 
  2006-09-27  Gabriel Dos Reis  <address@hidden>
  
        * config/var-def.mk (AXIOM): Move from toplevel Makefile.
*** config/setup-dep.mk (revision 15870)
--- config/setup-dep.mk (local)
*************** $(srcdir)/Makefile.in: $(srcdir)/Makefil
*** 43,50 ****
        cd $(srcdir) && notangle -t8 Makefile.pamphlet > ./Makefile.in
  
  .PRECIOUS: Makefile
! Makefile: $(srcdir)/Makefile.in $(top_srcdir)/configure \
!         $(top_srcdir)/config/var-def.mk \
          $(top_srcdir)/config/setup-dep.mk \
          $(abs_top_builddir)/config.status
        cd $(abs_top_builddir) && $(SHELL) ./config.status $(subdir)$@
--- 43,49 ----
        cd $(srcdir) && notangle -t8 Makefile.pamphlet > ./Makefile.in
  
  .PRECIOUS: Makefile
! Makefile: $(srcdir)/Makefile.in $(top_srcdir)/config/var-def.mk \
          $(top_srcdir)/config/setup-dep.mk \
          $(abs_top_builddir)/config.status
        cd $(abs_top_builddir) && $(SHELL) ./config.status $(subdir)$@
*** src/interp/ChangeLog.build-improvements     (revision 15870)
--- src/interp/ChangeLog.build-improvements     (local)
***************
*** 1,3 ****
--- 1,13 ----
+ 2006-09-28  Gabriel Dos Reis  <address@hidden>
+ 
+       * util.lisp.pamphlet (build-depsys): Replace last six parameters
+       with only indicating the build directory.
+       (make_depsys): Likewise.
+       (build-interpsys): Lose last six parameters.
+       * Makefile.pamphlet (${DEPSYS}): Adjust call to build-depsys.
+       ($(SAVESYS)) Adjust call to build-interpsys.
+       * debugsys.lisp.pamphlet: Likewise.
+ 
  2006-09-26  Gabriel Dos Reis  <address@hidden>
  
        * Makefile.pamphlet (all): Create stamp file.
*** src/interp/Makefile.in      (revision 15870)
--- src/interp/Makefile.in      (local)
*************** ${SAVESYS}:     ${DEPSYS} ${OBJS} ${OUT}/boo
*** 289,295 ****
        @ echo '(in-package "BOOT")' >> ${OUT}/makeint.lisp
        @ touch ${TIMESTAMP}
        @ echo '${YEARWEEK}' >> ${OUT}/makeint.lisp
!       @ echo '(build-interpsys (append (quote ($(patsubst %, "%", ${OBJS}))) 
(quote ($(patsubst %, "%", ${ASCOMP}))) (quote ($(patsubst %, "%", 
${INOBJS})))) (quote ($(patsubst %, "%", ${OPOBJS}))) (quote ($(patsubst %, 
"%", ${OCOBJS}))) (quote ($(patsubst %, "%", ${BROBJS}))) (quote ($(patsubst %, 
"%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote 
($(patsubst %, "%", ${ASAUTO})))  "${SPAD}"  "${LSP}" "$(axiom_src_srcdir)" 
"${INT}" "${OBJ}" "${MNT}" "${SYS}")' >> ${OUT}/makeint.lisp
        @ echo '(in-package "SCRATCHPAD-COMPILER")' >> ${OUT}/makeint.lisp
  #     @ echo '(|shoeInternFile| "${MNT}/${SYS}/doc/msgs/co-eng.msgs")' >> 
${OUT}/makeint.lisp
        @ echo '(boot::set-restart-hook)' >> ${OUT}/makeint.lisp
--- 289,295 ----
        @ echo '(in-package "BOOT")' >> ${OUT}/makeint.lisp
        @ touch ${TIMESTAMP}
        @ echo '${YEARWEEK}' >> ${OUT}/makeint.lisp
!       @ echo '(build-interpsys (append (quote ($(patsubst %, "%", ${OBJS}))) 
(quote ($(patsubst %, "%", ${ASCOMP}))) (quote ($(patsubst %, "%", 
${INOBJS})))) (quote ($(patsubst %, "%", ${OPOBJS}))) (quote ($(patsubst %, 
"%", ${OCOBJS}))) (quote ($(patsubst %, "%", ${BROBJS}))) (quote ($(patsubst %, 
"%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote 
($(patsubst %, "%", ${ASAUTO})))  "${SPAD}")' >> ${OUT}/makeint.lisp
        @ echo '(in-package "SCRATCHPAD-COMPILER")' >> ${OUT}/makeint.lisp
  #     @ echo '(|shoeInternFile| "${MNT}/${SYS}/doc/msgs/co-eng.msgs")' >> 
${OUT}/makeint.lisp
        @ echo '(boot::set-restart-hook)' >> ${OUT}/makeint.lisp
*************** ${DEPSYS}:      ${DEP} ${OUT}/sys-pkg.${LISP}
*** 326,332 ****
        @ echo '(load "${OUT}/bookvol5")' >> ${OUT}/makedep.lisp
        @ echo '(load "${OUT}/util")' >> ${OUT}/makedep.lisp
        @ echo '(in-package "BOOT")' >> ${OUT}/makedep.lisp
!       @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))) "${SPAD}" 
"${GCLDIR}" "$(axiom_src_srcdir)" "${INT}" "${OBJ}" "${MNT}" "${SYS}")' >> 
${OUT}/makedep.lisp
        @ echo '(unless (probe-file "${OUT}/postpar.$(OBJEXT)") (compile-file 
"${OUT}/postpar.${LISP}" :output-file "${OUT}/postpar.$(OBJEXT)"))' >> 
${OUT}/makedep.lisp
        @ echo '(load "${OUT}/postpar")' >> ${OUT}/makedep.lisp
        @ echo '(unless (probe-file "${OUT}/parse.$(OBJEXT)") (compile-file 
"${OUT}/parse.${LISP}" :output-file "${OUT}/parse.$(OBJEXT)"))' >> 
${OUT}/makedep.lisp
--- 326,332 ----
        @ echo '(load "${OUT}/bookvol5")' >> ${OUT}/makedep.lisp
        @ echo '(load "${OUT}/util")' >> ${OUT}/makedep.lisp
        @ echo '(in-package "BOOT")' >> ${OUT}/makedep.lisp
!       @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))) "${SPAD}" 
"$(builddir)")' >> ${OUT}/makedep.lisp
        @ echo '(unless (probe-file "${OUT}/postpar.$(OBJEXT)") (compile-file 
"${OUT}/postpar.${LISP}" :output-file "${OUT}/postpar.$(OBJEXT)"))' >> 
${OUT}/makedep.lisp
        @ echo '(load "${OUT}/postpar")' >> ${OUT}/makedep.lisp
        @ echo '(unless (probe-file "${OUT}/parse.$(OBJEXT)") (compile-file 
"${OUT}/parse.${LISP}" :output-file "${OUT}/parse.$(OBJEXT)"))' >> 
${OUT}/makedep.lisp
*** src/interp/Makefile.pamphlet        (revision 15870)
--- src/interp/Makefile.pamphlet        (local)
*************** ${DEPSYS}:      ${DEP} ${OUT}/sys-pkg.${LISP}
*** 798,804 ****
        @ echo '(load "${OUT}/bookvol5")' >> ${OUT}/makedep.lisp
        @ echo '(load "${OUT}/util")' >> ${OUT}/makedep.lisp
        @ echo '(in-package "BOOT")' >> ${OUT}/makedep.lisp
!       @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))) "${SPAD}" 
"${GCLDIR}" "$(axiom_src_srcdir)" "${INT}" "${OBJ}" "${MNT}" "${SYS}")' >> 
${OUT}/makedep.lisp
        @ echo '(unless (probe-file "${OUT}/postpar.$(OBJEXT)") (compile-file 
"${OUT}/postpar.${LISP}" :output-file "${OUT}/postpar.$(OBJEXT)"))' >> 
${OUT}/makedep.lisp
        @ echo '(load "${OUT}/postpar")' >> ${OUT}/makedep.lisp
        @ echo '(unless (probe-file "${OUT}/parse.$(OBJEXT)") (compile-file 
"${OUT}/parse.${LISP}" :output-file "${OUT}/parse.$(OBJEXT)"))' >> 
${OUT}/makedep.lisp
--- 798,804 ----
        @ echo '(load "${OUT}/bookvol5")' >> ${OUT}/makedep.lisp
        @ echo '(load "${OUT}/util")' >> ${OUT}/makedep.lisp
        @ echo '(in-package "BOOT")' >> ${OUT}/makedep.lisp
!       @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))) "${SPAD}" 
"$(builddir)")' >> ${OUT}/makedep.lisp
        @ echo '(unless (probe-file "${OUT}/postpar.$(OBJEXT)") (compile-file 
"${OUT}/postpar.${LISP}" :output-file "${OUT}/postpar.$(OBJEXT)"))' >> 
${OUT}/makedep.lisp
        @ echo '(load "${OUT}/postpar")' >> ${OUT}/makedep.lisp
        @ echo '(unless (probe-file "${OUT}/parse.$(OBJEXT)") (compile-file 
"${OUT}/parse.${LISP}" :output-file "${OUT}/parse.$(OBJEXT)"))' >> 
${OUT}/makedep.lisp
*************** ${SAVESYS}:     ${DEPSYS} ${OBJS} ${OUT}/boo
*** 879,885 ****
        @ echo '(in-package "BOOT")' >> ${OUT}/makeint.lisp
        @ touch ${TIMESTAMP}
        @ echo '${YEARWEEK}' >> ${OUT}/makeint.lisp
!       @ echo '(build-interpsys (append (quote ($(patsubst %, "%", ${OBJS}))) 
(quote ($(patsubst %, "%", ${ASCOMP}))) (quote ($(patsubst %, "%", 
${INOBJS})))) (quote ($(patsubst %, "%", ${OPOBJS}))) (quote ($(patsubst %, 
"%", ${OCOBJS}))) (quote ($(patsubst %, "%", ${BROBJS}))) (quote ($(patsubst %, 
"%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote 
($(patsubst %, "%", ${ASAUTO})))  "${SPAD}"  "${LSP}" "$(axiom_src_srcdir)" 
"${INT}" "${OBJ}" "${MNT}" "${SYS}")' >> ${OUT}/makeint.lisp
        @ echo '(in-package "SCRATCHPAD-COMPILER")' >> ${OUT}/makeint.lisp
  #     @ echo '(|shoeInternFile| "${MNT}/${SYS}/doc/msgs/co-eng.msgs")' >> 
${OUT}/makeint.lisp
        @ echo '(boot::set-restart-hook)' >> ${OUT}/makeint.lisp
--- 879,885 ----
        @ echo '(in-package "BOOT")' >> ${OUT}/makeint.lisp
        @ touch ${TIMESTAMP}
        @ echo '${YEARWEEK}' >> ${OUT}/makeint.lisp
!       @ echo '(build-interpsys (append (quote ($(patsubst %, "%", ${OBJS}))) 
(quote ($(patsubst %, "%", ${ASCOMP}))) (quote ($(patsubst %, "%", 
${INOBJS})))) (quote ($(patsubst %, "%", ${OPOBJS}))) (quote ($(patsubst %, 
"%", ${OCOBJS}))) (quote ($(patsubst %, "%", ${BROBJS}))) (quote ($(patsubst %, 
"%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote 
($(patsubst %, "%", ${ASAUTO})))  "${SPAD}")' >> ${OUT}/makeint.lisp
        @ echo '(in-package "SCRATCHPAD-COMPILER")' >> ${OUT}/makeint.lisp
  #     @ echo '(|shoeInternFile| "${MNT}/${SYS}/doc/msgs/co-eng.msgs")' >> 
${OUT}/makeint.lisp
        @ echo '(boot::set-restart-hook)' >> ${OUT}/makeint.lisp
*** src/interp/debugsys.lisp.pamphlet   (revision 15870)
--- src/interp/debugsys.lisp.pamphlet   (local)
*************** loaded by hand we need to establish a va
*** 247,259 ****
     ())
    (list 
     (thesymb "/int/interp/ax.clisp"))
!   (system:getenv "AXIOM")
!   "/lsp"
!   "/src"
!   "/int"
!   "/obj"
!   "/mnt"
!   *sys*)
  (in-package "SCRATCHPAD-COMPILER")
  (boot::set-restart-hook)
  (in-package "BOOT")
--- 247,253 ----
     ())
    (list 
     (thesymb "/int/interp/ax.clisp"))
!   (system:getenv "AXIOM"))
  (in-package "SCRATCHPAD-COMPILER")
  (boot::set-restart-hook)
  (in-package "BOOT")
*** src/interp/util.lisp.pamphlet       (revision 15870)
--- src/interp/util.lisp.pamphlet       (local)
*************** the necessary functions and macros to co
*** 38,51 ****
  image but it does not have any autoload triggers or databases
  loaded.
  <<build-depsys>>=
! (defun build-depsys (load-files spad lsp src int obj mnt sys)
  #+:CCL
    (setq *package* (find-package "BOOT"))
  #+:AKCL
    (in-package "BOOT")
    (push :oldboot *features*)
    (mapcar #'load load-files)
!   (make-depsys lsp src int obj mnt sys)
    (initroot spad)
    #+:AKCL
    (init-memory-config :cons 1000 :fixnum 400 :symbol 1000 :package 16
--- 38,51 ----
  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
*************** into the image. It used to read:
*** 74,92 ****
     (compiler::emit-fn t)
  \end{verbatim}
  <<make-depsys>>=
! (defun make-depsys (lsp src int obj mnt sys)
    ;; perform system initializations for building a starter system
    (init-memory-config)
    #+:AKCL
    (let ()
     (mapcar
       #'load
!      (directory (concatenate 'string obj "/" sys "/interp/*.fn")))
     (with-open-file
!     (out (concatenate 'string obj "/" sys "/interp/proclaims.lisp" )
        :direction :output)
       (compiler::make-proclaims out))
!    (load (concatenate 'string obj "/" sys "/interp/proclaims.lisp")))
    )
  
  @
--- 74,92 ----
     (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")))
    )
  
  @
*************** loads the databases, sets up autoload tr
*** 128,135 ****
  After this function is called the image is clean and can be saved.
  <<build-interpsys>>=
  (defun build-interpsys (load-files parse-files comp-files browse-files
!            translate-files nagbr-files asauto-files
!              spad lsp src int obj mnt sys)
    (push :oldboot *features*)
    (initroot spad)
    #+:AKCL
--- 128,134 ----
  After this function is called the image is clean and can be saved.
  <<build-interpsys>>=
  (defun build-interpsys (load-files parse-files comp-files browse-files
!            translate-files nagbr-files asauto-files spad)
    (push :oldboot *features*)
    (initroot spad)
    #+:AKCL