diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-04-12 21:55:50 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-04-12 22:10:38 -0400 |
| commit | 214dfbfea0cc7d64704aa4a258da542435c44cbb (patch) | |
| tree | 41210dc029b82d4590486f2bb8458fae3af24a70 /lisp/cedet/semantic/grammar.el | |
| parent | fc3caa45ef2dcbd5a1c8339f14696589b99888ce (diff) | |
| download | emacs-214dfbfea0cc7d64704aa4a258da542435c44cbb.tar.gz emacs-214dfbfea0cc7d64704aa4a258da542435c44cbb.tar.bz2 emacs-214dfbfea0cc7d64704aa4a258da542435c44cbb.zip | |
Don't version-control generated file `grammat-wy.el`
This file is needed for CEDET's bootstrap, tho, so we now keep a copy of it
under version control in `gram-wy-boot.el`, very much like we do with
the `ldefs-boot.el` copy of `loaddefs.el`.
* lisp/cedet/semantic/grm-wy-boot.el: Rename from
`lisp/cedet/semantic/grammar-wy.el`.
* lisp/cedet/semantic/grammar.el: Load `grm-wy-boot.el` if
`grammar-wy.el` hasn't been generated yet.
* admin/update_autogen: Also refresh `grm-wy-boot.el`.
* admin/grammars/Makefile.in (WISENT): Add `grammar-wy.el` to the
generated files.
* .gitignore: Add `grammar-wy.el`.
Diffstat (limited to 'lisp/cedet/semantic/grammar.el')
| -rw-r--r-- | lisp/cedet/semantic/grammar.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index dba289fdd75..4c3bb6c238b 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el @@ -31,7 +31,12 @@ (require 'semantic/format) ;; FIXME this is a generated file, but we need to load this file to ;; generate it! -(require 'semantic/grammar-wy) +;; We need `semantic/grammar-wy.el' but we're also needed to generate +;; that file from `grammar.wy', so to break the dependency, we keep +;; a bootstrap copy of `grammar-wy.el' in `grm-wy-boot.el'. See bug#16008. +(eval-and-compile + (unless (require 'semantic/grammar-wy nil t) + (load "semantic/grm-wy-boot"))) (require 'semantic/idle) (require 'help-fns) (require 'semantic/analyze) |