11:56 a.m.
I did a mapatoms to find an appropriate variable by its value when handling
built-in functions in symbol-file; I didn’t quite get back then that
build-root and source-root reflect the corresponding configure settings.
lisp/ChangeLog addition:
2006-07-05 Aidan Kehoe <kehoea(a)parhasard.net>
* loadhist.el (symbol-file):
Use source-root, not build-root when constructing the path of
symbol's C source file.
* loadup.el (build-root):
* loadup.el (source-root):
Document both variables.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: lisp/loadup.el lisp/loadhist.el
Index: lisp/loadhist.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/loadhist.el,v
retrieving revision 1.7
diff -u -r1.7 loadhist.el
--- lisp/loadhist.el 2006/04/29 16:15:26 1.7
+++ lisp/loadhist.el 2006/07/05 10:35:07
＠＠ -49,7 +49,7 ＠＠
(and (fboundp sym) (subrp (symbol-function sym))))
(let ((built-in-file (built-in-symbol-file sym)))
(if built-in-file
- (concat build-root "/src/" built-in-file))))))
+ (concat source-root "/src/" built-in-file))))))
(defun feature-symbols (feature)
"Return the file and list of symbols associated with a given FEATURE."
Index: lisp/loadup.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/loadup.el,v
retrieving revision 1.31
diff -u -r1.31 loadup.el
--- lisp/loadup.el 2004/12/27 12:25:14 1.31
+++ lisp/loadup.el 2006/07/05 10:35:07
＠＠ -55,10 +55,20 ＠＠
(defvar Installation-string nil
"Description of XEmacs installation.")
-(defvar build-root (expand-file-name ".." invocation-directory))
+(defvar build-root (expand-file-name ".." invocation-directory)
+ "Where XEmacs object files and executables are written during the build.
+This will differ from `source-root' if `configure' was run in a different
+directory to the source code, something autoconf supports and the GCC people
+recomment for their project. ")
+
(defvar source-lisp (file-name-directory (expand-file-name
(nth 2 command-line-args))))
-(defvar source-root (expand-file-name ".." source-lisp))
+
+(defvar source-root (expand-file-name ".." source-lisp)
+ "Where the XEmacs source code is stored during the build.
+Used during loadup, and used `symbol-file' when giving the file a built-in
+symbol is defined in. ")
+
;(defvar build-lib-src (expand-file-name "lib-src" build-root))
;(start-profiling)
--
Santa Maradona, priez pour moi!
4:04 p.m.
New subject: [Q] Use source-root, not build-root, in symbol-file. Document them.
QUERY
>>>> "Aidan" == Aidan Kehoe
<kehoea(a)parhasard.net> writes:
Aidan> Use source-root, not build-root when constructing the
Aidan> path of symbol's C source file.
Good. I wonder if these shouldn't be defconsts? Probably makes no
difference, of course. A couple of docstring niggles:
+(defvar build-root (expand-file-name ".." invocation-directory)
+ "Where XEmacs object files and executables are written during the build.
+This will differ from `source-root' if `configure' was run in a different
+directory to the source code, something autoconf supports and the GCC people
+recomment for their project. ")
"Root of tree containing object files and executables produced by build.
Differs from `source-root' if configured with --srcdir option, a practice
recommended for developers."
+(defvar source-root (expand-file-name ".." source-lisp)
+ "Where the XEmacs source code is stored during the build.
+Used during loadup, and used `symbol-file' when giving the file a built-in
+symbol is defined in. ")
"Root of tree containing source code for the current build.
Used during loadup and for documenting source of symbols defined in C."
Appearances to the contrary notwithstanding, those are typo fixes. :-)
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
2:09 p.m.
New subject: [Q] Use source-root, not build-root, in symbol-file. Document them.
Ar an séiú lá de mí Iúil, scríobh Stephen J. Turnbull:
>>>>> "Aidan" == Aidan Kehoe
<kehoea(a)parhasard.net> writes:
Aidan> Use source-root, not build-root when constructing the
Aidan> path of symbol's C source file.
Good. I wonder if these shouldn't be defconsts? Probably makes no
difference, of course.
I think I will move them to defconsts, and change their names to those the
FSF use, since as Ilya points out, they’ve only been available since March
2003. Thank you for the review.
--
Santa Maradona, priez pour moi!
6497
days inactive
6502
days old
2 comments
2 participants
participants (2)
-
Aidan Kehoe -
Stephen J. Turnbull