6dec2ae · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'master' into dev

commit6dec2ae0fa890d356539ca620270eb08e7cff0df authorEvan Czaplicki <info@elm-lang.org> dateThu 2 Jan 2014, 12:24 (13 years ago) parentb0a856e 60aaaf4

5 files changed+32−24

compare with master

unifiedsplit

Elm.cabal+1−1 README.md+21−13 libraries/elm_dependencies.json+4−4 server/Server.hs+4−4 server/elm-server.cabal+2−2

Elm.cabal+1−1

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

11Name: Elm

2−Version: 0.10.0.2

2+Version: 0.10.1

33Synopsis: The Elm language module.

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

55 It is a statically/strongly typed, functional reactive

README.md+21−13

@@ -3,11 +3,15 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/)

44## Install

6−**Note for OS X 10.9 Maverics:** you must follow

6+**Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then

7+jump to the [My First Project](#my-first-project) section.

8+<br/>

9+**OS X 10.9** — follow

710[these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9)

8−before continuing!

11+before continuing with the platform agnostic directions below.

912

10−Download the [Haskell Platform 2012.2.0.0 or later](http://hackage.haskell.org/platform/).

13+**Platform Agnostic** —

14+download the [Haskell Platform 2012.2.0.0 or later](http://hackage.haskell.org/platform/).

1115Once the Haskell Platform is installed:

1216

1317 cabal update

@@ -19,11 +23,8 @@ Once the Haskell Platform is installed:

1923To use `elm` and `elm-server` you may need to add a new directory to your PATH.

2024

2125Cabal should tell you where your executables are located upon

22−successful installation.

23−

24−For me, the executables were placed in `/home/evan/.cabal/bin` which I

25−appended to the end of my PATH variable in my .bashrc file.

26−

26+successful installation. It'll be something like `/home/evan/.cabal/bin`

27+which you should append to your PATH variable.

2728See this tutorial if you are new to changing your PATH in

2829[Unix/Linux](http://www.cyberciti.biz/faq/unix-linux-adding-path/).

2930

@@ -44,8 +45,15 @@ allowing you to navigate to `Main.elm` and see your first program in action.

4445

4546#### Final Notes

4647

47−The `elm` package provides support for compilation of Elm code directly in Haskell.

48−Check it out [on Hackage](http://hackage.haskell.org/package/Elm) if you are interested.

49−

50−If you are stuck, email [the list](https://groups.google.com/forum/?fromgroups#!forum/elm-discuss)

51−or ask a question in the [#Elm IRC channel](http://webchat.freenode.net/?channels=elm).

48+The `elm` package provides

49+[some utility functions](http://hackage.haskell.org/package/Elm) for

50+working with Elm in Haskell. This can be useful for creating tooling

51+for Elm, and has been useful for projects like

52+[the website](http://elm-lang.org/) and

53+[`elm-get`](https://github.com/evancz/elm-get). Email the list if you

54+want to rely on these functions!

55+

56+If you are stuck, email

57+[the list](https://groups.google.com/forum/?fromgroups#!forum/elm-discuss)

58+or ask a question in the

59+[#Elm IRC channel](http://webchat.freenode.net/?channels=elm).

libraries/elm_dependencies.json+4−4

@@ -1,9 +1,9 @@

1−{ "version": "0.10.0.2"

1+{ "version": "0.10.1"

22, "summary": "Elm's standard libraries"

3−, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.11, you should be using version 0.11 of the standard libraries."

3+, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.10.1, you should be using version 0.10.1 of the standard libraries."

44, "license": "BSD3"

55, "repository": "http://github.com/evancz/Elm.git"

6−, "elm-version": "0.10.0.2"

6+, "elm-version": "0.10.1"

77, "dependencies": {}

88, "exposed-modules":

99 [ "Basics"

@@ -36,4 +36,4 @@

3636 , "WebSocket"

3737 , "Window"

3838 ]

39−}

39+}

server/Server.hs+4−4

@@ -12,7 +12,7 @@ import System.Exit

1212import System.FilePath

1313import System.Process

1414import GHC.IO.Handle

15−import qualified Language.Elm as Elm

15+import qualified Elm.Internal.Paths as ElmPaths

1616import Paths_elm_server

1717

1818runtime = "/elm-runtime.js"

@@ -74,7 +74,7 @@ parse ("--help":_) = putStrLn usage

7474parse ("--version":_) = putStrLn ("The Elm Server " ++ showVersion version)

7575parse args =

7676 if null remainingArgs then

77− serve portNumber =<< elmRuntime

77+ serve portNumber elmRuntime

7878 else

7979 putStrLn usageMini

8080

@@ -86,9 +86,9 @@ parse args =

8686 argValue arg = tail $ dropWhile (/= '=') (head arg)

8787 portNumber = if null portArg then 8000 else read (argValue portArg) :: Int

8888 elmRuntime = if null runtimeArg then

89− Elm.runtime

89+ ElmPaths.runtime

9090 else

91− return $ argValue runtimeArg

91+ argValue runtimeArg

9292

9393usageMini :: String

9494usageMini =

server/elm-server.cabal+2−2

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

11Name: elm-server

2−Version: 0.10

2+Version: 0.10.1

33Synopsis: The Elm language server.

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

@@ -36,5 +36,5 @@ Executable elm-server

3636 happstack-server,

3737 deepseq,

3838 filepath,

39− Elm >= 0.10,

39+ Elm >= 0.10.1,

4040 process