diff options
author | dos-reis <gdr@axiomatics.org> | 2008-08-15 05:56:53 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2008-08-15 05:56:53 +0000 |
commit | f6073b2551b4053087052fc5a31e3875e1f67913 (patch) | |
tree | 898e3925814a86d15607a4cc894224540e12fc6c | |
parent | 66f954a68f42d1b3e9539bbfd794bc74e553bf93 (diff) | |
download | open-axiom-f6073b2551b4053087052fc5a31e3875e1f67913.tar.gz |
* lisp/core.lisp.in (getOptionValue): Export.
* interp/sys-driver.boot (initializeGlobalState): Record value for
--system-algebra.
* interp/sys-globals.boot ($buildingSystemAlgebra): Declare.
* interp/compiler.boot (compileSpad2Cmd): Don't build local
database if compiling system algebra.
* interp/i-syscmd.boot (compileAsharpCmd1): Likewise.
* algebra/Makefile.pamphlet (%.NRLIB/code.$(FASLEXT)): Use
--system-algebra.
(SPADPRSR.NRLIB/code.$(FASLEXT)): Likewise.
(PARSER.NRLIB/code.$(FASLEXT)): Likewise.
-rwxr-xr-x | configure | 18 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | configure.ac.pamphlet | 2 | ||||
-rw-r--r-- | src/ChangeLog | 14 | ||||
-rw-r--r-- | src/algebra/Makefile.in | 6 | ||||
-rw-r--r-- | src/algebra/Makefile.pamphlet | 6 | ||||
-rw-r--r-- | src/interp/compiler.boot | 3 | ||||
-rw-r--r-- | src/interp/i-syscmd.boot | 3 | ||||
-rw-r--r-- | src/interp/sys-driver.boot | 2 | ||||
-rw-r--r-- | src/interp/sys-globals.boot | 5 | ||||
-rw-r--r-- | src/lisp/core.lisp.in | 1 |
11 files changed, 43 insertions, 19 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-08-13. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-08-15. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.2.0-2008-08-13' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-08-13' +PACKAGE_VERSION='1.2.0-2008-08-15' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-08-15' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1404,7 +1404,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.2.0-2008-08-13 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-08-15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-08-13:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-08-15:";; esac cat <<\_ACEOF @@ -1578,7 +1578,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-08-13 +OpenAxiom configure 1.2.0-2008-08-15 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1592,7 +1592,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.2.0-2008-08-13, which was +It was created by OpenAxiom $as_me 1.2.0-2008-08-15, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -26089,7 +26089,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.2.0-2008-08-13, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-08-15, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26138,7 +26138,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-08-13 +OpenAxiom config.status 1.2.0-2008-08-15 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index b88d8a9e..22dac6e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-08-13], +AC_INIT([OpenAxiom], [1.2.0-2008-08-15], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index f90c06c0..000749ee 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1118,7 +1118,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-08-13], +AC_INIT([OpenAxiom], [1.2.0-2008-08-15], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index daccf126..105b6db0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +2008-08-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * lisp/core.lisp.in (getOptionValue): Export. + * interp/sys-driver.boot (initializeGlobalState): Record value for + --system-algebra. + * interp/sys-globals.boot ($buildingSystemAlgebra): Declare. + * interp/compiler.boot (compileSpad2Cmd): Don't build local + database if compiling system algebra. + * interp/i-syscmd.boot (compileAsharpCmd1): Likewise. + * algebra/Makefile.pamphlet (%.NRLIB/code.$(FASLEXT)): Use + --system-algebra. + (SPADPRSR.NRLIB/code.$(FASLEXT)): Likewise. + (PARSER.NRLIB/code.$(FASLEXT)): Likewise. + 2008-08-14 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/Makefile.pamphlet: Simplify build of interpsys and AXIOMsys. diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index f230c252..1586fff7 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -863,7 +863,7 @@ ${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT) .PRECIOUS: %.NRLIB/code.$(FASLEXT) %.NRLIB/code.$(FASLEXT): %.spad @ rm -rf $*.NRLIB - ${INTERPSYS} --strap=strap --compile $< + ${INTERPSYS} --strap=strap --system-algebra --compile $< # Compile bootstrap file to machine object code, and the result # immediately available for AXIOMsys consumption. strap/%.$(FASLEXT): %.lsp @@ -904,11 +904,11 @@ $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex SPADPRSR.NRLIB/code.$(FASLEXT): spad-parser.spad @ rm -rf SPADPRSR.NRLIB - ${INTERPSYS} --compile $< + ${INTERPSYS} --system-algebra --compile $< PARSER.NRLIB/code.$(FASLEXT): script-parser.spad @ rm -rf PARSER.NRLIB - ${INTERPSYS} --compile $< + ${INTERPSYS} --system-algebra --compile $< diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 45536ced..aaf1a1e9 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -1798,7 +1798,7 @@ ${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT) .PRECIOUS: %.NRLIB/code.$(FASLEXT) %.NRLIB/code.$(FASLEXT): %.spad @ rm -rf $*.NRLIB - ${INTERPSYS} --strap=strap --compile $< + ${INTERPSYS} --strap=strap --system-algebra --compile $< @ <<genericBOOTSTRAPfiles>>= @@ -1855,11 +1855,11 @@ $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex SPADPRSR.NRLIB/code.$(FASLEXT): spad-parser.spad @ rm -rf SPADPRSR.NRLIB - ${INTERPSYS} --compile $< + ${INTERPSYS} --system-algebra --compile $< PARSER.NRLIB/code.$(FASLEXT): script-parser.spad @ rm -rf PARSER.NRLIB - ${INTERPSYS} --compile $< + ${INTERPSYS} --system-algebra --compile $< @ <<diagrams.tex (OUT from IN)>>= diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 644a7f79..b3f6a7f7 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1741,7 +1741,8 @@ compileSpad2Cmd args == compilerDoitWithScreenedLisplib(constructor, fun) else compilerDoit(constructor, fun) - extendLocalLibdb $newConlist + if not $buildingSystemAlgebra then + extendLocalLibdb $newConlist terminateSystemCommand() spadPrompt() diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index 9390db26..d45895b2 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -608,7 +608,8 @@ compileAsharpCmd1 args == else if ^beQuiet then sayKeyedMsg("S2IZ0084", nil) - extendLocalLibdb $newConlist + if not $buildingSystemAlgebra then + extendLocalLibdb $newConlist compileAsharpArchiveCmd args == -- Assume we entered from the "compiler" function, so args ^= nil diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot index 593244f3..f620ea09 100644 --- a/src/interp/sys-driver.boot +++ b/src/interp/sys-driver.boot @@ -189,6 +189,8 @@ initializeGlobalState() == RESTART0() $NEWSPAD := true $SPAD := true + $buildingSystemAlgebra := + getOptionValue(Option '"system-algebra",%systemOptions()) ++ execute Spad script executeSpadScript(progname,options,file) == diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot index bd47c14e..c66f0d82 100644 --- a/src/interp/sys-globals.boot +++ b/src/interp/sys-globals.boot @@ -468,3 +468,8 @@ $OutputStream := $ErrorStream := MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*" + +--% + +++ True if we are building the system algebra. +$buildingSystemAlgebra := false diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index 6dff8f44..1339de0f 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -80,6 +80,7 @@ "$NativeTypeTable" "$LispOptimizeOptions" + "getOptionValue" "getCommandLineArguments" "processCommandLine" "handleCommandLine" |