Changeset 15693 for lang/elisp

Timestamp:

07/12/08 13:33:58 (4 months ago)

Author:

lieutar

Message:

modified the emacs lisp file for cygwin + Meadow

Files:

• lang/elisp/set-perl5lib/branch/cygwin/set-perl5lib.el (modified) (1 diff)

lang/elisp/set-perl5lib/branch/cygwin/set-perl5lib.el

@@ -33 +33 @@
 ;;; を関数内に追加すれば、自動的にパスを登録できます。
 ;;;
+
 ;;; SeeAlso: http://d.hatena.ne.jp/sun-basix/20080117/1200528765
 
-(defun perllib-check-path (lst lib-path)
-  (let ((dir (car lst))
-        (set-lib-path (concat lib-path "/lib")))
-    (if (setf stock-lst (cdr lst))
-        (cond ((string= dir "lib") set-lib-path)
-              ((and (string= dir "t")
-                    (file-readable-p set-lib-path)) set-lib-path)
-              (t (perllib-check-path stock-lst (concat lib-path "/" dir)))))))
 
-(defun set-perl5lib ()
+;;; * cygwin + Meadow 対応について
+
+;;; cygwin 用の perl を Meadow から扱えるよう cygpath による
+;;; パスの変換を加えました．
+;;; 
+;;; また，幾つかの関数を分断し，コマンドについては引数を渡せるようにしました
+
+;;; SeeAlso: http://d.hatena.ne.jp/lieutar/20080711/1215754040
+
+(defvar perl5lib-under-cygwin-p nil
+  "If it is not nil value , the perllib-check-path try to resolve by the command 'cygpath'")
+
+(defvar perl5lib-cygpath-cache nil)
+
+(defsubst perl5lib-apply-cygpath (path)
+  (if perl5lib-under-cygwin-p
+      (let ((associated (assoc path perl5lib-cygpath-cache)))
+        (if associated
+            (cdr associated)
+          (let ((result
+                 (let ((result (shell-command-to-string
+                                (format "cygpath %s" path))))
+                   (if (string-match "\\(\x0d\x0a\\|[\x0d\x0a]\\)" result)
+                       (substring result 0 (match-beginning 1))
+                     result))))
+            (setq perl5lib-cygpath-cache
+                  (cons (cons path result)
+                        perl5lib-cygpath-cache)))))
+    path))
+
+(defun perllib-check-path (path)
+  (let ((path    (expand-file-name path))
+        (result (cond ((string-match "\\(/lib/\\)" path)
+                       (substring path 0 (match-end 1)))
+                      ((string-match "\\(/t/\\)"   path)
+                       (format "%s/lib" (substring path 0
+                                                   (match-beginning 1))))
+                      (t nil))))
+    (when result
+      (if perl5lib-under-cygwin-p
+          (perl5lib-apply-cygpath result)
+        result))))
+
+(defun get-perl5lib (path)
+  "Get path from the PATH if its file path includes 'lib' directory"
+  (let* ((perl5lib-env (getenv "PERL5LIB"))
+         (perl5lib (and perl5lib-env (split-string perl5lib-env ":"))))
+  (append (let ((lib-path (perllib-check-path path)))
+            (when (and lib-path
+                       (null (member lib-path perl5lib))) (list lib-path)))
+          perl5lib)))
+
+(defun set-perl5lib (path)
   "Set path into PERL5LIB if its file path includes 'lib' directory"
-  (interactive)
-  (let* ((path-list (cdr (split-string buffer-file-name "/")))
-         (lib-path (perllib-check-path path-list ""))
-         (current-perl5lib (getenv "PERL5LIB")))
-    (when (or (and lib-path current-perl5lib
-               (not (string-match lib-path current-perl5lib)))
-              (not current-perl5lib))
-      (setenv "PERL5LIB" (concat lib-path ":" current-perl5lib))
-      (message "Added %s into PERL5LIB" lib-path))))
+  (interactive (list buffer-file-name))
+  (let ((lib-path (mapconcat 'identity (get-perl5lib path) ":")))
+    (setenv "PERL5LIB" lib-path)
+    (message "Added %s into PERL5LIB" lib-path)))
 
 (provide 'set-perl5lib)