From 5ce97cd6d22e2323a1a3f37114f6a16387ab18ad Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 18 Jan 2001 09:14:41 +0000 Subject: [PATCH] * lisp/gnus-vers.el (gnus-revision-number): Increment to 04. * lisp/dgnushack.el (dgnushack-make-autoloads): Do nothing if the files for autoloads already exist. (dgnushack-unexporting-files): More useful message. * lisp/Makefile.in (install): Call `clever' before installing. (install-lisp): Remove. (clever): Check for whether the all elc files should be recompiled. * Makefile.in (xclever): New target. (install-package-lisp): Replace `install-lisp' with `instal'. (install-package-ja): Replace `xlick' with `xclever'. (install-package): Ditto. * Makefile.in: Unset `PWD' for Meadow/NTEmacs. --- ChangeLog | 23 ++++++++++++++++ Makefile.in | 17 +++++++++--- lisp/Makefile.in | 22 ++++++++++++--- lisp/dgnushack.el | 77 ++++++++++++++++++++++++++++++++--------------------- lisp/gnus-vers.el | 2 +- 5 files changed, 102 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9095f01..45f9b78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2001-01-18 Katsumi Yamaoka + + * lisp/gnus-vers.el (gnus-revision-number): Increment to 04. + +2001-01-17 Katsumi Yamaoka + + * lisp/dgnushack.el (dgnushack-make-autoloads): Do nothing if the + files for autoloads already exist. + (dgnushack-unexporting-files): More useful message. + + * lisp/Makefile.in (install): Call `clever' before installing. + (install-lisp): Remove. + (clever): Check for whether the all elc files should be recompiled. + + * Makefile.in (xclever): New target. + (install-package-lisp): Replace `install-lisp' with `instal'. + (install-package-ja): Replace `xlick' with `xclever'. + (install-package): Ditto. + +2001-01-17 KOSEKI Yoshinori + + * Makefile.in: Unset `PWD' for Meadow/NTEmacs. + 2001-01-15 Jesper Harder * make.bat: Fix doc. diff --git a/Makefile.in b/Makefile.in index c662fb5..fb624a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,6 +10,12 @@ XEMACS = @XEMACS@ PACKAGEDIR = @PACKAGEDIR@ GNUS_PRODUCT_NAME = @GNUS_PRODUCT_NAME@ +# It may be needed for Meadow/NTEmacs when sh.exe is used for SHELL. +# Because Meadow/NTEmacs will get the value of the current-directory from +# the environment variable PWD, but sh.exe will not take care of it even +# if the current-directory has changed. So we should invalidate it. +PWD= + # It will be used to look for the XEmacs package path if this file is # mis-configured (e.g. configured for FSFmacs). EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \ @@ -52,11 +58,11 @@ install-info-ja: cd texi && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir)" install-ja ## Rule for XEmacs package. -install-package: xlick compose-package remove-extra-files-in-package \ +install-package: xclever compose-package remove-extra-files-in-package \ install-package-lisp \ install-package-info install-package-manifest -install-package-ja: xlick compose-package remove-extra-files-in-package \ +install-package-ja: xclever compose-package remove-extra-files-in-package \ install-package-lisp \ install-package-info install-package-info-ja \ install-package-manifest @@ -74,10 +80,10 @@ install-package-lisp: fi; \ echo "cd lisp && $(MAKE) EMACS=$(XEMACS)" \ "lispdir=$$package_dir""/lisp/$(GNUS_PRODUCT_NAME)" \ - "install-lisp"; \ + "install"; \ cd lisp && $(MAKE) EMACS="$(XEMACS)" \ lispdir="$$package_dir""/lisp/$(GNUS_PRODUCT_NAME)" \ - install-lisp + install install-package-info: @if test x$(PACKAGEDIR) = x; then \ @@ -127,6 +133,9 @@ compose-package: cd lisp && $(MAKE) EMACS="$(XEMACS)" compose-package ## +xclever: + cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" clever + xlick: cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" all diff --git a/lisp/Makefile.in b/lisp/Makefile.in index aadcaeb..7252ddd 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -28,12 +28,28 @@ warn: # The "clever" rule is unsafe, since redefined macros are loaded from # .elc files, and not the .el file. clever some: + @if test -f $(srcdir)/gnus.elc; then \ + echo \ + "checking for whether the all elc files should be recompiled..."; \ + RM_ELC=nil; \ + if test `$(EMACS) -batch -q -no-site-file \ + -eval "(princ (format \"%s\" (featurep (quote xemacs))))" \ + 2>/dev/null` = t; then \ + test ! -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \ + else \ + test -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \ + fi; \ + if test $$RM_ELC = t; then \ + echo " => yes; rm -f *.elc auto-autoloads.el custom-load.el"; \ + rm -f *.elc auto-autoloads.el custom-load.el; \ + else \ + echo " => unnecessary"; \ + fi; \ + fi W3DIR=$(W3DIR) lispdir=$(lispdir) \ srcdir=$(srcdir) $(EMACS) $(FLAGS) -f dgnushack-compile -install: clever install-lisp - -install-lisp: +install: clever $(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir) @for p in `$(EXPORTING_FILES)`; do \ echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \ diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index 17121ea..b1e9496 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -272,15 +272,19 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again. ;; configured for FSFmacs but XEmacs is running). (let ((lp (delete dgnushack-w3-dir (copy-sequence load-path)))) - (when (let ((load-path lp)) - (condition-case code - (require 'w3-forms) - (error - (message "No w3: %s %s" code - (locate-library "w3-forms")) - nil))) - ;; If success, fix `load-path' for compiling. - (setq load-path lp)))) + (if (let ((load-path lp)) + (condition-case nil + (require 'w3-forms) + (error nil))) + ;; If success, fix `load-path' for compiling. + (progn + (setq load-path lp) + (message " => fixed; W3DIR=%s" + (file-name-directory + (locate-library "w3-forms"))) + t) + (message " => ignored") + nil))) '("nnweb.el" "nnlistserv.el" "nnultimate.el" "nnslashdot.el" "nnwarchive.el" "webmail.el" "nnwfm.el")) @@ -485,28 +489,39 @@ Modify to suit your needs.")) (defun dgnushack-make-autoloads () "Make auto-autoloads.el, custom-load.el and then compile them." - (let (make-backup-files) - (message "Updating autoloads for directory %s..." default-directory) - (let ((generated-autoload-file "auto-autoloads.el") - (si:message (symbol-function 'message)) - noninteractive) - (defun message (fmt &rest args) - (cond ((and (string-equal "Generating autoloads for %s..." fmt) - (file-exists-p (file-name-nondirectory (car args)))) - (funcall si:message fmt (file-name-nondirectory (car args)))) - ((string-equal "No autoloads found in %s" fmt)) - ((string-equal "Generating autoloads for %s...done" fmt)) - (t (apply si:message fmt args)))) - (unwind-protect - (update-autoloads-from-directory default-directory) - (fset 'message si:message))) - (byte-compile-file "auto-autoloads.el") - (with-temp-buffer - (let ((standard-output (current-buffer))) - (Custom-make-dependencies ".")) - (message "%s" (buffer-string))) - (require 'cus-load) - (byte-compile-file "custom-load.el"))) + (let ((auto-autoloads (expand-file-name "auto-autoloads.el" srcdir)) + (custom-load (expand-file-name "custom-load.el" srcdir))) + (unless (and (file-exists-p auto-autoloads) + (file-exists-p (concat auto-autoloads "c")) + (file-newer-than-file-p (concat auto-autoloads "c") + auto-autoloads) + (file-exists-p custom-load) + (file-exists-p (concat custom-load "c")) + (file-newer-than-file-p (concat custom-load "c") + custom-load)) + (let (make-backup-files) + (message "Updating autoloads for directory %s..." default-directory) + (let ((generated-autoload-file auto-autoloads) + (si:message (symbol-function 'message)) + noninteractive) + (defun message (fmt &rest args) + (cond ((and (string-equal "Generating autoloads for %s..." fmt) + (file-exists-p (file-name-nondirectory (car args)))) + (funcall si:message + fmt (file-name-nondirectory (car args)))) + ((string-equal "No autoloads found in %s" fmt)) + ((string-equal "Generating autoloads for %s...done" fmt)) + (t (apply si:message fmt args)))) + (unwind-protect + (update-autoloads-from-directory default-directory) + (fset 'message si:message))) + (byte-compile-file auto-autoloads) + (with-temp-buffer + (let ((standard-output (current-buffer))) + (Custom-make-dependencies ".")) + (message "%s" (buffer-string))) + (require 'cus-load) + (byte-compile-file custom-load))))) (defun dgnushack-remove-extra-files-in-package () "Remove extra files in the lisp directory of the XEmacs package." diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el index 736d508..e17116e 100644 --- a/lisp/gnus-vers.el +++ b/lisp/gnus-vers.el @@ -31,7 +31,7 @@ (require 'product) (provide 'gnus-vers) -(defconst gnus-revision-number "03" +(defconst gnus-revision-number "04" "Revision number for this version of gnus.") ;; Product information of this gnus. -- 1.7.10.4