ghc-mod 1.0.1 → 1.0.2

raw patch · 4 files changed

+15/−11 lines, 4 filesdep +regex-posixdep −filemanipdep −unix

Dependencies added: regex-posix

Dependencies removed: filemanip, unix

Files

• CabalDev.hs +10/−6
• GHCMod.hs +1/−1
• elisp/ghc.el +1/−1
• ghc-mod.cabal +3/−3

@@ -8,11 +8,10 @@ -}  import Control.Applicative    ((<$>))-import Data.Maybe             (listToMaybe)-import System.FilePath.Find-import System.FilePath.Posix  (splitPath,joinPath,(</>))-import System.Posix.Directory (getWorkingDirectory)+import Data.List              (find)+import System.FilePath        (splitPath,joinPath,(</>)) import System.Directory+import Text.Regex.Posix       ((=~))  import Types @@ -26,7 +25,7 @@  findCabalDev :: IO (Maybe String) findCabalDev =-  getWorkingDirectory >>= searchIt . splitPath+  getCurrentDirectory >>= searchIt . splitPath  addPath :: Options -> String -> Options addPath orig_opts path = do@@ -38,8 +37,13 @@ searchIt path = do   a <- doesDirectoryExist (mpath path)   if a then do-    listToMaybe <$> find always (fileName ~~? "packages*.conf") (mpath path)+    findConf (mpath path)   else     searchIt $ init path   where     mpath a = joinPath a </> "cabal-dev/"++findConf :: FilePath -> IO (Maybe FilePath)+findConf path = do+  f <- find (=~ "packages.*\\.conf") <$> getDirectoryContents path+  return $ ((path </>) <$> f)

@@ -25,7 +25,7 @@ ghcOptHelp = " [-g GHC_opt1 -g GHC_opt2 ...] "  usage :: String-usage =    "ghc-mod version 1.0.1\n"+usage =    "ghc-mod version 1.0.2\n"         ++ "Usage:\n"         ++ "\t ghc-mod list" ++ ghcOptHelp ++ "[-l]\n"         ++ "\t ghc-mod lang [-l]\n"

@@ -16,7 +16,7 @@  ;;; Code: -(defconst ghc-version "1.0.1")+(defconst ghc-version "1.0.2")  ;; (eval-when-compile ;;  (require 'haskell-mode))

@@ -1,5 +1,5 @@ Name:                   ghc-mod-Version:                1.0.1+Version:                1.0.2 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -29,8 +29,8 @@   else     GHC-Options:        -Wall   Build-Depends:        base >= 4.0 && < 5, ghc, ghc-paths, transformers,-                        process, directory, filepath, old-time, unix,-                        hlint >= 1.7.1, filemanip,+                        process, directory, filepath, old-time,+                        hlint >= 1.7.1, regex-posix,                         attoparsec, enumerator, attoparsec-enumerator Source-Repository head   Type:                 git