git.iko.soy/Idris-dev
on master help sign in
Add --nobasepkgs flag

Intended for use when building the base packages, so that they don't look at installed versions. Simply removes 'prelude' and 'base' from the package list.

commitddac624309d57651ad01481c34798386ee1585eb authorEdwin Brady <ecb10@st-andrews.ac.uk> dateFri 22 Nov 2013, 16:16 (13 years ago) parenta338273
5 files changed+8−5
compare with master
unifiedsplit
libs/base/base.ipkg+1−1 libs/effects/effects.ipkg+1−1 libs/javascript/javascript.ipkg+1−1 src/Idris/AbsSyntaxTree.hs+1 src/Idris/REPL.hs+4−2
libs/base/base.ipkg+1−1
@@ -1,6 +1,6 @@
11package base
22
3−opts = "--total"
3+opts = "--nobasepkgs --total -i ../prelude"
44modules = System,
55
66 Network.Cgi,
libs/effects/effects.ipkg+1−1
@@ -1,6 +1,6 @@
11package effects
22
3−opts = "-i ../base"
3+opts = "--nobasepkgs -i ../prelude -i ../base"
44modules = Effects,
55 Effect.Exception, Effect.File, Effect.State,
66 Effect.Random, Effect.StdIO, Effect.Select,
libs/javascript/javascript.ipkg+1−1
@@ -1,5 +1,5 @@
11package javascript
22
3−opts = "-i ../base"
3+opts = "--nobasepkgs -i ../prelude -i ../base"
44modules = JavaScript, JavaScript.JSON
55
src/Idris/AbsSyntaxTree.hs+1
@@ -261,6 +261,7 @@ data Opt = Filename String
261261 | ShowLibs
262262 | ShowLibdir
263263 | ShowIncs
264+ | NoBasePkgs
264265 | NoPrelude
265266 | NoBuiltins -- only for the really primitive stuff!
266267 | NoREPL
src/Idris/REPL.hs+4−2
@@ -939,6 +939,7 @@ parseArgs ("--quiet":ns) = Quiet : (parseArgs ns)
939939parseArgs ("--ideslave":ns) = Ideslave : (parseArgs ns)
940940parseArgs ("--client":ns) = [Client (showSep " " ns)]
941941parseArgs ("--log":lvl:ns) = OLogging (read lvl) : (parseArgs ns)
942+parseArgs ("--nobasepkgs":ns) = NoBasePkgs : (parseArgs ns)
942943parseArgs ("--noprelude":ns) = NoPrelude : (parseArgs ns)
943944parseArgs ("--nobuiltins":ns) = NoBuiltins : NoPrelude : (parseArgs ns)
944945parseArgs ("--check":ns) = NoREPL : (parseArgs ns)
@@ -1127,8 +1128,9 @@ idrisMain opts =
11271128 (d:_) -> setIBCSubDir d
11281129 setImportDirs importdirs
11291130
1130− addPkgDir "prelude"
1131− addPkgDir "base"
1131+ when (not (NoBasePkgs `elem` opts)) $ do
1132+ addPkgDir "prelude"
1133+ addPkgDir "base"
11321134 mapM_ addPkgDir pkgdirs
11331135 elabPrims
11341136 when (not (NoBuiltins `elem` opts)) $ do x <- loadModule stdout "Builtins"