33b2e15 · stackage · git.iko.soy

git.iko.soy/stackage

on master help sign in

Update Haddock file refs

33b2e15Michael Snoyman12 years ago

Stackage/Test.hs+1

compare with master

unifiedsplit

@@ -232,6 +232,7 @@ runTestSuite cabalVersion settings testdir docdir

232 : "--hyperlink-source"

233 : "--html"

234 : "--hoogle"

235+ -- FIXME is this redundant with read-interface above?

235 : "--html-location=../$pkg-$version/"

236 : "--html-location=../$pkg-$version/"

236 : hfsOpts) dir

237 : hfsOpts) dir

237 let PackageName packageName' = packageName

238 let PackageName packageName' = packageName

Stackage2/PerformBuild.hs+13−7

@@ -309,15 +309,16 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =

309 (childDir </> "dist" </> "doc" </> "html" </> fpFromText name)

310 (pbDocDir pb </> fpFromText namever)

311

312− {-

313 enewPath <- tryIO

312 enewPath <- tryIO

314 $ canonicalizePath

313 $ canonicalizePath

315− $ docdir </> package </> packageName' <.> "haddock"

314+ $ pbDocDir pb

315+ </> fpFromText namever

316+ </> fpFromText name <.> "haddock"

316 case enewPath of

317 case enewPath of

317− Left _ -> return () -- print e

318+ Left e -> warn $ tshow e

318− Right newPath -> atomicModifyIORef haddockFilesRef $ \hfs'

319+ Right newPath -> atomically

319− -> ((package, newPath) : hfs', ())

320+ $ modifyTVar sbHaddockFiles

320− -}

321+ $ insertMap namever newPath

321

322

322 case (eres, pcHaddocks) of

323 case (eres, pcHaddocks) of

323 (Left e, ExpectSuccess) -> throwM e

324 (Left e, ExpectSuccess) -> throwM e

@@ -345,7 +346,12 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =

345

346

346 warn t = atomically $ modifyTVar sbWarningsVar (. (t:))

347 warn t = atomically $ modifyTVar sbWarningsVar (. (t:))

347

348

348− updateErrs exc =

349+ updateErrs exc = do

350+ log' $ concat

351+ [ display (piName sbPackageInfo)

352+ , ": "

353+ , tshow exc

354+ ]

349 atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'

355 atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'

350 where

356 where

351 exc' =

357 exc' =