git.iko.soy/stackage
on master help sign in
Update Haddock file refs
commit33b2e1540a16e45a1f144d0ac75799a549631b40 authorMichael Snoyman <michael@snoyman.com> dateThu 11 Dec 2014, 18:46 (12 years ago) parente0e64b4
2 files changed+14−7
compare with master
unifiedsplit
Stackage/Test.hs+1 Stackage2/PerformBuild.hs+13−7
Stackage/Test.hs+1
@@ -232,6 +232,7 @@ runTestSuite cabalVersion settings testdir docdir
232232 : "--hyperlink-source"
233233 : "--html"
234234 : "--hoogle"
235+ -- FIXME is this redundant with read-interface above?
235236 : "--html-location=../$pkg-$version/"
236237 : hfsOpts) dir
237238 let PackageName packageName' = packageName
Stackage2/PerformBuild.hs+13−7
@@ -309,15 +309,16 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
309309 (childDir </> "dist" </> "doc" </> "html" </> fpFromText name)
310310 (pbDocDir pb </> fpFromText namever)
311311
312− {-
313312 enewPath <- tryIO
314313 $ canonicalizePath
315− $ docdir </> package </> packageName' <.> "haddock"
314+ $ pbDocDir pb
315+ </> fpFromText namever
316+ </> fpFromText name <.> "haddock"
316317 case enewPath of
317− Left _ -> return () -- print e
318− Right newPath -> atomicModifyIORef haddockFilesRef $ \hfs'
319− -> ((package, newPath) : hfs', ())
320− -}
318+ Left e -> warn $ tshow e
319+ Right newPath -> atomically
320+ $ modifyTVar sbHaddockFiles
321+ $ insertMap namever newPath
321322
322323 case (eres, pcHaddocks) of
323324 (Left e, ExpectSuccess) -> throwM e
@@ -345,7 +346,12 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
345346
346347 warn t = atomically $ modifyTVar sbWarningsVar (. (t:))
347348
348− updateErrs exc =
349+ updateErrs exc = do
350+ log' $ concat
351+ [ display (piName sbPackageInfo)
352+ , ": "
353+ , tshow exc
354+ ]
349355 atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
350356 where
351357 exc' =