[commit: haddock] master: Fallback to ./resources when Cabal data is not found (a5bf30f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branch  : master
Link       : http://git.haskell.org/haddock.git/commitdiff/a5bf30f4968e7058e9c2a1f6264def56631d8bdd

>---------------------------------------------------------------

commit a5bf30f4968e7058e9c2a1f6264def56631d8bdd
Author: Simon Hengel <sol at typeful.net>
Date:   Sat Sep 7 10:46:59 2013 +0200

    Fallback to ./resources when Cabal data is not found
    
    (so that themes are found during development)


>---------------------------------------------------------------

a5bf30f4968e7058e9c2a1f6264def56631d8bdd
 src/Haddock.hs |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Haddock.hs b/src/Haddock.hs
index 1deb640..398aed4 100644
--- a/src/Haddock.hs
+++ b/src/Haddock.hs
@@ -40,6 +40,7 @@ import Data.IORef
 import qualified Data.Map as Map
 import System.IO
 import System.Exit
+import System.Directory
 
 #if defined(mingw32_HOST_OS)
 import Foreign
@@ -339,11 +340,19 @@ withGhc libDir flags ghcActs = saveStaticFlagGlobals >>= \savedFlags -> do
 getHaddockLibDir :: [Flag] -> IO String
 getHaddockLibDir flags =
   case [str | Flag_Lib str <- flags] of
-    [] ->
+    [] -> do
 #ifdef IN_GHC_TREE
       getInTreeDir
 #else
-      getDataDir -- provided by Cabal
+      d <- getDataDir -- provided by Cabal
+      doesDirectoryExist d >>= \exists -> case exists of
+        True -> return d
+        False -> do
+          -- If directory does not exist then we are probably invoking from
+          -- ./dist/build/haddock/haddock so we use ./resources as a fallback.
+          doesDirectoryExist "resources" >>= \exists_ -> case exists_ of
+            True -> return "resources"
+            False -> die ("Haddock's resource directory (" ++ d ++ ") does not exist!\n")
 #endif
     fs -> return (last fs)