Add bootstrap support. Also copy lisp source

when installing.

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 97d48a62b308a6222aded2a4262c062e17b9bee6..db9c23f633157f5e58297875ec230029ebbfedf3 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -24,13 +24,232 @@ ALL =
 \r
 all: $(ALL)\r
 \r
-topdontcompile = cus-load.el forms-d2.el forms-pass.el patcomp.el \\r
-                subdirs.el version.el\r
-maildontcompile = mail/blessmail.el mail/sc.el\r
-playdontcompile = play/bruce.el\r
-interdontcompile = international/latin-1.el international/latin-2.el \\r
-                international/latin-3.el international/latin-4.el \\r
-                international/latin-5.el international/mule-conf.el\r
+SQUOTE='\r
+# '\r
+\r
+#lisp=$(MAKEDIR:\=/)\r
+lisp=.\r
+\r
+# You can specify a different executable on the make command line,\r
+# e.g. "make EMACS=../src/emacs ...".\r
+\r
+EMACS = "../bin/emacs.exe"\r
+\r
+# Command line flags for Emacs.  This must include --multibyte,\r
+# otherwise some files will not compile.\r
+\r
+EMACSOPT = -batch --no-init-file --no-site-file --multibyte\r
+\r
+lisptagsfiles1 = $(lisp)/*.el\r
+lisptagsfiles2 = $(lisp)/*/*.el\r
+ETAGS = "../lib-src/$(BLD)/etags"\r
+\r
+# Files which should not be compiled.\r
+# - emacs-lisp/cl-specs.el:  only contains `def-edebug-spec's so there's\r
+#   no point compiling it, although it doesn't hurt.\r
+\r
+DONTCOMPILE = \\r
+       $(lisp)/bindings.el \\r
+       $(lisp)/cus-load.el \\r
+       $(lisp)/cus-start.el \\r
+       $(lisp)/emacs-lisp/cl-specs.el \\r
+       $(lisp)/eshell/esh-maint.el \\r
+       $(lisp)/eshell/esh-groups.el \\r
+       $(lisp)/finder-inf.el \\r
+       $(lisp)/forms-d2.el \\r
+       $(lisp)/forms-pass.el \\r
+       $(lisp)/generic-x.el \\r
+       $(lisp)/international/latin-1.el \\r
+       $(lisp)/international/latin-2.el \\r
+       $(lisp)/international/latin-3.el \\r
+       $(lisp)/international/latin-4.el \\r
+       $(lisp)/international/latin-5.el \\r
+       $(lisp)/international/latin-8.el \\r
+       $(lisp)/international/latin-9.el \\r
+       $(lisp)/international/mule-conf.el \\r
+       $(lisp)/loaddefs.el \\r
+       $(lisp)/loadup.el \\r
+       $(lisp)/mail/blessmail.el \\r
+       $(lisp)/mail/sc.el \\r
+       $(lisp)/patcomp.el \\r
+       $(lisp)/paths.el \\r
+       $(lisp)/play/bruce.el \\r
+       $(lisp)/subdirs.el \\r
+       $(lisp)/term/internal.el \\r
+       $(lisp)/version.el\r
+\r
+# Files to compile before others during a bootstrap.  This is done\r
+# to speed up the bootstrap process.\r
+\r
+COMPILE_FIRST = \\r
+       $(lisp)/emacs-lisp/byte-opt.el \\r
+       $(lisp)/emacs-lisp/bytecomp.el \\r
+       $(lisp)/subr.el\r
+\r
+# The actual Emacs command run in the targets below.\r
+\r
+emacs = $(EMACS) $(EMACSOPT)\r
+\r
+# Common command to find subdirectories\r
+\r
+setwins=subdirs=`find $$wd -type d -print`; \\r
+       for file in $$subdirs; do \\r
+          case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \\r
+               *) wins="$$wins $$file" ;; \\r
+          esac; \\r
+        done\r
+\r
+# Have to define the list of subdirs manually when not using sh.\r
+WINS=\\r
+       calendar \\r
+       emacs-lisp \\r
+       emulation \\r
+       eshell \\r
+       gnus \\r
+       international \\r
+       language \\r
+       mail \\r
+       net \\r
+       play \\r
+       progmodes \\r
+       term \\r
+       textmodes\r
+\r
+doit:\r
+\r
+cus-load.el:\r
+       touch $@\r
+custom-deps: cus-load.el doit\r
+       @echo Directories: $(WINS)\r
+       $(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hooks nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)\r
+\r
+finder-inf.el:\r
+       echo (provide $(SQUOTE)finder-inf)>> $@\r
+\r
+finder-data: finder-inf.el doit\r
+       @echo Directories: $(WINS)\r
+       $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS)\r
+\r
+loaddefs.el:\r
+       echo ;;; loaddefs.el --- automatically extracted autoloads> $@\r
+       echo ;;; Code:>> $@\r
+       echo \f>> $@\r
+       echo ;;; Local Variables:>> $@\r
+       echo ;;; version-control: never>> $@\r
+       echo ;;; no-byte-compile: t>> $@\r
+       echo ;;; no-update-autoloads: t>> $@\r
+       echo ;;; End:>> $@\r
+       echo ;;; loaddefs.el ends here>> $@\r
+\r
+autoloads: loaddefs.el doit\r
+       @echo Directories: $(WINS)\r
+       set EMACSLOADPATH=$(lisp)\r
+       $(SETLOADPATH) $(emacs) -l autoload --eval $(ARGQUOTE)(setq find-file-hooks nil generated-autoload-file $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) -f batch-update-autoloads $(lisp) $(WINS)\r
+\r
+subdirs.el:\r
+       $(MAKE) $(MFLAGS) update-subdirs\r
+\r
+# Need separate version for sh and native cmd.exe\r
+update-subdirs: update-subdirs-$(SHELLTYPE)\r
+\r
+update-subdirs-CMD: doit\r
+       @set QWINS=\r
+       @for %d in ($(WINS)) do if not (%d)==(term) set QWINS=%QWINS% "%d"\r
+       echo ;; In load-path, after this directory should come> subdirs.el\r
+       echo ;; certain of its subdirectories.  Here we specify them.>> subdirs.el\r
+       echo (normal-top-level-add-to-load-path $(SQUOTE)(%QWINS%))>> subdirs.el\r
+\r
+update-subdirs-SH: doit\r
+       wd=$(lisp); $(setwins); \\r
+       for file in $$wins; do \\r
+          $(srcdir)/update-subdirs $$file; \\r
+       done;\r
+\r
+updates: update-subdirs autoloads finder-data custom-deps\r
+\r
+TAGS: $(lisptagsfiles1) $(lisptagsfiles2)\r
+       $(ETAGS) $(lisptagsfiles1) $(lisptagsfiles2)\r
+\r
+TAGS-LISP: $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)\r
+       $(ETAGS) -o TAGS-LISP $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)\r
+\r
+.el.elc:\r
+       set EMACSLOADPATH=$(lisp)\r
+       -$(SETLOADPATH) $(emacs) -f batch-byte-compile $<\r
+\r
+$(DONTCOMPILE:.el=.elc):\r
+       -$(DEL) $@\r
+\r
+# Compile all Lisp files, except those from DONTCOMPILE.  This\r
+# compiles files unconditionally.  All .elc files are made writable\r
+# before compilation in case we checked out read-only (CVS option -r).\r
+# Files MUST be compiled one by one.  If we compile several files in a\r
+# row we can't make sure that the compilation environment is clean.\r
+# We also set the load-path of the Emacs used for compilation to the\r
+# current directory and its subdirectories, to make sure require's and\r
+# load's in the files being compiled find the right files.\r
+\r
+# Need separate version for sh and native cmd.exe\r
+compile-files: subdirs.el compile-files-$(SHELLTYPE) doit\r
+\r
+compile-files-CMD:\r
+       set EMACSLOADPATH=$(lisp)\r
+       -for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @attrib -r %g\r
+       for %f in ($(COMPILE_FIRST)) do $(emacs) -f batch-byte-compile %f\r
+       for %f in ($(lisp) $(WINS)) do for %g in (%f/*.el) do $(emacs) -f batch-byte-compile %f/%g\r
+\r
+compile-files-SH:\r
+#      for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done\r
+       for el in $(COMPILE_FIRST); do \\r
+         echo Compiling $$el; \\r
+         EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $$el; \\r
+       done\r
+       for dir in $(lisp) $(WINS); do \\r
+         for el in $$dir/*.el; do \\r
+           echo Compiling $$el; \\r
+           EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $$el; \\r
+         done; \\r
+       done\r
+\r
+# Backup compiled Lisp files in elc.tar.gz.  If that file already\r
+# exists, make a backup of it.\r
+\r
+backup-compiled-files:\r
+       -mv $(lisp)/elc.tar.gz $(lisp)/elc.tar.gz~\r
+       -tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc\r
+\r
+# Compile Lisp files, but save old compiled files first.\r
+\r
+compile: backup-compiled-files compile-files\r
+\r
+# Recompile all Lisp files which are newer than their .elc files.\r
+# Note that this doesn't create .elc files.  It only recompiles if an\r
+# .elc is present.\r
+\r
+recompile: doit\r
+       set EMACSLOADPATH=$(lisp)\r
+       $(SETLOADPATH) $(emacs) -f batch-byte-recompile-directory .\r
+\r
+# Prepare a bootstrap in the lisp subdirectory.  Build loaddefs.el,\r
+# because it's not sure it's up-to-date, and if it's not, that might\r
+# lead to errors during the bootstrap because something fails to\r
+# autoload as expected.  Remove compiled Lisp files so that\r
+# bootstrap-emacs will be built from sources only.\r
+\r
+# Need separate version for sh and native cmd.exe\r
+bootstrap-clean: bootstrap-clean-$(SHELLTYPE)\r
+\r
+bootstrap-clean-CMD:\r
+       if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads\r
+       -for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @$(DEL) %g\r
+\r
+bootstrap-clean-SH:\r
+       if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi\r
+       -rm -f $(lisp)/*.elc $(lisp)/*/*.elc\r
+\r
+# Generate/update files for the bootstrap process.\r
+\r
+bootstrap: autoloads compile-files custom-deps\r
 \r
 #\r
 # Assuming INSTALL_DIR is defined, copy the elisp files to it\r
@@ -44,20 +263,20 @@ install:
 #ifdef COPY_LISP_SOURCE\r
                $(IFNOTSAMEDIR) $(CP_DIR) . "$(INSTALL_DIR)/lisp" $(ENDIF)\r
 #else\r
-               $(IFNOTSAMEDIR) $(CP_DIR) *.elc "$(INSTALL_DIR)/lisp" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) cus-load.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) forms*.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) patcomp.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) subdirs.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) version.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) mail/blessmail.el "$(INSTALL_DIR)/lisp/mail" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) mail/sc.el "$(INSTALL_DIR)/lisp/mail" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) play/bruce.el "$(INSTALL_DIR)/lisp/play" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) international/latin-*.el "$(INSTALL_DIR)/lisp/international" $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP) international/mule-conf.el "$(INSTALL_DIR)/lisp/international" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP_DIR) *.elc "$(INSTALL_DIR)/lisp" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) cus-load.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) forms*.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) patcomp.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) subdirs.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) version.el "$(INSTALL_DIR)/lisp" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) mail/blessmail.el "$(INSTALL_DIR)/lisp/mail" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) mail/sc.el "$(INSTALL_DIR)/lisp/mail" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) play/bruce.el "$(INSTALL_DIR)/lisp/play" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) international/latin-*.el "$(INSTALL_DIR)/lisp/international" $(ENDIF)\r
+#              $(IFNOTSAMEDIR) $(CP) international/mule-conf.el "$(INSTALL_DIR)/lisp/international" $(ENDIF)\r
+#endif\r
                - $(DEL) ../same-dir.tst\r
                - $(DEL) "$(INSTALL_DIR)/same-dir.tst"\r
-#endif\r
 \r
 #\r
 # Maintenance\r