git.iko.soy/elk
on master help sign in
Corrections for second release.

Had some install issues on different platforms, so fixed an ambiguity with Control.Deepseq.force and removed some compilation flags.

commitea05fbe3d925e60880bdf850a767fdb846fd4f88 authorevancz <info@elm-lang.org> dateWed 23 May 2012, 00:50 (14 years ago) parent8215dac
4 files changed+11−9
compare with master
unifiedsplit
Elm.cabal+7−5 src/Compiler.hs+1−1 src/Server.hs+2−2 src/Types/Unify.hs+1−1
Elm.cabal+7−5
@@ -1,6 +1,6 @@
11
22Name: Elm
3−Version: 0.1.1.2
3+Version: 0.1.1.4
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
@@ -37,10 +37,11 @@ Executable elm
3737 Types, Constrain, Hints, Types, Unify
3838
3939 -- Packages needed in order to build this package.
40− ghc-options: -O3 -rtsopts -auto-all -caf-all
40+ ghc-options: -O3
4141 Build-depends: base >=4.2 && <5, containers >= 0.3,
4242 transformers >= 0.2, mtl >= 2, parsec >= 3.1.1,
43− blaze-html == 0.5.0.*, blaze-markup == 0.5.1.*, deepseq
43+ blaze-html == 0.5.0.*, blaze-markup == 0.5.1.*,
44+ deepseq
4445
4546 -- Modules not exported by this package.
4647 -- Other-modules:
@@ -56,10 +57,11 @@ Executable elm-server
5657 Rename, Language.Elm, Binop, Combinators, Lexer,
5758 ParsePatterns, Parser, ParserLib, ParseTypes, Tokens,
5859 Types, Constrain, Hints, Types, Unify
59− ghc-options: -O3 -rtsopts -auto-all -caf-all
60+ ghc-options: -O3
6061 Build-depends: base >=4.2 && <5, containers >= 0.3, transformers >= 0.2,
6162 mtl >= 2, parsec >= 3.1.1, blaze-html == 0.5.0.*,
62− HTTP >= 4000, happstack-server == 7.0.2
63+ HTTP >= 4000, happstack-server == 7.0.2,
64+ deepseq
6365
6466Library
6567 exposed-modules: Language.Elm
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.1"
13+parse ("--version":_) = putStrLn "The Elm Compiler 0.1.1.4"
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.1: running at <http://localhost:8000>"
14+ putStrLn "Elm Server 0.1.1.4: 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.1"
34+parse ("--version":_) = putStrLn "The Elm Server 0.1.1.4"
3535parse [] = serve "/elm-mini.js"
3636parse [arg]
3737 | "--runtime-location=" `isPrefixOf` arg =
src/Types/Unify.hs+1−1
@@ -9,7 +9,7 @@ import qualified Data.Set as Set
99import Guid
1010import Types
1111
12−import Control.DeepSeq
12+import Control.DeepSeq (NFData (..), deepseq)
1313
1414unify hints expr = run $ do
1515 cs <- constrain hints expr