diff options
| -rwxr-xr-x | Omni/Bild.hs | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/Omni/Bild.hs b/Omni/Bild.hs index 1b08f17..f84b08c 100755 --- a/Omni/Bild.hs +++ b/Omni/Bild.hs @@ -542,7 +542,6 @@ analyze hmap ns = case Map.lookup ns hmap of let quapath = path user <- Env.getEnv "USER" /> Text.pack host <- HostName.getHostName /> Text.pack - Log.info ["bild", "analyze", str path] contentLines <- withFile abspath ReadMode <| \h -> IO.hSetEncoding h IO.utf8_bom @@ -983,7 +982,6 @@ build andTest loud jobs cpus analysis = do then test loud target else pure result Guile -> do - Log.info ["bild", "dev", "guile", nschunk namespace] _ <- proc loud namespace (toNixFlag compiler) compilerFlags case wrapper of Nothing -> pure (Exit.ExitSuccess, mempty) @@ -995,18 +993,17 @@ build andTest loud jobs cpus analysis = do NixBuild -> Dir.getPermissions quapath /> Dir.executable +> \isExe -> isExe - ?: ( Log.info ["bild", "nix", user <> "@" <> host, nschunk namespace] - >> proc - loud - namespace - (toNixFlag compiler) - ( compilerFlags - ++ [ "--max-jobs", - Text.pack <| str jobs, - "--cores", - Text.pack <| str cpus - ] - ), + ?: ( proc + loud + namespace + (toNixFlag compiler) + ( compilerFlags + ++ [ "--max-jobs", + Text.pack <| str jobs, + "--cores", + Text.pack <| str cpus + ] + ), Log.warn ["bild", "nix", nschunk namespace, "x bit not set, not building"] >> pure (Exit.ExitSuccess, mempty) ) @@ -1014,11 +1011,9 @@ build andTest loud jobs cpus analysis = do Log.warn ["bild", "copy", "not implemented yet", nschunk namespace] pure (Exit.ExitSuccess, mempty) Rustc -> - Log.info ["bild", "dev", "rust", nschunk namespace] - >> nixBuild loud jobs cpus target + nixBuild loud jobs cpus target Sbcl -> - Log.info ["bild", "dev", "lisp", nschunk namespace] - >> proc loud namespace (toNixFlag compiler) compilerFlags + proc loud namespace (toNixFlag compiler) compilerFlags LogC.releaseCurrentLine namespace (isSuccess (fst result) ?: (LogC.Success, LogC.Failed)) pure result @@ -1074,7 +1069,7 @@ proc loud namespace cmd args = cmd = cmd, args = map Text.unpack args, onFailure = Log.fail ["bild", nschunk namespace] >> Log.br, - onSuccess = Log.good ["bild", nschunk namespace] >> Log.br + onSuccess = pure () } |> run @@ -1102,7 +1097,6 @@ logs ns src = .| Conduit.iterM ( ByteString.filter (/= BSI.c2w '\n') .> decodeUtf8 - .> (\t -> Log.fmt ["info", "bild", nschunk ns, t]) .> Text.take (columns - 1) .> (<> "…") .> LogC.updateCurrentLine ns @@ -1191,7 +1185,7 @@ nixBuild loud maxJobs cores target@(Target {..}) = str cores ], onFailure = Log.fail ["bild", "realise", nschunk namespace] >> Log.br, - onSuccess = Log.good ["bild", nschunk namespace] >> Log.br + onSuccess = pure () } symlink = Proc |