git.iko.soy/typeable/wai
on master help sign in
simpler install of wai-app-static

remove Cabal dependency form test images in separate folder for ease of use with mega repo

commit2476229310e7d5d31c88542c538d70c184231e64 authorGreg Weber <greg@gregweber.info> dateFri 25 Nov 2011, 11:00 (15 years ago) parent6bea22d
6 files changed+5−5
compare with master
unifiedsplit
images+1 wai-app-static/Network/Wai/Application/Static.hs+2−2 wai-app-static/folder.png → wai-app-static/images/folder.png wai-app-static/haskell.png → wai-app-static/images/haskell.png wai-app-static/tests/runtests.hs+2−2 wai-app-static/wai-app-static.cabal−1
imagesnew file+1
@@ -0,0 +1 @@
1+wai-app-static/images
wai-app-static/Network/Wai/Application/Static.hs+2−2
@@ -248,9 +248,9 @@ pathFromPieces = foldl' (</>)
248248
249249checkSpecialDirListing :: Pieces -> Maybe CheckPieces
250250checkSpecialDirListing [".hidden", "folder.png"] =
251− Just $ SendContent "image/png" $ L.fromChunks [$(embedFile "folder.png")]
251+ Just $ SendContent "image/png" $ L.fromChunks [$(embedFile "images/folder.png")]
252252checkSpecialDirListing [".hidden", "haskell.png"] =
253− Just $ SendContent "image/png" $ L.fromChunks [$(embedFile "haskell.png")]
253+ Just $ SendContent "image/png" $ L.fromChunks [$(embedFile "images/haskell.png")]
254254checkSpecialDirListing _ = Nothing
255255
256256checkPieces :: (Pieces -> IO FileLookup) -- ^ file lookup function
wai-app-static/folder.png → wai-app-static/images/folder.pngrenamed

Binary file not shown.

wai-app-static/haskell.png → wai-app-static/images/haskell.pngrenamed

Binary file not shown.

wai-app-static/tests/runtests.hs+2−2
@@ -5,9 +5,9 @@ import Test.Hspec.Monadic
55import Test.Hspec.QuickCheck
66import Test.Hspec.HUnit ()
77import Test.HUnit ((@?=))
8−import Distribution.Simple.Utils (isInfixOf)
8+import Data.List (isInfixOf)
99import qualified Data.ByteString.Char8 as S8
10−import qualified Data.ByteString.Lazy.Char8 as L8
10+-- import qualified Data.ByteString.Lazy.Char8 as L8
1111import qualified Data.Text as T
1212import qualified Data.Text.Encoding as TE
1313import System.PosixCompat.Files (getFileStatus, modificationTime)
wai-app-static/wai-app-static.cabal−1
@@ -58,7 +58,6 @@ test-suite runtests
5858 , time >= 1.1.4 && < 1.4
5959 , old-locale >= 1.0.0.2 && < 1.1
6060 , http-date
61− , Cabal
6261 , wai-app-static >= 0.3
6362 , wai-test
6463 , wai