7580119 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Added --libdir option

commit75801199d28d645f45d870d23de475e69c029714 authorEdwin Brady <eb@cs.st-andrews.ac.uk> dateMon 24 Sep 2012, 21:44 (14 years ago) parent314246b

3 files changed+15−2

compare with master

unifiedsplit

CHANGELOG+5 src/Idris/AbsSyntaxTree.hs+1 src/Main.hs+9−2

CHANGELOG+5

@@ -1,3 +1,8 @@

1+New in 0.9.4:

2+-------------

16New in 0.9.3:

27-------------

src/Idris/AbsSyntaxTree.hs+1

@@ -150,6 +150,7 @@ data Opt = Filename String

150150 | Ver

151151 | Usage

152152 | ShowLibs

153+ | ShowLibdir

153154 | ShowIncs

154155 | NoPrelude

155156 | NoREPL

src/Main.hs+9−2

@@ -52,6 +52,7 @@ runIdris opts =

5252 when (Usage `elem` opts) $ liftIO usage

5353 when (ShowIncs `elem` opts) $ liftIO showIncs

5454 when (ShowLibs `elem` opts) $ liftIO showLibs

55+ when (ShowLibdir `elem` opts) $ liftIO showLibdir

5556 setREPL runrepl

5657 setVerbose runrepl

5758 when (Verbose `elem` opts) $ setVerbose True

@@ -133,6 +134,10 @@ showLibs = do dir <- getDataDir

133134 putStrLn $ "-L" ++ dir ++ "/rts -lidris_rts -lgmp -lpthread"

134135 exitWith ExitSuccess

135136

137+showLibdir = do dir <- getDataDir

138+ putStrLn $ dir ++ "/"

139+ exitWith ExitSuccess

140+

136141showIncs = do dir <- getDataDir

137142 putStrLn $ "-I" ++ dir ++ "/rts"

138143 exitWith ExitSuccess

@@ -150,6 +155,7 @@ parseArgs ("--nocoverage":ns) = liftM (NoCoverage : ) (parseArgs ns)

150155parseArgs ("--errorcontext":ns) = liftM (ErrContext : ) (parseArgs ns)

151156parseArgs ("--help":ns) = liftM (Usage : ) (parseArgs ns)

152157parseArgs ("--link":ns) = liftM (ShowLibs : ) (parseArgs ns)

158+parseArgs ("--libdir":ns) = liftM (ShowLibdir : ) (parseArgs ns)

153159parseArgs ("--include":ns) = liftM (ShowIncs : ) (parseArgs ns)

154160parseArgs ("--version":ns) = liftM (Ver : ) (parseArgs ns)

155161parseArgs ("--verbose":ns) = liftM (Verbose : ) (parseArgs ns)

@@ -178,6 +184,7 @@ usagemsg = "Idris version " ++ ver ++ "\n" ++

178184 "\t--noprelude Don't import the prelude\n" ++

179185 "\t--typeintype Disable universe checking\n" ++

180186 "\t--log [level] Set debugging log level\n" ++

181− "\t--link Show library directories and exit (for C linking)\n" ++

182− "\t--include Show include directories and exit (for C linking)\n"

187+ "\t--libdir Show library install directory and exit\n" ++

188+ "\t--link Show C library directories and exit (for C linking)\n" ++

189+ "\t--include Show C include directories and exit (for C linking)\n"

183190