Stop keeping (all but one) generated cedet grammar files in the repository

* configure.ac (SUBDIR_MAKEFILES, AC_CONFIG_FILES):
Add admin/grammars Makefile.

* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Also clean admin/grammars, if present.

* admin/grammars/README: Remove.

* admin/grammars/Makefile.in: New file.

* admin/grammars/c.by, admin/grammars/java-tags.wy, admin/grammars/js.wy:
* admin/grammars/python.wy: Update declarations to match generated outputs.

* lisp/Makefile.in (semantic): New.
(compile-main): Depend on semantic.

* lisp/cedet/semantic/bovine/grammar.el (bovine--make-parser-1):
New function, split from bovine-make-parsers.
(bovine-make-parsers): Use bovine--make-parser-1.
(bovine-batch-make-parser): New function.

* lisp/cedet/semantic/wisent/grammar.el (wisent--make-parser-1):
New function, split from wisent-make-parsers.
(wisent-make-parsers): Use wisent--make-parser-1.
(wisent-batch-make-parser): New function.

* lisp/cedet/semantic/db.el (semanticdb-save-all-db):
Avoid prompting in batch mode.

* lisp/cedet/semantic/grammar.el (semantic-grammar-footer-template):
Disable version-control and autoloads in the output.
(semantic-grammar-create-package):
Add option to return nil if output is up-to-date.

* lisp/cedet/semantic/bovine/c-by.el, lisp/cedet/semantic/bovine/make-by.el:
* lisp/cedet/semantic/bovine/scm-by.el, lisp/cedet/semantic/wisent/javat-wy.el:
* lisp/cedet/semantic/wisent/js-wy.el, lisp/cedet/semantic/wisent/python-wy.el:
* lisp/cedet/srecode/srt-wy.el: Remove generated files from repository.

* .bzrignore: Update for this.

7 files changed, 137 insertions, 16 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index c9930c7023a..d70056f001e 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-30  Glenn Morris  <rgm@gnu.org>
+
+        Stop keeping (most) generated cedet grammar files in the repository.
+        * grammars/README: Remove.
+        * grammars/Makefile.in: New file.
+        * grammars/c.by, grammars/java-tags.wy, grammars/js.wy:
+        * grammars/python.wy: Update declarations to match generated outputs.
+
 2013-11-28  Glenn Morris  <rgm@gnu.org>
 
         * unidata/unidata-gen.el (unidata-gen-files):
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
new file mode 100644
index 00000000000..94c2e9a6ee2
--- /dev/null
+++ b/admin/grammars/Makefile.in
@@ -0,0 +1,105 @@
+### @configure_input@
+
+## Copyright (C) 2013 Free Software Foundation, Inc.
+
+## This file is part of GNU Emacs.
+
+## GNU Emacs is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+
+## GNU Emacs is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+### Commentary:
+
+## This directory contains grammar files in Bison and Wisent,
+## used to generate the parser data in the lisp/cedet directory.
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+
+EMACS = ${top_builddir}/src/emacs
+emacs = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp
+
+make_bovine = ${emacs} -l semantic/bovine/grammar -f bovine-batch-make-parser
+make_wisent = ${emacs} -l semantic/wisent/grammar -f wisent-batch-make-parser
+
+cedetdir = ${top_srcdir}/lisp/cedet
+bovinedir = ${cedetdir}/semantic/bovine
+wisentdir = ${cedetdir}/semantic/wisent
+
+BOVINE = \
+        ${bovinedir}/c-by.el \
+        ${bovinedir}/make-by.el \
+        ${bovinedir}/scm-by.el
+
+## FIXME Should include this one too:
+##      ${cedetdir}/semantic/grammar-wy.el
+## but semantic/grammar.el (which is what we use to generate grammar-wy.el)
+## requires it!
+WISENT = \
+        ${wisentdir}/javat-wy.el \
+        ${wisentdir}/js-wy.el \
+        ${wisentdir}/python-wy.el \
+        ${cedetdir}/srecode/srt-wy.el
+
+ALL = ${BOVINE} ${WISENT}
+
+.PHONY: all bovine wisent
+
+all: ${ALL}
+
+bovine: ${BOVINE}
+
+wisent: ${WISENT}
+
+
+${bovinedir}/c-by.el: ${srcdir}/c.by
+        ${make_bovine} -o "$@" ${srcdir}/c.by
+
+${bovinedir}/make-by.el: ${srcdir}/make.by
+        ${make_bovine} -o "$@" ${srcdir}/make.by
+
+${bovinedir}/scm-by.el: ${srcdir}/scheme.by
+        ${make_bovine} -o "$@" ${srcdir}/scheme.by
+
+
+${cedetdir}/semantic/grammar-wy.el: ${srcdir}/grammar.wy
+        ${make_wisent} -o "$@" ${srcdir}/grammar.wy
+
+${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy
+        ${make_wisent} -o "$@" ${srcdir}/java-tags.wy
+
+${wisentdir}/js-wy.el: ${srcdir}/js.wy
+        ${make_wisent} -o "$@" ${srcdir}/js.wy
+
+${wisentdir}/python-wy.el: ${srcdir}/python.wy
+        ${make_wisent} -o "$@" ${srcdir}/python.wy
+
+${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy
+        ${make_wisent} -o "$@" ${srcdir}/srecode-template.wy
+
+
+.PHONY: distclean bootstrap-clean maintainer-clean extraclean
+
+distclean:
+        rm -f Makefile
+
+bootstrap-clean maintainer-clean: distclean
+
+## We do not normally delete the generated files, even in bootstrap.
+## Creating them does not take long, so we could easily change this.
+extraclean:
+        rm -f ${ALL}
+
+# Makefile.in ends here
diff --git a/admin/grammars/README b/admin/grammars/README
deleted file mode 100644
index e38260952a5..00000000000
--- a/admin/grammars/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This directory contains grammar files in Bison and Wisent, used to
-generate the parser data in the lisp/semantic/bovine/ and
-lisp/semantic/wisent/ directories.  You can run the parser generators
-with
-
-emacs -batch -Q -l semantic/bovine/grammar -f bovine-make-parsers
-emacs -batch -Q -l semantic/wisent/grammar -f wisent-make-parsers
-
-Currently, the parser files in lisp/ are not generated directly from
-these grammar files when making Emacs.  This state of affairs, and the
-contents of this directory, will change in a future version of Emacs.
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index 5d2f407e8e3..55ec0fbaf01 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -41,9 +41,13 @@
 %provide semantic/bovine/c-by
 
 %{
-(declare-function semantic-c-reconstitute-token "semantic/bovine/c")
-(declare-function semantic-c-reconstitute-template "semantic/bovine/c")
-(declare-function semantic-expand-c-tag "semantic/bovine/c")
+(declare-function semantic-c-reconstitute-token "semantic/bovine/c"
+                  (tokenpart declmods typedecl))
+(declare-function semantic-c-reconstitute-template "semantic/bovine/c"
+                  (tag specifier))
+(declare-function semantic-expand-c-tag "semantic/bovine/c" (tag))
+(declare-function semantic-parse-region "semantic"
+                  (start end &optional nonterminal depth returnonerror))
 }
 
 %languagemode  c-mode c++-mode
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index 71607f452a0..3f5c3ad04c6 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -25,6 +25,11 @@
 %package wisent-java-tags-wy
 %provide semantic/wisent/javat-wy
 
+%{
+(declare-function semantic-parse-region "semantic"
+                  (start end &optional nonterminal depth returnonerror))
+}
+
 %languagemode  java-mode
 
 ;; The default start symbol
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index 3b602296552..a6a358a0ee7 100644
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -59,6 +59,12 @@
 
 %package wisent-javascript-jv-wy
 %provide semantic/wisent/js-wy
+
+%{
+(declare-function semantic-parse-region "semantic"
+                  (start end &optional nonterminal depth returnonerror))
+}
+
 ;; JAVE I prefere ecmascript-mode
 %languagemode ecmascript-mode javascript-mode
 
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 02fb7390b01..b82125d2bc3 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -91,8 +91,12 @@
 %provide semantic/wisent/python-wy
 
 %{
-(declare-function wisent-python-reconstitute-function-tag "semantic/wisent/python")
-(declare-function wisent-python-reconstitute-class-tag "semantic/wisent/python")
+(declare-function wisent-python-reconstitute-function-tag
+                  "semantic/wisent/python" (tag suite))
+(declare-function wisent-python-reconstitute-class-tag "semantic/wisent/python"
+                  (tag))
+(declare-function semantic-parse-region "semantic"
+                  (start end &optional nonterminal depth returnonerror))
 }
 
 %languagemode python-mode