44b2e45 · elk · git.iko.soy

git.iko.soy/elk

Updates for version 0.1.1.6

Includes ExtractNoscript in the .cabal file and updates version numbers as necessary.

commit44b2e45380d6c112972d8f7ece2ced939434ad80 authorevancz <info@elm-lang.org> dateSun 27 May 2012, 17:49 (14 years ago) parent89605b1

3 files changed+7−7

compare with master

unifiedsplit

Elm.cabal+4−4 src/Compiler.hs+1−1 src/Server.hs+2−2

Elm.cabal+4−4

@@ -1,6 +1,6 @@

22Name: Elm

3−Version: 0.1.1.4

3+Version: 0.1.1.6

44Synopsis: The Elm compiler and server.

55Description: Elm aims to make client-side web-development more pleasant.

66 It is a statically/strongly typed, functional reactive

@@ -34,7 +34,7 @@ Executable elm

3434 other-modules: Ast, CompileToJS, GenerateHtml, Guid, Initialize,

3535 Rename, Language.Elm, Binop, Combinators, Lexer,

3636 ParsePatterns, Parser, ParserLib, ParseTypes, Tokens,

37− Types, Constrain, Hints, Types, Unify

37+ Types, Constrain, Hints, Types, Unify, ExtractNoscript

3838

3939 -- Packages needed in order to build this package.

4040 ghc-options: -O3

@@ -56,7 +56,7 @@ Executable elm-server

5656 other-modules: Ast, CompileToJS, GenerateHtml, Guid, Initialize,

5757 Rename, Language.Elm, Binop, Combinators, Lexer,

5858 ParsePatterns, Parser, ParserLib, ParseTypes, Tokens,

59− Types, Constrain, Hints, Types, Unify

59+ Types, Constrain, Hints, Types, Unify, ExtractNoscript

6060 ghc-options: -O3

6161 Build-depends: base >=4.2 && <5, containers >= 0.3, transformers >= 0.2,

6262 mtl >= 2, parsec >= 3.1.1, blaze-html == 0.5.0.*,

@@ -69,4 +69,4 @@ Library

6969 other-modules: Ast, CompileToJS, GenerateHtml, Guid, Initialize,

7070 Rename, Binop, Combinators, Lexer,

7171 ParsePatterns, Parser, ParserLib, ParseTypes, Tokens,

72− Types, Constrain, Hints, Types, Unify

72+ Types, Constrain, Hints, Types, Unify, ExtractNoscript

src/Compiler.hs+1−1

@@ -10,7 +10,7 @@ import Text.Blaze.Html.Renderer.String (renderHtml)

1010main = getArgs >>= parse

1111

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

13−parse ("--version":_) = putStrLn "The Elm Compiler 0.1.1.4"

13+parse ("--version":_) = putStrLn "The Elm Compiler 0.1.1.6"

1414parse [loc,file]

1515 | "--runtime-location=" `isPrefixOf` loc =

1616 produceHtml (tail $ dropWhile (/='=') loc) file

src/Server.hs+2−2

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

1111

1212serve :: String -> IO ()

1313serve libLoc = do

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

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

1515 simpleHTTP nullConf $ do

1616 compressedResponseFilter

1717 msum [ uriRest (serveElm libLoc)

@@ -31,7 +31,7 @@ serveElm libLoc fp = do

3131main = getArgs >>= parse

3232

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

34−parse ("--version":_) = putStrLn "The Elm Server 0.1.1.4"

34+parse ("--version":_) = putStrLn "The Elm Server 0.1.1.6"

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

3636parse [arg]

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