4634210 · Idris-dev · git.iko.soy

src/IRTS/System.hs+6−1

compare with master

unifiedsplit

@@ -6,7 +6,7 @@ License : BSD3

6Maintainer : The Idris Community.

7-}

8{-# LANGUAGE CPP #-}

9−module IRTS.System( getDataFileName

9+module IRTS.System( getIdrisDataFileByName

10 , getCC

11 , getLibFlags

12 , getIdrisDataDir

@@ -42,6 +42,11 @@ getIdrisDataDir = do

42 return ddir

43 Just ddir -> return ddir

44

45+getIdrisDataFileByName :: String -> IO FilePath

46+getIdrisDataFileByName fn = do

47+ dir <- getIdrisDataDir

48+ return $ dir </> fn

49+

45overrideIdrisSubDirWith :: String -- ^ Sub directory in `getDataDir` location.

50overrideIdrisSubDirWith :: String -- ^ Sub directory in `getDataDir` location.

46 -> String -- ^ Environment variable to get new location from.

51 -> String -- ^ Environment variable to get new location from.

47 -> IO FilePath

52 -> IO FilePath

src/Idris/IdrisDoc.hs+2−2

@@ -19,7 +19,7 @@ import Idris.Docs

19import Idris.Docstrings (nullDocstring)

20import qualified Idris.Docstrings as Docstrings

21import Idris.Parser.Helpers (opChars)

22−import IRTS.System (getDataFileName)

22+import IRTS.System (getIdrisDataFileByName)

23

24import Control.Applicative ((<|>))

25import Control.Monad (forM_)

@@ -708,5 +708,5 @@ copyDependencies :: FilePath -- ^ The base directory to which

708 -- dependencies should be written

709 -> IO ()

710copyDependencies dir =

711− do styles <- getDataFileName $ "idrisdoc" </> "styles.css"

711+ do styles <- getIdrisDataFileByName $ "idrisdoc" </> "styles.css"

712 copyFile styles (dir </> "styles.css")

src/Idris/Info.hs+5

@@ -22,6 +22,7 @@ module Idris.Info

22 , getIdrisHistoryFile

23 , getIdrisInstalledPackages

24 , getIdrisLoggingCategories

25+ , getIdrisDataFileByName

25 ) where

26 ) where

26

27

27import Idris.AbsSyntax (loggingCatsStr)

28import Idris.AbsSyntax (loggingCatsStr)

@@ -34,6 +35,7 @@ import Version_idris (gitHash)

34import Data.Version

35import Data.Version

35import System.Directory

36import System.Directory

36import System.FilePath

37import System.FilePath

38+

37getIdrisDataDir :: IO String

39getIdrisDataDir :: IO String

38getIdrisDataDir = S.getIdrisDataDir

40getIdrisDataDir = S.getIdrisDataDir

39

41

@@ -88,3 +90,6 @@ getIdrisInstalledPackages = installedPackages

88

90

89getIdrisLoggingCategories :: IO [String]

91getIdrisLoggingCategories :: IO [String]

90getIdrisLoggingCategories = return $ words loggingCatsStr

92getIdrisLoggingCategories = return $ words loggingCatsStr

93+

94+getIdrisDataFileByName :: String -> IO FilePath

95+getIdrisDataFileByName = S.getIdrisDataFileByName