Mercurial > hg > xemacs-beta
view lib-src/config.values.sh @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 |
parents | 3580ae2ce979 |
children | e6508b64ee08 308d34e9f07d |
line wrap: on
line source
: #-*- Perl -*- eval 'exec perl -w -S $0 ${1+"$@"}' # Portability kludge if 0; # config.values.sh --- create config.values.in from ../configure # Author: Martin Buchholz # Maintainer: Martin Buchholz # Keywords: configure elisp report-xemacs-bugs # This file is part of XEmacs. # XEmacs is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # XEmacs is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # You should have received a copy of the GNU General Public License # along with XEmacs; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. ### Commentary: ## Extract all the @foo@ configuration symbols from ../configure ## to make them available to elisp later (see util/config.el) ## Primarily useful for creating ridiculously verbose bug reports. ## ## See lisp/config.el, ../configure.in, ## and the Autoconf documentation on AC_OUTPUT, for more details. ## ## This script needs only to be run occasionally (before a Net release) ## by an XEmacs Maintainer (consider yourself so blessed, if you are ## actually reading this commentary). ## if (! -r "./configure") { chdir ".." or die "Can't chdir: $!"; if (! -r "./configure") { die "Can't find configure!"; } } sub FileContents { local $/ = undef; # Slurp mode open (FILE, "< $_[0]") or die "$_[0]: $!"; my $contents = <FILE>; close FILE or die "$_[0]: $!"; return $contents; } my $configure_contents = FileContents "./configure"; my $cvi_contents = FileContents "lib-src/config.values.in"; my $new_cvi_contents = ";;; Do not edit this file! ;;; This file was automatically generated, by the config.values.sh script, ;;; from configure, which was itself automatically generated from configure.in. ;;; ;;; See lisp/config.el for details on how this file is used. ;;; ;;; You are trapped in a twisty maze of strange-looking files, all autogenerated... ;;; configure is created, from configure.in, by autoconf ;;; config.values.in is created, from configure, by config.values.sh ;;; config.values is created, from config.values.in, by configure ;;; config.values is read by lisp/config.el, ;;; to create the (Lisp object) config-value-hash-table ;;; Variables defined in configure by AC_SUBST follow: ;;; (These are used in Makefiles) "; my %done; for my $var (sort { $a cmp $b } $configure_contents =~ /^s\,\@([A-Za-z0-9_]+)\@\,\$[A-Za-z0-9_]+\,;t t/mg) { $new_cvi_contents .= "$var \"\@$var\@\"\n" unless exists $done{$var}; $done{$var} = 1; } $new_cvi_contents .= " ;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow: ;;; (These are used in C code) "; if ($cvi_contents ne $new_cvi_contents) { unlink "lib-src/config.values.in"; open (CVI, "> lib-src/config.values.in") or die "lib-src/config.values.in: $!"; print CVI $new_cvi_contents; close CVI or die "lib-src/config.values.in: $!"; }