[Axiom-developer] [build-improvements] depsys and systemError

axiom-developer
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Axiom-developer] [build-improvements] depsys and systemError

From:	Gabriel Dos Reis
Subject:	[Axiom-developer] [build-improvements] depsys and systemError
Date:	31 Mar 2007 14:03:24 -0500
Hi,

  depsys uses systemError, but no definition is provided in the
set of files we currently compile to it.  Curious.  The actual 
definitions are to be found in g-error.boot.  This patch adds that
file to the contituents of depsys.

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

-- Gaby

2007-03-31  Gabriel Dos Reis  <address@hidden>
  
        * g-error.boot.pamphlet: Explicitly puch into package "BOOT".

        * Makefile.pamphlet (${DEPSYS}): Add g-error.clisp to
        requirements.  Load it g-error.$(FASLEXT) too.
        (depsys_objects): Include g-error.$(FASLEXT).
        (depsys_boot_sources): Icnlude g-error.boot.
        (<<g-error.clisp>>): Remove.
        * Makefile.in: Regenerate.

*** src/interp/Makefile.in      (revision 19368)
--- src/interp/Makefile.in      (local)
*************** depsys_lisp_sources = $(depsys_lisp_nonc
*** 36,42 ****
                        $(depsys_lisp_compiled_sources)
  
  depsys_boot_sources = postpar.boot parse.boot clam.boot slam.boot \
!       g-boot.boot c-util.boot g-util.boot
  DEP=  vmlisp.lisp     ggreater.lisp   \
        hash.lisp       bootfuns.lisp   \
        union.lisp      nlib.lisp       \
--- 36,42 ----
                        $(depsys_lisp_compiled_sources)
  
  depsys_boot_sources = postpar.boot parse.boot clam.boot slam.boot \
!       g-boot.boot g-error.boot c-util.boot g-util.boot
  DEP=  vmlisp.lisp     ggreater.lisp   \
        hash.lisp       bootfuns.lisp   \
        union.lisp      nlib.lisp       \
*************** depsys_lisp_sources += parsing.lisp meta
*** 327,337 ****
                        metameta.lisp fnewmeta.lisp
  
  depsys_boot_sources = postpar.boot parse.boot clam.boot slam.boot \
!                       g-boot.boot c-util.boot g-util.boot
  
  depsys_SOURCES = $(depsys_lisp_SOURCES) $(depsys_boot_SOURCES)
  
! depsys_objects = nocompil.$(FASLEXT) bookvol5.$(FASLEXT) \
                util.$(FASLEXT) postpar.$(FASLEXT) parse.$(FASLEXT) \
                parsing.$(FASLEXT) metalex.$(FASLEXT) bootlex.$(FASLEXT) \
                newaux.$(FASLEXT) preparse.$(FASLEXT) postprop.$(FASLEXT) \
--- 327,337 ----
                        metameta.lisp fnewmeta.lisp
  
  depsys_boot_sources = postpar.boot parse.boot clam.boot slam.boot \
!                       g-boot.boot g-error.boot c-util.boot g-util.boot
  
  depsys_SOURCES = $(depsys_lisp_SOURCES) $(depsys_boot_SOURCES)
  
! depsys_objects = nocompil.$(FASLEXT) bookvol5.$(FASLEXT) g-error.$(FASLEXT) \
                util.$(FASLEXT) postpar.$(FASLEXT) parse.$(FASLEXT) \
                parsing.$(FASLEXT) metalex.$(FASLEXT) bootlex.$(FASLEXT) \
                newaux.$(FASLEXT) preparse.$(FASLEXT) postprop.$(FASLEXT) \
*************** ${DEPSYS}:      ${DEP} sys-pkg.lisp nocompil.
*** 347,352 ****
--- 347,353 ----
                preparse.lisp \
                postprop.lisp def.lisp \
                metameta.lisp fnewmeta.lisp \
+               g-error.clisp \
                g-boot.${LISP} c-util.${LISP} \
                g-util.clisp \
                clam.${LISP} \
*************** ${DEPSYS}:      ${DEP} sys-pkg.lisp nocompil.
*** 386,391 ****
--- 387,394 ----
        @ echo '(load "clam")' >> makedep.lisp
        @ echo '(unless (probe-file "slam.$(FASLEXT)") (compile-file 
"slam.clisp" :output-file "slam.$(FASLEXT)"))' >> makedep.lisp
        @ echo '(load "slam")' >> makedep.lisp
+       @ echo '(unless (probe-file "g-error.$(FASLEXT)") (compile-file 
"g-error.clisp" :output-file "g-error.$(FASLEXT)"))' >> makedep.lisp
+       @ echo '(load "g-error")' >> makedep.lisp
        @ echo '(unless (probe-file "g-boot.$(FASLEXT)") (compile-file 
"g-boot.${LISP}" :output-file "g-boot.$(FASLEXT)"))' >> makedep.lisp
        @ echo '(load "g-boot")' >> makedep.lisp
        @ echo '(unless (probe-file "c-util.$(FASLEXT)") (compile-file 
"c-util.${LISP}" :output-file "c-util.$(FASLEXT)"))' >> makedep.lisp
*************** g-cndata.clisp: g-cndata.boot
*** 830,844 ****
          fi
  
  
- g-error.clisp: g-error.boot
-       @ echo 264 making $@ from $<
-       @ if [ -z "${NOISE}" ] ; then \
-          echo '(progn (boottran::boottocl "g-error.boot"))' | ${DEPSYS} ; \
-         else \
-          echo '(progn (boottran::boottocl "g-error.boot"))' | ${DEPSYS} >> 
${TMP}/trace ; \
-         fi
- 
- 
  g-opt.clisp: g-opt.boot
        @ echo 267 making $@ from $<
        @ if [ -z "${NOISE}" ] ; then \
--- 833,838 ----
*** src/interp/Makefile.pamphlet        (revision 19368)
--- src/interp/Makefile.pamphlet        (local)
*************** depsys_lisp_sources = $(depsys_lisp_nonc
*** 277,283 ****
                        $(depsys_lisp_compiled_sources)
  
  depsys_boot_sources = postpar.boot parse.boot clam.boot slam.boot \
!       g-boot.boot c-util.boot g-util.boot
  @
  
  The {\bf DEP} variable contains the list of files that
--- 277,283 ----
                        $(depsys_lisp_compiled_sources)
  
  depsys_boot_sources = postpar.boot parse.boot clam.boot slam.boot \
!       g-boot.boot g-error.boot c-util.boot g-util.boot
  @
  
  The {\bf DEP} variable contains the list of files that
*************** depsys_lisp_sources += parsing.lisp meta
*** 990,1000 ****
                        metameta.lisp fnewmeta.lisp
  
  depsys_boot_sources = postpar.boot parse.boot clam.boot slam.boot \
!                       g-boot.boot c-util.boot g-util.boot
  
  depsys_SOURCES = $(depsys_lisp_SOURCES) $(depsys_boot_SOURCES)
  
! depsys_objects = nocompil.$(FASLEXT) bookvol5.$(FASLEXT) \
                util.$(FASLEXT) postpar.$(FASLEXT) parse.$(FASLEXT) \
                parsing.$(FASLEXT) metalex.$(FASLEXT) bootlex.$(FASLEXT) \
                newaux.$(FASLEXT) preparse.$(FASLEXT) postprop.$(FASLEXT) \
--- 990,1000 ----
                        metameta.lisp fnewmeta.lisp
  
  depsys_boot_sources = postpar.boot parse.boot clam.boot slam.boot \
!                       g-boot.boot g-error.boot c-util.boot g-util.boot
  
  depsys_SOURCES = $(depsys_lisp_SOURCES) $(depsys_boot_SOURCES)
  
! depsys_objects = nocompil.$(FASLEXT) bookvol5.$(FASLEXT) g-error.$(FASLEXT) \
                util.$(FASLEXT) postpar.$(FASLEXT) parse.$(FASLEXT) \
                parsing.$(FASLEXT) metalex.$(FASLEXT) bootlex.$(FASLEXT) \
                newaux.$(FASLEXT) preparse.$(FASLEXT) postprop.$(FASLEXT) \
*************** ${DEPSYS}:      ${DEP} sys-pkg.lisp nocompil.
*** 1010,1015 ****
--- 1010,1016 ----
                preparse.lisp \
                postprop.lisp def.lisp \
                metameta.lisp fnewmeta.lisp \
+               g-error.clisp \
                g-boot.${LISP} c-util.${LISP} \
                g-util.clisp \
                clam.${LISP} \
*************** ${DEPSYS}:      ${DEP} sys-pkg.lisp nocompil.
*** 1049,1054 ****
--- 1050,1057 ----
        @ echo '(load "clam")' >> makedep.lisp
        @ echo '(unless (probe-file "slam.$(FASLEXT)") (compile-file 
"slam.clisp" :output-file "slam.$(FASLEXT)"))' >> makedep.lisp
        @ echo '(load "slam")' >> makedep.lisp
+       @ echo '(unless (probe-file "g-error.$(FASLEXT)") (compile-file 
"g-error.clisp" :output-file "g-error.$(FASLEXT)"))' >> makedep.lisp
+       @ echo '(load "g-error")' >> makedep.lisp
        @ echo '(unless (probe-file "g-boot.$(FASLEXT)") (compile-file 
"g-boot.${LISP}" :output-file "g-boot.$(FASLEXT)"))' >> makedep.lisp
        @ echo '(load "g-boot")' >> makedep.lisp
        @ echo '(unless (probe-file "c-util.$(FASLEXT)") (compile-file 
"c-util.${LISP}" :output-file "c-util.$(FASLEXT)"))' >> makedep.lisp
*************** g-cndata.clisp: g-cndata.boot
*** 1880,1898 ****
  
  @
  
- \subsection{g-error.boot}
- 
- <<g-error.clisp>>=
- g-error.clisp: g-error.boot
-       @ echo 264 making $@ from $<
-       @ if [ -z "${NOISE}" ] ; then \
-          echo '(progn (boottran::boottocl "g-error.boot"))' | ${DEPSYS} ; \
-         else \
-          echo '(progn (boottran::boottocl "g-error.boot"))' | ${DEPSYS} >> 
${TMP}/trace ; \
-         fi
- 
- @
- 
  \subsection{g-opt.boot}
  
  <<g-opt.clisp>>=
--- 1883,1888 ----
*************** distclean-local: clean-local
*** 3304,3311 ****
  
  <<g-cndata.clisp>>
  
- <<g-error.clisp>>
- 
  <<g-opt.clisp>>
  
  <<g-timer.clisp>>
--- 3294,3299 ----
*** src/interp/g-error.boot.pamphlet    (revision 19368)
--- src/interp/g-error.boot.pamphlet    (local)
***************
*** 1,14 ****
  \documentclass{article}
  \usepackage{axiom}
! \begin{document}
! \title{\$SPAD/src/interp g-error.boot}
  \author{The Axiom Team}
  \maketitle
  \begin{abstract}
  \end{abstract}
  \eject
  \tableofcontents
  \eject
  \section{License}
  <<license>>=
  -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
--- 1,17 ----
  \documentclass{article}
  \usepackage{axiom}
! 
! \title{\File{src/interp/g-error.boot} Pamphlet}
  \author{The Axiom Team}
+ 
+ \begin{document}
  \maketitle
  \begin{abstract}
  \end{abstract}
  \eject
  \tableofcontents
  \eject
+ 
  \section{License}
  <<license>>=
  -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
***************
*** 46,51 ****
--- 49,56 ----
  <<*>>=
  <<license>>
  
+ )package "BOOT"
+ 
  -- This file contains the error printing code used in BOOT and SPAD.
  -- While SPAD only calls "error" (which is then labeled as an algebra
  -- error, BOOT calls "userError" and "systemError" when a problem is
[Prev in Thread]
Current Thread
[Next in Thread]
[Axiom-developer] [build-improvements] depsys and systemError, Gabriel Dos Reis <=
Prev by Date: [Axiom-developer] Re: SymPy on Axiom Wiki
Next by Date: [Axiom-developer] RE: SymPy on Axiom Wiki
Previous by thread: [Axiom-developer] SymPy on Axiom Wiki
Index(es):
- Date
- Thread