slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

hledger, hledger-lib: support GHC 7.6

Browse Source
This commit is contained in:
Simon Michael 2012-10-08 16:52:07 +00:00
parent f441bbd946
commit c1ab41f0a9
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger-lib/hledger-lib.cabal
View File

@ -17,7 +17,7 @@ maintainer: Simon Michael <simon@joyful.com>
homepage: http://hledger.org homepage: http://hledger.org
bug-reports: http://code.google.com/p/hledger/issues bug-reports: http://code.google.com/p/hledger/issues
stability: beta stability: beta
tested-with: GHC==7.0.4, GHC==7.2.2, GHC==7.4.1 tested-with: GHC==7.0.4, GHC==7.2.2, GHC==7.4.1, GHC==7.6.1
cabal-version: >= 1.8 cabal-version: >= 1.8
build-type: Simple build-type: Simple
-- data-dir: data -- data-dir: data

19
hledger/Hledger/Cli/Utils.hs
View File

@ -1,4 +1,4 @@
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables, CPP #-}
{-| {-|
Utilities for top-level modules and ghci. See also Hledger.Read and Utilities for top-level modules and ghci. See also Hledger.Read and
@ -34,6 +34,10 @@ import System.Process (readProcessWithExitCode)
import System.Time (ClockTime, getClockTime, diffClockTimes, TimeDiff(TimeDiff)) import System.Time (ClockTime, getClockTime, diffClockTimes, TimeDiff(TimeDiff))
import Test.HUnit import Test.HUnit
import Text.Printf import Text.Printf
#if __GLASGOW_HASKELL__ >= 706
import System.Time (ClockTime(TOD))
import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds)
#endif
import Hledger.Cli.Options import Hledger.Cli.Options
import Hledger.Data import Hledger.Data
@ -98,8 +102,17 @@ journalSpecifiedFileIsNewer Journal{filereadtime=tread} f = do
fileModificationTime :: FilePath -> IO ClockTime fileModificationTime :: FilePath -> IO ClockTime
fileModificationTime f fileModificationTime f
| null f = getClockTime | null f = getClockTime
| otherwise = getModificationTime f `C.catch` \(_::C.IOException) -> getClockTime | otherwise = (do
#if __GLASGOW_HASKELL__ < 706
clo <- getModificationTime f
#else
utc <- getModificationTime f
let nom = utcTimeToPOSIXSeconds utc
let clo = TOD (read $ show nom) 0 -- XXX
#endif
return clo
)
`C.catch` \(_::C.IOException) -> getClockTime
-- | Attempt to open a web browser on the given url, all platforms. -- | Attempt to open a web browser on the given url, all platforms.
openBrowserOn :: String -> IO ExitCode openBrowserOn :: String -> IO ExitCode
openBrowserOn u = trybrowsers browsers u openBrowserOn u = trybrowsers browsers u

2
hledger/hledger.cabal
View File

@ -18,7 +18,7 @@ maintainer: Simon Michael <simon@joyful.com>
homepage: http://hledger.org homepage: http://hledger.org
bug-reports: http://code.google.com/p/hledger/issues bug-reports: http://code.google.com/p/hledger/issues
stability: beta stability: beta
tested-with: GHC==7.0.4, GHC==7.2.2, GHC==7.4.1 tested-with: GHC==7.0.4, GHC==7.2.2, GHC==7.4.1, GHC==7.6.1
cabal-version: >= 1.8 cabal-version: >= 1.8
build-type: Simple build-type: Simple
-- data-dir: data -- data-dir: data