X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=bd04d089b08e3a8421ecdfcca7860bd9f16dbf62;hb=e2696774a2e225ea60d46cc665d4232c80412731;hp=cdedb1b020735d5c4767732aa311d88f9c007c90;hpb=ee70a66fb20ed12d43960dd3933c7f416257ef42;p=elisp%2Fgnus.git-

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index cdedb1b..bd04d08 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,5 +1,6 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994,95,96,97,98,99 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Katsumi Yamaoka <yamaoka@jpl.org>
@@ -28,68 +29,46 @@
 ;;; Code:
 
 ;; Set coding priority of Shift-JIS to the bottom.
-(defvar *predefined-category*)
-(defvar coding-category-list)
 (if (featurep 'xemacs)
-    (fset 'set-coding-priority 'ignore)
-  (fset 'coding-priority-list 'ignore)
-  (fset 'set-coding-priority-list 'ignore))
+    (defalias 'set-coding-priority 'ignore)
+  (defalias 'coding-priority-list 'ignore)
+  (defalias 'set-coding-priority-list 'ignore))
 (cond ((and (featurep 'xemacs) (featurep 'mule))
        (if (memq 'shift-jis (coding-priority-list))
 	   (set-coding-priority-list
-	    (nconc (delq 'shift-jis (coding-priority-list)) '(shift-jis)))))
-      ((boundp 'MULE)
-       (put '*coding-category-sjis* 'priority (length *predefined-category*)))
+	    (append (delq 'shift-jis (coding-priority-list)) '(shift-jis)))))
       ((featurep 'mule)
        (if (memq 'coding-category-sjis coding-category-list)
 	   (set-coding-priority
-	    (nconc (delq 'coding-category-sjis coding-category-list)
-		   '(coding-category-sjis))))))
+	    (append (delq 'coding-category-sjis
+			  (copy-sequence coding-category-list))
+		    '(coding-category-sjis))))))
 
-(fset 'facep 'ignore)
+(defalias 'facep 'ignore)
 
 (require 'cl)
 
-;; cl functions.
-(define-compiler-macro mapc (&whole form fn seq &rest rest)
-  (if (and (fboundp 'mapc)
-	   (subrp (symbol-function 'mapc)))
-      form
-    (if rest
-	`(let* ((fn ,fn)
-		(seq ,seq)
-		(args (cons seq ,rest))
-		(m (apply (function min) (mapcar (function length) args)))
-		(n 0))
-	   (while (< n m)
-	     (apply fn (mapcar (function (lambda (arg) (nth n arg))) args))
-	     (setq n (1+ n)))
-	   seq)
-      `(let ((seq ,seq))
-	 (mapcar ,fn seq)
-	 seq))))
-
-(define-compiler-macro last (&whole form x &optional n)
-  (if (and (fboundp 'last)
-	   (subrp (symbol-function 'last)))
-      form
-    (if n
-	`(let* ((x ,x)
-		(n ,n)
-		(m 0)
-		(p x))
-	   (while (consp p)
-	     (incf m)
-	     (pop p))
-	   (if (<= n 0)
-	       p
-	     (if (< n m)
-		 (nthcdr (- m n) x)
-	       x)))
-      `(let ((x ,x))
-	 (while (consp (cdr x))
-	   (pop x))
-	 x))))
+(unless (and
+	 ;; `dolist' might not be available because of ``-no-autoloads''.
+	 (fboundp 'dolist)
+	 ;; It may have been defined in egg.el.
+	 (dolist (var nil t)))
+  (load "cl-macs" nil t))
+
+(defvar srcdir (or (getenv "srcdir") "."))
+(defvar loaddir (and load-file-name (file-name-directory load-file-name)))
+
+(defvar dgnushack-w3-directory (let ((w3dir (getenv "W3DIR")))
+				 (unless (zerop (length w3dir))
+				   (file-name-as-directory w3dir))))
+
+(let ((urldir (getenv "URLDIR")))
+  (unless (zerop (length urldir))
+    (setq urldir (file-name-as-directory urldir))
+    (push (file-name-as-directory urldir) load-path))
+  (when (and dgnushack-w3-directory
+	     (not (string-equal urldir dgnushack-w3-directory)))
+    (push dgnushack-w3-directory load-path)))
 
 ;; If we are building w3 in a different directory than the source
 ;; directory, we must read *.el from source directory and write *.elc
@@ -110,49 +89,189 @@
 	(t (concat filename ".elc"))))
 
 (require 'bytecomp)
+;; To avoid having defsubsts and inlines happen.
+;(if (featurep 'xemacs)
+;    (require 'byte-optimize)
+;  (require 'byte-opt))
+;(defun byte-optimize-inline-handler (form)
+;  "byte-optimize-handler for the `inline' special-form."
+;  (cons 'progn (cdr form)))
+;(defalias 'byte-compile-file-form-defsubst 'byte-compile-file-form-defun)
+
+(when (and (not (featurep 'xemacs))
+	   (= emacs-major-version 21)
+	   (= emacs-minor-version 3)
+	   (condition-case code
+	       (let ((byte-compile-error-on-warn t))
+		 (byte-optimize-form (quote (pop x)) t)
+		 nil)
+	     (error (string-match "called for effect"
+				  (error-message-string code)))))
+  (defadvice byte-optimize-form-code-walker (around silence-warn-for-pop
+						    (form for-effect)
+						    activate)
+    "Silence the warning \"...called for effect\" for the `pop' form.
+It is effective only when the `pop' macro is defined by cl.el rather
+than subr.el."
+    (let (tmp)
+      (if (and (eq (car-safe form) 'car)
+	       for-effect
+	       (setq tmp (get 'car 'side-effect-free))
+	       (not byte-compile-delete-errors)
+	       (not (eq tmp 'error-free))
+	       (eq (car-safe (cadr form)) 'prog1)
+	       (let ((var (cadr (cadr form)))
+		     (last (nth 2 (cadr form))))
+		 (and (symbolp var)
+		      (null (nthcdr 3 (cadr form)))
+		      (eq (car-safe last) 'setq)
+		      (eq (cadr last) var)
+		      (eq (car-safe (nth 2 last)) 'cdr)
+		      (eq (cadr (nth 2 last)) var))))
+	  (progn
+	    (put 'car 'side-effect-free 'error-free)
+	    (unwind-protect
+		ad-do-it
+	      (put 'car 'side-effect-free tmp)))
+	ad-do-it))))
+
+(when (and (not (featurep 'xemacs))
+	   (byte-optimize-form '(and (> 0 1) foo) t))
+  (defadvice byte-optimize-form-code-walker
+    (around fix-bug-in-and/or-forms (form for-effect) activate)
+    "Optimize the rest of the and/or forms.
+It has been fixed in XEmacs before releasing 21.4 and also has been
+fixed in Emacs after 21.3."
+    (if (and for-effect (memq (car-safe form) '(and or)))
+	(let ((fn (car form))
+	      (backwards (reverse (cdr form))))
+	  (while (and backwards
+		      (null (setcar backwards
+				    (byte-optimize-form (car backwards) t))))
+	    (setq backwards (cdr backwards)))
+	  (if (and (cdr form) (null backwards))
+	      (byte-compile-log
+	       "  all subforms of %s called for effect; deleted" form))
+	  (when backwards
+	    (setcdr backwards
+		    (mapcar 'byte-optimize-form (cdr backwards))))
+	  (setq ad-return-value (cons fn (nreverse backwards))))
+      ad-do-it)))
+
+;; Add `early-package-load-path' to `load-path' for XEmacs.  Those paths
+;; won't appear in `load-path' when XEmacs starts with the `-no-autoloads'
+;; option because of a bug. :<
+(when (and (featurep 'xemacs)
+	   (string-match "--package-path=\\([^ ]+\\)"
+			 system-configuration-options))
+  (let ((paths
+	 (apply 'nconc
+		(mapcar
+		 (lambda (path)
+		   (when (file-directory-p
+			  (setq path (expand-file-name "lisp" path)))
+		     (directory-files path t)))
+		 (split-string (match-string 1 system-configuration-options)
+			       "::"))))
+	path adds)
+    (while paths
+      (setq path (car paths)
+	    paths (cdr paths))
+      (when (and path
+		 (not (or (string-match "/\\.\\.?\\'" path)
+			  (member (file-name-as-directory path) load-path)
+			  (member path load-path)))
+		 (file-directory-p path))
+	(push (file-name-as-directory path) adds)))
+    (setq load-path (nconc (nreverse adds) load-path))))
+
+(if (file-exists-p (expand-file-name "dgnuspath.el" srcdir))
+    (load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
+  (message "  ** There's no dgnuspath.el file"))
 
-(defvar srcdir (or (getenv "srcdir") "."))
-
-(push srcdir load-path)
-
-;; Attempt to pickup the additional load-path(s).
-(load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
 (condition-case err
     (load "~/.lpath.el" t nil t)
   (error (message "Error in \"~/.lpath.el\" file: %s" err)))
 
-(condition-case nil
-    (char-after)
-  (wrong-number-of-arguments
-   ;; Optimize byte code for `char-after'.
-;;;   (put 'char-after 'byte-optimizer 'byte-optimize-char-after)
-;;;   (defun byte-optimize-char-after (form)
-;;;     (if (null (cdr form))
-;;;	 '(char-after (point))
-;;;       form))
-   (byte-defop-compiler char-after 0-1)))
-
-(condition-case nil
-    (char-before)
-  (wrong-number-of-arguments
-   (define-compiler-macro char-before (&whole form &optional pos)
-     (if (null pos)
-	 '(char-before (point))
-       form))))
-
-;; `char-after' and `char-before' must be well-behaved before lpath.el
-;; is loaded.  Because it requires `poe' via `path-util'.
-(load (expand-file-name "lpath.el" srcdir) nil t t)
-
-(unless (fboundp 'byte-compile-file-form-custom-declare-variable)
-  ;; Bind defcustom'ed variables.
-  (put 'custom-declare-variable 'byte-hunk-handler
-       'byte-compile-file-form-custom-declare-variable)
-  (defun byte-compile-file-form-custom-declare-variable (form)
-    (if (memq 'free-vars byte-compile-warnings)
-	(setq byte-compile-bound-variables
-	      (cons (nth 1 (nth 1 form)) byte-compile-bound-variables)))
-    form))
+;; Don't load path-util until `char-after' and `char-before' have been
+;; optimized because it requires `poe' and then modify the functions.
+
+;; If the APEL modules are installed under the non-standard directory,
+;; for example "/var/home/john/lisp/apel-VERSION/", you should add that
+;; name using the configure option "--with-addpath=".
+;; And also the directory where the EMU modules are installed, for
+;; example "/usr/local/share/mule/19.34/site-lisp/", it should be
+;; included in the standard `load-path' or added by the configure
+;; option "--with-addpath=".
+(let ((path (or (locate-library "path-util")
+		(locate-library "apel/path-util")));; backward compat.
+      parent lpath)
+  (if path
+      (progn
+	(when (string-match "/$" (setq path (file-name-directory path)))
+	  (setq path (substring path 0 (match-beginning 0))))
+	;; path == "/var/home/john/lisp/apel-VERSION"
+	(when (string-match "/$" (setq parent (file-name-directory path)))
+	  (setq parent (substring path 0 (match-beginning 0))))
+	;; parent == "/var/home/john/lisp"
+	(if (setq lpath (or (member path load-path)
+			    (member (file-name-as-directory path) load-path)))
+	    (unless (or (member parent load-path)
+			(member (file-name-as-directory parent) load-path))
+	      (push parent (cdr lpath)))
+	  (push path load-path)
+	  (unless (or (member parent load-path)
+		      (member (file-name-as-directory parent) load-path))
+	    (push parent (cdr load-path))))
+	(require 'advice)
+	(require 'path-util))
+    (error "
+APEL modules are not found in %s.
+Try to re-configure with --with-addpath=APEL_PATH and run make again.
+"
+	   load-path)))
+
+(unless (locate-library "mel")
+  (add-path "flim"))
+(unless (module-installed-p 'mel)
+  ;; FLIM 1.14 may have installed in two "flim" subdirectories.
+  (push (expand-file-name "flim"
+			  (file-name-directory (get-latest-path "^apel$" t)))
+	load-path)
+  (unless (module-installed-p 'mel)
+    (error "
+FLIM modules does not found in %s.
+Try to re-configure with --with-addpath=FLIM_PATH and run make again.
+"
+	   load-path)))
+(add-path "semi")
+
+(when (and (featurep 'xemacs)
+	   (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
+	     (modify-syntax-entry ?= " " table)
+	     (with-temp-buffer
+	       (with-syntax-table table
+		 (insert "foo=bar")
+		 (goto-char (point-min))
+		 (forward-sexp 1)
+		 (eolp)))))
+  ;; The original `with-syntax-table' uses `copy-syntax-table' which
+  ;; doesn't seem to copy modified syntax entries in XEmacs 21.5.
+  (defmacro with-syntax-table (syntab &rest body)
+    "Evaluate BODY with the SYNTAB as the current syntax table."
+    `(let ((stab (syntax-table)))
+       (unwind-protect
+	   (progn
+	     ;;(set-syntax-table (copy-syntax-table ,syntab))
+	     (set-syntax-table ,syntab)
+	     ,@body)
+	 (set-syntax-table stab)))))
+
+(push srcdir load-path)
+(push loaddir load-path)
+(load (expand-file-name "lpath.el" loaddir) nil t)
+
+(require 'custom)
 
 ;; Bind functions defined by `defun-maybe'.
 (put 'defun-maybe 'byte-hunk-handler 'byte-compile-file-form-defun-maybe)
@@ -165,32 +284,10 @@
 		  byte-compile-function-environment)))
   form)
 
-(condition-case nil
-    :symbol-for-testing-whether-colon-keyword-is-available-or-not
-  (void-variable
-   ;; Bind keywords.
-   (mapcar (lambda (keyword) (set keyword keyword))
-	   '(:button-keymap :data :file :mime-handle))))
-
 ;; Unknown variables and functions.
-(unless (boundp 'buffer-file-coding-system)
-  (defvar buffer-file-coding-system (symbol-value 'file-coding-system)))
-(autoload 'font-lock-set-defaults "font-lock")
-(unless (fboundp 'coding-system-get)
-  (defalias 'coding-system-get 'ignore))
-(when (boundp 'MULE)
-  (defalias 'find-coding-system 'ignore))
-(unless (fboundp 'get-charset-property)
-  (defalias 'get-charset-property 'ignore))
 (unless (featurep 'xemacs)
   (defalias 'Custom-make-dependencies 'ignore)
-  (defalias 'toolbar-gnus 'ignore)
   (defalias 'update-autoloads-from-directory 'ignore))
-(autoload 'texinfo-parse-line-arg "texinfmt")
-
-(unless (fboundp 'with-temp-buffer)
-  ;; Pickup some macros.
-  (require 'emu))
 
 (defalias 'device-sound-enabled-p 'ignore)
 (defalias 'play-sound-file 'ignore)
@@ -200,50 +297,199 @@
 (defalias 'define-mail-user-agent 'ignore)
 
 (eval-and-compile
-  (unless (string-match "XEmacs" emacs-version)
-    (fset 'get-popup-menu-response 'ignore)
-    (fset 'event-object 'ignore)
-    (fset 'x-defined-colors 'ignore)
-    (fset 'read-color 'ignore)))
+  (when (featurep 'xemacs)
+    (unless (fboundp 'defadvice)
+      (autoload 'defadvice "advice" nil nil 'macro))
+    (autoload 'Info-directory "info" nil t)
+    (autoload 'Info-menu "info" nil t)
+    (autoload 'annotations-at "annotations")
+    (autoload 'apropos "apropos" nil t)
+    (autoload 'apropos-command "apropos" nil t)
+    (autoload 'bbdb-complete-name "bbdb-com" nil t)
+    (autoload 'browse-url "browse-url" nil t)
+    (autoload 'c-mode "cc-mode" nil t)
+    (autoload 'customize-apropos "cus-edit" nil t)
+    (autoload 'customize-save-variable "cus-edit" nil t)
+    (autoload 'customize-set-variable "cus-edit" nil t)
+    (autoload 'customize-variable "cus-edit" nil t)
+    (autoload 'delete-annotation "annotations")
+    (autoload 'dolist "cl-macs" nil nil 'macro)
+    (autoload 'enriched-decode "enriched")
+    (autoload 'executable-find "executable")
+    (autoload 'font-lock-fontify-buffer "font-lock" nil t)
+    (autoload 'info "info" nil t)
+    (autoload 'mail-fetch-field "mail-utils")
+    (autoload 'make-annotation "annotations")
+    (autoload 'make-display-table "disp-table")
+    (autoload 'pp "pp")
+    (autoload 'ps-despool "ps-print" nil t)
+    (autoload 'ps-spool-buffer "ps-print" nil t)
+    (autoload 'ps-spool-buffer-with-faces "ps-print" nil t)
+    (autoload 'read-passwd "passwd")
+    (autoload 'regexp-opt "regexp-opt")
+    (autoload 'reporter-submit-bug-report "reporter")
+    (if (emacs-version>= 21 5)
+	(autoload 'setenv "process" nil t)
+      (autoload 'setenv "env" nil t))
+    (autoload 'sgml-mode "psgml" nil t)
+    (autoload 'smtpmail-send-it "smtpmail")
+    (autoload 'sort-numeric-fields "sort" nil t)
+    (autoload 'sort-subr "sort")
+    (autoload 'trace-function-background "trace" nil t)
+    (autoload 'w3-do-setup "w3")
+    (autoload 'w3-prepare-buffer "w3-display")
+    (autoload 'w3-region "w3-display" nil t)
+    (defalias 'frame-char-height 'frame-height)
+    (defalias 'frame-char-width 'frame-width)
+    (defalias 'frame-parameter 'frame-property)
+    (defalias 'make-overlay 'ignore)
+    (defalias 'overlay-end 'ignore)
+    (defalias 'overlay-get 'ignore)
+    (defalias 'overlay-put 'ignore)
+    (defalias 'overlay-start 'ignore)
+    (defalias 'overlays-in 'ignore)
+    (defalias 'replace-dehighlight 'ignore)
+    (defalias 'replace-highlight 'ignore)
+    (defalias 'run-with-idle-timer 'ignore)
+    (defalias 'w3-coding-system-for-mime-charset 'ignore)))
+
+;; T-gnus stuff.
+(eval-and-compile
+  (when (featurep 'xemacs)
+    (autoload 'c-mode "cc-mode" nil t)
+    (autoload 'font-lock-mode "font-lock" nil t)
+    (autoload 'read-kbd-macro "edmacro" nil t)
+    (autoload 'turn-on-font-lock "font-lock" nil t))
+  (autoload 'nnheader-detect-coding-region "nnheader")
+  (autoload 'std11-extract-addresses-components "nnheader")
+  (autoload 'std11-fold-region "nnheader")
+  (autoload 'std11-narrow-to-field "nnheader")
+  (autoload 'std11-unfold-region "nnheader"))
+
+(defconst dgnushack-unexporting-files
+  (append '("dgnushack.el" "dgnuspath.el" "dgnuskwds.el" "lpath.el"
+	    "legacy-gnus-agent.el")
+	  (unless (or (condition-case code
+			  (require 'w3-parse)
+			(error
+			 (message "No w3: %s%s, retrying..."
+				  (error-message-string code)
+				  (if (setq code (locate-library "w3-parse"))
+				      (concat " (" code ")")
+				    ""))
+			 nil))
+		      ;; Maybe mis-configured Makefile is used (e.g.
+		      ;; configured for FSFmacs but XEmacs is running).
+		      (let ((lp (delete dgnushack-w3-directory
+					(copy-sequence load-path))))
+			(if (let ((load-path lp))
+			      (condition-case nil
+				  (require 'w3-parse)
+				(error nil)))
+			    ;; If success, fix `load-path' for compiling.
+			    (progn
+			      (setq load-path lp)
+			      (message " => fixed; W3DIR=%s"
+				       (file-name-directory
+					(locate-library "w3-parse")))
+			      t)
+			  (message " => ignored")
+			  nil)))
+	    '("nnultimate.el" "webmail.el" "nnwfm.el"))
+	  (condition-case code
+	      (progn (require 'mh-e) nil)
+	    (error
+	     (message "No mh-e: %s%s (ignored)"
+		      (error-message-string code)
+		      (if (setq code (locate-library "mh-e"))
+			  (concat " (" code ")")
+			""))
+	     '("gnus-mh.el")))
+	  (condition-case code
+	      (progn (require 'xml) nil)
+	    (error
+	     (message "No xml: %s%s (ignored)"
+		      (error-message-string code)
+		      (if (setq code (locate-library "xml"))
+			  (concat " (" code ")")
+			""))
+	     '("nnrss.el")))
+	  (condition-case code
+	      (progn (require 'bbdb) nil)
+	    (error
+	     (message "No bbdb: %s%s (ignored)"
+		      (error-message-string code)
+		      (if (setq code (locate-library "bbdb"))
+			  (concat " (" code ")")
+			""))
+	     '("gnus-bbdb.el")))
+	  (unless (featurep 'xemacs)
+	    '("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el"
+	      "run-at-time.el"))
+	  (when (and (fboundp 'base64-decode-string)
+		     (subrp (symbol-function 'base64-decode-string)))
+	    '("base64.el"))
+	  (when (and (fboundp 'md5) (subrp (symbol-function 'md5)))
+	    '("md5.el"))
+	  (when (featurep 'xemacs)
+	    '("gnus-load.el")))
+  "Files which will not be installed.")
+
+(defconst dgnushack-exporting-files
+  (let ((files (directory-files srcdir nil "^[^=].*\\.el$" t)))
+    (dolist (file dgnushack-unexporting-files)
+      (setq files (delete file files)))
+    (sort files 'string-lessp))
+  "Files which will be compiled and installed.")
+
+(defun dgnushack-exporting-files ()
+  "Print name of files which will be installed."
+  (princ (mapconcat 'identity dgnushack-exporting-files " ")))
+
+(defconst dgnushack-dont-compile-files
+  '("gnus-load.el"
+    "mm-bodies.el" "mm-decode.el" "mm-encode.el" "mm-extern.el"
+    "mm-partial.el" "mm-url.el" "mm-uu.el" "mm-view.el" "mml-sec.el"
+    "mml-smime.el" "mml.el" "mml1991.el" "mml2015.el")
+  "Files which should not be byte-compiled.")
+
+(defun dgnushack-compile-verbosely ()
+  "Call dgnushack-compile with warnings ENABLED.  If you are compiling
+patches to gnus, you should consider modifying make.bat to call
+dgnushack-compile-verbosely.  All other users should continue to use
+dgnushack-compile."
+  (dgnushack-compile t))
 
 (defun dgnushack-compile (&optional warn)
   ;;(setq byte-compile-dynamic t)
   (unless warn
     (setq byte-compile-warnings
 	  '(free-vars unresolved callargs redefine)))
-  (unless (locate-library "cus-edit")
-    (error "You do not seem to have Custom installed.
-Fetch it from <URL:http://www.dina.kvl.dk/~abraham/custom/>.
-You also then need to add the following to the lisp/dgnushack.el file:
 
-     (push \"~/lisp/custom\" load-path)
+  ;; Show `load-path'.
+  (message "load-path=(\"%s\")"
+	   (mapconcat 'identity load-path "\"\n           \""))
 
-Modify to suit your needs."))
-  (let ((files (delete "dgnuspath.el"
-		       (directory-files srcdir nil "^[^=].*\\.el$")))
-	(xemacs (string-match "XEmacs" emacs-version))
+  (dolist (file dgnushack-exporting-files)
+    (setq file (expand-file-name file srcdir))
+    (when (and (file-exists-p
+		(setq elc (concat (file-name-nondirectory file) "c")))
+	       (file-newer-than-file-p file elc))
+      (delete-file elc)))
+
+  ;; Avoid barfing (from gnus-xmas) because the etc directory is not yet
+  ;; installed.
+  (when (featurep 'xemacs)
+    (setq gnus-xmas-glyph-directory "dummy"))
+
+  (let ((files dgnushack-exporting-files)
 	;;(byte-compile-generate-call-tree t)
 	file elc)
-    (condition-case ()
-	(require 'w3-forms)
-      (error
-       (dolist (file '("nnweb.el" "nnlistserv.el" "nnultimate.el"
-		       "nnslashdot.el" "nnwarchive.el" "webmail.el"))
-	 (setq files (delete file files)))))
-    (condition-case ()
-	(require 'bbdb)
-      (error (setq files (delete "gnus-bbdb.el" files))))
     (while (setq file (pop files))
-      (unless (or (and (not xemacs)
-		       (member file
-			       '("gnus-xmas.el" "gnus-picon.el"
-				 "messagexmas.el" "nnheaderxm.el"
-				 "smiley.el" "x-overlay.el")))
-		  (and (string-equal file "md5.el")
-		       (not (and (fboundp 'md5)
-				 (subrp (symbol-function 'md5))))))
+      (unless (member file dgnushack-dont-compile-files)
 	(setq file (expand-file-name file srcdir))
-	(when (or (not (file-exists-p (setq elc (concat file "c"))))
+	(when (or (not (file-exists-p
+			(setq elc (concat (file-name-nondirectory file) "c"))))
 		  (file-newer-than-file-p file elc))
 	  (ignore-errors
 	    (byte-compile-file file)))))))
@@ -252,240 +498,199 @@ Modify to suit your needs."))
   (require 'gnus)
   (byte-recompile-directory "." 0))
 
+(defvar dgnushack-gnus-load-file
+  (if (featurep 'xemacs)
+      (expand-file-name "auto-autoloads.el" srcdir)
+    (expand-file-name "gnus-load.el" srcdir)))
+
+(defvar	dgnushack-cus-load-file
+  (if (featurep 'xemacs)
+      (expand-file-name "custom-load.el" srcdir)
+    (expand-file-name "cus-load.el" srcdir)))
+
+(defun dgnushack-make-cus-load ()
+  (load "cus-dep")
+  (let ((cusload-base-file dgnushack-cus-load-file))
+    (if (fboundp 'custom-make-dependencies)
+	(custom-make-dependencies)
+      (Custom-make-dependencies))
+    (when (featurep 'xemacs)
+      (message "Compiling %s..." dgnushack-cus-load-file)
+      (byte-compile-file dgnushack-cus-load-file))))
+
+(defun dgnushack-make-auto-load ()
+  (require 'autoload)
+  (unless (make-autoload '(define-derived-mode child parent name
+			    "docstring" body)
+			 "file")
+    (defadvice make-autoload (around handle-define-derived-mode activate)
+      "Handle `define-derived-mode'."
+      (if (eq (car-safe (ad-get-arg 0)) 'define-derived-mode)
+	  (setq ad-return-value
+		(list 'autoload
+		      (list 'quote (nth 1 (ad-get-arg 0)))
+		      (ad-get-arg 1)
+		      (nth 4 (ad-get-arg 0))
+		      t nil))
+	ad-do-it))
+    (put 'define-derived-mode 'doc-string-elt 3))
+  (let ((generated-autoload-file dgnushack-gnus-load-file)
+	(make-backup-files nil)
+	(autoload-package-name "gnus"))
+    (if (featurep 'xemacs)
+	(if (file-exists-p generated-autoload-file)
+	    (delete-file generated-autoload-file))
+      (with-temp-file generated-autoload-file
+	(insert ?\014)))
+    (if (featurep 'xemacs)
+	(let ((si:message (symbol-function 'message)))
+	  (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
+	      (batch-update-autoloads)
+	    (fset 'message si:message)))
+      (batch-update-autoloads))))
+
+(defun dgnushack-make-load ()
+  (unless (featurep 'xemacs)
+    (message "Generating %s..." dgnushack-gnus-load-file)
+    (with-temp-file dgnushack-gnus-load-file
+      (insert-file-contents dgnushack-cus-load-file)
+      (delete-file dgnushack-cus-load-file)
+      (goto-char (point-min))
+      (search-forward ";;; Code:")
+      (forward-line)
+      (delete-region (point-min) (point))
+      (insert "\
+;;; gnus-load.el --- automatically extracted custom dependencies and autoload
+;;
+;;; Code:
+")
+      (goto-char (point-max))
+      (if (search-backward "custom-versions-load-alist" nil t)
+	  (forward-line -1)
+	(forward-line -1)
+	(while (eq (char-after) ?\;)
+	  (forward-line -1))
+	(forward-line))
+      (delete-region (point) (point-max))
+      (insert "\n")
+      ;; smiley-* are duplicated. Remove them all.
+      (let ((point (point)))
+	(insert-file-contents dgnushack-gnus-load-file)
+	(goto-char point)
+	(while (search-forward "smiley-" nil t)
+	  (beginning-of-line)
+	  (if (looking-at "(autoload ")
+	      (delete-region (point) (progn (forward-sexp) (point)))
+	    (forward-line))))
+      ;;
+      (goto-char (point-max))
+      (when (search-backward "\n(provide " nil t)
+	(forward-line -1)
+	(delete-region (point) (point-max)))
+      (insert "\
+
+\(provide 'gnus-load)
+
+;;; Local Variables:
+;;; version-control: never
+;;; no-byte-compile: t
+;;; no-update-autoloads: t
+;;; End:
+;;; gnus-load.el ends here
+")
+      ))
+  (message "Compiling %s..." dgnushack-gnus-load-file)
+  (byte-compile-file dgnushack-gnus-load-file)
+  (when (featurep 'xemacs)
+    (message "Creating dummy gnus-load.el...")
+    (with-temp-file (expand-file-name "gnus-load.el")
+      (insert "\
+
+\(provide 'gnus-load)
+
+;;; Local Variables:
+;;; version-control: never
+;;; no-byte-compile: t
+;;; no-update-autoloads: t
+;;; End:
+;;; gnus-load.el ends here"))))
+
 
-;; Avoid byte-compile warnings.
-(defvar gnus-product-name)
-(defvar early-package-load-path)
-(defvar early-packages)
-(defvar last-package-load-path)
-(defvar last-packages)
-(defvar late-package-load-path)
-(defvar late-packages)
-
-(defconst dgnushack-info-file-regexp
-  (concat "^\\(gnus\\|message\\|emacs-mime\\|gnus-ja\\|message-ja\\)"
-	  "\\.info\\(-[0-9]+\\)?$"))
-
-(defconst dgnushack-texi-file-regexp
-  "^\\(gnus\\|message\\|emacs-mime\\|gnus-ja\\|message-ja\\)\\.texi$")
-
-(defun dgnushack-make-package ()
-  (require 'gnus)
-  (let* ((product-name (downcase gnus-product-name))
-	 (lisp-dir (concat "lisp/" product-name "/"))
+(defconst dgnushack-info-file-regexp-en
+  (let ((names '("gnus" "message" "emacs-mime"))
+	regexp name)
+    (while (setq name (pop names))
+      (setq regexp (concat regexp "^" name "\\.info\\(-[0-9]+\\)?$"
+			   (when names "\\|"))))
+    regexp)
+  "Regexp matching English info files.")
+
+(defconst dgnushack-info-file-regexp-ja
+  (let ((names '("gnus-ja" "message-ja"))
+	regexp name)
+    (while (setq name (pop names))
+      (setq regexp (concat regexp "^" name "\\.info\\(-[0-9]+\\)?$"
+			   (when names "\\|"))))
+    regexp)
+  "Regexp matching Japanese info files.")
+
+(defun dgnushack-remove-extra-files-in-package ()
+  "Remove extra files in the lisp directory of the XEmacs package."
+  (let ((lisp-dir (expand-file-name (concat "lisp/"
+					    ;; GNUS_PRODUCT_NAME
+					    (cadr command-line-args-left)
+					    "/")
+				    ;; PACKAGEDIR
+				    (car command-line-args-left))))
+    (setq command-line-args-left nil)
+    (when (file-directory-p lisp-dir)
+      (let (files)
+	(dolist (file dgnushack-exporting-files)
+	  (setq files (nconc files (list file (concat file "c")))))
+	(dolist (file (directory-files lisp-dir nil nil t t))
+	  (unless (member file files)
+	    (setq file (expand-file-name file lisp-dir))
+	    (message "Removing %s..." file)
+	    (condition-case nil
+		(delete-file file)
+	      (error nil))))))))
+
+(defun dgnushack-install-package-manifest ()
+  "Install MANIFEST file as an XEmacs package."
+  (let* ((package-dir (pop command-line-args-left))
+	 (product-name (pop command-line-args-left))
+	 (pkginfo-dir (expand-file-name "pkginfo" package-dir))
+	 (name (expand-file-name (concat "MANIFEST." product-name)
+				 pkginfo-dir))
 	 make-backup-files)
-
-    (message "Updating autoloads for directory %s..." default-directory)
-    (let ((generated-autoload-file "auto-autoloads.el")
-	  noninteractive
-	  (omsg (symbol-function 'message)))
-      (defun message (fmt &rest args)
-	(cond ((and (string-equal "Generating autoloads for %s..." fmt)
-		    (file-exists-p (file-name-nondirectory (car args))))
-	       (funcall omsg fmt (file-name-nondirectory (car args))))
-	      ((string-equal "No autoloads found in %s" fmt))
-	      ((string-equal "Generating autoloads for %s...done" fmt))
-	      (t (apply omsg fmt args))))
-      (unwind-protect
-	  (update-autoloads-from-directory default-directory)
-	(fset 'message omsg)))
-    (byte-compile-file "auto-autoloads.el")
-
-    (with-temp-buffer
-      (let ((standard-output (current-buffer)))
-	(Custom-make-dependencies "."))
-      (message (buffer-string)))
-    (require 'cus-load)
-    (byte-compile-file "custom-load.el")
-
-    (message "Generating MANIFEST.%s for the package..." product-name)
-    (with-temp-buffer
-      (insert "pkginfo/MANIFEST." product-name "\n"
-	      lisp-dir
-	      (mapconcat
-	       'identity
-	       (sort (delete "dgnuspath.el"
-			     (delete "patchs.elc"
-				     (directory-files "." nil "\\.elc?$")))
-		     'string-lessp)
-	       (concat "\n" lisp-dir))
-	      "\ninfo/"
-	      (mapconcat
-	       'identity
-	       (sort (directory-files "../texi/"
-				      nil dgnushack-info-file-regexp)
-		     'string-lessp)
-	       "\ninfo/")
-	      "\n")
-      (write-file (concat "../MANIFEST." product-name)))))
-
-(defun dgnushack-install-package ()
-  (let ((package-dir (car command-line-args-left))
-	dirs info-dir pkginfo-dir product-name lisp-dir manifest files)
-    (unless package-dir
-      (when (boundp 'early-packages)
-	(setq dirs (delq nil (append (when early-package-load-path
-				       early-packages)
-				     (when late-package-load-path
-				       late-packages)
-				     (when last-package-load-path
-				       last-packages))))
-	(while (and dirs (not package-dir))
-	  (when (file-exists-p (car dirs))
-	    (setq package-dir (car dirs)
-		  dirs (cdr dirs))))))
-    (unless package-dir
-      (error "%s" "
-You must specify the name of the package path as follows:
-
-% make install-package PACKAGEDIR=/usr/local/lib/xemacs/xemacs-packages
-"
-	     ))
-    (setq info-dir (expand-file-name "info/" package-dir)
-	  pkginfo-dir (expand-file-name "pkginfo/" package-dir))
-    (require 'gnus)
-    (setq product-name (downcase gnus-product-name)
-	  lisp-dir (expand-file-name (concat "lisp/" product-name "/")
-				     package-dir)
-	  manifest (concat "MANIFEST." product-name))
-
-    (unless (file-directory-p lisp-dir)
-      (make-directory lisp-dir t))
-    (unless (file-directory-p info-dir)
-      (make-directory info-dir))
     (unless (file-directory-p pkginfo-dir)
+      (message "Creating directory %s/..." pkginfo-dir)
       (make-directory pkginfo-dir))
-
-    (setq files
-	  (sort (delete "dgnuspath.el"
-			(delete "dgnuspath.elc"
-				(directory-files "." nil "\\.elc?$")))
-		'string-lessp))
-    (mapcar
-     (lambda (file)
-       (unless (member file files)
-	 (setq file (expand-file-name file lisp-dir))
-	 (message "Removing %s..." file)
-	 (condition-case nil
-	     (delete-file file)
-	   (error nil))))
-     (directory-files lisp-dir nil nil nil t))
-    (mapcar
-     (lambda (file)
-       (message "Copying %s to %s..." file lisp-dir)
-       (copy-file file (expand-file-name file lisp-dir) t t))
-     files)
-
-    (mapcar
-     (lambda (file)
-       (message "Copying ../texi/%s to %s..." file info-dir)
-       (copy-file (expand-file-name file "../texi/")
-		  (expand-file-name file info-dir)
-		  t t))
-     (sort (directory-files "../texi/" nil dgnushack-info-file-regexp)
-	   'string-lessp))
-
-    (message "Copying ../%s to %s..." manifest pkginfo-dir)
-    (copy-file (expand-file-name manifest "../")
-	       (expand-file-name manifest pkginfo-dir) t t)
-
-    (message "Done")))
-
-(defun dgnushack-texi-add-suffix-and-format ()
-  (dgnushack-texi-format t))
-
-(defun dgnushack-texi-format (&optional addsuffix)
-  (if (not noninteractive)
-      (error "batch-texinfo-format may only be used -batch."))
-  (require 'texinfmt)
-  (let ((auto-save-default nil)
-	(find-file-run-dired nil)
-	coding-system-for-write)
-    (let ((error 0)
-	  file
-	  (files ()))
-      (while command-line-args-left
-	(setq file (expand-file-name (car command-line-args-left)))
-	(cond ((not (file-exists-p file))
-	       (message ">> %s does not exist!" file)
-	       (setq error 1
-		     command-line-args-left (cdr command-line-args-left)))
-	      ((file-directory-p file)
-	       (setq command-line-args-left
-		     (nconc (directory-files file)
-			    (cdr command-line-args-left))))
-	      (t
-	       (setq files (cons file files)
-		     command-line-args-left (cdr command-line-args-left)))))
-      (while files
-	(setq file (car files)
-	      files (cdr files))
-	(condition-case err
-	    (progn
-	      (if buffer-file-name (kill-buffer (current-buffer)))
-	      (find-file file)
-	      (setq coding-system-for-write buffer-file-coding-system)
-	      (when (and addsuffix
-			 (re-search-forward
-			  "^@setfilename[\t ]+\\([^\t\n ]+\\)" nil t)
-			 (not (string-match "\\.info$" (match-string 1))))
-		(insert ".info"))
-	      (buffer-disable-undo (current-buffer))
-	      ;; process @include before updating node
-	      ;; This might produce some problem if we use @lowersection or
-	      ;; such.
-	      (let ((input-directory default-directory)
-		    (texinfo-command-end))
-		(while (re-search-forward "^@include" nil t)
-		  (setq texinfo-command-end (point))
-		  (let ((filename (concat input-directory
-					  (texinfo-parse-line-arg))))
-		    (re-search-backward "^@include")
-		    (delete-region (point) (save-excursion
-					     (forward-line 1)
-					     (point)))
-		    (message "Reading included file: %s" filename)
-		    (save-excursion
-		      (save-restriction
-			(narrow-to-region
-			 (point)
-			 (+ (point)
-			    (car (cdr (insert-file-contents filename)))))
-			(goto-char (point-min))
-			;; Remove `@setfilename' line from included file,
-			;; if any, so @setfilename command not duplicated.
-			(if (re-search-forward "^@setfilename"
-					       (save-excursion
-						 (forward-line 100)
-						 (point))
-					       t)
-			    (progn
-			      (beginning-of-line)
-			      (delete-region (point) (save-excursion
-						       (forward-line 1)
-						       (point))))))))))
-	      (texinfo-mode)
-	      (texinfo-every-node-update)
-	      (set-buffer-modified-p nil)
-	      (message "texinfo formatting %s..." file)
-	      (texinfo-format-buffer nil)
-	      (if (buffer-modified-p)
-		  (progn (message "Saving modified %s" (buffer-file-name))
-			 (save-buffer))))
-	  (error
-	   (message ">> Error: %s" (prin1-to-string err))
-	   (message ">>  point at")
-	   (let ((s (buffer-substring (point)
-				      (min (+ (point) 100)
-					   (point-max))))
-		 (tem 0))
-	     (while (setq tem (string-match "\n+" s tem))
-	       (setq s (concat (substring s 0 (match-beginning 0))
-			       "\n>>  "
-			       (substring s (match-end 0)))
-		     tem (1+ tem)))
-	     (message ">>  %s" s))
-	   (setq error 1))))
-      (kill-emacs error))))
+    (message "Generating %s..." name)
+    (with-temp-file name
+      (insert "pkginfo/MANIFEST." product-name "\n")
+      (let ((lisp-dir (concat "lisp/" product-name "/"))
+	    (files (sort (directory-files "." nil "\\.elc?$" t) 'string-lessp))
+	    file)
+	(while (setq file (pop files))
+	  (unless (member file dgnushack-unexporting-files)
+	    (insert lisp-dir file "\n")))
+	(setq files
+	      (sort (directory-files "../texi/" nil
+				     (concat dgnushack-info-file-regexp-en
+					     "\\|"
+					     dgnushack-info-file-regexp-ja)
+				     t)
+		    'string-lessp))
+	(while (setq file (pop files))
+	  (insert "info/" file "\n"))))))
 
 ;;; dgnushack.el ends here