This commit was generated by cvs2svn to compensate for changes in r434,

[elisp/tm.git] / inst-tm

diff --git a/inst-tm b/inst-tm
index 9f58172..c0ae129 100644 (file)
--- a/inst-tm
+++ b/inst-tm
@@ -1,12 +1,12 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 1.2 1996/03/04 09:39:25 morioka Exp $
+;;; $Id: inst-tm,v 7.8 1996/07/22 18:29:22 morioka Exp $
 ;;;
 
-(load-file "tm-cfg")
+(load-file "TM-CFG")
 (load-file "../tl/tl-els")
 (load-file "../mel/mel-els")
-(load-file "tm-els")
+(load-file "TM-ELS")
 (load-file "mh-e/tmh-els")
 
 (defun make-mime-setup (tl-path mel-path tm-path)
@@ -14,19 +14,30 @@
     (goto-char (point-min))
     (re-search-forward "^;;; Code:" nil t)
     (setq buffer-read-only nil)
-    (insert
-     (format
-      "
+    (if (member tl-path default-load-path)
+       (insert "
+
+\(require \'tl-misc)")
+      (insert
+       (format "
 
 \(let ((load-path
        (cons \"%s\"
              load-path)))
   (require \'tl-misc)
   )
-\(add-path \"%s\")
-\(add-path \"%s\")
-\(add-path \"%s\")"
-      tl-path tl-path mel-path tm-path))
+\(add-path \"%s\")" tl-path tl-path))
+      )
+    (or (member mel-path default-load-path)
+       (insert
+        (format "
+\(add-path \"%s\")" mel-path)))
+    (or (member tm-path default-load-path)
+       (insert
+        (format "
+\(add-path \"%s\")" tm-path)))
+    (insert (format "
+(defvar mime-viewer/external-progs \"%s\")" METHOD_DIR))
     (write-file "mime-setup.el")
     ))
 
@@ -43,31 +54,20 @@
               )))
          modules))
 
-(defun compile-tm-gnus (type)
-  (erase-buffer)
-  (call-process SHELL
-               nil t t
-               "-c"
-               (format "cd gnus; PWD=`pwd` make %s EMACS=%s"
-                       type (car command-line-args))
-               )
-  (princ (buffer-string))
-  )
-
 (defun install-tm-gnus ()
   (erase-buffer)
   (call-process SHELL
                nil t t
-               "-c"
+               SHELLOPTION
                (format
-                "cd gnus; PWD=`pwd` make install-19 EMACS=%s TMDIR19=%s"
+                TM_GNUS_INSTALL_FORMAT
                 (car command-line-args) TM_GNUS_DIR)
                )
   (princ (buffer-string))
   )
 
 (defun compile-tm ()
-  (require 'tm-rich)
+  (print load-path)
   (require 'mel-u)
   (require 'tm-edit)
   (load "rmailsum")
@@ -77,19 +77,34 @@
   (compile-el-files "../mel/" mel-modules)
   (compile-el-files "./"      tm-modules)
   (compile-el-files "mh-e/"   tm-mh-e-modules)
-  (compile-tm-gnus "gnus")
-  (cond ((< emacs-major-version 19)
-        (compile-tm-gnus "gnus4")
-        )
-       ((< emacs-minor-version 30)
-        (compile-tm-gnus "gnus4")
-        (compile-tm-gnus "gnus5")
-        )
-       (t
-        (compile-tm-gnus "sgnus")
-        ))
   (compile-el-files "./"      '("mime-setup"))
-  )
+  (save-excursion
+    (set-buffer (get-buffer-create TM_GNUS_COMPILE))
+    (let ((emacs (car command-line-args)))
+      (insert (format "cd gnus\n%s gnus EMACS=%s PWD=`pwd`\n" MAKE emacs))
+      (cond (running-xemacs-19_14-or-later
+            )
+           (running-xemacs
+            (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" MAKE emacs))
+            )
+           (t (cond (running-emacs-18
+                     (insert (format "%s gnus3 EMACS=%s PWD=`pwd`\n"
+                                     MAKE emacs))
+                     (insert (format "%s gnus4 EMACS=%s PWD=`pwd`\n"
+                                     MAKE emacs))
+                     )
+                    ((<= emacs-minor-version 29)
+                     (insert (format "%s gnus4 EMACS=%s PWD=`pwd`\n"
+                                     MAKE emacs))
+                     (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" 
+                                     MAKE emacs))
+                     )
+                    (t
+                     (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" 
+                                     MAKE emacs))
+                     )))))
+    (write-file TM_GNUS_COMPILE)
+    ))
 
 (defun install-el-file (src dest file)
   (let ((src-file (expand-file-name file src)))
@@ -104,6 +119,9 @@
     ))
 
 (defun install-el-files (src dest &rest files)
+  (or (file-exists-p dest)
+      (make-directory dest t)
+      )
   (mapcar (function (lambda (file)
                      (install-el-file src dest file)
                      ))
@@ -114,7 +132,15 @@
     (if (file-exists-p src-file)
        (let ((full-path (expand-file-name file dest)))
          (copy-file src-file full-path t t)
-         (delete-file src-file)
+         (catch 'tag
+           (while (file-exists-p src-file)
+             (condition-case err
+                 (progn
+                   (delete-file src-file)
+                   (throw 'tag nil)
+                   )
+               (error (princ (format "%s\n" (nth 1 err))))
+               )))
          (princ (format "%s -> %s\n" file dest))
          ))
     ))
@@ -126,9 +152,6 @@
          files))
 
 (defun install-el-and-elc-files (src dest el-files elc-files)
-  (if (not (file-exists-p dest))
-      (make-directory dest t)
-    )
   (apply (function install-el-files)  src dest el-files)
   (apply (function install-elc-files) src dest elc-files)
   )
@@ -146,6 +169,6 @@
   )
 
 (defun install-execs ()
-  (apply (function install-el-files) "src/" BIN_DIR BINS)
-  (apply (function install-el-files) "methods/" METHOD_DIR METHODS)
+  (apply (function install-el-files) BIN_SRC_DIR BIN_DIR BINS)
+  (apply (function install-el-files) METHOD_SRC_DIR METHOD_DIR METHODS)
   )