haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix yesod devel file finding breakage

Browse Source
This commit is contained in:
gregwebs 2012-04-02 06:47:41 -07:00
parent 26a78f41ce
commit 1ccbf5ce06
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
yesod/Build.hs
View File

@ -112,12 +112,12 @@ findHaskellFiles path = do
go filename = do go filename = do
d <- doesDirectoryExist full d <- doesDirectoryExist full
if not d if not d
then return [] then if isHaskellFile
then return [full]
else return []
else if isHaskellDir else if isHaskellDir
then findHaskellFiles full then findHaskellFiles full
else if isHaskellFile else return []
then return [full]
else return []
where where
-- this could fail on unicode -- this could fail on unicode
isHaskellDir = isUpper (head filename) isHaskellDir = isUpper (head filename)
@ -147,8 +147,11 @@ determineDeps x = do
go Nothing = return [] go Nothing = return []
parser = do parser = do
ty <- (A.string "$(parseRoutesFile " >> return Verbatim) ty <- (do _ <- A.string "\nstaticFiles \""
x' <- A.many1 $ A.satisfy (/= '"')
return $ StaticFiles x')
#if __GLASGOW_HASKELL__ < 704 #if __GLASGOW_HASKELL__ < 704
<|> (A.string "$(parseRoutesFile " >> return Verbatim)
<|> (A.string "$(hamletFile " >> return Hamlet) <|> (A.string "$(hamletFile " >> return Hamlet)
<|> (A.string "$(ihamletFile " >> return Hamlet) <|> (A.string "$(ihamletFile " >> return Hamlet)
<|> (A.string "$(whamletFile " >> return Hamlet) <|> (A.string "$(whamletFile " >> return Hamlet)
@ -156,9 +159,6 @@ determineDeps x = do
<|> (A.string "$(widgetFile " >> return Hamlet) <|> (A.string "$(widgetFile " >> return Hamlet)
<|> (A.string "$(Settings.hamletFile " >> return Hamlet) <|> (A.string "$(Settings.hamletFile " >> return Hamlet)
<|> (A.string "$(Settings.widgetFile " >> return Hamlet) <|> (A.string "$(Settings.widgetFile " >> return Hamlet)
#endif
<|> (A.string "$(persistFile " >> return Verbatim) <|> (A.string "$(persistFile " >> return Verbatim)
<|> ( <|> (
A.string "$(persistFileWith " >> A.string "$(persistFileWith " >>
@ -173,10 +173,7 @@ determineDeps x = do
y <- A.many1 $ A.satisfy (/= '"') y <- A.many1 $ A.satisfy (/= '"')
_ <- A.string "\"" _ <- A.string "\""
return $ Messages $ concat [x', "/", y, ".msg"]) return $ Messages $ concat [x', "/", y, ".msg"])
<|> (do #endif
_ <- A.string "\nstaticFiles \""
x' <- A.many1 $ A.satisfy (/= '"')
return $ StaticFiles x')
case ty of case ty of
Messages{} -> return $ Just (ty, "") Messages{} -> return $ Just (ty, "")
StaticFiles{} -> return $ Just (ty, "") StaticFiles{} -> return $ Just (ty, "")