e82cf70 · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'master' of https://github.com/evancz/Elm into ParserRewrite

commite82cf70ea411245fe1194f7cfc53e7297c75b978 authorevancz <info@elm-lang.org> dateSat 9 Jun 2012, 23:13 (14 years ago) parentd36cdba c131d88

3 files changed+5−5

compare with master

unifiedsplit

README.md+1 elm-server/Server.hs+2−2 elm-server/elm-server.cabal+2−3

README.md+1

@@ -49,6 +49,7 @@ Yesod users should also install the `elm-yesod` package which provides functions

4949

5050 cabal install elm-yesod

5151

52+Some extra tips on Elm+Yesod can be found [here](https://github.com/evancz/Elm/wiki/Elm-with-Yesod:-Getting-Started).

5253

5354Potential problems and their solutions

5455--------------------------------------

elm-server/Server.hs+2−2

@@ -11,7 +11,7 @@ import qualified Language.Elm as Elm

1111

1212serve :: String -> IO ()

1313serve libLoc = do

14− putStrLn "Elm Server 0.1.2: running at <http://localhost:8000>"

14+ putStrLn "Elm Server 0.2: running at <http://localhost:8000>"

1515 simpleHTTP nullConf $ do

1616 _ <- compressedResponseFilter

1717 msum [ uriRest (serveElm libLoc)

@@ -34,7 +34,7 @@ main = getArgs >>= parse

3434

3535parse :: [String] -> IO ()

3636parse ("--help":_) = putStrLn usage

37−parse ("--version":_) = putStrLn "The Elm Server 0.1.2"

37+parse ("--version":_) = putStrLn "The Elm Server 0.2"

3838parse [] = serve "/elm-mini.js"

3939parse [arg]

4040 | "--runtime-location=" `isPrefixOf` arg =

elm-server/elm-server.cabal+2−3

@@ -1,5 +1,5 @@

11Name: elm-server

2−Version: 0.1.2

2+Version: 0.2

33Synopsis: The Elm language server.

44Description: This package provides a standalone, Happstack-based Elm server.

@@ -25,7 +25,6 @@ source-repository head

2525

2626Executable elm-server

2727 Main-is: Server.hs

28− ghc-options: -Wall

2928 Build-depends: base >=4.2 && <5,

3029 containers >= 0.3,

3130 transformers >= 0.2,

@@ -35,4 +34,4 @@ Executable elm-server

3534 HTTP >= 4000,

3635 happstack-server == 7.0.2,

3736 deepseq,

38− Elm == 0.1.2.*

37+ Elm >= 0.2