hake 1.3.4 → 1.3.5

raw patch · 2 files changed

+11/−5 lines, 2 filesdep ~basedep ~yjtools

Dependency ranges changed: base, yjtools

Files

• Development/Hake/RunHake.hs +8/−2
• hake.cabal +3/−3

@@ -30,10 +30,16 @@ import Control.Monad              (when) import Control.Monad.Tools        (unlessM, filterM) import Data.Function.Tools        (applyWhen, apply2way)-import YJTools.Tribial            (ghcMake, updateFile)-import Text.RegexPR               (gsubRegexPR, ggetbrsRegexPR)+import YJTools.Tribial            (ghcMake, updateFile_)+import Text.RegexPR               (gsubRegexPR, ggetbrsRegexPR, matchRegexPR) import Development.Hake.Variables (defaultTrgtStr, hakefileUpdateOption,                                    hakeDir, commentPair, srcSuffix, exeEscPairs)++updateFile :: (String, String) -> FilePath -> FilePath -> IO Bool+updateFile (cmtB, cmtE) src dst = do+  let cmtOut  = (cmtB ++) . ( ++ cmtE ++ "\n")+      cmtIn   = (>>= lookup 1) . fmap snd . matchRegexPR (cmtB ++ "(\\S+)" ++ cmtE)+  updateFile_ cmtIn cmtOut src dst  runHake :: FilePath -> FilePath -> [ FilePath ] -> [ String ] -> IO ExitCode runHake src exe othrs args = do

@@ -1,5 +1,5 @@ Name:		hake-Version:	1.3.4+Version:	1.3.5 License:	GPL License-file:	LICENSE Author:		Yoshikuni Jujo@@ -76,11 +76,11 @@  Library   GHC-Options:		-Wall-  Build-Depends:	base<=4.1.0.0, old-time, mtl, filepath+  Build-Depends:	base<=4.2.0.3, old-time, mtl, filepath   Exposed-Modules:	Development.Hake, Development.Hake.OldFunSet, Development.Hake.FunSet, Development.Hake.FunSetRaw, Development.Hake.FunSetIO   Other-Modules:	Development.Hake.Variables, Development.Hake.Types, Development.Hake.Tools, Development.Hake.RunHake, Development.Hake.Core  Executable hake   GHC-Options:		-Wall-  Build-Depends:	directory, process, yjtools >= 0.9.7, regexpr >= 0.5.1+  Build-Depends:	directory, process, yjtools >= 0.9.9, regexpr >= 0.5.1   Main-Is:		Main.hs