aboutsummaryrefslogtreecommitdiffstats
path: root/admin/update_autogen
diff options
context:
space:
mode:
authorStefan Monnier2021-04-12 21:55:50 -0400
committerStefan Monnier2021-04-12 22:10:38 -0400
commit214dfbfea0cc7d64704aa4a258da542435c44cbb (patch)
tree41210dc029b82d4590486f2bb8458fae3af24a70 /admin/update_autogen
parentfc3caa45ef2dcbd5a1c8339f14696589b99888ce (diff)
downloademacs-214dfbfea0cc7d64704aa4a258da542435c44cbb.tar.gz
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 'admin/update_autogen')
-rwxr-xr-xadmin/update_autogen12
1 files changed, 9 insertions, 3 deletions
diff --git a/admin/update_autogen b/admin/update_autogen
index 35c391da19e..11c4313ae37 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -317,7 +317,7 @@ EOF
317echo "Finding loaddef targets..." 317echo "Finding loaddef targets..."
318 318
319find lisp -name '*.el' -exec grep '^;.*generated-autoload-file:' {} + | \ 319find lisp -name '*.el' -exec grep '^;.*generated-autoload-file:' {} + | \
320 sed -e '/loaddefs\|esh-groups/d' -e 's|/[^/]*: "|/|' -e 's/"//g' \ 320 sed -e '/loaddefs\|esh-groups/d' -e 's|/[^/]*: "|/|' -e 's/"//g' \
321 >| $tempfile || die "Error finding targets" 321 >| $tempfile || die "Error finding targets"
322 322
323genfiles= 323genfiles=
@@ -363,17 +363,23 @@ make -C lisp "$@" autoloads EMACS=../src/bootstrap-emacs || die "make src error"
363 363
364 364
365## Ignore comment differences. 365## Ignore comment differences.
366[ ! "$lboot_flag" ] || \ 366[ ! "$lboot_flag" ] || \
367 diff -q -I '^;' $ldefs_in $ldefs_out || \ 367 diff -q -I '^;' $ldefs_in $ldefs_out || \
368 cp $ldefs_in $ldefs_out || die "cp ldefs_boot error" 368 cp $ldefs_in $ldefs_out || die "cp ldefs_boot error"
369 369
370# Refresh the prebuilt grammar-wy.el
371grammar_in=lisp/cedet/semantic/grammar-wy.el
372grammar_out=lisp/cedet/semantic/grm-wy-boot.el
373make -C admin/grammars/ ../../$grammar_in
374cp $grammar_in $grammar_out || die "cp grm_wy_boot error"
375
370 376
371echo "Checking status of loaddef files..." 377echo "Checking status of loaddef files..."
372 378
373## It probably would be fine to just check+commit lisp/, since 379## It probably would be fine to just check+commit lisp/, since
374## making autoloads should not effect any other files. But better 380## making autoloads should not effect any other files. But better
375## safe than sorry. 381## safe than sorry.
376modified=$(status $genfiles $ldefs_out) || die 382modified=$(status $genfiles $ldefs_out $grammar_out) || die
377 383
378 384
379commit "loaddefs" $modified || die "commit error" 385commit "loaddefs" $modified || die "commit error"