haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-02-11 05:47:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Combine log files

Browse Source
This commit is contained in:
Michael Snoyman 2014-12-12 10:07:14 +02:00
parent 98ea14a264
commit 6cacdb4c9c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Stackage2/PerformBuild.hs
View File

@ -212,14 +212,14 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
, display $ ppVersion $ piPlan sbPackageInfo , display $ ppVersion $ piPlan sbPackageInfo
] ]
runIn wdir outH errH cmd args = runIn wdir outH cmd args =
withCheckedProcess cp $ \ClosedStream UseProvidedHandle UseProvidedHandle -> withCheckedProcess cp $ \ClosedStream UseProvidedHandle UseProvidedHandle ->
(return () :: IO ()) (return () :: IO ())
where where
cp = (proc (unpack $ asText cmd) (map (unpack . asText) args)) cp = (proc (unpack $ asText cmd) (map (unpack . asText) args))
{ cwd = Just $ fpToString wdir { cwd = Just $ fpToString wdir
, std_out = UseHandle outH , std_out = UseHandle outH
, std_err = UseHandle errH , std_err = UseHandle outH
, env = Just sbModifiedEnv , env = Just sbModifiedEnv
} }
runParent = runIn sbBuildDir runParent = runIn sbBuildDir
@ -238,9 +238,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
, ")\n" , ")\n"
] ]
libOut = pbLogDir </> fpFromText namever </> "build.out" libOut = pbLogDir </> fpFromText namever </> "build.out"
libErr = pbLogDir </> fpFromText namever </> "build.err"
testOut = pbLogDir </> fpFromText namever </> "test.out" testOut = pbLogDir </> fpFromText namever </> "test.out"
testErr = pbLogDir </> fpFromText namever </> "test.err"
testRunOut = pbLogDir </> fpFromText namever </> "test-run.out" testRunOut = pbLogDir </> fpFromText namever </> "test-run.out"
wf fp inner = do wf fp inner = do
@ -268,10 +266,10 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
PackageConstraints {..} = ppConstraints $ piPlan sbPackageInfo PackageConstraints {..} = ppConstraints $ piPlan sbPackageInfo
buildLibrary = wf libOut $ \outH -> wf libErr $ \errH -> do buildLibrary = wf libOut $ \outH -> do
let run = runChild outH errH let run = runChild outH
log' $ "Unpacking " ++ namever log' $ "Unpacking " ++ namever
runParent outH errH "cabal" ["unpack", namever] runParent outH "cabal" ["unpack", namever]
log' $ "Configuring " ++ namever log' $ "Configuring " ++ namever
run "cabal" $ "configure" : configArgs run "cabal" $ "configure" : configArgs
@ -328,8 +326,8 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
(Right (), ExpectFailure) -> warn $ namever ++ ": unexpected Haddock success" (Right (), ExpectFailure) -> warn $ namever ++ ": unexpected Haddock success"
_ -> return () _ -> return ()
runTests = wf testOut $ \outH -> wf testErr $ \errH -> do runTests = wf testOut $ \outH -> do
let run = runChild outH errH let run = runChild outH
when (pcTests /= Don'tBuild) $ do when (pcTests /= Don'tBuild) $ do
log' $ "Test configure " ++ namever log' $ "Test configure " ++ namever