annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
1 : #-*- Perl -*-
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
2 eval 'exec perl -w -S $0 ${1+"$@"}' # Portability kludge
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
3 if 0;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
4
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5 # config.values.sh --- create config.values.in from ../configure
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 # Author: Martin Buchholz
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 # Maintainer: Martin Buchholz
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 # Keywords: configure elisp report-xemacs-bugs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 # This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 # XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 # under the terms of the GNU General Public License as published by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 # the Free Software Foundation; either version 2, or (at your option)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 # any later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 # XEmacs is distributed in the hope that it will be useful, but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 # WITHOUT ANY WARRANTY; without even the implied warranty of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 # General Public License for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 # You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 # along with XEmacs; see the file COPYING. If not, write to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 # Boston, MA 02111-1307, USA.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 ### Commentary:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 ## Extract all the @foo@ configuration symbols from ../configure
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31 ## to make them available to elisp later (see util/config.el)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 ## Primarily useful for creating ridiculously verbose bug reports.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 ##
543
7e84f0c36c66 [xemacs-hg @ 2001-05-17 13:44:34 by stephent]
stephent
parents: 434
diff changeset
34 ## See lisp/config.el, ../configure.in,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35 ## and the Autoconf documentation on AC_OUTPUT, for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 ##
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 ## This script needs only to be run occasionally (before a Net release)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 ## by an XEmacs Maintainer (consider yourself so blessed, if you are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 ## actually reading this commentary).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 ##
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
41
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
42 if (! -r "./configure") {
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
43 chdir ".." or die "Can't chdir: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
44 if (! -r "./configure") {
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
45 die "Can't find configure!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
46 }
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
47 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
49 sub FileContents {
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
50 local $/ = undef; # Slurp mode
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
51 open (FILE, "< $_[0]") or die "$_[0]: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
52 my $contents = <FILE>;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
53 close FILE or die "$_[0]: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
54 return $contents;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
55 }
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
56
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
57 my $configure_contents = FileContents "./configure";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
58 my $cvi_contents = FileContents "lib-src/config.values.in";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
59
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
60 my $new_cvi_contents =
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
61 ";;; Do not edit this file!
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62 ;;; This file was automatically generated, by the config.values.sh script,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 ;;; from configure, which was itself automatically generated from configure.in.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 ;;;
543
7e84f0c36c66 [xemacs-hg @ 2001-05-17 13:44:34 by stephent]
stephent
parents: 434
diff changeset
65 ;;; See lisp/config.el for details on how this file is used.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 ;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 ;;; You are trapped in a twisty maze of strange-looking files, all autogenerated...
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 ;;; configure is created, from configure.in, by autoconf
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 ;;; config.values.in is created, from configure, by config.values.sh
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 ;;; config.values is created, from config.values.in, by configure
543
7e84f0c36c66 [xemacs-hg @ 2001-05-17 13:44:34 by stephent]
stephent
parents: 434
diff changeset
72 ;;; config.values is read by lisp/config.el,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73 ;;; to create the (Lisp object) config-value-hash-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 ;;; Variables defined in configure by AC_SUBST follow:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 ;;; (These are used in Makefiles)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
78 ";
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
80 my %done;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
81 for my $var (sort { $a cmp $b }
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
82 $configure_contents =~
2651
3580ae2ce979 [xemacs-hg @ 2005-03-11 11:18:44 by malcolmp]
malcolmp
parents: 543
diff changeset
83 /^s\,\@([A-Za-z0-9_]+)\@\,\$[A-Za-z0-9_]+\,;t t/mg) {
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
84 $new_cvi_contents .= "$var \"\@$var\@\"\n" unless exists $done{$var};
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
85 $done{$var} = 1;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
86 }
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
87
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
88 $new_cvi_contents .= "
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89 ;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 ;;; (These are used in C code)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
92 ";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
93
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
94 if ($cvi_contents ne $new_cvi_contents) {
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
95 unlink "lib-src/config.values.in";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
96 open (CVI, "> lib-src/config.values.in")
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
97 or die "lib-src/config.values.in: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
98 print CVI $new_cvi_contents;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
99 close CVI
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
100 or die "lib-src/config.values.in: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
101 }