haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-21 19:51:56 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Show active items

Browse Source
This commit is contained in:
Michael Snoyman 2014-12-11 18:05:10 +02:00
parent 29230aa366
commit e0e64b4088
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Stackage2/PerformBuild.hs
View File

@ -101,7 +101,7 @@ waitForDeps toolMap packageMap activeComps bp pi action = do
withCounter counter = bracket_ withCounter counter = bracket_
(atomically $ modifyTVar counter (+ 1)) (atomically $ modifyTVar counter (+ 1))
(atomically $ modifyTVar counter (`subtract` 1)) (atomically $ modifyTVar counter (subtract 1))
withTSem sem = bracket_ (atomically $ waitTSem sem) (atomically $ signalTSem sem) withTSem sem = bracket_ (atomically $ waitTSem sem) (atomically $ signalTSem sem)
@ -230,7 +230,14 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
runChild = runIn childDir runChild = runIn childDir
childDir = sbBuildDir </> fpFromText namever childDir = sbBuildDir </> fpFromText namever
log' = pbLog . encodeUtf8 . (++ "\n") log' t = do
i <- readTVarIO sbActive
pbLog $ encodeUtf8 $ concat
[ t
, " (active: "
, tshow i
, ")\n"
]
libOut = pbLogDir </> fpFromText namever </> "build.out" libOut = pbLogDir </> fpFromText namever </> "build.out"
libErr = pbLogDir </> fpFromText namever </> "build.err" libErr = pbLogDir </> fpFromText namever </> "build.err"
testOut = pbLogDir </> fpFromText namever </> "test.out" testOut = pbLogDir </> fpFromText namever </> "test.out"