Flag to disable effects

Setup.hs

@@ -44,7 +44,7 @@ cleanJavaLib verbosity
        execPomExists <- doesFileExist ("java" </> "executable_pom.xml")
        when pomExists $ removeFile ("java" </> "executable_pom.xml")
 
-installStdLib pkg local verbosity copy
+installStdLib pkg local withoutEffects verbosity copy
     = do let dirs = L.absoluteInstallDirs pkg local copy
          let idir = datadir dirs
          let icmd = idrisCmd local
@@ -54,11 +54,12 @@ installStdLib pkg local verbosity copy
                , "TARGET=" ++ idir
                , "IDRIS=" ++ icmd
                ]
-         make verbosity
-               [ "-C", "effects", "install"
-               , "TARGET=" ++ idir
-               , "IDRIS=" ++ icmd
-               ]
+         unless withoutEffects $
+           make verbosity
+                 [ "-C", "effects", "install"
+                 , "TARGET=" ++ idir
+                 , "IDRIS=" ++ icmd
+                 ]
          let idirRts = idir </> "rts"
          putStrLn $ "Installing run time system in " ++ idirRts
          make verbosity
@@ -93,17 +94,18 @@ removeLibIdris local verbosity
                , "IDRIS=" ++ icmd
                ]
 
-checkStdLib local verbosity
+checkStdLib local withoutEffects verbosity
     = do let icmd = idrisCmd local
          putStrLn $ "Building libraries..."
          make verbosity
                [ "-C", "lib", "check"
                , "IDRIS=" ++ icmd
                ]
-         make verbosity
-               [ "-C", "effects", "check"
-               , "IDRIS=" ++ icmd
-               ]
+         unless withoutEffects $
+           make verbosity
+                 [ "-C", "effects", "check"
+                 , "IDRIS=" ++ icmd
+                 ]
          make verbosity
                [ "-C", "rts", "check"
                , "IDRIS=" ++ icmd
@@ -117,6 +119,12 @@ javaFlag flags =
     Just False -> False
     Nothing -> False
 
+noEffectsFlag flags =
+   case lookup (FlagName "noeffects") (S.configConfigurationsFlags flags) of
+      Just True -> True
+      Just False -> False
+      Nothing -> False
+
 preparePoms version
     = do pomTemplate <- TIO.readFile ("java" </> "pom_template.xml")
          TIO.writeFile ("java" </> "pom.xml") (insertVersion pomTemplate)
@@ -132,11 +140,13 @@ main = do
   defaultMainWithHooks $ simpleUserHooks
         { postCopy = \ _ flags pkg lbi -> do
               let verb = S.fromFlag $ S.copyVerbosity flags
-              installStdLib pkg lbi verb
+              let withoutEffects = noEffectsFlag $ configFlags lbi
+              installStdLib pkg lbi withoutEffects verb
                                     (S.fromFlag $ S.copyDest flags)
         , postInst = \ _ flags pkg lbi -> do
               let verb = (S.fromFlag $ S.installVerbosity flags)
-              installStdLib pkg lbi verb
+              let withoutEffects = noEffectsFlag $ configFlags lbi
+              installStdLib pkg lbi withoutEffects verb
                                     NoCopyDest
               when (javaFlag $ configFlags lbi) 
                    (installJavaLib pkg 
@@ -155,6 +165,7 @@ main = do
               cleanJavaLib verb
         , postBuild = \ _ flags _ lbi -> do
               let verb = S.fromFlag $ S.buildVerbosity flags
-              checkStdLib lbi verb
+              let withoutEffects = noEffectsFlag $ configFlags lbi
+              checkStdLib lbi withoutEffects verb
               when (javaFlag $ configFlags lbi) (checkJavaLib verb)
         }

config.mk

@@ -1,6 +1,9 @@
 GMP_INCLUDE_DIR :=
 CC              :=gcc
 CABAL           :=cabal
-CABALFLAGS	:=
+#CABALFLAGS	:=
 ## Enable Java RTS:
 #CABALFLAGS    :=-f Java
+## Disable building of Effects
+CABALFLAGS :=-f NoEffects
+

idris.cabal

@@ -65,7 +65,7 @@ Extra-source-files:    lib/Makefile  lib/*.idr lib/Prelude/*.idr
                        config.mk
                        rts/*.c rts/*.h rts/Makefile
                        js/*.js
-		       java/org/idris/rts/*.java
+                       java/org/idris/rts/*.java
 
 source-repository head
   type:     git
@@ -75,6 +75,9 @@ Flag Java
   Description: Build the Java RTS
   Default:     False
 
+Flag NoEffects
+  Description: Do not build the effects package
+  Default:     False
 
 Executable     idris
                Main-is: Main.hs