Re: bootstrap not regenerating some *loaddefs

[Juanma Barranquero]

> Can you try and track down why it doesn't?
> The way it works in non-w32 is that loadup.el loads ldefs-boot.el in
> case loading loaddefs.el failed, so removing loaddefs.el should work
> just as well as copying it from ldefs-boot.el.

The following patch works for me in the following situations:

 - bootstrapping a fresh checkout
 - bootstrapping an already existing workspace
 - "make maintaner-clean" & "make bootstrap install"

However, I'd like to hear from Eli before committing this, as it is
his code that I'm removing.

   Juanma



2008-06-18  Juanma Barranquero  <address@hidden>

        * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH):
        Don't copy ldefs-boot.el over loaddefs.el.
        (bootstrap-clean): Remove loaddefs.el and don't depend on it.
        (loaddefs.el-SH, loaddefs.el-CMD): Add coding cookie to loaddefs.el.



Index: lisp/makefile.w32-in
===================================================================
RCS file: /sources/emacs/emacs/lisp/makefile.w32-in,v
retrieving revision 1.81
diff -u -2 -r1.81 makefile.w32-in
--- lisp/makefile.w32-in        6 May 2008 08:05:36 -0000       1.81
+++ lisp/makefile.w32-in        18 Jun 2008 10:50:15 -0000
@@ -138,13 +138,15 @@
        echo "(defvar cvs-global-menu nil)" >>$@
        echo " " >> $@
-       echo ";;; Local Variables:" >> $@
-       echo ";;; version-control: never" >> $@
-       echo ";;; no-byte-compile: t" >> $@
-       echo ";;; no-update-autoloads: t" >> $@
-       echo ";;; End:" >> $@
+       echo ";; Local Variables:" >> $@
+       echo ";; version-control: never" >> $@
+       echo ";; no-byte-compile: t" >> $@
+       echo ";; no-update-autoloads: t" >> $@
+       echo ";; coding: utf-8" >> $@
+       echo ";; End:" >> $@
        echo ";;; loaddefs.el ends here" >> $@

 loaddefs.el-CMD:
        echo ;;; loaddefs.el --- automatically extracted autoloads> $@
+       echo ;;>> $@
        echo ;;; Code:>> $@
        echo (autoload 'define-minor-mode "easy-mmode")>> $@
@@ -156,9 +158,10 @@
        echo (defvar cvs-global-menu nil)>> $@
        echo. >> $@
-       echo ;;; Local Variables:>> $@
-       echo ;;; version-control: never>> $@
-       echo ;;; no-byte-compile: t>> $@
-       echo ;;; no-update-autoloads: t>> $@
-       echo ;;; End:>> $@
+       echo ;; Local Variables:>> $@
+       echo ;; version-control: never>> $@
+       echo ;; no-byte-compile: t>> $@
+       echo ;; no-update-autoloads: t>> $@
+       echo ;; coding: utf-8>> $@
+       echo ;; End:>> $@
        echo ;;; loaddefs.el ends here>> $@

@@ -385,14 +388,10 @@

 # Need separate version for sh and native cmd.exe
-# Note that bootstrap-clean-$(SHELLTYPE) copies ldefs-boot.el to loaddefs.el,
-# and thus the almost-empty loaddefs.el crafted by the $(lisp)/loaddefs.el
-# target can NOT be built _after_ bootstrap-clean-$(SHELLTYPE) does its
-# thing, or else an empty loaddefs.el will overwrite the full one.
-bootstrap-clean: $(lisp)/loaddefs.el
+bootstrap-clean:
+       - $(DEL) $(lisp)/loaddefs.el
        $(MAKE) $(MFLAGS) bootstrap-clean-$(SHELLTYPE)

 bootstrap-clean-CMD:
 #      if exist "$(EMACS)" $(MAKE) $(MFLAGS) autoloads
-       cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el
        -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g

@@ -400,5 +399,4 @@
 #      if test -f "$(EMACS)"; then $(MAKE) $(MFLAGS) autoloads; fi
 #      -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
-       cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el
        -for dir in . $(WINS); do rm -f $$dir/*.elc; done