diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-04-24 22:53:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-04-24 23:06:27 -0700 |
| commit | 5b0fdefb4ca54b0d3dac3047ac1e4b380beb6ba7 (patch) | |
| tree | ba51a863ba3114d3e7e075824971bf4094d184cd /lisp/loadup.el | |
| parent | c1e71d3899daca49e216dfa3a6e6e07169d02e1e (diff) | |
| download | emacs-5b0fdefb4ca54b0d3dac3047ac1e4b380beb6ba7.tar.gz | |
Generate each unicode lisp file independently
This is better for parallel builds, eg it eliminates race
conditions from having one process write multiple files.
* admin/unidata/Makefile.in (lparen, unifiles): New variables.
Parse unidata-gen.el, not charprop.el, to get the list of uni- files.
(all): Explicitly list the output lisp files.
(PHONY_EXTRAS): Remove.
(${unidir}/charprop.el): Change rule to just be for this file.
(${unifiles}): New rule to write each unicode lisp file.
(extraclean): Simplify.
* admin/unidata/unidata-gen.el (unidata-gen-charprop):
Quieten in batch mode.
(unidata-gen-files): Remove, no longer used.
* lisp/loadup.el: Update command-line parser.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 112282740a8..9dc43daa3a0 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -59,8 +59,11 @@ ;; This is because PATH_DUMPLOADSEARCH is just "../lisp". (if (or (equal (member "bootstrap" command-line-args) '("bootstrap")) ;; FIXME this is irritatingly fragile. - (equal (nth 4 command-line-args) "unidata-gen.el") - (equal (nth 7 command-line-args) "unidata-gen-files") + (and (stringp (nth 4 command-line-args)) + (string-match "^unidata-gen\\(\\.elc?\\)?$" + (nth 4 command-line-args))) + (member (nth 7 command-line-args) '("unidata-gen-file" + "unidata-gen-charprop")) (if (fboundp 'dump-emacs) (string-match "src/bootstrap-emacs" (nth 0 command-line-args)) t)) |