6dec2ae · elk · git.iko.soy

Elm.cabal+1−1

compare with master

unifiedsplit

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

1Name: Elm

2−Version: 0.10.0.2

2+Version: 0.10.1

3Synopsis: The Elm language module.

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

5 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/)

3

4## Install

5

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/>

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

9+**OS X 10.9** — follow

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

10[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.

9

12

13+**Platform Agnostic** —

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

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

11Once the Haskell Platform is installed:

15Once the Haskell Platform is installed:

12

16

13 cabal update

17 cabal update

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

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

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

20

24

21Cabal should tell you where your executables are located upon

25Cabal should tell you where your executables are located upon

22−successful installation.

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

23−

27+which you should append to your PATH variable.

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−

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

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

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

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

29

30

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

44

45

45#### Final Notes

46#### Final Notes

46

47

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

48+The `elm` package provides

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

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

49−

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

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

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

58+or ask a question in the

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

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"

2, "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."

4, "license": "BSD3"

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

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

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

7, "dependencies": {}

8, "exposed-modules":

9 [ "Basics"

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

36 , "WebSocket"

37 , "Window"

38 ]

39−}

39+}

server/Server.hs+4−4

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

12import System.FilePath

13import System.Process

14import GHC.IO.Handle

15−import qualified Language.Elm as Elm

15+import qualified Elm.Internal.Paths as ElmPaths

16import Paths_elm_server

17

18runtime = "/elm-runtime.js"

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

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

75parse args =

76 if null remainingArgs then

77− serve portNumber =<< elmRuntime

77+ serve portNumber elmRuntime

78 else

79 putStrLn usageMini

80

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

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

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

88 elmRuntime = if null runtimeArg then

89− Elm.runtime

89+ ElmPaths.runtime

90 else

91− return $ argValue runtimeArg

91+ argValue runtimeArg

92

93usageMini :: String

94usageMini =

server/elm-server.cabal+2−2

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

1Name: elm-server

2−Version: 0.10

2+Version: 0.10.1

3Synopsis: The Elm language server.

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

5

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

36 happstack-server,

37 deepseq,

38 filepath,

39− Elm >= 0.10,

39+ Elm >= 0.10.1,

40 process