X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=WL-MK;h=008697e5f31a0acd8e81f7e134a9888cdee14579;hb=b39b0f98d5876a90ceae2f4507f9d3595e2f3b0a;hp=6e4936367f4de3bae8778a86279c227e8b520d89;hpb=32349971724768a46901c004c6b8853b08391682;p=elisp%2Fwanderlust.git

diff --git a/WL-MK b/WL-MK
index 6e49363..008697e 100644
--- a/WL-MK
+++ b/WL-MK
@@ -20,7 +20,7 @@
 (defvar COMPRESS-SUFFIX-LIST '("" ".gz" ".Z" ".bz2"))
 
 (defvar wl-install-utils nil
-  "if Non-nil, install `wl-utils-modules'.")
+  "If Non-nil, install `wl-utils-modules'.")
 
 ;;; INFO
 (defconst wl-ja-info "wl-ja.info")
@@ -28,13 +28,9 @@
 (defconst wl-en-info "wl.info")
 (defconst wl-en-texi "wl.texi")
 
-(defvar wl-info-lang "ja"
+(defvar wl-info-lang '("ja" "en")
   "The language of info file (\"ja\" or \"en\").")
 
-;; for Nemacs (dirty!)
-(if (not (fboundp 'file-executable-p))
-    (fset 'file-executable-p 'file-exists-p))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (require 'cl)
@@ -47,7 +43,7 @@
 	     ;; ignore broken module
 	     (not (featurep 'tinycustom)))
   (when (and (boundp 'emacs-major-version)
-	     (eq emacs-major-version 19)
+	     (= emacs-major-version 19)
 	     (>= emacs-minor-version 29))
     (message "%s" "
   Warning: You don't seem to have \"new custom\" package installed.
@@ -84,8 +80,7 @@
 (setq byte-compile-warnings '(free-vars unresolved callargs redefine))
 
 ;; v18, v19
-(if (or (boundp 'MULE)
-	(fboundp 'nemacs-version))
+(if (boundp 'MULE)
     (setq max-lisp-eval-depth 400))
 
 ;; FIXME: it is currently needed to byte-compile with Emacs 21.
@@ -101,7 +96,6 @@
     (setq load-path (cons (expand-file-name ".") load-path))
     (setq load-path (cons (expand-file-name WLDIR)
 			  (cons (expand-file-name ELMODIR) load-path)))
-    (setq wl-icon-dir (expand-file-name ICONDIR))
     ;; load custom file if exists.  `WL-CFG.el' override for committer.
     (load "./WL-CFG" t nil nil)
     ;; load-path
@@ -109,13 +103,17 @@
 	(setq load-path (cons (expand-file-name UTILSDIR) load-path)))
     (require 'install)
     (load "./WL-ELS" nil nil t)
-    (condition-case ()
-	(require 'mime-setup)
-      (error (error "No MIME module was detected. Please install SEMI or tm.")))
+    ;; product.el version check
+    (require 'product)
+    (if (not (fboundp 'product-version-as-string))
+	(error "Please install new APEL.  See INSTALL or INSTALL.ja"))
     ;; smtp.el version check.
     (require 'smtp)
     (if (not (fboundp 'smtp-send-buffer))
-	(error "Please install FLIM 1.14.0 or later."))))
+	(error "Please install new FLIM.  See INSTALL or INSTALL.ja"))
+    (condition-case ()
+	(require 'mime-setup)
+      (error (error "Cannot load `mime-setup'.  Please install SEMI")))))
 
 (defun config-wl-pixmap-dir (&optional packagedir)
   "Examine pixmap directory where icon files should go."
@@ -124,10 +122,7 @@
       (if (string= pixmap-dir "NONE")
 	  (if packagedir
 	      (expand-file-name "etc/wl/" packagedir)
-	    (if (or (featurep 'xemacs)
-		    (and (boundp 'emacs-major-version)
-			 (>= emacs-major-version 21)))
-		(expand-file-name "wl/icons/" data-directory)))
+	    (expand-file-name "wl/icons/" data-directory))
 	pixmap-dir)))
   (if PIXMAPDIR
       (princ (format "PIXMAPDIR is %s\n" PIXMAPDIR)))
@@ -146,7 +141,28 @@
   (config-wl-pixmap-dir)
   (princ "\n"))
 
+(defun update-version ()
+  "Update version number of documents."
+  (config-wl-package)
+  (load-file "elmo/elmo-version.el")
+  (let ((version (mapconcat
+		  'number-to-string
+		  (product-version (product-find 'elmo-version))
+		  ".")))
+    (princ (concat "Update version number to " version "\n"))
+    ;; generate version.tex
+    (with-temp-buffer
+      (insert "\\def\\versionnumber{" version "}\n")
+      (write-region (point-min) (point-max) (expand-file-name
+					     "version.tex" "doc")))
+    ;; generate version.texi
+    (with-temp-buffer
+      (insert "@set VERSION " version "\n")
+      (write-region (point-min) (point-max) (expand-file-name
+					     "version.texi" "doc")))))
+
 (defun test-wl ()
+  "Run test suite for developer."
   (config-wl-package)
   (require 'lunit)
   (let ((files (directory-files "tests" t "^test-.*\\.el$"))
@@ -163,6 +179,7 @@
     (lunit suite)))
 
 (defun check-wl ()
+  "Check user environment.  Not for developer."
   (config-wl-package)
   (require 'lunit)
   (let ((files (directory-files "tests" t "^check-.*\\.el$"))
@@ -203,10 +220,7 @@
 
 
 (defun compile-wl-package ()
-  ;; For nemacs byte compiler's strange behavior(?).
   (config-wl-package)
-  (if (fboundp 'nemacs-version)
-      (load (expand-file-name "wl.el" WLDIR)))
   (mapcar
    '(lambda (x)
       (compile-elisp-modules (cdr x) (car x)))
@@ -216,7 +230,14 @@
   (if (not (file-directory-p PIXMAPDIR))
       (make-directory PIXMAPDIR t))
   (let* ((case-fold-search t)
-	 (icons (directory-files ICONDIR t "\\.x[bp]m$"))
+	 (icons (directory-files ICONDIR t
+				 (cond ((featurep 'xemacs)
+					"\\.x[bp]m$")
+				       ((and (boundp 'emacs-major-version)
+					     (>= emacs-major-version 21))
+					"\\.img$\\|\\.x[bp]m$")
+				       ((featurep 'mule)
+					"\\.img$\\|\\.xbm$"))))
 	 icon dest)
     (while icons
       (setq icon (car icons)
@@ -266,7 +287,7 @@
 
 (defun config-wl-package-xmas ()
   (if (not (featurep 'xemacs))
-      (error "This directive is only for XEmacs."))
+      (error "This directive is only for XEmacs"))
   (config-wl-package-subr)
   ;; PACKAGEDIR check.
   (let (package-dir)
@@ -386,8 +407,6 @@
 
 (defun wl-detect-info-directory ()
   (config-wl-package-subr)
-  (if (fboundp 'nemacs-version)
-      (error "Cannot format info on Nemacs. Please use another formatter."))
   ;; INFODIR check.
   (require 'info)
   (if (fboundp 'info-initialize)