[Emacs-diffs] trunk r115992: Remove broken VCSWITNESS code, and explain the problem.

[Eric S. Raymond]

------------------------------------------------------------
revno: 115992
revision-id: address@hidden
parent: address@hidden
committer: Eric S. Raymond <address@hidden>
branch nick: trunk
timestamp: Sun 2014-01-12 09:54:50 -0500
message:
  Remove broken VCSWITNESS code, and explain the problem.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  Makefile.in                    makefile.in-20091113204419-o5vbwnq5f7feedwu-446
  etc/PROBLEMS                   problems-20091113204419-o5vbwnq5f7feedwu-1498
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-01-12 01:35:51 +0000
+++ b/ChangeLog 2014-01-12 14:54:50 +0000
@@ -1,3 +1,8 @@
+2014-01-12  Eric S. Raymond  <address@hidden>
+
+       * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS
+       code, and explain the problem.
+
 2014-01-12  Glenn Morris  <address@hidden>
 
        * README: Replace reference to etc/MAILINGLISTS.

=== modified file 'Makefile.in'
--- a/Makefile.in       2014-01-01 07:43:34 +0000
+++ b/Makefile.in       2014-01-12 14:54:50 +0000
@@ -374,16 +374,12 @@
 # all preloaded elisp files, and only then dump the actual src/emacs, which
 # is not wrong, but is overkill in 99.99% of the cases.
 src: Makefile FRC
-       dirstate='.bzr/checkout/dirstate';                              \
-       vcswitness='$$(srcdir)/../'$$dirstate;                          \
-       [ -r "$(srcdir)/$$dirstate" ] || vcswitness='';                 \
        cd $@ || exit;                                                  \
        boot=bootstrap-emacs$(EXEEXT);                                  \
        [ ! -x "$$boot" ] || boot='';                                   \
        $(MAKE) all $(MFLAGS)                                           \
          CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'          \
-         LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"   \
-         VCSWITNESS="$$vcswitness"
+         LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"
 
 blessmail: Makefile src FRC
        cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \

=== modified file 'etc/PROBLEMS'
--- a/etc/PROBLEMS      2014-01-09 19:42:46 +0000
+++ b/etc/PROBLEMS      2014-01-12 14:54:50 +0000
@@ -2429,6 +2429,12 @@
 from source, rather than the Ubuntu version, worked.
 See <URL:http://debbugs.gnu.org/327, <URL:http://debbugs.gnu.org/821>.
 
+*** Rebuild of loaddefs.el is not always done after Lisp changes
+
+The rebuild production should depend on all Lisp files with #autoload
+cookies.  It doesn't yet.  This needs a configure-time improvement to
+the nuild system.
+
 ** Dumping
 
 *** Linux: Segfault during `make bootstrap' under certain recent versions of 
the Linux kernel.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-12 14:25:10 +0000
+++ b/lisp/ChangeLog    2014-01-12 14:54:50 +0000
@@ -36,7 +36,7 @@
 
 2014-01-11  Eric S. Raymond  <address@hidden>
 
-       * version.el (emacs-repository-get-version): Enhancee so the
+       * version.el (emacs-repository-get-version): Enhance so the
        function works correctly in either a Bazaar or Git repo. The
        Bazaar case can be discarded  after the repo transition.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2014-01-05 04:56:23 +0000
+++ b/src/Makefile.in   2014-01-12 14:54:50 +0000
@@ -629,12 +629,10 @@
 ## Since the .el.elc rule cannot specify an extra dependency, we do it here.
 $(lisp): $(BOOTSTRAPEMACS)
 
-## VCSWITNESS points to the file that holds info about the current checkout.
-## We use it as a heuristic to decide when to rebuild loaddefs.el.
-## If empty it is ignored; the parent makefile can set it to some other value.
-VCSWITNESS =
+## This ought to depend on every Lisp file that contains an autoload cookie.
+## A task for the future...
 
-$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
+$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS)
        cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS="$(bootstrap_exe)"
 
 ## Dump an Emacs executable named bootstrap-emacs containing the