@@ -18,7 +18,6 @@ import System.Process
18import qualified Data.Text as T
18import qualified Data.Text as T
19import qualified Data.Text.IO as TIO
19import qualified Data.Text.IO as TIO
22-- After Idris is built, we need to check and install the prelude and other libs
21-- After Idris is built, we need to check and install the prelude and other libs
24make verbosity = P.runProgramInvocation verbosity . P.simpleProgramInvocation "make"
23make verbosity = P.runProgramInvocation verbosity . P.simpleProgramInvocation "make"
@@ -70,6 +69,7 @@ installStdLib pkg local verbosity copy
71installJavaLib pkg local verbosity copy version = do
70installJavaLib pkg local verbosity copy version = do
72 let rtsFile = "idris-" ++ display version ++ ".jar"
71 let rtsFile = "idris-" ++ display version ++ ".jar"
72+ putStrLn $ "Installing java libraries"
73 mvn verbosity [ "install:install-file"
73 mvn verbosity [ "install:install-file"
74 , "-Dfile=" ++ ("java" </> "target" </> rtsFile)
74 , "-Dfile=" ++ ("java" </> "target" </> rtsFile)
75 , "-DgroupId=org.idris-lang"
75 , "-DgroupId=org.idris-lang"
@@ -111,8 +111,8 @@ checkStdLib local verbosity
112checkJavaLib verbosity = mvn verbosity [ "-f", "java" </> "pom.xml", "package" ]
112checkJavaLib verbosity = mvn verbosity [ "-f", "java" </> "pom.xml", "package" ]
114−noJavaFlag flags =
114+javaFlag flags =
115− case lookup (FlagName "nojava") (S.configConfigurationsFlags flags) of
115+ case lookup (FlagName "java") (S.configConfigurationsFlags flags) of
116 Just True -> True
116 Just True -> True
117 Just False -> False
117 Just False -> False
118 Nothing -> False
118 Nothing -> False
@@ -138,17 +138,17 @@ main = do
138 let verb = (S.fromFlag $ S.installVerbosity flags)
138 let verb = (S.fromFlag $ S.installVerbosity flags)
139 installStdLib pkg lbi verb
139 installStdLib pkg lbi verb
140 NoCopyDest
140 NoCopyDest
141− unless (noJavaFlag $ configFlags lbi)
141+ when (javaFlag $ configFlags lbi)
142− (installJavaLib pkg
142+ (installJavaLib pkg
145− NoCopyDest
145+ NoCopyDest
146− (pkgVersion . package $ localPkgDescr lbi)
146+ (pkgVersion . package $ localPkgDescr lbi)
148 , postConf = \ _ flags _ lbi -> do
148 , postConf = \ _ flags _ lbi -> do
149 removeLibIdris lbi (S.fromFlag $ S.configVerbosity flags)
149 removeLibIdris lbi (S.fromFlag $ S.configVerbosity flags)
150− unless (noJavaFlag $ configFlags lbi)
150+ when (javaFlag $ configFlags lbi)
151− (preparePoms . pkgVersion . package $ localPkgDescr lbi)
151+ (preparePoms . pkgVersion . package $ localPkgDescr lbi)
152 , postClean = \ _ flags _ _ -> do
152 , postClean = \ _ flags _ _ -> do
153 let verb = S.fromFlag $ S.cleanVerbosity flags
153 let verb = S.fromFlag $ S.cleanVerbosity flags
154 cleanStdLib verb
154 cleanStdLib verb
@@ -156,5 +156,5 @@ main = do
156 , postBuild = \ _ flags _ lbi -> do
156 , postBuild = \ _ flags _ lbi -> do
157 let verb = S.fromFlag $ S.buildVerbosity flags
157 let verb = S.fromFlag $ S.buildVerbosity flags
158 checkStdLib lbi verb
158 checkStdLib lbi verb
159− unless (noJavaFlag $ configFlags lbi) (checkJavaLib verb)
159+ when (javaFlag $ configFlags lbi) (checkJavaLib verb)