on master help sign in
Move externally useful Util.System functions to IRTS.System

Functions moved: * getTargetDir * getCC * getLibFlags * getIdrisLibDir * getIncFlags * getMvn * getExecutablePom

commitf27a1ff6eed93f5f1af226d7b14ba5b026046b96 authorBrian McKenna <brian@brianmckenna.org> dateSat 30 Nov 2013, 15:12 (13 years ago) parent0f97368
7 files changed+73−63
idris.cabal+2 src/IRTS/CodegenC.hs+1 src/IRTS/CodegenJava.hs+1 src/IRTS/System.hs+63 src/Main.hs+2−1 src/Pkg/Package.hs+2 src/Util/System.hs+2−62
idris.cabal+2
@@ -371,6 +371,7 @@ Library
371371 , IRTS.Java.Pom
372372 , IRTS.Lang
373373 , IRTS.Simplified
374+ , IRTS.System
374375
375376 Other-modules:
376377 Util.Pretty
@@ -484,6 +485,7 @@ Executable idris
484485 , IRTS.Java.Pom
485486 , IRTS.Lang
486487 , IRTS.Simplified
488+ , IRTS.System
487489
488490 , Util.Pretty
489491 , Util.System
src/IRTS/CodegenC.hs+1
@@ -4,6 +4,7 @@ import Idris.AbsSyntax
44import IRTS.Bytecode
55import IRTS.Lang
66import IRTS.Simplified
7+import IRTS.System
78import IRTS.CodegenCommon
89import Idris.Core.TT
910import Paths_idris
src/IRTS/CodegenJava.hs+1
@@ -9,6 +9,7 @@ import IRTS.Java.Mangling
99import IRTS.Java.Pom (pomString)
1010import IRTS.Lang
1111import IRTS.Simplified
12+import IRTS.System
1213import Util.System
1314
1415import Control.Applicative hiding (Const)
src/IRTS/System.hsnew file+63
@@ -0,0 +1,63 @@
1+{-# LANGUAGE CPP #-}
2+module IRTS.System(getTargetDir,getCC,getLibFlags,getIdrisLibDir,
3+ getIncFlags,getMvn,getExecutablePom) where
4+
5+import Util.System
6+
7+import Control.Applicative ((<$>))
8+import Data.Maybe (fromMaybe)
9+import System.FilePath ((</>), addTrailingPathSeparator)
10+import System.Environment
11+
12+import Paths_idris
13+
14+getCC :: IO String
15+getCC = fromMaybe "gcc" <$> environment "IDRIS_CC"
16+
17+mvnCommand :: String
18+#ifdef mingw32_HOST_OS
19+mvnCommand = "mvn.bat"
20+#else
21+mvnCommand = "mvn"
22+#endif
23+
24+getMvn :: IO String
25+getMvn = fromMaybe mvnCommand <$> environment "IDRIS_MVN"
26+
27+environment :: String -> IO (Maybe String)
28+environment x = catchIO (do e <- getEnv x
29+ return (Just e))
30+ (\_ -> return Nothing)
31+
32+getTargetDir :: IO String
33+getTargetDir = environment "TARGET" >>= maybe getDataDir return
34+
35+#ifdef FREEBSD
36+extraLib = " -L/usr/local/lib"
37+#else
38+extraLib = ""
39+#endif
40+
41+#ifdef IDRIS_GMP
42+gmpLib = " -lgmp"
43+#else
44+gmpLib = ""
45+#endif
46+
47+getLibFlags = do dir <- getDataDir
48+ return $ "-L" ++ (dir </> "rts") ++
49+ " -lidris_rts" ++ extraLib ++ gmpLib ++ " -lpthread"
50+
51+getIdrisLibDir = do dir <- getDataDir
52+ return $ addTrailingPathSeparator dir
53+
54+#ifdef FREEBSD
55+extraInclude = " -I/usr/local/include"
56+#else
57+extraInclude = ""
58+#endif
59+getIncFlags = do dir <- getDataDir
60+ return $ "-I" ++ dir </> "rts" ++ extraInclude
61+
62+getExecutablePom = do dir <- getDataDir
63+ return $ dir </> "java" </> "executable_pom.xml"
src/Main.hs+2−1
@@ -25,7 +25,8 @@ import Idris.Primitives
2525import Idris.Imports
2626import Idris.Error
2727
28−import Util.System ( getLibFlags, getIdrisLibDir, getIncFlags )
28+import IRTS.System ( getLibFlags, getIdrisLibDir, getIncFlags )
29+
2930import Util.DynamicLinker
3031
3132import Pkg.Package
src/Pkg/Package.hs+2
@@ -18,6 +18,8 @@ import Idris.Core.TT
1818import Idris.REPL
1919import Idris.AbsSyntax
2020
21+import IRTS.System
22+
2123import Pkg.PParser
2224
2325import Paths_idris (getDataDir)
src/Util/System.hs+2−62
@@ -1,46 +1,24 @@
1−{-# LANGUAGE CPP #-}
2−module Util.System(tempfile,withTempdir,getTargetDir,getCC,
3− getLibFlags,getIdrisLibDir,getIncFlags,rmFile,
4− getMvn,getExecutablePom,catchIO) where
1+module Util.System(tempfile,withTempdir,rmFile,catchIO) where
52
63-- System helper functions.
74import Control.Monad (when)
8−import Control.Applicative ((<$>))
9−import Data.Maybe (fromMaybe)
105import Distribution.Text (display)
116import System.Directory (getTemporaryDirectory
127 , removeFile
138 , removeDirectoryRecursive
149 , createDirectoryIfMissing
1510 )
16−import System.FilePath ((</>), addTrailingPathSeparator, normalise)
17−import System.Environment
11+import System.FilePath ((</>), normalise)
1812import System.IO
1913import System.IO.Error
2014import Control.Exception as CE
2115
22−import Paths_idris
23−
2416catchIO :: IO a -> (IOError -> IO a) -> IO a
2517catchIO = CE.catch
2618
2719throwIO :: IOError -> IO a
2820throwIO = CE.throw
2921
30−
31−getCC :: IO String
32−getCC = fromMaybe "gcc" <$> environment "IDRIS_CC"
33−
34−mvnCommand :: String
35−#ifdef mingw32_HOST_OS
36−mvnCommand = "mvn.bat"
37−#else
38−mvnCommand = "mvn"
39−#endif
40−
41−getMvn :: IO String
42−getMvn = fromMaybe mvnCommand <$> environment "IDRIS_MVN"
43−
4422tempfile :: IO (FilePath, Handle)
4523tempfile = do dir <- getTemporaryDirectory
4624 openTempFile (normalise dir) "idris"
@@ -57,46 +35,8 @@ withTempdir subdir callback
5735 when removeLater $ removeDirectoryRecursive tmpDir
5836 return result
5937
60−environment :: String -> IO (Maybe String)
61−environment x = catchIO (do e <- getEnv x
62− return (Just e))
63− (\_ -> return Nothing)
64−
65−getTargetDir :: IO String
66−getTargetDir = environment "TARGET" >>= maybe getDataDir return
67−
6838rmFile :: FilePath -> IO ()
6939rmFile f = do putStrLn $ "Removing " ++ f
7040 catchIO (removeFile f)
7141 (\ioerr -> putStrLn $ "WARNING: Cannot remove file "
7242 ++ f ++ ", Error msg:" ++ show ioerr)
73−
74−#ifdef FREEBSD
75−extraLib = " -L/usr/local/lib"
76−#else
77−extraLib = ""
78−#endif
79−
80−#ifdef IDRIS_GMP
81−gmpLib = " -lgmp"
82−#else
83−gmpLib = ""
84−#endif
85−
86−getLibFlags = do dir <- getDataDir
87− return $ "-L" ++ (dir </> "rts") ++
88− " -lidris_rts" ++ extraLib ++ gmpLib ++ " -lpthread"
89−
90−getIdrisLibDir = do dir <- getDataDir
91− return $ addTrailingPathSeparator dir
92−
93−#ifdef FREEBSD
94−extraInclude = " -I/usr/local/include"
95−#else
96−extraInclude = ""
97−#endif
98−getIncFlags = do dir <- getDataDir
99− return $ "-I" ++ dir </> "rts" ++ extraInclude
100−
101−getExecutablePom = do dir <- getDataDir
102− return $ dir </> "java" </> "executable_pom.xml"