annotate nt/site.def @ 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 43dd3413c7c7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
1 XCOMM site: $XConsortium: site.def /main/revisionist/3 1996/10/15 09:31:04 swick $
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
3 /***************************************************************************
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
4 * *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
5 * SITE-SPECIFIC DEFINITIONS *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
6 * *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
7 * This file contains two halves, one included before the vendor-specific *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
8 * configuration file (.cf file), and one included after the .cf file. *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
9 * The before-half should be protected by #ifdef BeforeVendorCF, and the *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
10 * after-half should be protected by #ifdef AfterVendorCF. *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
11 * *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
12 * The before-half should only set things that the .cf file depends on. *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
13 * For the .cf files shipped in this release, the main variables in this *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
14 * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
15 * OSMinorVersion, and OSTeenyVersion. *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
16 * *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
17 * The after-half should contain all other definitions. For example, *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
18 * place your ProjectRoot definition here. *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
19 * *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
20 * OS Major and Minor version numbers should be changed directly in the *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
21 * .cf file, not overridden in site.def. *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
22 * *
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
23 ***************************************************************************/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
24
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
25 /* if you want host-specific customization, this is one way to do it */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
26 /*
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
27 #ifndef SiteIConfigFiles
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
28 #define SiteIConfigFiles $(IRULESRC)/host.def
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
29 #define LocalConfigFiles host.def
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
30 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
31 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
33
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
34 #ifdef BeforeVendorCF
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
35
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
36 /* #include <host.def> */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
37
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
38 /* On systems where cpp doesn't expand correctly macros in include directives
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
39 * the two following macros need to be defined directly (where "X11" is
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
40 * really whatever the TopLevelProject macro is defined to be).
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
41 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
42 # ifndef ProjectRulesFile
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
43 # define ProjectRulesFile <X11.rules>
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
44 # endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
45 # ifndef ProjectTmplFile
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
46 # define ProjectTmplFile <X11.tmpl>
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
47 # endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
48
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
49 /*
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
50 #ifndef HasGcc2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
51 #define HasGcc2 YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
52 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
53 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
54
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
55 #endif /* BeforeVendorCF */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
56
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
57 #ifdef AfterVendorCF
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
58
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
59 #define ProjectRoot f:/utils/X11R6
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
60
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
61 /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
62 /* #define HasXdmAuth YES */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
63
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
64 /* #define PreIncDir /usr/local/lib/gcc-lib/sparc-sun-solaris2.4/2.7.2/include */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
65
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
66 /*
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
67 #if defined(SunArchitecture) && defined(SparcArchitecture)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
68 #define HasCodeCenter YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
69 #ifndef SVR4Architecture
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
70 #define HasTestCenter YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
71 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
72 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
73 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
74
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
75 /*
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
76 #ifdef __hp9000s800
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
77 #define HasCodeCenter YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
78 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
79 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
80
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
81 /*
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
82 #if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
83 #define HasPurify YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
84 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
85 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
86
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
87 /*
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
88 #define HasSentinel YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
89 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
90
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
91 /*
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
92 #undef DefaultUserPath
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
93 #define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
94 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
95
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
96
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
97 /* You do NOT need SetUID if you only run the server under xdm */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
98 /* You MAY need SetUID if users run the server by hand or under xinit */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
99 /* Consult your system administrator before making the X server setuid */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
100 /*
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
101 #if defined(SunArchitecture) && OSMajorVersion > 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
102 #define InstallXserverSetUID YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
103 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
104 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
105
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
106 /* You do NOT need SetUID if you only run the server under xdm */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
107 /* You MAY need SetUID if users run the server by hand or under xinit */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
108 /* Consult your system administrator before making the X server setuid */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
109 /*
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
110 #ifdef XFree86Version
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
111 #define InstallXserverSetUID YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
112 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
113 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
114
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
115 #ifndef XnestServer
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
116 #undef BuildServer
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
117 #define BuildServer YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
118 #define XnestServer YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
119 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
120
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
121 /* #include <host.def> */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
122
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
123 #endif /* AfterVendorCF */