@@ -18,7 +18,6 @@ import System.Process
1818import qualified Data.Text as T
1919import qualified Data.Text.IO as TIO
2020
21−
2221-- After Idris is built, we need to check and install the prelude and other libs
2322
2423make verbosity = P.runProgramInvocation verbosity . P.simpleProgramInvocation "make"
@@ -70,6 +69,7 @@ installStdLib pkg local verbosity copy
7069
7170installJavaLib pkg local verbosity copy version = do
7271 let rtsFile = "idris-" ++ display version ++ ".jar"
72+ putStrLn $ "Installing java libraries"
7373 mvn verbosity [ "install:install-file"
7474 , "-Dfile=" ++ ("java" </> "target" </> rtsFile)
7575 , "-DgroupId=org.idris-lang"
@@ -111,8 +111,8 @@ checkStdLib local verbosity
111111
112112checkJavaLib verbosity = mvn verbosity [ "-f", "java" </> "pom.xml", "package" ]
113113
114−noJavaFlag flags =
115− case lookup (FlagName "nojava") (S.configConfigurationsFlags flags) of
114+javaFlag flags =
115+ case lookup (FlagName "java") (S.configConfigurationsFlags flags) of
116116 Just True -> True
117117 Just False -> False
118118 Nothing -> False
@@ -138,17 +138,17 @@ main = do
138138 let verb = (S.fromFlag $ S.installVerbosity flags)
139139 installStdLib pkg lbi verb
140140 NoCopyDest
141− unless (noJavaFlag $ configFlags lbi)
142− (installJavaLib pkg
143− lbi
144− verb
145− NoCopyDest
146− (pkgVersion . package $ localPkgDescr lbi)
147− )
141+ when (javaFlag $ configFlags lbi)
142+ (installJavaLib pkg
143+ lbi
144+ verb
145+ NoCopyDest
146+ (pkgVersion . package $ localPkgDescr lbi)
147+ )
148148 , postConf = \ _ flags _ lbi -> do
149149 removeLibIdris lbi (S.fromFlag $ S.configVerbosity flags)
150− unless (noJavaFlag $ configFlags lbi)
151− (preparePoms . pkgVersion . package $ localPkgDescr lbi)
150+ when (javaFlag $ configFlags lbi)
151+ (preparePoms . pkgVersion . package $ localPkgDescr lbi)
152152 , postClean = \ _ flags _ _ -> do
153153 let verb = S.fromFlag $ S.cleanVerbosity flags
154154 cleanStdLib verb
@@ -156,5 +156,5 @@ main = do
156156 , postBuild = \ _ flags _ lbi -> do
157157 let verb = S.fromFlag $ S.buildVerbosity flags
158158 checkStdLib lbi verb
159− unless (noJavaFlag $ configFlags lbi) (checkJavaLib verb)
159+ when (javaFlag $ configFlags lbi) (checkJavaLib verb)
160160 }