diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/interp/daase.lisp | 10 | ||||
| -rw-r--r-- | src/interp/lisplib.boot | 14 |
6 files changed, 31 insertions, 23 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.3.0-2008-09-01. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2008-09-04. # # 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.3.0-2008-09-01' -PACKAGE_STRING='OpenAxiom 1.3.0-2008-09-01' +PACKAGE_VERSION='1.3.0-2008-09-04' +PACKAGE_STRING='OpenAxiom 1.3.0-2008-09-04' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1405,7 +1405,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.3.0-2008-09-01 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.3.0-2008-09-04 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1475,7 +1475,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-09-01:";; + short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-09-04:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.3.0-2008-09-01 +OpenAxiom configure 1.3.0-2008-09-04 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1593,7 +1593,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.3.0-2008-09-01, which was +It was created by OpenAxiom $as_me 1.3.0-2008-09-04, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -26103,7 +26103,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.3.0-2008-09-01, which was +This file was extended by OpenAxiom $as_me 1.3.0-2008-09-04, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26152,7 +26152,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.3.0-2008-09-01 +OpenAxiom config.status 1.3.0-2008-09-04 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 d7ec9e19..66de3ae2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.3.0-2008-09-01], +AC_INIT([OpenAxiom], [1.3.0-2008-09-04], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 12817fc4..2407441b 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1131,7 +1131,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.3.0-2008-09-01], +AC_INIT([OpenAxiom], [1.3.0-2008-09-04], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index ddd5fd61..0310b530 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2008-09-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/daase.lisp (processDir): Lose last argument. Don't + change directory. + (localdatabase): Adjust call. + * interp/lisplib.boot (getAllIndexPathnames): Take an argument. + (getAllAldorObjectFiles): Likewise. + 2008-09-04 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/g-util.boot (getTypeOfSyntax): Handle more ASTs. diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp index 8eabf2ef..9355c2a1 100644 --- a/src/interp/daase.lisp +++ b/src/interp/daase.lisp @@ -982,11 +982,9 @@ (when options (format t " Ignoring unknown )library option: ~a~%" options)) (values only dir noexpose))) - (processDir (dirarg thisdir) - (|changeDirectory| (string dirarg)) - (let ((indexFiles (|getAllIndexPathnames|)) - (aldorFiles (|getAllAldorObjectFiles|))) - (|changeDirectory| thisdir) + (processDir (dirarg) + (let ((indexFiles (|getAllIndexPathnames| dirarg)) + (aldorFiles (|getAllAldorObjectFiles| dirarg))) (values indexFiles (first aldorFiles) @@ -1006,7 +1004,7 @@ (setq noexpose t)) (if dir (multiple-value-setq (nrlibs asys asos libs) - (processDir dir thisdir))) + (processDir (|ensureTrailingSlash| (string dir))))) (dolist (file filelist) (let ((filename (pathname-name file)) (namedir (directory-namestring file))) diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index a4b90f8a..7296b447 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -685,21 +685,23 @@ getIndexPathname: %String -> %String getIndexPathname dir == strconc(ensureTrailingSlash dir, $IndexFilename) -getAllIndexPathnames() == +getAllIndexPathnames: %String -> %List +getAllIndexPathnames dir == -- GCL's semantics of Common Lisp's `DIRECTORY *' differs from the -- rest of everybody else' semantics. Namely, GCL would return a -- a list of drirectories AND files. Pretty much like `ls *'. -- Everybody else strips out directories. )if %hasFeature KEYWORD::GCL - [getIndexPathname NAMESTRING d for d in DIRECTORY '"*.NRLIB"] + [getIndexPathname NAMESTRING d for d in DIRECTORY strconc(dir,'"*.NRLIB")] )else - DIRECTORY strconc('"*.NRLIB/",$IndexFilename) + DIRECTORY strconc(dir,'"*.NRLIB/",$IndexFilename) )endif -getAllAldorObjectFiles() == - asys := DIRECTORY '"*.asy" - asos := DIRECTORY '"*.ao" +getAllAldorObjectFiles: %String -> %List +getAllAldorObjectFiles dir == + asys := DIRECTORY strconc(dir,'"*.asy") + asos := DIRECTORY strconc(dir,'"*.ao") -- don't include both a `x.asy' and `x.ao', and retain -- only sensical .asy files. dupAOs := MAPCAN(function PATHNAME_-NAME,asys) |